[GitHub] JaroslavTulach closed pull request #422: Backport of emilianbold's transaction for bug #250103

[GitBox <gi...@apache.org>]

JaroslavTulach closed pull request #422: Backport of emilianbold's transaction for bug #250103
URL: https://github.com/apache/incubator-netbeans/pull/422
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/nbi/engine/src/org/netbeans/installer/wizard/components/actions/CreateMacOSAppLauncherAction.java b/nbi/engine/src/org/netbeans/installer/wizard/components/actions/CreateMacOSAppLauncherAction.java
index e05fab856..8e93c8095 100644
--- a/nbi/engine/src/org/netbeans/installer/wizard/components/actions/CreateMacOSAppLauncherAction.java
+++ b/nbi/engine/src/org/netbeans/installer/wizard/components/actions/CreateMacOSAppLauncherAction.java
@@ -42,6 +42,7 @@
 import org.netbeans.installer.utils.system.launchers.LauncherResource;
 import org.netbeans.installer.utils.system.launchers.impl.CommandLauncher;
 import org.netbeans.installer.wizard.components.WizardAction;
+import static org.netbeans.installer.wizard.components.actions.CreateNativeLauncherAction.BUNDLED_JVM_FILE_PROPERTY;
 
 /**
  *
@@ -162,6 +163,15 @@ public void execute() {
                     LauncherResource.Type.RELATIVE_LAUNCHER_PARENT.
                     getPathString("../Resources/" + iconName));
             
+            if (System.getProperty(BUNDLED_JVM_FILE_PROPERTY) != null) {
+                final LauncherResource jvm = new LauncherResource(
+                        new File(System.getProperty(BUNDLED_JVM_FILE_PROPERTY)));
+                properties.addJVM(jvm);
+                properties.getJvmArguments().add(
+                        "-D" + BUNDLED_JVM_FILE_PROPERTY + "="
+                        + jvm.getAbsolutePath());
+            }
+
             File file = SystemUtils.createLauncher(properties, platform, progress).
                     getOutputFile();
             


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services

---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists