X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=50192c3003657199d14dff4b7cc9d5a850fe5353;hb=2d5642bdfc7f316f23851e2ced189213f6f17198;hp=77684322e72115d87d90892ef154e6b25a72b689;hpb=d82239f6ad1be37c08754310a5ca8eb1bd10ea67;p=org.ibex.arenaj.git

diff --git a/Makefile b/Makefile
index 7768432..50192c3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,19 @@
-#cp        =  lib/soot.jar:/Users/megacz/ibex.org/jar/org.ibex.core.jar:/Users/megacz/ibex.org/jar/org.ibex.util.jar:/Users/megacz/ibex.org/jar/org.ibex.js.jar:/Users/megacz/ibex.org/jar/org.ibex.net.jar:/Users/megacz/ibex.org/jar/org.ibex.io.jar:bin
-sootcp    = lib/soot.jar:/System/Library/Frameworks/JavaVM.framework/Versions/1.4.2/Classes/classes.jar
-#mainclass = org.ibex.graphics.Mesh
-mainclass = edu.berkeley.cs.megacz.Test
-
-go:
-	rm -rf sootOutput out.jar out
-	javac -classpath lib/soot.jar -d bin `find src/ -name \*.java`
-	mkdir -p out
-	java -cp bin:lib/soot.jar edu.berkeley.cs.megacz.Transformer -app -i edu.berkeley.cs.megacz -d out -cp ${sootcp}:bin ${mainclass}
-	java -jar lib/soot.jar -process-dir out -f d -cp ${sootcp}:out edu.berkeley.cs.megacz.Test
-	cd out; find . -name \*.class -exec jad {} \;
-	cat out/Test.jad
+sootjars := jar/sootclasses-2.2.1.jar jar/jasminclasses-2.2.1.jar jar/polyglotclasses-1.3.jar
+java     := java -Djava.ext.dirs=jar
+arenaj   := ${java} -jar jar/org.ibex.arenaj.jar
+
+jar:                            ; mkdir -p jar
+jar/sootclasses-2.2.1.jar:   jar; cd jar; curl -C - -O http://www.sable.mcgill.ca/software/sootclasses-2.2.1.jar
+jar/jasminclasses-2.2.1.jar: jar; cd jar; curl -C - -O http://www.sable.mcgill.ca/software/jasminclasses-2.2.1.jar
+jar/polyglotclasses-1.3.jar: jar; cd jar; curl -C - -O http://www.sable.mcgill.ca/software/polyglotclasses-1.3.jar
+
+prepare: ${sootjars}
+
+jar/org.ibex.arenaj.jar: ${sootjars} jar/org.ibex.tool.jar
+	${java} -jar jar/org.ibex.tool.jar -v -w -j jar/org.ibex.arenaj.jar -m org.ibex.arenaj.Main src
+
+demo: jar/org.ibex.arenaj.jar
+	${arenaj} \
+		-app -i org.ibex.graphics \
+		-d out \
+		org.ibex.arenaj.Test