Applied patch [ 793000 ] "unreachable code" changes in wxrc contrib util

[wxWidgets.git] / wxPython / b.bat

diff --git a/wxPython/b.bat b/wxPython/b.bat
index 44a1d67f782a119f43e74228be4187a7e52c8cfa..b53ff255f965cbe7940210cbe4a48d6c79122096 100755 (executable)
--- a/wxPython/b.bat
+++ b/wxPython/b.bat
@@ -1,12 +1,17 @@
 @echo off
+REM ----------------------------------------------------------------------
+REM Note:  This is a 4NT script
+REM ----------------------------------------------------------------------
+call wxset.btm
 setlocal
 
 set FLAGS=USE_SWIG=1 IN_CVS_TREE=1
 
 
 rem  Use non-default python?
-iff "%1" == "15" .or. "%1" == "20" .or. "%1" == "21" then
-       set PYTHON=c:\tools\python%1%\python.exe
+iff "%1" == "15" .or. "%1" == "20" .or. "%1" == "21" .or. "%1" == "22" .or. "%1" == "23" then
+       set VER=%1
+       set PYTHON=%TOOLS%\python%1%\python.exe
        shift
 else
        beep
@@ -22,18 +27,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
@@ -43,7 +50,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
@@ -64,27 +71,35 @@ 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 d
        call b.bat 21 h
        call b.bat 21 r
-
+       call b.bat 21 d UNICODE=1
+       call b.bat 21 h UNICODE=1
+       call b.bat 21 r UNICODE=1
+
+       call b.bat 22 d
+       call b.bat 22 h
+       call b.bat 22 r
+       call b.bat 22 d UNICODE=1
+       call b.bat 22 h UNICODE=1
+       call b.bat 22 r UNICODE=1
+
+       call b.bat 23 d
+       call b.bat 23 h
+       call b.bat 23 r
+       call b.bat 23 d UNICODE=1
+       call b.bat 23 h UNICODE=1
+       call b.bat 23 r UNICODE=1
+
+
+rem "b" --> both debug and hybrid builds
+elseiff "%1" == "b" then
+       shift
+       set CMD=echo Finished!
+       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