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

rev 9619 : imported patch 9-jake-fxpackager.patch

@@ -98,10 +98,14 @@
     }
     else if (FBootFields->FClassPath.find(GetMainJar()) == TString::npos) {
         FBootFields->FClassPath = GetMainJar() + FilePath::PathSeparator() + FBootFields->FClassPath;
     }
 
+    // Modulepath.
+    config->GetValue(keys[CONFIG_SECTION_APPLICATION], keys[CONFIG_MODULEPATH_KEY], FBootFields->FModulePath);
+    FBootFields->FModulePath = FilePath::FixPathSeparatorForPlatform(FBootFields->FModulePath);
+
     // Main Class.
     config->GetValue(keys[CONFIG_SECTION_APPLICATION], keys[CONFIG_MAINCLASSNAME_KEY], FBootFields->FMainClassName);
 
     // Splash Screen.
     if (config->GetValue(keys[CONFIG_SECTION_APPLICATION], keys[CONFIG_SPLASH_KEY], FBootFields->FSplashScreenFileName) == true) {

@@ -560,10 +564,15 @@
 TString Package::GetClassPath() {
     assert(FBootFields != NULL);
     return FBootFields->FClassPath;
 }
 
+TString Package::GetModulePath() {
+    assert(FBootFields != NULL);
+    return FBootFields->FModulePath;
+}
+
 TString Package::GetMainJar() {
     assert(FBootFields != NULL);
     return FBootFields->FMainJar;
 }