Fixed new-line problems and path specification for java-options.conf in

batch file

Author: cboehme

.gitattributes

@@ -17,9 +17,13 @@
 *.bat eol=crlf
 *.sh eol=lf
 
+# The batch script can only handle the config
+# properly if it uses crlf as end-of-line marker:
+src/main/config/java-options.conf eol=crlf
+
 # Denote all files that are truly binary and should not be modified:
 *.bz2 binary
 *.bzip2 binary
 *.gz binary
 *.gzip binary
-*.xz binary
+*.xz binary

src/main/scripts/flux.bat

@@ -11,7 +11,7 @@ IF "x%FLUX_JAVA_BIN%" == "x" (
 	SET FLUX_JAVA_BIN=java
 )
 
-SET JAVA_OPTS_FILE="%METAFACTURE_HOME%/config/java-options.conf"
+SET JAVA_OPTS_FILE="%METAFACTURE_HOME%\config\java-options.conf"
 SET JAR_FILE="%METAFACTURE_HOME%${project.build.finalName}.jar"
 
 REM Read JVM options from configuration file. Lines starting