X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4309b812efa07373abe6b8b6bba29e2fe2e4c49f..fed66a8797b486b0a242fc878248511b1f594897:/wxPython/b.bat

diff --git a/wxPython/b.bat b/wxPython/b.bat
index ed0181719c..22f0042c1e 100755
--- a/wxPython/b.bat
+++ b/wxPython/b.bat
@@ -10,7 +10,7 @@ set FLAGS=USE_SWIG=1 IN_CVS_TREE=1
 rem  Use non-default python?
 iff "%1" == "15" .or. "%1" == "20" .or. "%1" == "21" .or. "%1" == "22" then
 	set VER=%1
-	set PYTHON=c:\tools\python%1%\python.exe
+	set PYTHON=%TOOLS%\python%1%\python.exe
 	shift
 else
 	beep
@@ -26,18 +26,20 @@ set SETUP=%PYTHON% -u setup.py
 rem "c" --> clean
 iff "%1" == "c" then
 	shift
-	set CMD=%SETUP% %FLAGS% clean
+	set CMD=%SETUP% %FLAGS% clean %1 %2 %3 %4 %5 %6 %7 %8 %9
 	set OTHERCMD=del wxPython\*.pyd
 
 rem just remove the *.pyd's
 elseiff "%1" == "d" then
 	shift
 	set CMD=del wxPython\*.pyd
+	set OTHERCMD=del wxPython\*.pdb
 
 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
+	set CMD=echo Finished!
+	find . -name "*.i" | xargs -l touch
 
 rem "i" --> install
 elseiff "%1" == "i" then
@@ -47,7 +49,7 @@ elseiff "%1" == "i" then
 rem "r" --> make installer
 elseiff "%1" == "r" then
 	shift
-	set CMD=%PYTHON% distrib\make_installer.py
+	set CMD=%PYTHON% distrib\make_installer.py %1 %2 %3 %4 %5 %6 %7 %8 %9
 
 rem "s" --> source dist
 elseiff "%1" == "s" then
@@ -69,6 +71,16 @@ elseiff "%1" == "a" then
 	shift
 	set CMD=echo Finished!
 
+	call b.bat 15 c
+	call b.bat 15 f
+	cd demo
+	p15 encode_bitmaps.py
+	cd -
+	call b.bat 15 r
+	call b.bat 15 c
+	call b.bat 15 h
+	call b.bat 15 r
+
 	call b.bat 21 c
 	call b.bat 21 f
 	call b.bat 21 r
@@ -88,8 +100,8 @@ rem "b" --> both debug and hybrid builds
 elseiff "%1" == "b" then
 	shift
 	set CMD=echo Finished!
-	call b.bat %VER% h
-	call b.bat %VER%
+	call b.bat %VER%   %1 %2 %3 %4 %5 %6 %7 %8 %9
+	call b.bat %VER% h %1 %2 %3 %4 %5 %6 %7 %8 %9
 
 rem (no command arg) --> normal build for development
 else