fixed LastRead() after Read(wxOutputStream&) (patch 1658301)

[wxWidgets.git] / wxPython / b.win32

diff --git a/wxPython/b.win32 b/wxPython/b.win32
index b15390270f3fd0c18a22e2d68a64c25f40e6ab30..5f4908879b26ed6e8d4f489629e87094ecb718f2 100644 (file)
--- a/wxPython/b.win32
+++ b/wxPython/b.win32
@@ -1,23 +1,44 @@
 #!/bin/bash
 # ----------------------------------------------------------------------
 
 #!/bin/bash
 # ----------------------------------------------------------------------
 

+if [ "$SWIGDIR" = "" ]; then
+  SWIGDIR=$PROJECTS\\SWIG-1.3.29
+fi

 
 

-FLAGS="USE_SWIG=1 SWIG=e:/projects/SWIG-cvs/swig.exe"

 
 #  Use non-default python?
 
 #  Use non-default python?

-if [[ "$1" = "15" || "$1" = "20" || "$1" = "21" || "$1" = "22" || "$1" = "23" ]]; then
-    VER=$1
-    PYTHON=$TOOLS/python$1/python.exe
-    shift
-else
-    echo You must specify the Python version as first parameter.
-    exit -1
-fi
+case $1 in
+    21 | 2.1) VER=21; shift ;;
+    22 | 2.2) VER=22; shift ;;
+    23 | 2.3) VER=23; shift ;;
+    24 | 2.4) VER=24; shift ;;
+    25 | 2.5) VER=25; shift ;;
+
+    *)         VER=24
+esac
+
+PYTHON=$TOOLS/python$VER/python.exe

 
 SETUP="$PYTHON -u setup.py"
 $PYTHON -c "import sys;print '\n', sys.version, '\n'"
 
 
 
 SETUP="$PYTHON -u setup.py"
 $PYTHON -c "import sys;print '\n', sys.version, '\n'"
 
 

+FLAGS="USE_SWIG=1 SWIG=$SWIGDIR\\swig.exe"
+UNIFLAG="UNICODE=1"
+
+for p in $*; do
+    if [ "$p" = "UNICODE=0" -o "$p" = "UNICODE=1" ]; then
+       UNIFLAG=""
+       break
+    fi
+done
+
+FLAGS="$FLAGS $UNIFLAG"
+
+
+
+
+

 
 # "c" --> clean
 if [ "$1" = "c" ]; then
 
 # "c" --> clean
 if [ "$1" = "c" ]; then


@@ -66,20 +87,20 @@ elif [ "$1" = "a" ]; then
     shift
     CMD=
 
     shift
     CMD=
 

-    $0 22 d
-    $0 22 h
-    $0 22 r
-    $0 22 d UNICODE=1
-    $0 22 h UNICODE=1
-    $0 22 r UNICODE=1
-    
-    $0 23 d
-    $0 23 h
-    $0 23 r
+    $0 23 d UNICODE=0
+    $0 23 h UNICODE=0
+    $0 23 r UNICODE=0

     $0 23 d UNICODE=1
     $0 23 h UNICODE=1
     $0 23 r UNICODE=1
 
     $0 23 d UNICODE=1
     $0 23 h UNICODE=1
     $0 23 r UNICODE=1
 

+    $0 24 d UNICODE=0
+    $0 24 h UNICODE=0
+    $0 24 r UNICODE=0
+    $0 24 d UNICODE=1
+    $0 24 h UNICODE=1
+    $0 24 r UNICODE=1
+

 
 # "b" --> both debug and hybrid builds
 elif [ "$1" = "b" ]; then
 
 # "b" --> both debug and hybrid builds
 elif [ "$1" = "b" ]; then


@@ -88,7 +109,7 @@ elif [ "$1" = "b" ]; then
     $0 $VER   $@
     $0 $VER h $@
 
     $0 $VER   $@
     $0 $VER h $@
 

-# (no command arg) --> normal build for development
+# (no command arg) --> normal debug build for development

 else
     CMD="$SETUP $FLAGS HYBRID=0 build_ext --inplace --debug $@"
 fi
 else
     CMD="$SETUP $FLAGS HYBRID=0 build_ext --inplace --debug $@"
 fi