X-Git-Url: http://git.megacz.com/?p=nestedvm.git;a=blobdiff_plain;f=Makefile;h=7c7692b919d7abaead1953f1ba9424d18fc92706;hp=f0212b10157d3c1c9c29d8172f265014f91f4338;hb=031222f07c4ac6549cfdcb0667114ba5476bbbaf;hpb=28768566741750d4453d00e3355b878427ba7bb3

diff --git a/Makefile b/Makefile
index f0212b1..7c7692b 100644
--- a/Makefile
+++ b/Makefile
@@ -106,7 +106,7 @@ build/org/ibex/nestedvm/util/.Dummy.class:
 $(java_classes): build/org/ibex/nestedvm/util/.Dummy.class
 endif
 
-$(java_classes): $(java_sources) $(tasks)/build_darcs_classgen
+$(java_classes): $(java_sources) $(tasks)/build_git_classgen
 	$(JAVAC) -classpath "$(classpath)" -d build $(java_sources)
 
 # GCJ Stuff
@@ -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" > $@
@@ -236,7 +235,7 @@ nestedvm.jar: $(java_classes) .manifest
 .gcclass_hints: $(java_sources)
 	sed -n 's/.*GCCLASS_HINT: \([^ ]*\) \([^ ]*\).*/hint:\1:\2/p' $(java_sources) > $@
 
-compact_runtime_compiler.jar: $(java_classes) .manifest $(tasks)/build_darcs_gcclass .gcclass_hints
+compact_runtime_compiler.jar: $(java_classes) .manifest $(tasks)/build_git_gcclass .gcclass_hints
 	mkdir -p tmp/pruned
 	rm -rf tmp/pruned/*
 	$(JAVA) -cp \
@@ -409,7 +408,7 @@ ntlmtest: build/tests/NtlmAuth.class
 	@test -e smb.conf || cp upstream/build/samba/examples/smb.conf.default smb.conf
 	$(JAVA) -cp "$(classpath)" tests.NtlmAuth --username=brian --password=test --diagnostics -d 5
 
-ntlmauth.jar: build/tests/NtlmAuth.class $(tasks)/build_darcs_gcclass .gcclass_hints
+ntlmauth.jar: build/tests/NtlmAuth.class $(tasks)/build_git_gcclass .gcclass_hints
 	mkdir -p tmp/pruned
 	rm -rf tmp/pruned/*
 	java -cp \
@@ -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,12 @@ doc/ivme04.pdf: doc/ivme04.tex doc/acmconf.cls $(charts:%.dat=%.pdf) build/tests
 
 pdf: doc/ivme04.pdf
 	open doc/ivme04.pdf
+
+push:
+	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