Merge branch 'issue-302' into devel

Author: fvarrui

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

@@ -5,6 +5,8 @@
 import java.util.Arrays;
 import java.util.List;
 
+import org.apache.commons.lang3.ObjectUtils;
+
 import io.github.fvarrui.javapackager.packagers.Packager;
 
 /**
@@ -19,6 +21,7 @@ public class LinuxConfig implements Serializable {
 	private boolean generateAppImage = true;
 	private File pngFile;
 	private boolean wrapJar = true;
+	private File installationPath;
 
 	public void setCategories(List<String> categories) {
 		this.categories = categories;
@@ -67,11 +70,20 @@ public boolean isWrapJar() {
 	public void setWrapJar(boolean wrapJar) {
 		this.wrapJar = wrapJar;
 	}
+	
+	public File getInstallationPath() {
+		return installationPath;
+	}
+	
+	public void setInstallationPath(File installationPath) {
+		this.installationPath = installationPath;
+	}
 
 	@Override
 	public String toString() {
 		return "LinuxConfig [categories=" + categories + ", generateDeb=" + generateDeb + ", generateRpm=" + generateRpm
-				+ ", generateAppImage=" + generateAppImage + ", pngFile=" + pngFile + ", wrapJar=" + wrapJar + "]";
+				+ ", generateAppImage=" + generateAppImage + ", pngFile=" + pngFile + ", wrapJar=" + wrapJar
+				+ ", installationPath=" + installationPath + "]";
 	}
 
 	/**
@@ -81,6 +93,7 @@ public String toString() {
 	 */
 	public void setDefaults(Packager packager) {
 		this.setCategories((categories == null || categories.isEmpty()) ? Arrays.asList("Utility") : categories);
+		this.setInstallationPath(ObjectUtils.defaultIfNull(installationPath, new File("/opt")));
 	}
 
 }

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

