updated the readme with correct instructions for running Maker, added…

… a convenience script for running Maker and fixed some problems with FiveTran related to the new project structure.

.gitignore

@@ -1,3 +1,4 @@
+*.class
 *.DS_Store
 *.before
 *.after

Readme.txt

@@ -4,6 +4,12 @@ Mako has two stacks- a parameter stack and a return stack. Most MakoVM instructi
 
 The Maker source files provided in the examples directory can be executed by compiling Maker and then invoking it with a filename and the '--run' flag. Without the flag, Maker will simply print a disassembly of the prepared Mako memory image.
 
-	java Maker /examples/Pong/Pong.fs --run
-
 To compile, run `ant` from the top directory.
+
+To run an example, invoke Maker from the command line:
+
+	java -jar dist/Maker.jar /examples/Pong/Pong.fs --run
+
+Or use the 'maker' script to save a little typing:
+
+	./maker /examples/Pong/Pong.fs --run

maker

@@ -0,0 +1,2 @@
+#!/bin/bash
+java -jar dist/Maker.jar $@

tools/Fivetran/Fivetran.java

@@ -18,7 +18,7 @@ public static void main(String[] args) {
 		compiler.parseFile(args[0]);
 		MakoRom rom = compiler.compile();
 		if (Arrays.asList(args).contains("--run")) {
-			Mako.exec(rom.toArray());
+			Mako.exec(rom.toArray(), false);
 		}
 	}
 

tools/Fivetran/build.xml

@@ -18,13 +18,13 @@
 	</target>
 
 	<target name="stage" depends="clean">
-		<copy  file= "../../Mako.java"          todir="." />
-		<copy  file= "../../MakoVM.java"        todir="." />
-		<copy  file= "../../MakoRom.java"       todir="." />
-		<copy  file= "../../MakoConstants.java" todir="." />
+		<copy  file= "../../src/Mako.java"          todir="." />
+		<copy  file= "../../src/MakoVM.java"        todir="." />
+		<copy  file= "../../src/MakoRom.java"       todir="." />
+		<copy  file= "../../src/MakoConstants.java" todir="." />
 		<java
 			classname="Maker"
-			classpath="../../"
+			classpath="../../build/"
 		>
 			<arg line="base/BaseRom.fs base/BaseRom"/>
 		</java>