corrections to dynamic loading for Darwin

[wxWidgets.git] / wxPython / b.bat

diff --git a/wxPython/b.bat b/wxPython/b.bat
index 44a1d67f782a119f43e74228be4187a7e52c8cfa..bac157005999b3e7088500ac0c0bc39bbeca7d18 100755 (executable)
--- a/wxPython/b.bat
+++ b/wxPython/b.bat
@@ -1,11 +1,15 @@
 @echo off
+REM ----------------------------------------------------------------------
+REM Note:  This is a 4NT script
+REM ----------------------------------------------------------------------
 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
+iff "%1" == "15" .or. "%1" == "20" .or. "%1" == "21" .or. "%1" == "22" then
+       set VER=%1
        set PYTHON=c:\tools\python%1%\python.exe
        shift
 else
@@ -33,7 +37,8 @@ elseiff "%1" == "d" then
 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
@@ -64,20 +69,17 @@ rem "a" --> make all installers
 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 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
@@ -85,6 +87,20 @@ elseiff "%1" == "a" then
        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 h
+       call b.bat 22 r
+
+
+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%
 
 rem (no command arg) --> normal build for development
 else