Merge branch 'master' into issue-115

Author: fvarrui

src/main/java/io/github/fvarrui/javapackager/model/LinuxConfig.java

@@ -15,6 +15,7 @@ public class LinuxConfig implements Serializable {
 	private boolean generateRpm = true;
 	private File pngFile;
 	private File xpmFile;
+	private boolean wrapJar = true;
 
 	public boolean isGenerateDeb() {
 		return generateDeb;
@@ -47,11 +48,19 @@ public File getXpmFile() {
 	public void setXpmFile(File xpmFile) {
 		this.xpmFile = xpmFile;
 	}
+	
+	public boolean isWrapJar() {
+		return wrapJar;
+	}
+	
+	public void setWrapJar(boolean wrapJar) {
+		this.wrapJar = wrapJar;
+	}
 
 	@Override
 	public String toString() {
 		return "LinuxConfig [generateDeb=" + generateDeb + ", generateRpm=" + generateRpm + ", pngFile=" + pngFile
-				+ ", xpmFile=" + xpmFile + "]";
+				+ ", xpmFile=" + xpmFile + ", wrapJar=" + wrapJar + "]";
 	}
 
 	/**

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

@@ -133,7 +133,7 @@ protected File doApply(Packager packager) throws Exception {
 
 		}
 
-		// removes jre/legal folder
+		// removes jre/legal folder as it causes problems when codesigning from Mac OS
 		File legalFolder = new File(destinationFolder, "legal");
 		if (legalFolder.exists()) {
 			FileUtils.removeFolder(legalFolder);
@@ -144,6 +144,10 @@ protected File doApply(Packager packager) throws Exception {
 		} else {
 			Logger.infoUnindent("JRE bundling skipped!");
 		}
+		
+		// updates bundle jre property value, as this artifact generator could disable this option 
+		// (e.g. when bundling a jre from a different platform than the current one)
+		packager.bundleJre(bundleJre);
 
 		return destinationFolder;
 	}

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

@@ -65,7 +65,12 @@ public File doCreateApp() throws Exception {
 		Logger.info("Startup script generated in " + startupFile.getAbsolutePath());
 
 		// concats linux startup.sh script + generated jar in executable (binary)
-		FileUtils.concat(executable, startupFile, jarFile);
+		if (getLinuxConfig().isWrapJar())
+			FileUtils.concat(executable, startupFile, jarFile);
+		else {
+			FileUtils.copyFileToFile(startupFile, executable);
+			FileUtils.copyFileToFolder(jarFile, appFolder);
+		}
 
 		// sets execution permissions
 		executable.setExecutable(true, false);

src/main/resources/linux/assembly.xml.vtl

@@ -13,6 +13,7 @@
 				<exclude>${info.executable.name}</exclude>
 #if ($info.bundleJre)				
 				<exclude>${info.jreDirectoryName}/bin/*</exclude>
+				<exclude>${info.jreDirectoryName}/lib/jspawnhelper</exclude>
 #end
 			</excludes>
 		</fileSet>
@@ -23,6 +24,7 @@
 				<include>${info.executable.name}</include>
 #if ($info.bundleJre)				
 				<include>${info.jreDirectoryName}/bin/*</include>
+				<include>${info.jreDirectoryName}/lib/jspawnhelper</include>
 #end
 			</includes>
 			<fileMode>0755</fileMode>

src/main/resources/linux/startup.sh.vtl

@@ -53,7 +53,11 @@ fi
 #end
 #end
 
+#if ($info.linuxConfig.wrapJar)
 BINARY="$SCRIPTPATH/${info.executable.name}"
+#else
+BINARY="$SCRIPTPATH/${info.jarFile.name}"
+#end
 
 #if ($info.envPath)
 export PATH=${info.envPath}

src/main/resources/mac/assembly.xml.vtl

@@ -14,6 +14,7 @@
 				<exclude>Contents/MacOS/universalJavaApplicationStub</exclude>
 #if ($info.bundleJre)
 				<exclude>Contents/PlugIns/${info.jreDirectoryName}/Contents/Home/bin/*</exclude>
+				<exclude>Contents/PlugIns/${info.jreDirectoryName}/Contents/Home/lib/jspawnhelper</exclude>
 #end
 			</excludes>
 		</fileSet>
@@ -25,6 +26,7 @@
 				<include>Contents/MacOS/universalJavaApplicationStub</include>
 #if ($info.bundleJre)
 				<include>Contents/PlugIns/${info.jreDirectoryName}/Contents/Home/bin/*</include>
+				<include>Contents/PlugIns/${info.jreDirectoryName}/Contents/Home/lib/jspawnhelper</include>
 #end
 			</includes>
 			<fileMode>0755</fileMode>