Updated launchers with versions that will launch in process. Added su…

…pport for fork attribute in app.xml which, when set to false, explicitly, will trigger the launcher to launch in process instead of launching a new process.

cli/src/main/java/ca/weblite/jdeploy/JDeploy.java

@@ -1116,6 +1116,8 @@ private void loadAppInfo(AppInfo appInfo) throws IOException {
         appInfo.setMacAppBundleId(getString("macAppBundleId", null));
         appInfo.setTitle(getString("displayName", appInfo.getNpmPackage()));
         appInfo.setNpmAllowPrerelease("true".equals(getenv("JDEPLOY_BUNDLE_PRERELEASE", getString("prerelease", "false"))));
+        appInfo.setFork("true".equals(getString("fork", "false")));
+
         if (rj().getAsBoolean("codesign") && rj().getAsBoolean("notarize")) {
             appInfo.setCodeSignSettings(AppInfo.CodeSignSettings.CodeSignAndNotarize);
         } else if (rj().getAsBoolean("codesign")) {

installer/package.json

@@ -15,7 +15,8 @@
       "bundles" : ["mac", "win", "linux"],
       "macAppBundleId" : "HRNMHC7527.ca.weblite.jdeploy.installer",
       "codesign" : true,
-      "notarize" : false
+      "notarize" : false,
+      "fork" : true
   },
   "dependencies": {"shelljs": "^0.8.4"},
   "license": "ISC",

installer/src/main/java/ca/weblite/jdeploy/installer/Main.java

@@ -153,6 +153,7 @@ private void loadAppInfo() throws IOException {
         appInfo.setAppURL(appXml.toURI().toURL());
         appInfo.setTitle(ifEmpty(root.getAttribute("title"), root.getAttribute("package"), null));
         appInfo.setNpmPackage(ifEmpty(root.getAttribute("package"), null));
+        appInfo.setFork(false);
 
         String installerVersion = ifEmpty(root.getAttribute("version"), "latest");
 

jar-runner/src/JarRunner.java

@@ -53,7 +53,7 @@ public static void run(File jarFile, String[] args) throws Exception {
         //URLClassLoader classPathLoader = new URLClassLoader(classURLs.toArray(new URL[classURLs.size()]));
         //Thread.currentThread().setContextClassLoader(classPathLoader);
 
-        Class clsMain = JarRunner.class.getClassLoader().loadClass(mainClass);
+        Class clsMain = Thread.currentThread().getContextClassLoader().loadClass(mainClass);
         Method mainMethod = clsMain.getMethod("main", String[].class);
         mainMethod.invoke(null, (Object)args);
     }

shared/src/main/java/ca/weblite/jdeploy/app/AppInfo.java

@@ -44,6 +44,7 @@ public class AppInfo  {
     private String npmVersion;
     private boolean npmAllowPrerelease;
     private String jdeployBundleCode;
+    private boolean fork;
 
 
 
@@ -225,6 +226,14 @@ public void setJdeployBundleCode(String jdeployBundleCode) {
         this.jdeployBundleCode = jdeployBundleCode;
     }
 
+    public boolean isFork() {
+        return fork;
+    }
+
+    public void setFork(boolean fork) {
+        this.fork = fork;
+    }
+
 
     public static enum Updates {
         Auto,

shared/src/main/java/ca/weblite/jdeploy/appbundler/AppDescription.java

@@ -16,6 +16,7 @@ public class AppDescription {
     private String npmPackage;
     private String npmVersion;
     private boolean npmPrerelease;
+    private boolean fork;
     private String url;
     private List<Jar> jars;
     private String name;
@@ -227,4 +228,12 @@ public boolean isNpmPrerelease() {
     public void setNpmPrerelease(boolean npmPrerelease) {
         this.npmPrerelease = npmPrerelease;
     }
+
+    public boolean isFork() {
+        return fork;
+    }
+
+    public void setFork(boolean fork) {
+        this.fork = fork;
+    }
 }

shared/src/main/java/ca/weblite/jdeploy/appbundler/Bundler.java

@@ -100,6 +100,7 @@ public static BundlerResult runit(AppInfo appInfo, String url,
         AppDescription app = new AppDescription();
         app.setNpmPrerelease(appInfo.isNpmAllowPrerelease());
         app.setName(appInfo.getTitle());
+        app.setFork(appInfo.isFork());
         URL iconURL = URLUtil.url(appInfo.getAppURL(), "icon.png");
         app.setIconDataURI(toDataURI(iconURL));
 

shared/src/main/java/com/joshondesign/appbundler/linux/LinuxBundler.java

@@ -97,7 +97,8 @@ private static void processAppXml(AppDescription app, File dest) throws Exceptio
                     "package", app.getNpmPackage(),
                     "version", app.getNpmVersion(),
                     "icon", app.getIconDataURI(),
-                    "prerelease", app.isNpmPrerelease()+""
+                    "prerelease", app.isNpmPrerelease()+"",
+                    "fork", ""+app.isFork()
             ).end();
         } else {
             out.start("app", "name", app.getName(), "url", app.getUrl(), "icon", app.getIconDataURI()).end();

shared/src/main/java/com/joshondesign/appbundler/mac/MacBundler.java

@@ -284,7 +284,8 @@ private static void processAppXml(AppDescription app, File contentsDir) throws E
                     "package", app.getNpmPackage(),
                     "version", app.getNpmVersion(),
                     "icon", app.getIconDataURI(),
-                    "prerelease", app.isNpmPrerelease() ? "true" : "false"
+                    "prerelease", app.isNpmPrerelease() ? "true" : "false",
+                    "fork", ""+app.isFork()
             ).end();
         } else {
             out.start("app", "name", app.getName(), "url", app.getUrl(), "icon", app.getIconDataURI()).end();

shared/src/main/java/com/joshondesign/appbundler/win/WindowsBundler2.java

@@ -101,7 +101,8 @@ private static void processAppXml(AppDescription app, File dest) throws Exceptio
                     "package", app.getNpmPackage(),
                     "version", app.getNpmVersion(),
                     "icon", app.getIconDataURI(),
-                    "prerelease", app.isNpmPrerelease()+""
+                    "prerelease", app.isNpmPrerelease()+"",
+                    "fork", ""+app.isFork()
             ).end();
         } else {
             out.start("app", "name", app.getName(), "url", app.getUrl(), "icon", app.getIconDataURI()).end();