src/jdk.incubator.jpackage/macosx/native/libapplauncher/MacPlatform.mm

*** 95,105 ****
  MacPlatform::~MacPlatform(void) {
  }
  
  TString MacPlatform::GetPackageAppDirectory() {
      return FilePath::IncludeTrailingSeparator(
!             GetPackageRootDirectory()) + _T("Java");
  }
  
  TString MacPlatform::GetPackageLauncherDirectory() {
      return FilePath::IncludeTrailingSeparator(
              GetPackageRootDirectory()) + _T("MacOS");
--- 95,105 ----
  MacPlatform::~MacPlatform(void) {
  }
  
  TString MacPlatform::GetPackageAppDirectory() {
      return FilePath::IncludeTrailingSeparator(
!             GetPackageRootDirectory()) + _T("app");
  }
  
  TString MacPlatform::GetPackageLauncherDirectory() {
      return FilePath::IncludeTrailingSeparator(
              GetPackageRootDirectory()) + _T("MacOS");
*** 196,209 ****
      }
  
      return result;
  }
  
- void MacPlatform::SetCurrentDirectory(TString Value) {
-     chdir(PlatformString(Value).toPlatformString());
- }
- 
  TString MacPlatform::GetPackageRootDirectory() {
      NSBundle *mainBundle = [NSBundle mainBundle];
      NSString *mainBundlePath = [mainBundle bundlePath];
      NSString *contentsPath =
              [mainBundlePath stringByAppendingString : @"/Contents"];
--- 196,205 ----
*** 466,486 ****
      } else {
          keys.insert(std::map<TString, TString>::value_type(CONFIG_VERSION,
                  _T("app.version")));
          keys.insert(std::map<TString, TString>::value_type(CONFIG_MAINJAR_KEY,
                  _T("JavaMainJarName")));
!         keys.insert(std::map<TString, TString>::value_type(CONFIG_MAINMODULE_KEY,
                  _T("JavaMainModuleName")));
          keys.insert(std::map<TString, TString>::value_type(
                  CONFIG_MAINCLASSNAME_KEY, _T("JavaMainClassName")));
          keys.insert(std::map<TString, TString>::value_type(
                  CONFIG_CLASSPATH_KEY, _T("JavaAppClasspath")));
          keys.insert(std::map<TString, TString>::value_type(APP_NAME_KEY,
                  _T("CFBundleName")));
          keys.insert(std::map<TString, TString>::value_type(JAVA_RUNTIME_KEY,
                  _T("JavaRuntime")));
!         keys.insert(std::map<TString, TString>::value_type(JPACKAGE_APP_DATA_DIR,
                  _T("CFBundleIdentifier")));
  
          keys.insert(std::map<TString, TString>::value_type(CONFIG_SPLASH_KEY,
                  _T("app.splash")));
          keys.insert(std::map<TString, TString>::value_type(CONFIG_APP_MEMORY,
--- 462,484 ----
      } else {
          keys.insert(std::map<TString, TString>::value_type(CONFIG_VERSION,
                  _T("app.version")));
          keys.insert(std::map<TString, TString>::value_type(CONFIG_MAINJAR_KEY,
                  _T("JavaMainJarName")));
!         keys.insert(std::map<TString,
!                 TString>::value_type(CONFIG_MAINMODULE_KEY,
                  _T("JavaMainModuleName")));
          keys.insert(std::map<TString, TString>::value_type(
                  CONFIG_MAINCLASSNAME_KEY, _T("JavaMainClassName")));
          keys.insert(std::map<TString, TString>::value_type(
                  CONFIG_CLASSPATH_KEY, _T("JavaAppClasspath")));
          keys.insert(std::map<TString, TString>::value_type(APP_NAME_KEY,
                  _T("CFBundleName")));
          keys.insert(std::map<TString, TString>::value_type(JAVA_RUNTIME_KEY,
                  _T("JavaRuntime")));
!         keys.insert(std::map<TString,
!                 TString>::value_type(JPACKAGE_APP_DATA_DIR,
                  _T("CFBundleIdentifier")));
  
          keys.insert(std::map<TString, TString>::value_type(CONFIG_SPLASH_KEY,
                  _T("app.splash")));
          keys.insert(std::map<TString, TString>::value_type(CONFIG_APP_MEMORY,