X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=50192c3003657199d14dff4b7cc9d5a850fe5353;hb=f854a3b952b2997f73f4c7a7f13e4bae2dc0a227;hp=d9b8c027a3e3250739cf4a6ae5546d7c170c3612;hpb=b5cb3733c4dcd25a8ef793436074ee1d0d8162db;p=org.ibex.arenaj.git

diff --git a/Makefile b/Makefile
index d9b8c02..50192c3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,33 +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
+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
 
-#mainclass = edu.berkeley.cs.megacz.Test
-#mainclass = org.ibex.graphics.Mesh
+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
 
-go:
-	javac -classpath lib/soot.jar:bin -d bin `find src/ -name \*.java`
-	mkdir -p in
-#	cd in; for A in /Users/megacz/ibex.org.arenaj/jar/*.jar; do jar xf $$A; done
-#	mkdir -p out
-#	java -cp bin:lib/soot.jar edu.berkeley.cs.megacz.Transformer -keep-line-number -app -i org.ibex.graphics -d out -cp ${sootcp}:in org.ibex.graphics.Mesh
-	java -cp bin:lib/soot.jar edu.berkeley.cs.megacz.Transformer \
-		-keep-line-number \
-		-app -i org.ibex.graphics \
-		-w \
-		-d out \
-		-cp ${sootcp}:bin \
-		-p cg enabled:false \
-		-p cg.cha enabled:false \
-		-p cg.spark enabled:false \
-		-p cg.paddle enabled:false \
-		-p wjap.ra enabled:false \
-		-p wjap.umt enabled:false \
-		-p wjap.uft enabled:false \
-		-p wjap.tqt enabled:false \
-		-p wjap.cgg enabled:false \
-		edu.berkeley.cs.megacz.GCBench
+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
 
-#	java -jar lib/soot.jar -app -i org.ibex.graphics -f d -d outsrc -cp ${sootcp}:out ${mainclass}
-#	cd out; find . -name \*.class -exec jad {} \;
-#	cat out/Test.jad
+demo: jar/org.ibex.arenaj.jar
+	${arenaj} \
+		-app -i org.ibex.graphics \
+		-d out \
+		org.ibex.arenaj.Test