X-Git-Url: http://git.megacz.com/?p=nestedvm.git;a=blobdiff_plain;f=Makefile;h=80940996ba8c480116c7007841a5677aa4fb1e4c;hp=3cdb29167d99c0218b06eeb796376235c816cf7d;hb=00faa5231809fd956989e44e18c5284951876f01;hpb=0b3efa1620ad89fe3de2a83c6734cbea4e9d441b

diff --git a/Makefile b/Makefile
index 3cdb291..8094099 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
+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"
 
@@ -199,6 +200,7 @@ env.sh: Makefile $(tasks)/build_gcc $(tasks)/build_libc build/org/ibex/nestedvm/
 #
 
 runtime_classes = Runtime Registers UsermodeConstants util/Seekable
+unix_runtime_classes = $(runtime_classes) UnixRuntime util/Platform util/InodeCache
 
 tex.jar: $(mips_objects) $(runtime_classes:%=build/org/ibex/nestedvm/%.class) build/tests/TeX.class
 	echo -e "Manifest-Version: 1.0\nMain-Class: Tex\n" > .manifest
@@ -214,6 +216,16 @@ runtime.jar: $(runtime_classes:%=build/org/ibex/nestedvm/%.class)
 		org/ibex/nestedvm/Runtime\$$*.class \
 		org/ibex/nestedvm/util/Seekable\$$*.class
 
+unix_runtime.jar: $(unix_runtime_classes:%=build/org/ibex/nestedvm/%.class)
+	cd build && jar cf ../$@ \
+		$(unix_runtime_classes:%=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
+
 .manifest:
 	printf "Manifest-Version: 1.0\nMain-Class: org.ibex.nestedvm.RuntimeCompiler\n" > $@
 
@@ -227,8 +239,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 .
@@ -407,6 +419,10 @@ ntlmauth.jar: build/tests/NtlmAuth.class $(tasks)/build_darcs_gcclass .gcclass_h
 	cd tmp/pruned && jar cfm ../../$@ ../../.manifest.ntlm .
 	rm -f  .manifest.ntlm
 
+gmptest: $(tasks)/build_gmp
+	cd upstream/build/gmp && \
+	make check TESTS_ENVIRONMENT="java -cp \"$(classpath)\" org.ibex.nestedvm.RuntimeCompiler"
+
 #
 # Speed tests
 #
@@ -415,7 +431,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"
@@ -501,3 +517,9 @@ 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
+	darcs push /afs/ibex.org/project/nestedvm