2003/09/26 03:42:46

[org.ibex.core.git] / Makefile

diff --git a/Makefile b/Makefile
index 7da3b84..99c3a5d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -122,8 +122,8 @@ java_objects := $(nonplat_java_sources:build/java/%.java=build/$(platform)/%.jav
 build/$(platform)/$(platform).ar: $(java_objects) build/$(platform)/builtin.o $(plat_java_sources:build/java/%.java=build/$(platform)/%.java.o)
        @echo -e "\n\033[1marchiving             .o -> .a\033[0m"
        mkdir -p build/$(platform)
-       upstream/install/bin/$(target)-ar rc $@ $?
-       upstream/install/bin/$(target)-ranlib $@
+       upstream/install/$(target)/bin/ar rc $@ $?
+       upstream/install/$(target)/bin/ranlib $@
 
 $(target_bin): build/$(platform)/$(platform).ar build/$(platform)/org/xwt/plat/$(platform).cc.o upstream/jpeg-6b/build-$(target)/libjpeg.a 
        @echo -e "\n\033[1mlinking               .o -> $(target_bin)\033[0m"
@@ -252,19 +252,12 @@ dist: compile
                tail -n 200 .make-dist.out | \
                        mail -s "Unsigned binaries of $(current_build) are now available" cvs@xwt.org
         else
-               echo -e 'export JAVA_HOME=/usr/lib/j2sdk1.4\n cd /home/xwt\n date=`date +%d-%b-%H%M`\n mkdir xwt-$$date\n cd xwt-$$date\n /usr/bin/cvs -d /cvs co $(this_branch_flag) xwt\n mv xwt/* .\n mv xwt/.* .\n rmdir xwt\n touch .make-dist.out\n nohup make dist &> /dev/null &\n echo\n cat .make-dist.out' | ssh xwt@xwt.org | grep -v "make...:.\(Entering\|Leaving\).directory"
+               echo -e 'export JAVA_HOME=/usr/lib/j2sdk1.4\n cd /home/xwt\n date=`date +%d-%b-%H%M`\n mkdir xwt-$$date\n cd xwt-$$date\n /usr/bin/cvs -d /cvs co $(this_branch_flag) xwt\n mv xwt/* .\n mv xwt/.* .\n rmdir xwt\n touch .make-dist.out\n nohup make dist &\n echo\n cat .make-dist.out' | ssh xwt@xwt.org | grep -v "make...:.\(Entering\|Leaving\).directory"
         endif
 
 dist-private:
        make $(silent) update-build
 
-       # preserve gcc across builds so we don't have to remake it
-       mkdir -p $(HOME)/dist.xwt.org-gcc
-       mv gcc gcc-
-       ln -s $(HOME)/dist.xwt.org-gcc gcc
-       mv -f gcc-/Makefile gcc/
-       mv -f gcc-/*.patch gcc/
-
        # build it
        nice -n 19 make all
 
@@ -272,13 +265,23 @@ dist-private:
        echo === master.dist.xwt.org ==================================
 
        echo "copying xwt.jar to distribution area..."
-       cp xwt.jar /var/www/master.dist.xwt.org/xwt-$(current_build).jar.unsigned
+       cp build/JVM/xwt.jar /var/www/master.dist.xwt.org/xwt-$(current_build).jar.unsigned
 
        echo "stripping xwt.exe and copying it to the distribution area..."
-       $(strip) build/Win32/xwt.exe -o /var/www/master.dist.xwt.org/xwt-$(current_build).exe.unsigned
+       upstream/install/i686-pc-mingw32/bin/strip build/Win32/xwt.exe \
+               -o /var/www/master.dist.xwt.org/xwt-$(current_build).exe.unsigned
 
        echo "copying xwt.linux to distribution area..."
-       $(strip) build/Linux/xwt.linux -o /var/www/master.dist.xwt.org/xwt-$(current_build).linux.unsigned
+       upstream/install/i686-pc-linux-gnu/bin/strip build/Linux/xwt.linux \
+               -o /var/www/master.dist.xwt.org/xwt-$(current_build).linux.unsigned
+
+       echo "copying xwt.solaris to distribution area..."
+       upstream/install/sparc-sun-solaris2.7/bin/strip build/Solaris/xwt.solaris \
+               -o /var/www/master.dist.xwt.org/xwt-$(current_build).solaris.unsigned
+
+       echo "copying xwt.darwin to distribution area..."
+       upstream/install/powerpc-apple-darwin/bin/strip build/Darwin/xwt.darwin \
+               -o /var/www/master.dist.xwt.org/xwt-$(current_build).darwin.unsigned
 
        echo "creating source tarball in distribution area..."
        CVSROOT=/cvs cvs export -r xwt-$(current_build) xwt