Merge pull request #121 from farzadpanahi/master

Search PATH for JRE in Windows

Author: fvarrui

build.gradle

@@ -50,16 +50,16 @@ dependencies {
     implementation 'commons-io:commons-io:2.6'
     implementation 'org.apache.commons:commons-collections4:4.1'
     implementation 'org.apache.velocity:velocity-engine-core:2.0'
-	implementation 'io.github.fvarrui:gradle-launch4j:2.4.7' 
-	implementation 'com.netflix.nebula:gradle-ospackage-plugin:8.4.1'
-	implementation 'net.jsign:jsign-core:3.1'
+    implementation 'io.github.fvarrui:gradle-launch4j:2.4.7' 
+    implementation 'com.netflix.nebula:gradle-ospackage-plugin:8.4.1'
+    implementation 'net.jsign:jsign-core:3.1'
 
     testImplementation 'junit:junit:4.12'
 
     compileOnly 'org.apache.maven.plugin-tools:maven-plugin-annotations:3.6.0'
-	
-	mavenEmbedder 'org.apache.maven:maven-embedder:3.6.0'
-	mavenEmbedder 'org.apache.maven:maven-compat:3.6.0'	
+    
+    mavenEmbedder 'org.apache.maven:maven-embedder:3.6.0'
+    mavenEmbedder 'org.apache.maven:maven-compat:3.6.0'	
     mavenEmbedder 'org.slf4j:slf4j-simple:1.7.30'
     mavenEmbedder 'org.eclipse.aether:aether-connector-basic:1.1.0'
     mavenEmbedder 'org.eclipse.aether:aether-transport-wagon:1.1.0'

src/main/java/io/github/fvarrui/javapackager/gradle/CreateWindowsExe.java

@@ -63,7 +63,7 @@ protected File doApply(Packager packager) throws Exception {
 		l4jTask.setMainClassName(mainClass);
 		l4jTask.setClasspath(new HashSet<>(windowsPackager.getClasspaths()));
 		l4jTask.setChdir(useResourcesAsWorkingDir ? "." : "");
-		l4jTask.setBundledJrePath(bundleJre ? jreDirectoryName : "%JAVA_HOME%");
+		l4jTask.setBundledJrePath(bundleJre ? jreDirectoryName : "%JAVA_HOME%;%PATH%");
 		if (!StringUtils.isBlank(jreMinVersion)) { 
 			l4jTask.setJreMinVersion(jreMinVersion);
 		}

src/main/java/io/github/fvarrui/javapackager/maven/CreateWindowsExe.java

@@ -68,7 +68,7 @@ protected File doApply(Packager packager) {
 
 		List<Element> jreElements = new ArrayList<>();
 		jreElements.add(element("opts", optsElements.toArray(new Element[optsElements.size()])));
-		jreElements.add(element("path", bundleJre ? jreDirectoryName : "%JAVA_HOME%"));
+		jreElements.add(element("path", bundleJre ? jreDirectoryName : "%JAVA_HOME%;%PATH%"));
 		if (!StringUtils.isBlank(jreMinVersion)) {
 			jreElements.add(element("minVersion", jreMinVersion));
 		}