@@ -64,6 +64,8 @@ protected File doApply(LinuxPackager packager) throws Exception {
 		File executable = packager.getExecutable();
 		File javaFile = new File(appFolder, jreDirectoryName + "/bin/java");
 		File mimeXmlFile = packager.getMimeXmlFile();
+		File installationPath = packager.getLinuxConfig().getInstallationPath();
+		File appPath = new File(installationPath, name);
 
 		// generates desktop file from velocity template
 		File desktopFile = new File(assetsFolder, name + ".desktop");
@@ -87,7 +89,7 @@ protected File doApply(LinuxPackager packager) throws Exception {
 
 		Mapper appFolderMapper = new Mapper();
 		appFolderMapper.setType("perm");
-		appFolderMapper.setPrefix("/opt/" + name);
+		appFolderMapper.setPrefix(appPath.getAbsolutePath());
 		appFolderMapper.setFileMode("644");
 
 		Data appFolderData = new Data();
@@ -102,12 +104,12 @@ protected File doApply(LinuxPackager packager) throws Exception {
 
 		Mapper executableMapper = new Mapper();
 		executableMapper.setType("perm");
-		executableMapper.setPrefix("/opt/" + name);
+		executableMapper.setPrefix(appPath.getAbsolutePath());
 		executableMapper.setFileMode("755");
 
 		Data executableData = new Data();
 		executableData.setType("file");
-		executableData.setSrc(new File(appFolder.getAbsolutePath() + "/" + name));
+		executableData.setSrc(executable);
 		executableData.addMapper(executableMapper);
 
 		dataProducers.add(executableData);
@@ -150,7 +152,7 @@ protected File doApply(LinuxPackager packager) throws Exception {
 			Mapper javaBinaryMapper = new Mapper();
 			javaBinaryMapper.setType("perm");
 			javaBinaryMapper.setFileMode("755");
-			javaBinaryMapper.setPrefix("/opt/" + name + "/" + jreDirectoryName + "/bin");
+			javaBinaryMapper.setPrefix(appPath + "/" + jreDirectoryName + "/bin");
 
 			Data javaBinaryData = new Data();
 			javaBinaryData.setType("file");
@@ -168,7 +170,7 @@ protected File doApply(LinuxPackager packager) throws Exception {
 				Mapper javaSpawnHelperMapper = new Mapper();
 				javaSpawnHelperMapper.setType("perm");
 				javaSpawnHelperMapper.setFileMode("755");
-				javaSpawnHelperMapper.setPrefix("/opt/" + name + "/" + jreDirectoryName + "/lib");
+				javaSpawnHelperMapper.setPrefix(appPath + "/" + jreDirectoryName + "/lib");
 
 				Data javaSpawnHelperData = new Data();
 				javaSpawnHelperData.setType("file");
@@ -182,7 +184,7 @@ protected File doApply(LinuxPackager packager) throws Exception {
 
 		// symbolic link in /usr/local/bin to app binary data producer
 
-        DataProducer linkData = createLink("/usr/local/bin/" + name, "/opt/" + name + "/" + name);
+        DataProducer linkData = createLink("/usr/local/bin/" + executable.getName(), appPath + "/" + executable.getName());
 
 		dataProducers.add(linkData);
 

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

@@ -44,11 +44,13 @@ protected File doApply(LinuxPackager packager) throws Exception {
 		String jreDirectoryName = packager.getJreDirectoryName();
 		Architecture arch = Architecture.valueOf(packager.getArch().getRpm());
 		File mimeXmlFile = packager.getMimeXmlFile();
+		File installationPath = packager.getLinuxConfig().getInstallationPath();
+		File appPath = new File(installationPath, name);
 
 		// generates desktop file from velocity template
 		File desktopFile = new File(assetsFolder, name + ".desktop");
 		VelocityUtils.render("linux/desktop.vtl", desktopFile, packager);
-		Logger.info("Rendering desktop file to " + desktopFile.getAbsolutePath());
+		Logger.info("Desktop file rendered in " + desktopFile.getAbsolutePath());
 
 		// copies desktop file to app
 		FileUtils.copyFileToFolder(desktopFile, appFolder);
@@ -68,17 +70,20 @@ protected File doApply(LinuxPackager packager) throws Exception {
 		executionPermissions.add(new File(appFolder, jreDirectoryName + "/bin/java"));
 		executionPermissions.add(new File(appFolder, jreDirectoryName + "/lib/jspawnhelper"));
 
+		// add all app files
+		addDirectoryTree(builder, installationPath.getAbsolutePath(), appFolder, executionPermissions);
+
 		// link to desktop file
-		addLink(builder, "/usr/share/applications/" + desktopFile.getName(), "/opt/" + name + "/" + desktopFile.getName());
+		addLink(builder, "/usr/share/applications/" + desktopFile.getName(), appPath + "/" + desktopFile.getName());
 
 		// copy and link to mime.xml file
 		if (mimeXmlFile != null) {
 			FileUtils.copyFileToFolder(mimeXmlFile, appFolder);
-			addLink(builder, "/usr/share/mime/packages/" + mimeXmlFile.getName(), "/opt/" + name + "/" + mimeXmlFile.getName());
+			addLink(builder, "/usr/share/mime/packages/" + mimeXmlFile.getName(), appPath + "/" + mimeXmlFile.getName());
 		}
 
 		// link to binary
-		addLink(builder, "/usr/local/bin/" + executable.getName(), "/opt/" + name + "/" + executable.getName());
+		addLink(builder, "/usr/local/bin/" + executable.getName(), appPath + "/" + executable.getName());
 
 		// add all app files
 		addDirectory(builder, "/opt", appFolder, executionPermissions);

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

@@ -34,6 +34,11 @@ public class MacPackager extends Packager {
 	private File javaFolder;
 	private File macOSFolder;
 	private File jreBundleFolder;
+	
+	public MacPackager() {		
+		super();
+		platform(Platform.mac);
+	}
 
 	public File getAppFile() {
 		return appFile;

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

@@ -6,6 +6,7 @@
 
 import org.apache.commons.lang3.StringUtils;
 
+import io.github.fvarrui.javapackager.model.Platform;
 import io.github.fvarrui.javapackager.utils.Logger;
 import io.github.fvarrui.javapackager.utils.VelocityUtils;
 
@@ -28,6 +29,11 @@ public File getMsmFile() {
 	public void setMsmFile(File msmFile) {
 		this.msmFile = msmFile;
 	}
+	
+	public WindowsPackager() {		
+		super();
+		platform(Platform.windows);
+	}
 
 	@Override
 	public void doInit() throws Exception {

src/main/resources/linux/desktop.vtl

@@ -3,8 +3,8 @@
 Name=${info.displayName}
 GenericName=${info.displayName}
 Comment=${info.description}
-Exec=/opt/${info.name}/${info.name} %U
-Icon=/opt/${info.name}/${info.name}.png
+Exec=${info.linuxConfig.installationPath}/${info.name}/${info.executable.name} %U
+Icon=${info.linuxConfig.installationPath}/${info.name}/${info.name}.png
 Terminal=false
 Type=Application
 StartupNotify=true