checkpoint

[org.ibex.arenaj.git] / Makefile

diff --git a/Makefile b/Makefile
index 8c55976..7768432 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,13 @@
 #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
-cp        =  lib/soot.jar:bin
-sootcp    = ${cp}:/System/Library/Frameworks/JavaVM.framework/Versions/1.4.2/Classes/classes.jar
+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`
-       java -cp ${cp} edu.berkeley.cs.megacz.Transformer -app -i edu.berkeley.cs.megacz -outjar -cp ${sootcp} ${mainclass}
-       mv sootOutput out.jar
-       mkdir -p out; cd out; jar xvf ../out.jar
+       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