Allow building with wxUSE_CALENDARCTRL=0

[wxWidgets.git] / wxPython / b.bat

diff --git a/wxPython/b.bat b/wxPython/b.bat
index 8b33a2eda7a866174644be5c19af3e884682dc67..2fd5dedc5cd1e7f103dfc8ba9f6105dce9101a41 100755 (executable)
--- a/wxPython/b.bat
+++ b/wxPython/b.bat
@@ -9,6 +9,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
        shift
 else
@@ -25,7 +26,7 @@ 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
@@ -36,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
@@ -46,7 +48,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
@@ -67,8 +69,12 @@ 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
@@ -81,14 +87,20 @@ elseiff "%1" == "a" then
        call b.bat 21 h
        call b.bat 21 r
 
-       rem call b.bat 22 c
-       rem call b.bat 22 f
-       rem call b.bat 22 r
-       rem call b.bat 22 c
-       rem call b.bat 22 h
-       rem call b.bat 22 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