Skip to content

Commit 931c0b4

Browse files
committed
Update CreateWindowsExe.java
1 parent fe97405 commit 931c0b4

File tree

1 file changed

+9
-14
lines changed

1 file changed

+9
-14
lines changed

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

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
* Creates Windows native executable on Gradle context
1818
*/
1919
public class CreateWindowsExe extends AbstractCreateWindowsExe {
20-
20+
2121
@Override
2222
protected File doApply(WindowsPackager packager) throws Exception {
23-
23+
2424
List<String> vmArgs = packager.getVmArgs();
2525
WindowsConfig winConfig = packager.getWinConfig();
2626
File executable = packager.getExecutable();
@@ -30,16 +30,11 @@ protected File doApply(WindowsPackager packager) throws Exception {
3030
String jreDirectoryName = packager.getJreDirectoryName();
3131
String jreMinVersion = packager.getJreMinVersion();
3232
File jarFile = packager.getJarFile();
33-
34-
try {
35-
// creates a folder only for launch4j assets
36-
createAssets(packager);
37-
} catch (Exception ex) {
38-
throw new RuntimeException(ex);
39-
}
40-
33+
34+
createAssets(packager); // creates a folder only for launch4j assets
35+
4136
String jarPath = winConfig.isWrapJar() ? getGenericJar().getAbsolutePath() : jarFile.getName();
42-
37+
4338
Launch4jLibraryTask l4jTask = Context.getGradleContext().getLibraryTask();
4439
l4jTask.getOutputs().upToDateWhen(task -> false);
4540
l4jTask.setHeaderType(winConfig.getHeaderType().toString());
@@ -54,7 +49,7 @@ protected File doApply(WindowsPackager packager) throws Exception {
5449
if (bundleJre) {
5550
l4jTask.setBundledJrePath(jreDirectoryName);
5651
}
57-
if (!StringUtils.isBlank(jreMinVersion)) {
52+
if (!StringUtils.isBlank(jreMinVersion)) {
5853
l4jTask.setJreMinVersion(jreMinVersion);
5954
}
6055
l4jTask.getJvmOptions().addAll(vmArgs);
@@ -67,11 +62,11 @@ protected File doApply(WindowsPackager packager) throws Exception {
6762
l4jTask.setInternalName(winConfig.getInternalName());
6863
l4jTask.setTrademarks(winConfig.getTrademarks());
6964
l4jTask.setLanguage(winConfig.getLanguage());
70-
//l4jTask.setLibraryDir("");
65+
// l4jTask.setLibraryDir("");
7166
l4jTask.getActions().forEach(action -> action.execute(l4jTask));
7267

7368
sign(getGenericExe(), packager);
74-
69+
7570
FileUtils.copyFileToFile(getGenericExe(), executable);
7671

7772
return createBootstrapScript(packager);

0 commit comments

Comments
 (0)