X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4dfaa61e60c3f7bf781d22687fffe2453d97d008..6aeb6f2a5810694b5241eb267d71dab4848cf8bb:/wxPython/b?ds=inline

diff --git a/wxPython/b b/wxPython/b
index 4888c8ad75..4ab9f9e4c6 100755
--- a/wxPython/b
+++ b/wxPython/b
@@ -1,22 +1,28 @@
 #!/bin/sh
 
-if [ "$1" = "15" ]; then
-    PYVER=1.5
-    shift
-elif [ "$1" = "20" ]; then
-    PYVER=2.0
-    shift
-elif [ "$1" = "21" ]; then
-    PYVER=2.1
-    shift
-else
-    echo You must specify Python version as first parameter.
-    exit
-fi
+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
+    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 IN_CVS_TREE=1"
+FLAGS="USE_SWIG=1 IN_CVS_TREE=1" # BUILD_GLCANVAS=0"
 OTHERFLAGS=""
 
 
@@ -35,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 touch'
 
 # "i" --> install
 elif [ "$1" = "i" ]; then
@@ -49,40 +56,62 @@ elif [ "$1" = "s" ]; 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
+	# 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
+	# 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-gl RPM
-    $SETUP $OTHERFLAGS bdist_rpm --binary-only --doc-files README.txt
-    rm dist/wxPython-gl*.tar.gz
+	# 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
 
-    # 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
+	# 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
 
-    # put the oringal back
-    cp setup.py.save setup.py
-    rm setup.py.*
+	# put the oringal setup.py back
+	cp setup.py.save setup.py
+	rm setup.py.*
 
-    # rebuild the source dist without the munched up setup.py
-    $SETUP $OTHERFLAGS sdist
+	# 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
+
+    done
+
+    # rebuild the source dists without the munched up setup.py
+    $SETUP $OTHERFLAGS bdist_rpm --source-only
     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