Build and distrib tweaks

[wxWidgets.git] / wxPython / distrib / all / build-windows

diff --git a/wxPython/distrib/all/build-windows b/wxPython/distrib/all/build-windows
index 252928627bea5702680458c8876f91771c438445..fda836feca1a05b02307dd7f31314b4c9180be43 100755 (executable)
--- a/wxPython/distrib/all/build-windows
+++ b/wxPython/distrib/all/build-windows
@@ -3,11 +3,16 @@
 
 set -o errexit
 
 
 set -o errexit
 

-# read the config variables from the file given on the command line
-# . $1

 
 PYVER=$1
 
 
 PYVER=$1
 

+if [ $buildansi = yes ]; then
+    CHARTYPE=both
+else
+    CHARTYPE=unicode
+fi
+
+

 if [ $skipwin != yes ]; then
     # test if the target machine is online
     if ping -q -c1 -w1 $WIN_HOST > /dev/null; then
 if [ $skipwin != yes ]; then
     # test if the target machine is online
     if ping -q -c1 -w1 $WIN_HOST > /dev/null; then


@@ -17,19 +22,21 @@ if [ $skipwin != yes ]; then
        return 0
     fi
 
        return 0
     fi
 

-    echo "Copying source file and build script..."
+    echo "Copying source, docs and build script..."

     scp $STAGING_DIR/wxPython-src-$VERSION.tar.bz2 \
     scp $STAGING_DIR/wxPython-src-$VERSION.tar.bz2 \

+       $STAGING_DIR/wxPython-docs-$VERSION.tar.bz2 \

        distrib/all/do-build-windows \
        $WIN_HOST:$WIN_BUILD
     
      echo "Running build script on $WIN_HOST..."
      wxdir=$WIN_BUILD/wxPython-src-$VERSION
      cmd=./do-build-windows
        distrib/all/do-build-windows \
        $WIN_HOST:$WIN_BUILD
     
      echo "Running build script on $WIN_HOST..."
      wxdir=$WIN_BUILD/wxPython-src-$VERSION
      cmd=./do-build-windows

-     ssh $WIN_HOST "cd $WIN_BUILD && $cmd $wxdir $WIN_BUILD $skipclean $VERSION $PYVER && rm $cmd"
+     ssh $WIN_HOST "cd $WIN_BUILD && $cmd $wxdir $WIN_BUILD $skipclean $VERSION $PYVER $CHARTYPE && rm $cmd"

 
      echo "Fetching the results..."
      scp "$WIN_HOST:$WIN_BUILD/wxPython*-win32*"  $STAGING_DIR
      ssh $WIN_HOST "rm $WIN_BUILD/wxPython*-win32*"
 
      echo "Fetching the results..."
      scp "$WIN_HOST:$WIN_BUILD/wxPython*-win32*"  $STAGING_DIR
      ssh $WIN_HOST "rm $WIN_BUILD/wxPython*-win32*"

+     ssh $WIN_HOST "rm -rf $WIN_BUILD/*"

 
      echo "Done!"
 fi
\ No newline at end of file
 
      echo "Done!"
 fi
\ No newline at end of file