Fixed compile errors, warnings and other DSMs, and improved comments.

[wxWidgets.git] / wxPython / b.bat

diff --git a/wxPython/b.bat b/wxPython/b.bat
index a6404c9af85eb0ea43b235b1b71d78bd7670096a..44a1d67f782a119f43e74228be4187a7e52c8cfa 100755 (executable)
--- a/wxPython/b.bat
+++ b/wxPython/b.bat
@@ -6,13 +6,18 @@ set FLAGS=USE_SWIG=1 IN_CVS_TREE=1
 
 rem  Use non-default python?
 iff "%1" == "15" .or. "%1" == "20" .or. "%1" == "21" then
 
 rem  Use non-default python?
 iff "%1" == "15" .or. "%1" == "20" .or. "%1" == "21" then

-       set SETUP=c:\tools\python%1%\python.exe -u setup.py
+       set PYTHON=c:\tools\python%1%\python.exe

        shift
 else
        shift
 else

-       set SETUP=python -u setup.py
+       beep
+       echo You must specify Python version as first parameter.
+       quit

 endiff
 endiff

+set SETUP=%PYTHON% -u setup.py

 
 
 
 

+%PYTHON% -c "import sys;print '\n', sys.version, '\n'"
+

 
 rem "c" --> clean
 iff "%1" == "c" then
 
 rem "c" --> clean
 iff "%1" == "c" then


@@ -25,11 +30,21 @@ elseiff "%1" == "d" then
        shift
        set CMD=del wxPython\*.pyd
 
        shift
        set CMD=del wxPython\*.pyd
 

+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
+

 rem "i" --> install
 elseiff "%1" == "i" then
        shift
        set CMD=%SETUP% build install
 
 rem "i" --> install
 elseiff "%1" == "i" then
        shift
        set CMD=%SETUP% build install
 

+rem "r" --> make installer
+elseiff "%1" == "r" then
+       shift
+       set CMD=%PYTHON% distrib\make_installer.py
+

 rem "s" --> source dist
 elseiff "%1" == "s" then
        shift
 rem "s" --> source dist
 elseiff "%1" == "s" then
        shift


@@ -45,6 +60,32 @@ elseiff "%1" == "h" then
        shift
        set CMD=%SETUP% %FLAGS% HYBRID=1 build_ext --inplace %1 %2 %3 %4 %5 %6 %7 %8 %9
 
        shift
        set CMD=%SETUP% %FLAGS% HYBRID=1 build_ext --inplace %1 %2 %3 %4 %5 %6 %7 %8 %9
 

+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 h
+       call b.bat 21 r
+
+

 rem (no command arg) --> normal build for development
 else
        set CMD=%SETUP% %FLAGS% HYBRID=0 build_ext --inplace --debug %1 %2 %3 %4 %5 %6 %7 %8 %9
 rem (no command arg) --> normal build for development
 else
        set CMD=%SETUP% %FLAGS% HYBRID=0 build_ext --inplace --debug %1 %2 %3 %4 %5 %6 %7 %8 %9