Skip to content

Commit 1ea4751

Browse files
committed
added %PATH% to jre-path entry
1 parent 84d6d8b commit 1ea4751

File tree

2 files changed

+16
-26
lines changed

2 files changed

+16
-26
lines changed

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

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
package io.github.fvarrui.javapackager.gradle;
22

3-
import java.io.File;
4-
import java.util.HashSet;
5-
import java.util.List;
6-
import java.util.UUID;
7-
8-
import org.apache.commons.lang3.StringUtils;
9-
103
import edu.sc.seis.launch4j.tasks.Launch4jLibraryTask;
114
import io.github.fvarrui.javapackager.model.WindowsConfig;
125
import io.github.fvarrui.javapackager.packagers.Context;
136
import io.github.fvarrui.javapackager.packagers.Packager;
147
import io.github.fvarrui.javapackager.packagers.WindowsArtifactGenerator;
158
import io.github.fvarrui.javapackager.packagers.WindowsPackager;
169
import io.github.fvarrui.javapackager.utils.FileUtils;
10+
import org.apache.commons.lang3.StringUtils;
11+
12+
import java.io.File;
13+
import java.util.HashSet;
14+
import java.util.List;
15+
import java.util.UUID;
1716

1817
/**
1918
* Creates Windows native executable on Gradle context
@@ -63,7 +62,7 @@ protected File doApply(Packager packager) throws Exception {
6362
l4jTask.setMainClassName(mainClass);
6463
l4jTask.setClasspath(new HashSet<>(windowsPackager.getClasspaths()));
6564
l4jTask.setChdir(useResourcesAsWorkingDir ? "." : "");
66-
l4jTask.setBundledJrePath(bundleJre ? jreDirectoryName : "%JAVA_HOME%");
65+
l4jTask.setBundledJrePath(bundleJre ? jreDirectoryName : "%JAVA_HOME%;%PATH%");
6766
if (!StringUtils.isBlank(jreMinVersion)) {
6867
l4jTask.setJreMinVersion(jreMinVersion);
6968
}

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

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,19 @@
11
package io.github.fvarrui.javapackager.maven;
22

3-
import static org.twdata.maven.mojoexecutor.MojoExecutor.artifactId;
4-
import static org.twdata.maven.mojoexecutor.MojoExecutor.configuration;
5-
import static org.twdata.maven.mojoexecutor.MojoExecutor.element;
6-
import static org.twdata.maven.mojoexecutor.MojoExecutor.executeMojo;
7-
import static org.twdata.maven.mojoexecutor.MojoExecutor.goal;
8-
import static org.twdata.maven.mojoexecutor.MojoExecutor.groupId;
9-
import static org.twdata.maven.mojoexecutor.MojoExecutor.plugin;
10-
import static org.twdata.maven.mojoexecutor.MojoExecutor.version;
11-
12-
import java.io.File;
13-
import java.util.ArrayList;
14-
import java.util.List;
15-
import java.util.stream.Collectors;
16-
17-
import org.apache.commons.lang3.StringUtils;
18-
import org.twdata.maven.mojoexecutor.MojoExecutor.Element;
19-
203
import io.github.fvarrui.javapackager.model.WindowsConfig;
214
import io.github.fvarrui.javapackager.packagers.Context;
225
import io.github.fvarrui.javapackager.packagers.Packager;
236
import io.github.fvarrui.javapackager.packagers.WindowsArtifactGenerator;
247
import io.github.fvarrui.javapackager.packagers.WindowsPackager;
258
import io.github.fvarrui.javapackager.utils.FileUtils;
9+
import org.apache.commons.lang3.StringUtils;
10+
11+
import java.io.File;
12+
import java.util.ArrayList;
13+
import java.util.List;
14+
import java.util.stream.Collectors;
15+
16+
import static org.twdata.maven.mojoexecutor.MojoExecutor.*;
2617

2718
/**
2819
* Copies all dependencies to app folder on Maven context
@@ -68,7 +59,7 @@ protected File doApply(Packager packager) {
6859

6960
List<Element> jreElements = new ArrayList<>();
7061
jreElements.add(element("opts", optsElements.toArray(new Element[optsElements.size()])));
71-
jreElements.add(element("path", bundleJre ? jreDirectoryName : "%JAVA_HOME%"));
62+
jreElements.add(element("path", bundleJre ? jreDirectoryName : "%JAVA_HOME%;%PATH%"));
7263
if (!StringUtils.isBlank(jreMinVersion)) {
7364
jreElements.add(element("minVersion", jreMinVersion));
7465
}

0 commit comments

Comments
 (0)