X-Git-Url: http://git.megacz.com/?p=nestedvm.git;a=blobdiff_plain;f=Makefile;h=122ba3941a6e36b7e6ca9dc3ff18f89a4eac5b4b;hp=f0212b10157d3c1c9c29d8172f265014f91f4338;hb=6598036848013a0dcd0a0511ebfd37880c1f22c3;hpb=28768566741750d4453d00e3355b878427ba7bb3

diff --git a/Makefile b/Makefile
index f0212b1..122ba39 100644
--- a/Makefile
+++ b/Makefile
@@ -222,9 +222,8 @@ unix_runtime.jar: $(unix_runtime_classes:%=build/org/ibex/nestedvm/%.class)
 		org/ibex/nestedvm/Runtime\$$*.class \
 		org/ibex/nestedvm/util/Seekable\$$*.class \
 		org/ibex/nestedvm/UnixRuntime\$$*.class \
-		org/ibex/nestedvm/util/Platform\$$*.class
-	cd upstream/build/classgen/build && jar -uf ../../../../$@ \
-		org/ibex/classgen/util/Sort*.class
+		org/ibex/nestedvm/util/Platform\$$*.class \
+		org/ibex/nestedvm/util/Sort*.class
 
 .manifest:
 	printf "Manifest-Version: 1.0\nMain-Class: org.ibex.nestedvm.RuntimeCompiler\n" > $@
@@ -431,7 +430,7 @@ build/tests/SpeedTest.class: build/org/ibex/nestedvm/Runtime.class
 
 tmp/thebride_1280.jpg:
 	@mkdir -p tmp
-	cd tmp && curl -O http://www.kill-bill.com/images/wallpaper/thebride_1280.jpg
+	cd tmp && curl -O http://www.brianweb.net/misc/thebride_1280.jpg
 
 oldspeedtest: build/tests/DJpeg.class tmp/thebride_1280.jpg
 	bash -c "time $(JAVA) -cp build tests.DJpeg -targa -outfile tmp/thebride_1280.tga tmp/thebride_1280.jpg"
@@ -491,7 +490,7 @@ commit:
 
 update:
 	@if [ -d _darcs ]; then darcs pull; \
-	else wget -nH -rl 16 -N -X _darcs http://nestedvm.darcs.brianweb.net; \
+	else echo "you must have darcs installed in order to acquire the rest of the software" \
 	fi
 
 #
@@ -517,3 +516,15 @@ doc/ivme04.pdf: doc/ivme04.tex doc/acmconf.cls $(charts:%.dat=%.pdf) build/tests
 
 pdf: doc/ivme04.pdf
 	open doc/ivme04.pdf
+
+push:
+	if [ "$${HOSTNAME#*.}" = "brianweb.net" ]; then \
+		darcs push charger.brianweb.net:/home/darcs/nestedvm; \
+	fi
+	git push /afs/megacz.com/web/org/ibex/nestedvm/ master
+
+snapshot:
+	git archive --prefix=nestedvm-`date +%Y-%m-%d`/ HEAD | \
+	  gzip -c > \
+	  /afs/megacz.com/web/org/ibex/nestedvm/dist/nestedvm-`date +%Y-%m-%d`.tgz
+	@echo url is http://nestedvm.ibex.org/dist/dist/nestedvm-`date +%Y-%m-%d`.tgz