Attempted to fix all the deployment errors

christos-c · christos-c · commit cff4a2d49972 · 2016-03-10T22:17:18.000-06:00
diff --git a/lbjava-examples/compileLBJ.sh b/lbjava-examples/compileLBJ.sh
@@ -15,16 +15,17 @@ generateLBJFiles() {
     SWITCHES="-ea -XX:MaxPermSize=1g -Xmx8g"
 
     BIN=target
-    LBJBIN=target
+    LBJBIN=target/classes
     SRC=src/main/java
     GSP=src/main/java
 
+    if [ ! -d $LBJBIN ]; then mkdir -p $LBJBIN; fi
     CP=$BIN:$LBJBIN:lib/*:lib/illinois-core-utilities-3.0.15.jar:lib/liblinear.jar:../lbjava/target/lbjavaCore.jar
 
     echo $CP
 
-    $JAVA $SWITCHES -cp $CP edu.illinois.cs.cogcomp.lbjava.Main -d $LBJBIN -gsp $GSP -x -sourcepath $SRC $FILE
-    $JAVA $SWITCHES -cp $CP edu.illinois.cs.cogcomp.lbjava.Main -d $LBJBIN -gsp $GSP -sourcepath $SRC $FILE
+    $JAVA $SWITCHES -cp $CP edu.illinois.cs.cogcomp.lbjava.Main -x -d $LBJBIN -gsp $GSP -sourcepath $SRC $FILE
+    $JAVA $SWITCHES -cp $CP edu.illinois.cs.cogcomp.lbjava.Main -c -d $LBJBIN -gsp $GSP -sourcepath $SRC $FILE
 }
 
 # generate all .lbj files
@@ -51,7 +52,7 @@ fi
 
 case $1 in
 	"all")
-		echo "===== Generating output for all =====\n";
+		echo "===== Generating output for all =====";
 		generateAllLBJFiles
 		exit;;
 	"badges")
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
@@ -165,7 +165,7 @@ public void cleanup() {
         File[] dirFiles = lbjDir.listFiles(new FilenameFilter() {
 
             public boolean accept(File dir, String name) {
-                return !name.endsWith(".lbj");
+                return !name.endsWith(".lbj") && !name.startsWith(".nfs");
             }
         });
         for (File file: dirFiles) assert file.delete() : "Could not delete file " + file;
diff --git a/pom.xml b/pom.xml
@@ -104,6 +104,9 @@
                         <exclude>**/*.md</exclude>
                         <exclude>src/test/resources/**</exclude>
                         <exclude>src/main/resources/**</exclude>
+                        <exclude>src/main/java/edu/illinois/cs/cogcomp/lbjava/frontend/sym.java</exclude>
+                        <exclude>src/main/java/edu/illinois/cs/cogcomp/lbjava/frontend/parser.java</exclude>
+                        <exclude>../lbjava-examples/**</exclude>
                     </excludes>
                 </configuration>
                 <executions>

Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ public void cleanup() {`
`165`	`165`	`File[] dirFiles = lbjDir.listFiles(new FilenameFilter() {`
`166`	`166`
`167`	`167`	`public boolean accept(File dir, String name) {`
`168`		`- return !name.endsWith(".lbj");`
	`168`	`+ return !name.endsWith(".lbj") && !name.startsWith(".nfs");`
`169`	`169`	`}`
`170`	`170`	`});`
`171`	`171`	`for (File file: dirFiles) assert file.delete() : "Could not delete file " + file;`