add template configs support (default template for iss.vtl)

Author: fvarrui

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

@@ -3,7 +3,14 @@
 public class Template {
 
 	private String name;
-	private boolean bom = true;
+	private boolean bom = false;
+	
+	public Template() {}
+	
+	public Template(String name, boolean bom) {
+		this.name = name;
+		this.bom = bom;
+	}
 
 	public String getName() {
 		return name;

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

@@ -56,7 +56,7 @@ protected File doApply(WindowsPackager packager) throws Exception {
 
 		// generates iss file from velocity template
 		File issFile = new File(assetsFolder, name + ".iss");
-		VelocityUtils.render("windows/iss.vtl", issFile, packager, true);
+		VelocityUtils.render("windows/iss.vtl", issFile, packager);
 
 		// generates windows installer with inno setup command line compiler
 		CommandUtils.execute("iscc", "/O" + outputDirectory.getAbsolutePath(), "/F" + name + "_" + version, issFile);

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

@@ -101,8 +101,8 @@ private void init() throws Exception {
 			throw new Exception("'mainClass' cannot be null");
 		}
 
-		// sets assetsDir for velocity to locate custom velocity templates
-		VelocityUtils.setAssetsDir(assetsDir);
+		// init velocity utils
+		VelocityUtils.init(this);
 
 		// using name as displayName, if it's not specified
 		displayName = defaultIfBlank(displayName, name);

src/main/java/io/github/fvarrui/javapackager/utils/VelocityUtils.java

@@ -4,6 +4,8 @@
 
 import java.io.File;
 import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
 import java.util.UUID;
 
 import org.apache.velocity.Template;
@@ -14,15 +16,27 @@
 import org.apache.velocity.runtime.resource.loader.FileResourceLoader;
 import org.apache.velocity.util.StringBuilderWriter;
 
+import io.github.fvarrui.javapackager.packagers.Packager;
+
 /**
  * Velocity utils 
  */
 public class VelocityUtils {
 
 	private static File assetsDir = new File("assets");
 	private static VelocityEngine velocityEngine = null;
+	private static List<io.github.fvarrui.javapackager.model.Template> templates;
 
 	private VelocityUtils() {}
+	
+	public static void init(Packager packager) {
+		assetsDir = packager.getAssetsDir();
+		templates = packager.getTemplates() != null ? packager.getTemplates() : new ArrayList<>();
+		// add default template configs
+		if (templates.stream().noneMatch(t -> t.getName().equals("windows/iss.vtl"))) {
+			templates.add(new io.github.fvarrui.javapackager.model.Template("windows/iss.vtl", true));
+		}
+	}
 
 	private static VelocityEngine getVelocityEngine() {
 
@@ -58,16 +72,8 @@ private static String render(String templatePath, Object info) throws Exception
 		template.merge(context, writer);		
 		return writer.toString();
 	}
-
-	public static void setAssetsDir(File assetsDir) {
-		VelocityUtils.assetsDir = assetsDir;
-	}
-
-	public static void render(String templatePath, File output, Object info) throws Exception {
-		render(templatePath, output, info, false);
-	}
 
-	public static void render(String templatePath, File output, Object info, boolean includeBom) throws Exception {
+	private static void render(String templatePath, File output, Object info, boolean includeBom) throws Exception {
 		String data = render(templatePath, info);
 		data = StringUtils.dosToUnix(data);
 		if (!includeBom) {
@@ -76,5 +82,10 @@ public static void render(String templatePath, File output, Object info, boolean
 			FileUtils.writeStringToFileWithBOM(output, data);
 		}
 	}
-	
+
+	public static void render(String templatePath, File output, Object info) throws Exception {
+		Optional<io.github.fvarrui.javapackager.model.Template> template = templates.stream().filter(t -> t.getName().equals(templatePath)).findFirst();
+		render(templatePath, output, info, template.isPresent() ? template.get().isBom() : false);
+	}
+
 }