part of DS' change _was_ corrent, restored

[wxWidgets.git] / wxPython / b.bat

diff --git a/wxPython/b.bat b/wxPython/b.bat
index 3c52574c3b7b8c080d6f48679a758a37dfc58d80..c07f60c5118aa90b639dd5ab49feb37d7902b5cb 100755 (executable)
--- a/wxPython/b.bat
+++ b/wxPython/b.bat
@@ -2,13 +2,14 @@
 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" .or. "%1" == "22" then
+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
@@ -33,6 +34,7 @@ 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
@@ -70,37 +72,27 @@ 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
-       call b.bat 21 c
-       call b.bat 21 h
-       call b.bat 21 r
-
-       call b.bat 22 c
-       call b.bat 22 f
-       call b.bat 22 r
-       call b.bat 22 c
+       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% 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