Make maven plugin paths platform agnostic.

bhargav · bhargav · commit e78b05e6423d · 2016-04-19T02:19:38.000-05:00
diff --git a/appveyor.yml b/appveyor.yml
@@ -0,0 +1,33 @@
+version: '{build}'
+skip_tags: true
+clone_depth: 10
+environment:
+  matrix:
+    - JAVA_HOME: C:\Program Files\Java\jdk1.7.0
+    - JAVA_HOME: C:\Program Files\Java\jdk1.8.0
+branches:
+  only:
+    - master
+  except:
+    - gh-pages
+os: Windows Server 2012
+install:
+  - ps: |
+      Add-Type -AssemblyName System.IO.Compression.FileSystem
+      if (!(Test-Path -Path "C:\maven" )) {
+        (new-object System.Net.WebClient).DownloadFile('http://apache.mirrors.tds.net/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.zip', 'C:\maven-bin.zip')
+        [System.IO.Compression.ZipFile]::ExtractToDirectory("C:\maven-bin.zip", "C:\maven")
+      }
+  - cmd: SET PATH=C:\maven\apache-maven-3.3.9\bin;%JAVA_HOME%\bin;%PATH:C:\Ruby193\bin;=%
+  - cmd: SET MAVEN_OPTS=-XX:MaxPermSize=2g -Xmx4g
+  - cmd: SET JAVA_OPTS=-XX:MaxPermSize=2g -Xmx4g
+  - cmd: mvn --version
+  - cmd: java -version
+build_script:
+  - mvn clean
+  - mvn compile -P train-all-examples
+test_script:
+  - mvn test
+cache:
+  - C:\maven\
+  - C:\Users\appveyor\.m2
diff --git a/lbjava-mvn-plugin/src/main/java/edu/illinois/cs/cogcomp/CleanMojo.java b/lbjava-mvn-plugin/src/main/java/edu/illinois/cs/cogcomp/CleanMojo.java
@@ -10,10 +10,13 @@
  */
 package edu.illinois.cs.cogcomp;
 
