more fixes for volume names handling

[wxWidgets.git] / wxPython / b

diff --git a/wxPython/b b/wxPython/b
index cd240e9772fb687b17a6d412e0d83edcba959ebf..ecad3115509bc0c57c5c716096037a44acbf974b 100755 (executable)
--- a/wxPython/b
+++ b/wxPython/b
@@ -7,6 +7,8 @@ function getpyver {
        PYVER=2.0
     elif [ "$1" = "21" ]; then
        PYVER=2.1
+    elif [ "$1" = "22" ]; then
+       PYVER=2.2
     else
        echo You must specify Python version as first parameter.
         exit
@@ -18,9 +20,9 @@ shift
 
 python$PYVER -c "import sys;print '\n', sys.version, '\n'"
 
-WXPYVER=`python$PYVER -c "import setup;print setup.VERSION"`
+
 SETUP="python$PYVER -u setup.py"
-FLAGS="USE_SWIG=1 IN_CVS_TREE=1"
+FLAGS="USE_SWIG=1 IN_CVS_TREE=1" # BUILD_GLCANVAS=0"
 OTHERFLAGS=""
 
 
@@ -39,7 +41,8 @@ elif [ "$1" = "d" ]; then
 # "t" --> touch *.i files
 elif [ "$1" = "t" ]; then
     shift
-    CMD="set CMD=touch src\*.i; touch contrib\glcanvas\*.i; touch contrib\ogl\*.i; touch contrib\stc\*.i"
+    #CMD="set CMD=touch src\*.i; touch contrib\glcanvas\*.i; touch contrib\ogl\*.i; touch contrib\stc\*.i"
+    CMD='find . -name "*.i" | xargs -l touch'
 
 # "i" --> install
 elif [ "$1" = "i" ]; then
@@ -53,7 +56,7 @@ elif [ "$1" = "s" ]; then
 
 # "r" --> rpm dist
 elif [ "$1" = "r" ]; then
-
+    WXPYVER=`python$PYVER -c "import setup;print setup.VERSION"`
     for VER in 15 20 21; do
        getpyver $VER
 
@@ -98,14 +101,19 @@ elif [ "$1" = "r" ]; then
     exit 0
 
 
+# "f" --> FINAL (no debug)
+elif [ "$1" = "f" ]; then
+    shift
+    CMD="$SETUP $FLAGS $OTHERFLAGS build_ext --inplace $*"
+
 # (no command arg) --> normal build for development
 else
-    CMD="$SETUP $FLAGS $OTHERFLAGS build_ext --inplace $*"
+    CMD="$SETUP $FLAGS $OTHERFLAGS build_ext --inplace --debug $*"
 fi
 
 
 echo $CMD
-$CMD
+eval $CMD
 
 
 if [ "$OTHERCMD" != "" ]; then