Another addtomethod removed

[wxWidgets.git] / wxPython / b

diff --git a/wxPython/b b/wxPython/b
index 4888c8ad757de3a0667789f407eccbd6370f94e2..5c97518e564efeeaa0eab49bf6440bbdecde8ed7 100755 (executable)
--- a/wxPython/b
+++ b/wxPython/b
@@ -1,88 +1,131 @@
 #!/bin/sh
 
 #!/bin/sh
 

-if [ "$1" = "15" ]; then
-    PYVER=1.5
-    shift
-elif [ "$1" = "20" ]; then
-    PYVER=2.0
+function getpyver {
+    if [ "$1" = "15" ]; then
+       PYVER=1.5
+    elif [ "$1" = "20" ]; then
+       PYVER=2.0
+    elif [ "$1" = "21" ]; then
+       PYVER=2.1
+    elif [ "$1" = "22" ]; then
+       PYVER=2.2
+    elif [ "$1" = "23" ]; then
+       PYVER=2.3
+    else
+       echo You must specify Python version as first parameter.
+        exit
+    fi
+}
+
+getpyver $1
+shift
+
+python$PYVER -c "import sys;print '\n', sys.version, '\n'"
+
+
+SETUP="python$PYVER -u setup.py"
+FLAGS="USE_SWIG=1 SWIG=/opt/swig/bin/swig" 
+OTHERFLAGS=""
+PORTFLAGS=""
+
+
+if [ "$1" = "gtk1" ]; then 
+    PORTFLAGS=""

     shift
     shift

-elif [ "$1" = "21" ]; then
-    PYVER=2.1
+elif [ "$1" = "gtk2" ]; then 
+    PORTFLAGS="WXPORT=gtk2 UNICODE=1"

     shift
     shift

-else
-    echo You must specify Python version as first parameter.
-    exit

 fi
 
 fi
 

+FLAGS="$FLAGS $PORTFLAGS"

 
 

-SETUP="python$PYVER -u setup.py"
-FLAGS="USE_SWIG=1 IN_CVS_TREE=1"
-OTHERFLAGS=""

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

-    CMD="$SETUP $FLAGS $OTHERFLAGS clean"
-    OTHERCMD="rm -f wxPython/*.so"
+    CMD="$SETUP $FLAGS $OTHERFLAGS clean $*"
+    OTHERCMD="rm -f wx/*.so"

 
 # "d" --> clean extension modules only
 elif [ "$1" = "d" ]; then
     shift
 
 # "d" --> clean extension modules only
 elif [ "$1" = "d" ]; then
     shift

-    CMD="rm -f wxPython/*.so"
+    CMD="rm -f wx/*.so"

 
 # "t" --> touch *.i files
 elif [ "$1" = "t" ]; then
     shift
 
 # "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='find . -name "*.i" | xargs touch'

 
 # "i" --> install
 elif [ "$1" = "i" ]; then
     shift
 
 # "i" --> install
 elif [ "$1" = "i" ]; then
     shift

-    CMD="$SETUP build $OTHERFLAGS install"
+    CMD="$SETUP $FLAGS $OTHERFLAGS build_ext install $*"

 
 # "s" --> source dist
 elif [ "$1" = "s" ]; then
     shift
 
 # "s" --> source dist
 elif [ "$1" = "s" ]; then
     shift

-    CMD="$SETUP $OTHERFLAGS sdist"
+    CMD="$SETUP $OTHERFLAGS sdist $*"

 
 # "r" --> rpm dist
 elif [ "$1" = "r" ]; then
 
 # "r" --> rpm dist
 elif [ "$1" = "r" ]; then

+    WXPYVER=`python$PYVER -c "import setup;print setup.VERSION"`
+    for VER in 21 22; do
+       getpyver $VER
+
+       echo "*****************************************************************"
+       echo "*******      Building wxPython for Python $PYVER"
+       echo "*****************************************************************"
+
+       SETUP="python$PYVER -u setup.py"
+
+       # save the original
+       cp setup.py setup.py.save
+
+       # fix up setup.py the way we want...
+       sed "s/BUILD_GLCANVAS = /BUILD_GLCANVAS = 0 #/" < setup.py.save > setup.py.temp
+       sed "s/GL_ONLY = /GL_ONLY = 1 #/" < setup.py.temp > setup.py

 
 

-    # save the original
-    cp setup.py setup.py.save
+       # build wxPython-gl RPM
+       $SETUP $OTHERFLAGS bdist_rpm --binary-only --doc-files README.txt --python=python$PYVER
+                       ### --requires=python$PYVER
+       rm dist/wxPython-gl*.tar.gz

 
 

-    # fix up setup.py the way we want...
-    sed "s/BUILD_GLCANVAS = /BUILD_GLCANVAS = 0 #/" < setup.py.save > setup.py.temp
-    sed "s/GL_ONLY = /GL_ONLY = 1 #/" < setup.py.temp > setup.py
+       # Build wxPython RPM
+       cp setup.py setup.py.temp
+       sed "s/GL_ONLY = /GL_ONLY = 0 #/" < setup.py.temp > setup.py
+       $SETUP $OTHERFLAGS bdist_rpm --binary-only --python=python$PYVER
+                       ### --requires=python$PYVER

 
 

-    # build wxPython-gl RPM
-    $SETUP $OTHERFLAGS bdist_rpm --binary-only --doc-files README.txt
-    rm dist/wxPython-gl*.tar.gz
+       # put the oringal setup.py back
+       cp setup.py.save setup.py
+       rm setup.py.*

 
 

-    # Build wxPython RPM
-    cp setup.py setup.py.temp
-    sed "s/GL_ONLY = /GL_ONLY = 0 #/" < setup.py.temp > setup.py
-    $SETUP $OTHERFLAGS bdist_rpm
+       # rename the binary RPM's
+       mv dist/wxPython-$WXPYVER-1.i386.rpm dist/wxPython-$WXPYVER-1-Py$VER.i386.rpm
+       mv dist/wxPython-gl-$WXPYVER-1.i386.rpm dist/wxPython-gl-$WXPYVER-1-Py$VER.i386.rpm

 
 

-    # put the oringal back
-    cp setup.py.save setup.py
-    rm setup.py.*
+    done

 
 

-    # rebuild the source dist without the munched up setup.py
-    $SETUP $OTHERFLAGS sdist
+    # rebuild the source dists without the munched up setup.py
+    $SETUP $OTHERFLAGS bdist_rpm --source-only

     exit 0
 
 
     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
 # (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
 fi
 
 
 echo $CMD

-$CMD
+eval $CMD

 
 
 if [ "$OTHERCMD" != "" ]; then
 
 
 if [ "$OTHERCMD" != "" ]; then