X-Git-Url: http://git.megacz.com/?p=nestedvm.git;a=blobdiff_plain;f=Makefile;h=e539ef63e57b3c1e871a67aefd7f1227a0156d99;hp=e2edde72098e8cdf26c06db810c6284bc0384b48;hb=437397dbd57fbfc6656c49f1aff377da37484bb6;hpb=8817b8182ec910e54686e834e4a21efb0ab2fde8

diff --git a/Makefile b/Makefile
index e2edde7..e539ef6 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
@@ -199,6 +199,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 +215,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,7 +238,7 @@ 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 \
+	$(JAVA) -cp \
 		upstream/build/gcclass/build:upstream/build/gcclass/upstream/bcel-5.1/bcel-5.1.jar \
 	com.brian_web.gcclass.GCClass \
 		"$(classpath)" tmp/pruned org.ibex.nestedvm.RuntimeCompiler.main `cat .gcclass_hints`