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

@@ -56,10 +56,13 @@
     Platform& platform = Platform::GetInstance();
 
     FBootFields = new PackageBootFields();
     FDebugging = dsNone;
 
+    // Allow duplicates for Java options, so we can have multiple --add-exports
+    // or similar args.
+    FBootFields->FJavaOptions.SetAllowDuplicates(true);
     FBootFields->FPackageRootDirectory = platform.GetPackageRootDirectory();
     FBootFields->FPackageAppDirectory = platform.GetPackageAppDirectory();
     FBootFields->FPackageLauncherDirectory =
             platform.GetPackageLauncherDirectory();
     FBootFields->FAppDataDirectory = platform.GetAppDataDirectory();

@@ -76,13 +79,11 @@
             FilePath::FixPathForPlatform(FBootFields->FPackageAppDataDirectory);
 
     // Main JAR.
     config->GetValue(keys[CONFIG_SECTION_APPLICATION],
             keys[CONFIG_MAINJAR_KEY], FBootFields->FMainJar);
-    FBootFields->FMainJar =
-            FilePath::IncludeTrailingSeparator(GetPackageAppDirectory())
-            + FilePath::FixPathForPlatform(FBootFields->FMainJar);
+    FBootFields->FMainJar = FilePath::FixPathForPlatform(FBootFields->FMainJar);
 
     // Main Module.
     config->GetValue(keys[CONFIG_SECTION_APPLICATION],
             keys[CONFIG_MAINMODULE_KEY], FBootFields->FMainModule);