Skip to content

Commit 52d6a51

Browse files
fvarruifvarrui
committed
Merge branch 'issue-325' into devel
2 parents 133bbe4 + 0dd0875 commit 52d6a51

File tree

6 files changed

+21
-16
lines changed

6 files changed

+21
-16
lines changed

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ dependencies {
4848
implementation 'org.vafer:jdeb:1.9'
4949
implementation 'net.jsign:jsign-core:3.1'
5050
implementation 'org.redline-rpm:redline:1.2.10'
51-
implementation 'io.github.fvarrui:launch4j:2.5.2'
51+
implementation 'edu.sc.seis.launch4j:launch4j:2.5.2'
5252

5353
testImplementation 'junit:junit:4.12'
5454

‎src/main/java/io/github/fvarrui/javapackager/maven/CreateRunnableJar.java‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import io.github.fvarrui.javapackager.packagers.ArtifactGenerator;
2323
import io.github.fvarrui.javapackager.packagers.Context;
2424
import io.github.fvarrui.javapackager.packagers.Packager;
25+
import io.github.fvarrui.javapackager.utils.FileUtils;
2526
import io.github.fvarrui.javapackager.utils.Logger;
2627
import io.github.fvarrui.javapackager.utils.MojoExecutorUtils;
2728

@@ -44,8 +45,8 @@ protected File doApply(Packager packager) {
4445
File outputDirectory = packager.getOutputDirectory();
4546
ExecutionEnvironment env = Context.getMavenContext().getEnv();
4647
Manifest manifest = packager.getManifest();
47-
48-
File jarFile = new File(outputDirectory, name + "-" + version + "-" + classifier + ".jar");
48+
String artifactId = env.getMavenProject().getArtifactId();
49+
File jarFile = new File(outputDirectory, artifactId + "-" + classifier + ".jar");
4950

5051
List<Element> archive = new ArrayList<>();
5152
archive.add(
@@ -86,18 +87,21 @@ protected File doApply(Packager packager) {
8687
configuration(
8788
element("classifier", classifier),
8889
element("archive", archive.toArray(new Element[archive.size()])),
89-
element("outputDirectory", jarFile.getParentFile().getAbsolutePath())
90+
element("outputDirectory", outputDirectory.getAbsolutePath())
9091
),
91-
env);
92-
92+
env
93+
);
94+
9395
} catch (MojoExecutionException e) {
9496

9597
Logger.error("Runnable jar creation failed! " + e.getMessage());
9698
throw new RuntimeException(e);
9799

98100
}
99101

100-
return jarFile;
102+
File finalJarFile = new File(outputDirectory, name + "-" + version + "-" + classifier + ".jar");
103+
FileUtils.rename(jarFile, finalJarFile.getName());
104+
return finalJarFile;
101105
}
102106

103107
}

‎src/main/java/io/github/fvarrui/javapackager/maven/CreateWindowsExeLaunch4j.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,17 +108,17 @@ protected File doApply(WindowsPackager packager) throws Exception {
108108
plugin(
109109
groupId("com.akathist.maven.plugins.launch4j"),
110110
artifactId("launch4j-maven-plugin"),
111-
version("2.1.1")
111+
version("2.4.1")
112112
),
113113
goal("launch4j"),
114114
configuration(pluginConfig.toArray(new Element[pluginConfig.size()])),
115115
Context.getMavenContext().getEnv()
116116
);
117117

118118
sign(getGenericExe(), packager);
119-
119+
120120
FileUtils.copyFileToFile(getGenericExe(), executable);
121-
121+
122122
} catch (Exception ex) {
123123
throw new RuntimeException(ex);
124124
}

‎src/main/java/io/github/fvarrui/javapackager/model/WindowsConfig.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package io.github.fvarrui.javapackager.model;
22

33
import static org.apache.commons.lang3.StringUtils.defaultIfBlank;
4+
import static io.github.fvarrui.javapackager.utils.ObjectUtils.defaultIfNull;
45

56
import java.io.File;
67
import java.io.Serializable;
78
import java.util.LinkedHashMap;
89
import java.util.UUID;
910

1011
import io.github.fvarrui.javapackager.packagers.Packager;
11-
import io.github.fvarrui.javapackager.utils.ObjectUtils;
1212

