X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8366ae934aab9f835747b0c2e456231e8795fe78..170a35e36438a7afa91409367b6dd32dc46a9fde:/wxPython/b

diff --git a/wxPython/b b/wxPython/b
index 1b9e33f442..f8dff7e681 100755
--- 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,19 +56,15 @@ elif [ "$1" = "s" ]; then
 
 # "r" --> rpm dist
 elif [ "$1" = "r" ]; then
-
-    for VER in 15 20 21; do
+    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 "*****************************************************************"
 
-	# NOTE:  This assumes that /usr/local/bin is BEFORE /usr/bin on the PATH
-	#        AND that you have write access to it.
-	rm -f /usr/local/bin/python
-	ln -s /usr/bin/python$PYVER /usr/local/bin/python
-	SETUP="/usr/local/bin/python -u setup.py"
+	SETUP="python$PYVER -u setup.py"
 
 	# save the original
 	cp setup.py setup.py.save
@@ -75,13 +74,15 @@ elif [ "$1" = "r" ]; then
 	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
+	$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 --binary-only
+	$SETUP $OTHERFLAGS bdist_rpm --binary-only --python=python$PYVER
+			### --requires=python$PYVER
 
 	# put the oringal setup.py back
 	cp setup.py.save setup.py
@@ -92,8 +93,8 @@ elif [ "$1" = "r" ]; then
 	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 sdist
     $SETUP $OTHERFLAGS bdist_rpm --source-only
     exit 0
 
@@ -110,7 +111,7 @@ fi
 
 
 echo $CMD
-$CMD
+eval $CMD
 
 
 if [ "$OTHERCMD" != "" ]; then