Merge branch 'pr-271' into devel

Author: fvarrui

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

@@ -2,6 +2,7 @@
 
 import edu.sc.seis.launch4j.tasks.Launch4jLibraryTask;
 import io.github.fvarrui.javapackager.packagers.Context;
+import io.github.fvarrui.javapackager.utils.Logger;
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
 
@@ -18,7 +19,6 @@ public class PackagePlugin implements Plugin<Project> {
 
 	@Override
 	public void apply(Project project) {
-
 		Context.setContext(new GradleContext(project));
 
 		project.getPluginManager().apply("java");

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);
+		VelocityUtils.render("windows/iss.vtl", issFile, packager, true);
 
 		// 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/utils/CharsetUtil.java

@@ -0,0 +1,44 @@
+package io.github.fvarrui.javapackager.utils;
+
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+
+import org.apache.commons.lang3.SystemUtils;
+
+public class CharsetUtil {
+	
+	private static Charset commandLineCharset;
+	
+    public static Charset getCommandLineCharset(){
+    	if (commandLineCharset == null) {
+	    	if (SystemUtils.IS_OS_WINDOWS) {
+		        commandLineCharset = chcp();
+	    	} else {
+	    		commandLineCharset = Charset.defaultCharset();
+	    	}
+    	}
+        return commandLineCharset;
+    }
+    
+    private static Charset chcp() {
+        try{
+            String result = CommandUtils.run("cmd /k chcp");	        	
+            String code = StringUtils.find("\\d+", result);
+            Logger.debug("'chcp' code found: " + code);
+            switch (code){
+            	case "37": 
+                case "037": return Charset.forName("IBM037");
+                case "936": return Charset.forName("gb2312");
+                case "950": return Charset.forName("big5");
+                case "1145": return Charset.forName("IBM01145");
+                case "1200": return StandardCharsets.UTF_16;
+                case "51936": return Charset.forName("EUC-CN");
+                case "65001": return StandardCharsets.UTF_8;
+            }
+        } catch (Exception e){
+        	// do nothing
+        }
+        return Charset.defaultCharset();
+    }
+
+}

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

@@ -52,7 +52,7 @@ public static ExecutionResult executeWithResult(File workingDirectory, String ex
 
 		Process process = command.execute();
 
-		BufferedReader output = new BufferedReader(new InputStreamReader(process.getInputStream()));
+		BufferedReader output = new BufferedReader(new InputStreamReader(process.getInputStream(), CharsetUtil.getCommandLineCharset()));
 		BufferedReader error = new BufferedReader(new InputStreamReader(process.getErrorStream()));
 		while (process.isAlive() || output.ready() || error.ready()) {
 			if (output.ready()) {
@@ -76,5 +76,13 @@ public static ExecutionResult executeWithResult(File workingDirectory, String ex
 
 		return result;
 	}
+	
+	public static String run(String command) throws IOException {
+    	Process p = Runtime.getRuntime().exec(command);
+        BufferedReader br = new BufferedReader(new InputStreamReader(p.getInputStream()));
+        String result = br.readLine();	        	
+		br.close();
+		return result;
+	}
 
 }

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

@@ -326,5 +326,20 @@ public static boolean exists(File file) {
 	public static boolean folderContainsFile(File folder, String filename) {
 		return new File(folder, filename).exists();
 	}
+	
+	/**
+	 * Writes String to a file in UTF-8 including BOM 
+	 * @param output Output file
+	 * @param data Input string
+	 * @throws Exception if something goes wrong
+	 */
+	public static void writeStringToFileWithBOM(File output, String data) throws Exception {
+		FileOutputStream fileOutputStream = new FileOutputStream(output);
+		// write utf-8 BOM
+		byte[] uft8bom = { (byte) 0xef, (byte) 0xbb, (byte) 0xbf };
+		fileOutputStream.write(uft8bom);
+		fileOutputStream.write(data.getBytes(StandardCharsets.UTF_8));
+		fileOutputStream.close();
+	}
 
 }

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

@@ -0,0 +1,19 @@
+package io.github.fvarrui.javapackager.utils;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class StringUtils {
+
+	public static String dosToUnix(String input) {
+		return input.replaceAll("\\r\\n", "\n").replaceAll("\\r", "\n");
+	}
+
+	public static String find(String pattern, String data) {
+		Pattern r = Pattern.compile(pattern);
+		Matcher matcher = r.matcher(data);
+		matcher.find();
+		return matcher.group();
+	}
+
+}

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

@@ -7,7 +7,6 @@
 import java.util.ArrayList;
 import java.util.UUID;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.velocity.Template;
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.VelocityEngine;
@@ -30,7 +29,7 @@ private static VelocityEngine getVelocityEngine() {
 			velocityEngine = new VelocityEngine();
 
 			// specify resource loaders to use
-			velocityEngine.setProperty("resource.loaders", "file,class");
+			velocityEngine.setProperty(RuntimeConstants.RESOURCE_LOADERS, "file,class");
 
 			// for the loader 'file', set the FileResourceLoader as the class to use and use 'assets' directory for templates
 			velocityEngine.setProperty("resource.loader.file.class", FileResourceLoader.class.getName());
@@ -63,12 +62,16 @@ public static void setAssetsDir(File assetsDir) {
 	}
 
 	public static void render(String templatePath, File output, Object info) throws Exception {
-		try {
-			String data = render(templatePath, info);
-			data = data.replaceAll("\\r\\n", "\n").replaceAll("\\r", "\n");
+		render(templatePath, output, info, false);
+	}
+	
+	public static void render(String templatePath, File output, Object info, boolean includeBom) throws Exception {
+		String data = render(templatePath, info);
+		data = StringUtils.dosToUnix(data);
+		if (!includeBom) {
 			writeStringToFile(output, data, "UTF-8");
-		} catch (IOException e) {
-			throw new Exception(e.getMessage(), e);
+		} else {
+			FileUtils.writeStringToFileWithBOM(output, data);
 		}
 	}