X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c368d904fc27d35ae1e533155e2154dc496432e4..6c41903ced78c0b4115785aa80a934833abbc1ef:/wxPython/b.bat

diff --git a/wxPython/b.bat b/wxPython/b.bat
index 8c3b04a970..44a1d67f78 100755
--- a/wxPython/b.bat
+++ b/wxPython/b.bat
@@ -5,14 +5,19 @@ set FLAGS=USE_SWIG=1 IN_CVS_TREE=1
 
 
 rem  Use non-default python?
-iff "%1" == "15" .or. "%1" == "20" then
-	set SETUP=c:\tools\python%1%\python.exe -u setup.py
+iff "%1" == "15" .or. "%1" == "20" .or. "%1" == "21" then
+	set PYTHON=c:\tools\python%1%\python.exe
 	shift
 else
-	set SETUP=python -u setup.py
+	beep
+	echo You must specify Python version as first parameter.
+	quit
 endiff
+set SETUP=%PYTHON% -u setup.py
 
 
+%PYTHON% -c "import sys;print '\n', sys.version, '\n'"
+
 
 rem "c" --> clean
 iff "%1" == "c" then
@@ -25,11 +30,21 @@ elseiff "%1" == "d" then
 	shift
 	set CMD=del wxPython\*.pyd
 
+rem touch all the *.i files so swig will regenerate
+elseiff "%1" == "t" then
+	shift
+	set CMD=touch src\*.i & touch contrib\glcanvas\*.i & touch contrib\ogl\*.i & touch contrib\stc\*.i
+
 rem "i" --> install
 elseiff "%1" == "i" then
 	shift
 	set CMD=%SETUP% build install
 
+rem "r" --> make installer
+elseiff "%1" == "r" then
+	shift
+	set CMD=%PYTHON% distrib\make_installer.py
+
 rem "s" --> source dist
 elseiff "%1" == "s" then
 	shift
@@ -40,9 +55,40 @@ elseiff "%1" == "f" then
 	shift
 	set CMD=%SETUP% %FLAGS% FINAL=1 build_ext --inplace %1 %2 %3 %4 %5 %6 %7 %8 %9
 
+rem "h" --> HYBRID
+elseiff "%1" == "h" then
+	shift
+	set CMD=%SETUP% %FLAGS% HYBRID=1 build_ext --inplace %1 %2 %3 %4 %5 %6 %7 %8 %9
+
+rem "a" --> make all installers
+elseiff "%1" == "a" then
+	shift
+	set CMD=echo Finished!
+	call b.bat 15 c
+	call b.bat 15 f
+	call b.bat 15 r
+	call b.bat 15 c
+	call b.bat 15 h
+	call b.bat 15 r
+
+	call b.bat 20 c
+	call b.bat 20 f
+	call b.bat 20 r
+	call b.bat 20 c
+	call b.bat 20 h
+	call b.bat 20 r
+
+	call b.bat 21 c
+	call b.bat 21 f
+	call b.bat 21 r
+	call b.bat 21 c
+	call b.bat 21 h
+	call b.bat 21 r
+
+
 rem (no command arg) --> normal build for development
 else
-	set CMD=%SETUP% %FLAGS% HYBRID=1 build_ext --inplace %1 %2 %3 %4 %5 %6 %7 %8 %9
+	set CMD=%SETUP% %FLAGS% HYBRID=0 build_ext --inplace --debug %1 %2 %3 %4 %5 %6 %7 %8 %9
 endiff
 
 
@@ -51,6 +97,7 @@ echo %CMD%
 %CMD%
 
 iff "%OTHERCMD%" != "" then
+	echo %OTHERCMD%
 	%OTHERCMD%
 endiff