2003/02/27 05:08:38

[org.ibex.core.git] / Makefile

diff --git a/Makefile b/Makefile
index c8ec000..f93ba5b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,7 @@ gcc_flags              := -O9 -ffast-math -fomit-frame-pointer -foptimize-siblin
 gcj_flags              := -fCLASSPATH=bin 
 gcj                    := $(gcc_path)/bin/$(target)-gcj $(gcj_flags) $(gcc_flags)
 gcc                    := $(gcc_path)/bin/$(target)-g++ $(gcc_flags)
-gcjh                   := $(gcc_path)/bin-$(target)-gcjh
+gcjh                   := $(gcc_path)/bin/$(target)-gcjh
 ar                     := $(gcc_path)/$(target)/bin/ar
 jikes                  := jikes -extdirs ${JAVA_HOME}/jre/lib -nowarn
 
@@ -31,7 +31,7 @@ all_platforms          := Win32 Linux Java2
 
 ## Platform-Neutral ###########################################################################
 
-.SILENT: new-release update-build $(jikes_java_objects) .headers $(gcj_java_objects) $(all_platforms) PalmOS bin/org/xwt/builtin.xwar
+.SILENT: dist update-build $(jikes_java_objects) .headers $(gcj_java_objects) $(all_platforms) PalmOS bin/org/xwt/builtin.xwar
 
 compile: $(jikes_java_objects) bin/org/xwt/builtin.xwar
 
@@ -58,7 +58,7 @@ update-build:
        echo -n "Next build will be "
        cat next.build
        echo committing...
-       cvs commit -m 'updated build' next.build
+       cvs commit -m 'updated next.build' next.build
        echo committed.
 
 
@@ -139,20 +139,25 @@ PalmOS:
 
 current_build         := $(shell cat next.build)
 
-new-release:
+nohup-dist:
+       rm .make-dist.out
+       touch .make-dist.out
+       (nice -n 19 nohup make dist &>/dev/null) & tail -f .make-dist.out
+
+dist:
        test `uname -n` = gosset.megacz.com || \
-               (echo -e "um, new-release is only intended for use on xwt.org...\nedit the Makefile if you really know what you're doing."; false)
+               (echo -e "um, dist is only intended for use on xwt.org...\nedit the Makefile if you really know what you're doing."; false)
        echo "***********************************************************"
        echo "*  This build is $(current_build)"
        echo "***********************************************************"
 
        make --silent update-build
-       (make --silent new-release-private &> .make-new-release.out) || \
-               (cat .make-new-release.out | mail -s "Build $(current_build) FAILED" cvs@xwt.org; false)
-       cat .make-new-release.out | \
+       (make --silent dist-private &> .make-dist.out) || \
+               (cat .make-dist.out | mail -s "Build $(current_build) FAILED" cvs@xwt.org; false)
+       cat .make-dist.out | \
                mail -s "Unsigned binaries of build $(current_build) are now available" cvs@xwt.org
 
-new-release-private:
+dist-private:
        # preserve gcc across builds so we don't have to remake it
        mv gcc/Makefile Makefile.gcc
        mkdir -p ~/dist.xwt.org-gcc
@@ -161,7 +166,7 @@ new-release-private:
        mv Makefile.gcc gcc/Makefile
 
        # build it
-       make all
+       nice -n 19 make all
 
        cp bin-Java2/xwt.jar /var/www/dist.xwt.org/xwt-$(current_build).jar.unsigned
        cp bin-Win32/xwt.exe /var/www/dist.xwt.org/xwt-$(current_build).exe.unsigned