Skip to content

Commit 53c737d

Browse files
committed
U fix problem with launch4j output directory
1 parent 6930d38 commit 53c737d

File tree

4 files changed

+21
-9
lines changed

4 files changed

+21
-9
lines changed

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

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@
1717
import io.github.fvarrui.javapackager.packagers.WindowsPackager;
1818

1919
/**
20-
* Gradle context
20+
* Gradle context
2121
*/
2222
public class GradleContext extends Context<Logger> {
2323

2424
private Project project;
2525

2626
private Launch4jLibraryTask libraryTask;
27-
27+
2828
public GradleContext(Project project) {
2929
super();
30-
this.project = project;
30+
this.project = project;
3131
}
3232

3333
public Logger getLogger() {
@@ -42,6 +42,11 @@ public Project getProject() {
4242
public File getRootDir() {
4343
return project.getRootDir();
4444
}
45+
46+
@Override
47+
public File getBuildDir() {
48+
return project.getBuildDir();
49+
}
4550

4651
@Override
4752
public File createRunnableJar(Packager packager) throws Exception {
@@ -68,10 +73,10 @@ public File resolveLicense(Packager packager) throws Exception {
6873
// do nothing
6974
return null;
7075
}
71-
76+
7277
@Override
7378
public File createWindowsExe(WindowsPackager packager) throws Exception {
74-
return new CreateWindowsExe().apply(packager);
79+
return new CreateWindowsExe().apply(packager);
7580
}
7681

7782
public Launch4jLibraryTask getLibraryTask() {
@@ -81,9 +86,10 @@ public Launch4jLibraryTask getLibraryTask() {
8186
public void setLibraryTask(Launch4jLibraryTask libraryTask) {
8287
this.libraryTask = libraryTask;
8388
}
84-
89+
8590
/**
8691
* Returns project's default toolchain
92+
*
8793
* @return Default toolchain
8894
*/
8995
public File getDefaultToolchain() {

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,16 @@ public ExecutionEnvironment getEnv() {
3030
public Log getLogger() {
3131
return logger;
3232
}
33-
33+
3434
@Override
3535
public File getRootDir() {
3636
return env.getMavenProject().getBasedir();
3737
}
38+
39+
@Override
40+
public File getBuildDir() {
41+
return new File(env.getMavenProject().getBuild().getDirectory());
42+
}
3843

3944
@Override
4045
public File createRunnableJar(Packager packager) throws Exception {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public File getGenericExe() {
5656

5757
public void setGenericExe(File genericExe) {
5858
this.genericExe = genericExe;
59-
}
59+
}
6060

6161
/**
6262
* Renames assets required for launch4j to avoid unsupported characters
@@ -71,7 +71,7 @@ protected void createAssets(WindowsPackager packager) throws Exception {
7171
File iconFile = packager.getIconFile();
7272
File jarFile = packager.getJarFile();
7373

74-
File launch4j = new File(Context.getGradleContext().getProject().getBuildDir(), "launch4j");
74+
File launch4j = new File(Context.getContext().getBuildDir(), "launch4j");
7575
FileUtils.mkdir(launch4j);
7676

7777
genericManifest = new File(launch4j, "app.exe.manifest");

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ public Context() {
3232
// common properties
3333

3434
public abstract File getRootDir();
35+
public abstract File getBuildDir();
3536
public abstract T getLogger();
3637

3738
// platform independent functions

0 commit comments

Comments
 (0)