X-Git-Url: http://git.megacz.com/?p=nestedvm.git;a=blobdiff_plain;f=Makefile;h=f0212b10157d3c1c9c29d8172f265014f91f4338;hp=0063dcfcd0380e6daa219ac36f45253edcb63af6;hb=28768566741750d4453d00e3355b878427ba7bb3;hpb=89cf090a2142029423cd82020c0b891b82e1717c

diff --git a/Makefile b/Makefile
index 0063dcf..f0212b1 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"
 
@@ -238,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 .
@@ -430,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.kill-bill.com/images/wallpaper/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"