+import java.io.File;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
+import edu.illinois.cs.cogcomp.lbjava.util.FileUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -59,10 +62,14 @@ public class CleanMojo extends AbstractMojo {
 	private String outputdir;
 
 	public void execute() throws MojoExecutionException {
+		dFlag = FileUtils.getPlatformIndependentFilePath(dFlag);
+		gspFlag = FileUtils.getPlatformIndependentFilePath(gspFlag);
+		sourcepathFlag = FileUtils.getPlatformIndependentFilePath(sourcepathFlag);
 
 		classpath.add(dFlag);
 		classpath.add(gspFlag);
-		String newpath = StringUtils.join(classpath, ":");
+
+		String newpath = StringUtils.join(classpath, File.pathSeparator);
 
 		// We need to reverse the order we do the cleaning since there might be dependencies across files
 		List<String> fileList = Arrays.asList(lbjavaInputFileList);
@@ -74,6 +81,9 @@ public void execute() throws MojoExecutionException {
 			}
 
 			getLog().info("Calling Java edu.illinois.cs.cogcomp.lbjava.Main with the -x flag (for cleaning)...");
+
+			lbjInputFile = FileUtils.getPlatformIndependentFilePath(lbjInputFile);
+
 			try {
 				// The -x flag makes all the difference.
 				String[] args = new String[] { "java", "-cp", newpath, "edu.illinois.cs.cogcomp.lbjava.Main", "-x",
diff --git a/lbjava-mvn-plugin/src/main/java/edu/illinois/cs/cogcomp/CompileMojo.java b/lbjava-mvn-plugin/src/main/java/edu/illinois/cs/cogcomp/CompileMojo.java
@@ -13,6 +13,7 @@
 import java.io.File;
 import java.util.List;
 
+import edu.illinois.cs.cogcomp.lbjava.util.FileUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -58,27 +59,28 @@ public class CompileMojo extends AbstractMojo {
 	private String outputdir;
 
 	public void execute() throws MojoExecutionException {
+		dFlag = FileUtils.getPlatformIndependentFilePath(dFlag);
+		gspFlag = FileUtils.getPlatformIndependentFilePath(gspFlag);
+		sourcepathFlag = FileUtils.getPlatformIndependentFilePath(sourcepathFlag);
 
 		classpath.add(dFlag);
 		classpath.add(gspFlag);
-		String newpath = StringUtils.join(classpath, ":");
+
+		String newpath = StringUtils.join(classpath, File.pathSeparator);
 
 		// If these directories don't exist, make them.
 		new File(dFlag).mkdirs();
 		new File(gspFlag).mkdirs();
 
 		for (String lbjInputFile : lbjavaInputFileList) {
 			if (StringUtils.isEmpty(lbjInputFile)) {
-				// making the optional-compile-step parameter happy.
+				// making the optional-compile-parameter happy.
 				continue;
 			}
 
 			getLog().info("Calling Java edu.illinois.cs.cogcomp.lbjava.Main...");
 
-			if (StringUtils.isEmpty(lbjInputFile)) {
-				// making the optional-compile-parameter happy.
-				continue;
-			}
+			lbjInputFile = FileUtils.getPlatformIndependentFilePath(lbjInputFile);
 
 			try {
 				String[] args = new String[] { "java", "-cp", newpath, "edu.illinois.cs.cogcomp.lbjava.Main",
diff --git a/lbjava-mvn-plugin/src/main/java/edu/illinois/cs/cogcomp/GenerateMojo.java b/lbjava-mvn-plugin/src/main/java/edu/illinois/cs/cogcomp/GenerateMojo.java
@@ -10,6 +10,7 @@
  */
 package edu.illinois.cs.cogcomp;
 
+import edu.illinois.cs.cogcomp.lbjava.util.FileUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -58,10 +59,14 @@ public class GenerateMojo extends AbstractMojo {
 	private String outputdir;
 
 	public void execute() throws MojoExecutionException {
+		dFlag = FileUtils.getPlatformIndependentFilePath(dFlag);
+		gspFlag = FileUtils.getPlatformIndependentFilePath(gspFlag);
+		sourcepathFlag = FileUtils.getPlatformIndependentFilePath(sourcepathFlag);
 
 		classpath.add(dFlag);
 		classpath.add(gspFlag);
-		String newpath = StringUtils.join(classpath, ":");
+
+		String newpath = StringUtils.join(classpath, File.pathSeparator);
 
 		// If these directories don't exist, make them.
 		new File(dFlag).mkdirs();
@@ -74,6 +79,9 @@ public void execute() throws MojoExecutionException {
 			}
 
 			getLog().info("Calling Java edu.illinois.cs.cogcomp.lbjava.Main...");
+
+			lbjInputFile = FileUtils.getPlatformIndependentFilePath(lbjInputFile);
+
 			try {
 				String[] args = new String[] { "java", "-cp", newpath, "edu.illinois.cs.cogcomp.lbjava.Main",
                         "-c", "-d", dFlag, "-gsp", gspFlag, "-sourcepath", sourcepathFlag, lbjInputFile };
diff --git a/lbjava/pom.xml b/lbjava/pom.xml
@@ -57,6 +57,11 @@
 			<artifactId>commons-math3</artifactId>
 			<version>3.6</version>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-lang3</artifactId>
+			<version>3.4</version>
+		</dependency>
 	</dependencies>
 
     <reporting>
diff --git a/lbjava/src/main/java/edu/illinois/cs/cogcomp/lbjava/Train.java b/lbjava/src/main/java/edu/illinois/cs/cogcomp/lbjava/Train.java
@@ -43,6 +43,8 @@
 import edu.illinois.cs.cogcomp.lbjava.parse.Parser;
 import edu.illinois.cs.cogcomp.lbjava.util.ClassUtils;
 
+import org.apache.commons.lang3.StringEscapeUtils;
+
 
 /**
  * After code has been generated with {@link TranslateToJava}, this pass
@@ -1079,7 +1081,7 @@ && new File(exFilePath).exists())
 						out.println(
 								"  public static Parser getParser() { return new "
 										+ "edu.illinois.cs.cogcomp.lbjava.parse.ArrayFileParser(\""
-										+ new File(exFilePath).getAbsolutePath()
+										+ StringEscapeUtils.escapeJava(new File(exFilePath).getAbsolutePath())
 										+ "\"); }");
 					else
 						out.println("  public static Parser getParser() { return "
@@ -1091,7 +1093,8 @@ && new File(testExFilePath).exists())
 						out.println(
 								"  public static Parser getTestParser() { return new "
 										+ "edu.illinois.cs.cogcomp.lbjava.parse.ArrayFileParser(\""
-										+ new File(testExFilePath).getAbsolutePath() + "\"); }");
+										+ StringEscapeUtils.escapeJava(new File(testExFilePath).getAbsolutePath())
+										+ "\"); }");
 					else
 						out.println("  public static Parser getTestParser() { return "
 								+ lce.testParser + "; }\n");
diff --git a/lbjava/src/main/java/edu/illinois/cs/cogcomp/lbjava/util/FileUtils.java b/lbjava/src/main/java/edu/illinois/cs/cogcomp/lbjava/util/FileUtils.java
@@ -0,0 +1,27 @@
+/**
+ * This software is released under the University of Illinois/Research and
+ *  Academic Use License. See the LICENSE file in the root folder for details.
+ * Copyright (c) 2016
+ *
+ * Developed by:
+ * The Cognitive Computations Group
+ * University of Illinois at Urbana-Champaign
+ * http://cogcomp.cs.illinois.edu/
+ */
+package edu.illinois.cs.cogcomp.lbjava.util;
+
+import java.io.File;
+
+/**
+ * Utility methods for handling file paths.
+ *
+ **/
+public class FileUtils {
+    public static String getPlatformIndependentFilePath(String configFilePath) {
+        if (File.separatorChar == '/') {
+            return configFilePath;
+        }
+
+        return configFilePath.replace('/', File.separatorChar);
+    }
+}
diff --git a/lbjava/src/test/java/edu/illinois/cs/cogcomp/lbjava/MainTest.java b/lbjava/src/test/java/edu/illinois/cs/cogcomp/lbjava/MainTest.java
@@ -13,6 +13,7 @@
 import edu.illinois.cs.cogcomp.lbjava.IR.*;
 import edu.illinois.cs.cogcomp.lbjava.frontend.Yylex;
 import edu.illinois.cs.cogcomp.lbjava.frontend.parser;
+import edu.illinois.cs.cogcomp.lbjava.util.FileUtils;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -59,10 +60,10 @@ private String generateLBJavaScript(String learnerName, String extractor, String
     @Before
     public void setUp() throws Exception {
         Main.fileNames = new HashSet<>();
-        Main.generatedSourceDirectory = "target/test-classes/lbj";
-        Main.classDirectory = "target/test-classes";
-        Main.classPackageDirectory = "target/test-classes/lbj";
-        Main.sourceDirectory = "target/test-classes/lbj";
+        Main.generatedSourceDirectory = FileUtils.getPlatformIndependentFilePath("target/test-classes/lbj");
+        Main.classDirectory = FileUtils.getPlatformIndependentFilePath("target/test-classes");
+        Main.classPackageDirectory = FileUtils.getPlatformIndependentFilePath("target/test-classes/lbj");
+        Main.sourceDirectory = FileUtils.getPlatformIndependentFilePath("target/test-classes/lbj");
 
         // The auto-generated code directory needs to be added to classpath
         URLClassLoader urlClassLoader = (URLClassLoader) ClassLoader.getSystemClassLoader();