1313
/**
1414
* JavaPackager Windows specific configuration
@@ -337,18 +337,20 @@ public String toString() {
337337
* @param packager Packager
338338
*/
339339
public void setDefaults(Packager packager) {
340-
this.setHeaderType(ObjectUtils.defaultIfNull(this.getHeaderType(), HeaderType.gui));
340+
this.setHeaderType(defaultIfNull(this.getHeaderType(), HeaderType.gui));
341341
this.setFileVersion(defaultIfBlank(this.getFileVersion(), "1.0.0.0"));
342342
this.setTxtFileVersion(defaultIfBlank(this.getTxtFileVersion(), "" + packager.getVersion()));
343343
this.setProductVersion(defaultIfBlank(this.getProductVersion(), "1.0.0.0"));
344-
this.setShortcutName(defaultIfBlank(this.getShortcutName(), packager.getName()));
344+
this.setShortcutName(defaultIfBlank(this.getShortcutName(), packager.getDisplayName()));
345345
this.setTxtProductVersion(defaultIfBlank(this.getTxtProductVersion(), "" + packager.getVersion()));
346346
this.setCompanyName(defaultIfBlank(this.getCompanyName(), packager.getOrganizationName()));
347+
this.setTrademarks(defaultIfBlank(this.getTrademarks(), packager.getOrganizationName()));
347348
this.setCopyright(defaultIfBlank(this.getCopyright(), packager.getOrganizationName()));
348349
this.setFileDescription(defaultIfBlank(this.getFileDescription(), packager.getDescription()));
349350
this.setProductName(defaultIfBlank(this.getProductName(), packager.getName()));
350351
this.setInternalName(defaultIfBlank(this.getInternalName(), packager.getName()));
351352
this.setOriginalFilename(defaultIfBlank(this.getOriginalFilename(), packager.getName() + ".exe"));
352353
this.setMsiUpgradeCode(defaultIfBlank(this.getMsiUpgradeCode(), UUID.randomUUID().toString()));
353354
}
355+
354356
}

‎src/main/java/io/github/fvarrui/javapackager/packagers/CreateWindowsExeWhy.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ public boolean skip(WindowsPackager packager) {
3333
@Override
3434
protected File doApply(WindowsPackager packager) throws Exception {
3535

36-
String name = packager.getName();
3736
File executable = packager.getExecutable();
3837
File manifestFile = packager.getManifestFile();
3938
File iconFile = packager.getIconFile();
@@ -67,7 +66,7 @@ protected File doApply(WindowsPackager packager) throws Exception {
6766
rcedit.setManifest(getGenericExe(), getGenericManifest());
6867
rcedit.setFileVersion(getGenericExe(), winConfig.getFileVersion());
6968
rcedit.setProductVersion(getGenericExe(), winConfig.getProductVersion());
70-
rcedit.setVersionString(getGenericExe(), "FileDescription", name);
69+
rcedit.setVersionString(getGenericExe(), "FileDescription", winConfig.getFileDescription());
7170
rcedit.setVersionString(getGenericExe(), "CompanyName", winConfig.getCompanyName());
7271
rcedit.setVersionString(getGenericExe(), "InternalName", winConfig.getInternalName());
7372
rcedit.setVersionString(getGenericExe(), "OriginalFilename", winConfig.getOriginalFilename());

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ protected File doApply(WindowsPackager packager) throws Exception {
126126
rcedit.setManifest(getGenericExe(), getGenericManifest());
127127
rcedit.setFileVersion(getGenericExe(), winConfig.getFileVersion());
128128
rcedit.setProductVersion(getGenericExe(), winConfig.getProductVersion());
129-
rcedit.setVersionString(getGenericExe(), "FileDescription", name);
129+
rcedit.setVersionString(getGenericExe(), "FileDescription", winConfig.getFileDescription());
130130
rcedit.setVersionString(getGenericExe(), "CompanyName", winConfig.getCompanyName());
131131
rcedit.setVersionString(getGenericExe(), "InternalName", winConfig.getInternalName());
132132
rcedit.setVersionString(getGenericExe(), "OriginalFilename", winConfig.getOriginalFilename());

0 commit comments

Comments
 (0)