Applied new master define for CommandBar vs. PocketPC mixed bar.

[wxWidgets.git] / wxPython / b.win32

diff --git a/wxPython/b.win32 b/wxPython/b.win32
index b15390270f3fd0c18a22e2d68a64c25f40e6ab30..80fbae20077655c613b43554be260d4c97e2dbaa 100644 (file)
--- a/wxPython/b.win32
+++ b/wxPython/b.win32
@@ -5,14 +5,17 @@
 FLAGS="USE_SWIG=1 SWIG=e:/projects/SWIG-cvs/swig.exe"
 
 #  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 ;;
+    22 | 2.2) VER=22 ;;
+    23 | 2.3) VER=23 ;;
+
+    *)         echo You must specify the Python version as first parameter.
+       exit -1
+esac
+
+PYTHON=$TOOLS/python$VER/python.exe
+shift
 
 SETUP="$PYTHON -u setup.py"
 $PYTHON -c "import sys;print '\n', sys.version, '\n'"
@@ -66,12 +69,12 @@ elif [ "$1" = "a" ]; then
     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 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