modules/fxpackager/src/main/native/library/common/GenericPlatform.cpp

*** 31,41 ****
   */
  
  
  #include "GenericPlatform.h"
  
- 
  #include <fstream>
  #include <locale>
  
  #ifdef WINDOWS
  #include <codecvt>
--- 31,40 ----
*** 51,61 ****
  TString GenericPlatform::GetConfigFileName() {
      TString result;
      TString basedir = GetPackageAppDirectory();
      
      if (basedir.empty() == false) {
!         basedir = FilePath::IncludeTrailingSlash(basedir);
          TString appConfig = basedir + GetAppName() + _T(".cfg");
          
          if (FilePath::FileExists(appConfig) == true) {
              result = appConfig;
          }
--- 50,60 ----
  TString GenericPlatform::GetConfigFileName() {
      TString result;
      TString basedir = GetPackageAppDirectory();
  
      if (basedir.empty() == false) {
!         basedir = FilePath::IncludeTrailingSeparater(basedir);
          TString appConfig = basedir + GetAppName() + _T(".cfg");
  
          if (FilePath::FileExists(appConfig) == true) {
              result = appConfig;
          }
*** 71,93 ****
      return result;
  }
  
  TString GenericPlatform::GetPackageAppDirectory() {
  #if defined(WINDOWS) || defined(LINUX)
!     return FilePath::IncludeTrailingSlash(GetPackageRootDirectory()) + _T("app");
  #endif //WINDOWS || LINUX
  #ifdef MAC
!     return FilePath::IncludeTrailingSlash(GetPackageRootDirectory()) + _T("Java");
  #endif
  }
  
  TString GenericPlatform::GetPackageLauncherDirectory() {
  #if defined(WINDOWS) || defined(LINUX)
      return GetPackageRootDirectory();
  #endif //WINDOWS || LINUX
  #ifdef MAC
!     return FilePath::IncludeTrailingSlash(GetPackageRootDirectory()) + _T("MacOS");
  #endif
  }
  
  std::list<TString> GenericPlatform::LoadFromFile(TString FileName) {
      std::list<TString> result;
--- 70,92 ----
      return result;
  }
  
  TString GenericPlatform::GetPackageAppDirectory() {
  #if defined(WINDOWS) || defined(LINUX)
!     return FilePath::IncludeTrailingSeparater(GetPackageRootDirectory()) + _T("app");
  #endif //WINDOWS || LINUX
  #ifdef MAC
!     return FilePath::IncludeTrailingSeparater(GetPackageRootDirectory()) + _T("Java");
  #endif
  }
  
  TString GenericPlatform::GetPackageLauncherDirectory() {
  #if defined(WINDOWS) || defined(LINUX)
      return GetPackageRootDirectory();
  #endif //WINDOWS || LINUX
  #ifdef MAC
!     return FilePath::IncludeTrailingSeparater(GetPackageRootDirectory()) + _T("MacOS");
  #endif
  }
  
  std::list<TString> GenericPlatform::LoadFromFile(TString FileName) {
      std::list<TString> result;
*** 161,179 ****
  }
  #endif //WINDOWS || LINUX
  
  std::map<TString, TString> GenericPlatform::GetKeys() {
      std::map<TString, TString> keys;
      keys.insert(std::map<TString, TString>::value_type(CONFIG_MAINJAR_KEY,       _T("app.mainjar")));
      keys.insert(std::map<TString, TString>::value_type(CONFIG_MAINCLASSNAME_KEY, _T("app.mainclass")));
      keys.insert(std::map<TString, TString>::value_type(CONFIG_CLASSPATH_KEY,     _T("app.classpath")));
      keys.insert(std::map<TString, TString>::value_type(APP_NAME_KEY,             _T("app.name")));
-     keys.insert(std::map<TString, TString>::value_type(CONFIG_SPLASH_KEY,        _T("app.splash")));
      keys.insert(std::map<TString, TString>::value_type(CONFIG_APP_ID_KEY,        _T("app.preferences.id")));
-     keys.insert(std::map<TString, TString>::value_type(CONFIG_APP_MEMORY,        _T("app.memory")));
      keys.insert(std::map<TString, TString>::value_type(JVM_RUNTIME_KEY,          _T("app.runtime")));
!     keys.insert(std::map<TString, TString>::value_type(PACKAGER_APP_DATA_DIR,    _T("app.preferences.id")));
      return keys;
  }
  
  #ifdef DEBUG
  DebugState GenericPlatform::GetDebugState() {
--- 160,189 ----
  }
  #endif //WINDOWS || LINUX
  
  std::map<TString, TString> GenericPlatform::GetKeys() {
      std::map<TString, TString> keys;
+     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("app.mainjar")));
      keys.insert(std::map<TString, TString>::value_type(CONFIG_MAINCLASSNAME_KEY, _T("app.mainclass")));
      keys.insert(std::map<TString, TString>::value_type(CONFIG_CLASSPATH_KEY,     _T("app.classpath")));
      keys.insert(std::map<TString, TString>::value_type(APP_NAME_KEY,             _T("app.name")));
      keys.insert(std::map<TString, TString>::value_type(CONFIG_APP_ID_KEY,        _T("app.preferences.id")));
      keys.insert(std::map<TString, TString>::value_type(JVM_RUNTIME_KEY,          _T("app.runtime")));
!     keys.insert(std::map<TString, TString>::value_type(PACKAGER_APP_DATA_DIR,    _T("app.identifier")));
! 
!     keys.insert(std::map<TString, TString>::value_type(CONFIG_APP_MEMORY,        _T("app.memory")));
!     keys.insert(std::map<TString, TString>::value_type(CONFIG_SPLASH_KEY,        _T("app.splash")));
! 
!     keys.insert(std::map<TString, TString>::value_type(CONFIG_SECTION_APPLICATION,    _T("Application")));
!     keys.insert(std::map<TString, TString>::value_type(CONFIG_SECTION_JVMOPTIONS,     _T("JVMOptions")));
!     keys.insert(std::map<TString, TString>::value_type(CONFIG_SECTION_JVMUSEROPTIONS, _T("JVMUserOptions")));
!     keys.insert(std::map<TString, TString>::value_type(CONFIG_SECTION_JVMUSEROVERRIDESOPTIONS, _T("JVMUserOverrideOptions")));
!     keys.insert(std::map<TString, TString>::value_type(CONFIG_SECTION_APPCDSJVMOPTIONS, _T("AppCDSJVMOptions")));
!     keys.insert(std::map<TString, TString>::value_type(CONFIG_SECTION_APPCDSGENERATECACHEJVMOPTIONS, _T("AppCDSGenerateCacheJVMOptions")));
!     keys.insert(std::map<TString, TString>::value_type(CONFIG_SECTION_ARGOPTIONS,     _T("ArgOptions")));
! 
      return keys;
  }
  
  #ifdef DEBUG
  DebugState GenericPlatform::GetDebugState() {