#127 Added multiple bundled JRE path search.

Author: grzegok

head/head.o

@@ -2,7 +2,7 @@
 	Launch4j (http://launch4j.sourceforge.net/)
 	Cross-platform Java application wrapper for creating Windows native executables.
 
-	Copyright (c) 2004, 2015 Grzegorz Kowal,
+	Copyright (c) 2004, 2019 Grzegorz Kowal,
 							 Ian Roberts (jdk preference patch)
 							 Sylvain Mina (single instance patch)
 
@@ -914,7 +914,7 @@ void setWorkingDirectory(const char *exePath, const int pathLen)
 BOOL bundledJreSearch(const char *exePath, const int pathLen)
 {
     debugAll("bundledJreSearch()\n");
-	char tmpPath[_MAX_PATH] = {0};
+	char jrePathSpec[_MAX_PATH] = {0};
     BOOL is64BitJre = loadBool(BUNDLED_JRE_64_BIT);
 
     if (!wow64 && is64BitJre)
@@ -923,30 +923,36 @@ BOOL bundledJreSearch(const char *exePath, const int pathLen)
         return FALSE;
     }
 
-	if (loadString(JRE_PATH, tmpPath))
+	if (loadString(JRE_PATH, jrePathSpec))
 	{
 		char jrePath[MAX_ARGS] = {0};
-		expandVars(jrePath, tmpPath, exePath, pathLen);
-		debug("Bundled JRE:\t%s\n", jrePath);
-
-		if (jrePath[0] == '\\' || jrePath[1] == ':')
-		{
-			// Absolute
-			strcpy(launcher.cmd, jrePath);
-		}
-		else
-		{
-			// Relative
-			strncpy(launcher.cmd, exePath, pathLen);
-			appendPath(launcher.cmd, jrePath);
-		}
-
-		if (isLauncherPathValid(launcher.cmd))
-		{
-            search.foundJava = is64BitJre ? FOUND_BUNDLED | KEY_WOW64_64KEY : FOUND_BUNDLED;
-			strcpy(search.foundJavaHome, launcher.cmd);
-			return TRUE;
-		}
+		expandVars(jrePath, jrePathSpec, exePath, pathLen);
+		debug("Bundled JRE(s):\t%s\n", jrePath);
+        char* path = strtok(jrePath, ";");
+        
+        while (path != NULL)
+        {
+            if (*path == '\\' || (*path != '\0' && *(path + 1) == ':'))
+    		{
+    			// Absolute
+    			strcpy(launcher.cmd, path);
+    		}
+    		else
+    		{
+    			// Relative
+    			strncpy(launcher.cmd, exePath, pathLen);
+    			appendPath(launcher.cmd, path);
+    		}
+
+    		if (isLauncherPathValid(launcher.cmd))
+    		{
+                search.foundJava = is64BitJre ? FOUND_BUNDLED | KEY_WOW64_64KEY : FOUND_BUNDLED;
+    			strcpy(search.foundJavaHome, launcher.cmd);
+    			return TRUE;
+    		}
+
+            path = strtok(NULL, ";");
+        }
     }
 
     return FALSE;

head_src/head.c

@@ -54,7 +54,7 @@
 #include <process.h>
 
 #define LAUNCH4j "Launch4j"
-#define VERSION "3.12"
+#define VERSION "3.13"
 
 #define JRE_VER_MAX_DIGITS_PER_PART 3
 

head_src/head.h

@@ -1,7 +1,7 @@
 Launch4j :: Cross-platform Java application wrapper
      for creating Windows native executables
 
-     Copyright (c) 2004, 2018 Grzegorz Kowal
+     Copyright (c) 2004, 2019 Grzegorz Kowal
               All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

l4j/nsis/launch4j-setup-license.txt

@@ -2,7 +2,7 @@
 
 ; HM NIS Edit Wizard helper defines
 !define PRODUCT_NAME "Launch4j"
-!define PRODUCT_VERSION "3.12"
+!define PRODUCT_VERSION "3.13"
 !define PRODUCT_PUBLISHER "Grzegorz Kowal"
 !define PRODUCT_WEB_SITE "http://launch4j.sourceforge.net"
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\launch4j.exe"

l4j/nsis/launch4j.nsi

@@ -1,7 +1,7 @@
 Launch4j (http://launch4j.sourceforge.net/)
 Cross-platform Java application wrapper for creating Windows native executables.
 
-Copyright (c) 2004, 2017 Grzegorz Kowal
+Copyright (c) 2004, 2019 Grzegorz Kowal
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

src/LICENSE.txt

@@ -1,2 +1,2 @@
-versionNumber=3.12.0.0
-version=3.12
+versionNumber=3.13.0.0
+version=3.13

src/launch4j.properties

@@ -86,7 +86,7 @@ private static void setDescription(Properties props) {
 				" (http://launch4j.sourceforge.net/)\n" +
 				"Cross-platform Java application wrapper" +
 						" for creating Windows native executables.\n\n" +
-				"Copyright (C) 2004, 2018 Grzegorz Kowal\n\n" +
+				"Copyright (C) 2004, 2019 Grzegorz Kowal\n\n" +
 				"Launch4j comes with ABSOLUTELY NO WARRANTY.\n" +
 				"This is free software, licensed under the BSD License.\n" +
 				"This product includes software developed by the Apache Software Foundation" +

src/net/sf/launch4j/Main.java

@@ -88,8 +88,8 @@ mutexNameTip=Mutex name that will uniquely identify your application.
 windowTitle=Window title
 windowTitleTip=Title of the GUI application window to bring up on attempt to start a next instance.
 
-jrePath=Bundled JRE path:
-jrePathTip=Bundled JRE path relative to the executable or absolute.
+jrePath=Bundled JRE paths:
+jrePathTip=Bundled JRE path(s) relative to the executable or absolute, for example 'myAppJre' or 'c:\\GlobalJre;%JAVA_HOME%'.
 bundledJre64Bit=64-bit
 bundledJre64BitTip=The bundled JRE is 64-bit, heap size will not be limited to the 32-bit maximum.
 bundledJreAsFallback=Fallback option