roll back busybox to 1.0pre9

[nestedvm.git] / Makefile

diff --git a/Makefile b/Makefile
index f37b90d..f6b0cf4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -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" > $@
@@ -430,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"
@@ -516,3 +516,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