2003/09/26 03:23:45

darcs-hash:20040130073651-2ba56-feece93defe0b3e612cd2afb2d336aa3ba5711e3.gz

diff --git a/Makefile b/Makefile
index 7da3b84..1dc5a20 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -259,11 +259,11 @@ 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/
+       #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 +272,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