X-Git-Url: http://git.megacz.com/?p=nestedvm.git;a=blobdiff_plain;f=Makefile;h=0b0944a41444b6698e1dbac4391aaa6f933b7bc3;hp=e72cab71d1372f2f4e312a8a225e158ff92b634d;hb=d5566fee6b4ea8e85ddea33ce20587e7c523bc25;hpb=814947ec0bf8e8cad840df9f21320a9ce9ffd1ac

diff --git a/Makefile b/Makefile
index e72cab7..0b0944a 100644
--- a/Makefile
+++ b/Makefile
@@ -43,7 +43,7 @@ MIPS_LDFLAGS= $(flags) --static -Wl,--gc-sections
 MIPS_STRIP = mips-unknown-elf-strip
 
 # Java compiler/VM settings
-JAVAC = javac -source 1.3
+JAVAC = javac -source 1.3 -target 1.3
 JAVA = java
 ifeq ($(firstword $(JAVAC)),gcj)
 	JAVAC_NODEBUG_FLAGS = -g0
@@ -90,7 +90,7 @@ $(tasks)/%:
 		MIPS_CFLAGS="$(filter-out -Werror,$(MIPS_CFLAGS))" \
 		MIPS_PCFLAGS="$(filter-out -Werror,$(MIPS_PCFLAGS))" \
 		MIPS_LDFLAGS="$(MIPS_LDFLAGS)"
-		
+
 upstream_clean_%:
 	$(MAKE) -C upstream clean_$* usr="$(usr)"
 
@@ -191,6 +191,7 @@ env.sh: Makefile $(tasks)/build_gcc $(tasks)/build_libc build/org/ibex/nestedvm/
 	@echo 'CXXFLAGS="$(mips_optflags)"; export CXXFLAGS' >> $@~
 	@echo 'LDFLAGS="$(MIPS_LDFLAGS)"; export LDFLAGS' >> $@~
 	@echo 'CLASSPATH=$(mips2java_root)/build:$(mips2java_root)/upstream/build/classgen/build:.; export CLASSPATH' >> $@~
+	@chmod a+x "$@~"
 	@mv "$@~" "$@"
 	@echo "$@ created successfully"
 
@@ -221,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" > $@
@@ -238,8 +238,8 @@ nestedvm.jar: $(java_classes) .manifest
 compact_runtime_compiler.jar: $(java_classes) .manifest $(tasks)/build_darcs_gcclass .gcclass_hints
 	mkdir -p tmp/pruned
 	rm -rf tmp/pruned/*
-	java -cp \
-		upstream/build/gcclass/build:upstream/build/gcclass/upstream/bcel-5.1/bcel-5.1.jar \
+	$(JAVA) -cp \
+		upstream/build/gcclass/build:upstream/build/gcclass/upstream/bcel-5.2/bcel-5.2.jar \
 	com.brian_web.gcclass.GCClass \
 		"$(classpath)" tmp/pruned org.ibex.nestedvm.RuntimeCompiler.main `cat .gcclass_hints`
 	cd tmp/pruned && jar cfm ../../$@ ../../.manifest .
@@ -430,7 +430,7 @@ build/tests/SpeedTest.class: build/org/ibex/nestedvm/Runtime.class
 
 tmp/thebride_1280.jpg:
 	@mkdir -p tmp
-	cd tmp && wget 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"
@@ -490,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
 
 #
@@ -516,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