src/jdk.incubator.jpackage/share/native/libapplauncher/Macros.cpp

*** 37,61 ****
  void Macros::Initialize() {
      Package& package = Package::GetInstance();
      Macros& macros = Macros::GetInstance();
  
      // Public macros.
!     macros.AddMacro(_T("$APPDIR"), package.GetPackageRootDirectory());
!     macros.AddMacro(_T("$PACKAGEDIR"), package.GetPackageAppDirectory());
!     macros.AddMacro(_T("$LAUNCHERDIR"), package.GetPackageLauncherDirectory());
!     macros.AddMacro(_T("$APPDATADIR"), package.GetAppDataDirectory());
! 
!     TString javaHome =
!             FilePath::ExtractFilePath(package.GetJavaLibraryFileName());
!     macros.AddMacro(_T("$JREHOME"), javaHome);
! 
!     // App CDS Macros
!     macros.AddMacro(_T("$CACHEDIR"), package.GetAppCDSCacheDirectory());
! 
!     // Private macros.
!     TString javaVMLibraryName = FilePath::ExtractFileName(javaHome);
!     macros.AddMacro(_T("$JAVAVMLIBRARYNAME"), javaVMLibraryName);
  }
  
  Macros& Macros::GetInstance() {
      static Macros instance;
      return instance;
--- 37,49 ----
  void Macros::Initialize() {
      Package& package = Package::GetInstance();
      Macros& macros = Macros::GetInstance();
  
      // Public macros.
!     macros.AddMacro(_T("$ROOTDIR"), package.GetPackageRootDirectory());
!     macros.AddMacro(_T("$APPDIR"), package.GetPackageAppDirectory());
!     macros.AddMacro(_T("$BINDIR"), package.GetPackageLauncherDirectory());
  }
  
  Macros& Macros::GetInstance() {
      static Macros instance;
      return instance;