Travis CI (#81)

* Use standard Java compiler for Makefile
* Can still build with ECJ using Eclipse & jardesc
* Ensure jar is only created after all classes are built (for parallel make)
* Add Travis CI yml script
* Add Travis CI badge to readme
* Remove the unsafe obsolete progress bar from disabled EGM

.travis.yml

@@ -0,0 +1,18 @@
+# competition for Thundercleese
+notifications:
+  irc: "chat.freenode.net#enigma"
+# don't build "feature" branches
+branches:
+  only:
+    - "master"
+# obviously this is java duh
+language: java
+
+os: linux
+dist: xenial
+
+script:
+  - git clone --recursive https://github.com/IsmAvatar/LateralGM.git ../LateralGM
+  - curl -o jna.jar https://enigma-dev.org/bin/jna.jar
+  - make
+

Makefile

@@ -1,22 +1,24 @@
-JC = ecj -1.6 -nowarn -cp .
-JFLAGS = -cp ../plugins/shared/jna.jar:../lgm16b4.jar:/usr/share/java/eclipse-ecj.jar:/usr/share/java/ecj.jar
-OUTPUT_FILE = ../plugins/enigma.jar
+JC = javac
+JFLAGS = -source 1.7 -target 1.7 -cp .:jna.jar:../LateralGM:../LateralGM/modules/joshedit/src/main/java:../LateralGM/modules/joshedit/src/main/resources
+OUTPUT_FILE = enigma.jar
 
-.SUFFIXES: .java .class
-
-.java.class:
-        $(JC) $(JFLAGS) $*.java
+%.class: %.java
+	$(JC) $(JFLAGS) $*.java
 
 JAVA_FILES = $(shell find org -name "*.java")
-JAR_INC_FILES = $(shell find org -type f \( -not -wholename '*/.git/*' \) -a \( -not -name "*.java" \) | sed 's/\$$/\\\$$/g')
+JAR_INC_FILES = $(shell find org -type f \( -not -wholename '*/.git/*' \) -a \( -not -name "*.java" \))
+BASE_CLASSES = $(JAVA_FILES:.java=.class)
 
 default: classes jar
 
-classes: $(JAVA_FILES:.java=.class)
+classes: $(BASE_CLASSES)
 
 clean:
-        find org/enigma -name "*.class" -exec rm {} \;
-        rm -f $(OUTPUT_FILE)
+	find org/enigma -name "*.class" -exec rm {} \;
+	rm -f $(OUTPUT_FILE)
+
+jar: $(BASE_CLASSES)
+	@echo JAR $(OUTPUT_FILE)
+	@jar cfm $(OUTPUT_FILE) META-INF/MANIFEST.MF COPYING LICENSE $(subst $$,\$$,$(JAR_INC_FILES))
 
-jar:
-        @jar cfm $(OUTPUT_FILE) META-INF/MANIFEST.MF COPYING LICENSE $(JAR_INC_FILES)
+.PHONY: clean jar default classes

README.md

@@ -1,4 +1,4 @@
-LateralGM Plugin
+LateralGM Plugin ![Travis CI Build Status](https://travis-ci.org/enigma-dev/lgmplugin.svg?branch=master)
 =========
 
 Java based plugin that enables [LateralGM](https://github.com/IsmAvatar/LateralGM) to compile games using [ENIGMA](https://github.com/enigma-dev/enigma-dev). If you are having issues or receiving error messages related to the plugin please visit the ENIGMA wiki and read the [troubleshooting page](http://enigma-dev.org/docs/Wiki/Troubleshoot) before posting new issues.

org/enigma/file/EFileReader.java

@@ -49,7 +49,6 @@
 import javax.swing.Icon;
 import javax.swing.JFileChooser;
 import javax.swing.JLabel;
-import javax.swing.JProgressBar;
 import javax.swing.filechooser.FileView;
 
 import org.enigma.EnigmaRunner;
@@ -551,20 +550,13 @@ public static ProjectFile readEgmFile(ProjectFile gf, ResNode root, boolean zip)
 	public static void readEgmFile(EProjectFile f, ProjectFile gf, ResNode root) throws IOException
 		{
 		gf.format = EFileWriter.FLAVOR_EGM;
-		JProgressBar progressBar = LGM.getProgressDialogBar();
-		progressBar.setMaximum(f.getEntries().size());
-		LGM.setProgressTitle(Messages.getString("ProgressDialog.EGM_LOADING"));
-
-		LGM.setProgress(0,Messages.getString("ProgressDialog.ENTRIES"));
 		readNodeChildren(f,gf,root,null,new String());
 
 		readResource(f,gf,null,EnigmaSettings.class,
 				f.getEntry("Enigma Settings.ey").asInputStream(),"","Enigma Settings");
 
 		while (!postpone.isEmpty())
 			postpone.remove().invoke();
-
-		LGM.setProgress(progressBar.getMaximum(),Messages.getString("ProgressDialog.FINISHED"));
 		}
 
 	// Workhorse methods
@@ -647,7 +639,6 @@ public static void processEntries(EProjectFile f, ProjectFile gf, ResNode parent
 				else
 					System.out.println("Extraneous TOC entry: " + e.name + " (" + e.kind + ")");
 				}
-			LGM.setProgress(LGM.getProgressDialogBar().getValue() + 1,Messages.getString("ProgressDialog.ENTRIES"));
 			}
 		}
 

org/enigma/file/EFileWriter.java

@@ -33,7 +33,6 @@
 import java.util.zip.ZipOutputStream;
 
 import javax.imageio.ImageIO;
-import javax.swing.JProgressBar;
 
 import org.enigma.EnigmaRunner;
 import org.enigma.backend.EnigmaSettings;
@@ -346,17 +345,10 @@ public static void writeEgmZipFile(OutputStream os, ProjectFile gf, ResNode tree
 
 	public static void writeEProjectFile(EGMOutputStream os, ProjectFile gf, ResNode tree) throws IOException
 		{
-		JProgressBar progressBar = LGM.getProgressDialogBar();
-		progressBar.setMaximum(tree.getChildCount());
-		LGM.setProgressTitle(Messages.getString("ProgressDialog.EGM_LOADING"));
-
-		LGM.setProgress(0,Messages.getString("ProgressDialog.ENTRIES"));
 		writeNodeChildren(os,gf,tree,new ArrayList<String>());
 
 		EnigmaSettingsWriter esw = new EnigmaSettingsWriter();
 		esw.write(os, gf, "Enigma Settings", new ArrayList<String>());
-
-		LGM.setProgress(progressBar.getMaximum(),Messages.getString("ProgressDialog.FINISHED"));
 		}
 
 	// Workhorse methods
@@ -392,8 +384,6 @@ public static void writeNodeChildren(EGMOutputStream os, ProjectFile gf, ResNode
 				writeNodeChildren(os,gf,child,newDir);
 				}
 			}
-		if (node.status == ResNode.STATUS_PRIMARY)
-			LGM.setProgress(LGM.getProgressDialogBar().getValue()+1,Messages.getString("ProgressDialog.ENTRIES"));
 		}
 
 	/**