X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=828aebaf3b1dcccf1f5333e24b6c131504aceb49;hb=251e990674d9861b29d569abe3648cad09355107;hp=8c5597637cd1cffa108803ae795a8714410f4db3;hpb=abbfe7c010eb00663b28d2420d5ef62e6b6f4c67;p=org.ibex.arenaj.git

diff --git a/Makefile b/Makefile
index 8c55976..828aeba 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,39 @@
 #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
+
+# IVME Paper
+doc/charts/%.pdf: doc/charts/%.dat doc/charts/%.gnuplot
+	cd doc/charts; gnuplot $*.gnuplot
+	cd doc/charts; chmod +x boxfill.pl; ./boxfill.pl -g -o unfilled.eps $*.eps
+	cd doc/charts; ps2pdf $*.eps
+
+#mainclass = edu.berkeley.cs.megacz.Test
 #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
-	cd out; find . -name \*.class -exec jad {} \;
-	cat out/Test.jad
+	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
+
+
+#	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