Skip to content

Commit b76ceee

Browse files
committed
winrun4j-launcher removed (not needed anymore)
1 parent 7efb884 commit b76ceee

File tree

6 files changed

+1
-74
lines changed

6 files changed

+1
-74
lines changed

build.gradle

-2
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,6 @@ java {
8080
withJavadocJar()
8181
}
8282

83-
build.dependsOn ':winrun4j-launcher:build'
84-
8583
// OSSRH publication
8684
publishing {
8785
repositories {

settings.gradle

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
rootProject.name = 'javapackager'
2-
include 'winrun4j-launcher'
1+
rootProject.name = 'javapackager'

src/main/java/io/github/fvarrui/javapackager/packagers/CreateWindowsExeWinRun4j.java

-20
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
package io.github.fvarrui.javapackager.packagers;
22

33
import java.io.File;
4-
import java.io.FileOutputStream;
54
import java.nio.file.Path;
65
import java.util.Arrays;
76
import java.util.Optional;
8-
import java.util.Properties;
97

108
import org.apache.commons.lang3.StringUtils;
119

@@ -14,7 +12,6 @@
1412
import io.github.fvarrui.javapackager.model.WindowsConfig;
1513
import io.github.fvarrui.javapackager.model.WindowsExeCreationTool;
1614
import io.github.fvarrui.javapackager.utils.FileUtils;
17-
import io.github.fvarrui.javapackager.utils.JarUtils;
1815
import io.github.fvarrui.javapackager.utils.Logger;
1916
import io.github.fvarrui.javapackager.utils.RcEdit;
2017
import io.github.fvarrui.javapackager.utils.VelocityUtils;
@@ -52,9 +49,7 @@ protected File doApply(WindowsPackager packager) throws Exception {
5249
File jarFile = packager.getJarFile();
5350
File manifestFile = packager.getManifestFile();
5451
File iconFile = packager.getIconFile();
55-
File libsFolder = packager.getLibsFolder();
5652
File appFolder = packager.getAppFolder();
57-
String mainClass = packager.getMainClass();
5853
File jreDestinationFolder = packager.getJreDestinationFolder();
5954
boolean bundleJre = packager.getBundleJre();
6055
String vmLocation = packager.getWinConfig().getVmLocation();
@@ -136,21 +131,6 @@ protected File doApply(WindowsPackager packager) throws Exception {
136131
// copies JAR to libs folder
137132
FileUtils.copyFileToFolder(jarFile, appFolder);
138133

139-
// copies winrun4j launcher helper library (needed to work around
140-
/*
141-
File winrun4jJar = new File(libsFolder, "winrun4j-launcher.jar");
142-
FileUtils.copyResourceToFile("/windows/winrun4j-launcher.jar", winrun4jJar);
143-
144-
// generates winrun4j properties pointing to main class
145-
File propertiesFile = new File(getOutputFolder(), "winrun4j.properties");
146-
Properties properties = new Properties();
147-
properties.setProperty("main.class", mainClass);
148-
properties.store(new FileOutputStream(propertiesFile), "WinRun4J Helper Launcher Properties");
149-
150-
// copies winrun4j properties to launcher jar
151-
JarUtils.addFileToJar(winrun4jJar, propertiesFile);
152-
*/
153-
154134
// generates ini file
155135
File genericIni = new File(getOutputFolder(), "app.ini");
156136
VelocityUtils.render("windows/ini.vtl", genericIni, packager);

winrun4j-launcher/build.gradle

-36
This file was deleted.

winrun4j-launcher/settings.gradle

-1
This file was deleted.

winrun4j-launcher/src/main/java/WinRun4JLauncher.java

-13
This file was deleted.

0 commit comments

Comments
 (0)