removed erroneous return type from a membersection (patch 905562)

[wxWidgets.git] / wxPython / b.bat

diff --git a/wxPython/b.bat b/wxPython/b.bat
index 950b821e26194b50e131a7965b6bdbdbd087ba87..7d8e917fea1b0cc7bcd8f5090987db562deb41a1 100755 (executable)
--- a/wxPython/b.bat
+++ b/wxPython/b.bat
@@ -1,12 +1,16 @@
 @echo off
 @echo off

+REM ----------------------------------------------------------------------
+REM Note:  This is a 4NT script
+REM ----------------------------------------------------------------------
+call wxset.btm

 setlocal
 
 setlocal
 

-set FLAGS=USE_SWIG=1 IN_CVS_TREE=1
-
+set FLAGS=USE_SWIG=1 SWIG=e:/projects/SWIG-cvs/swig.exe

 
 rem  Use non-default python?
 
 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
        shift
 else
        beep


@@ -22,18 +26,20 @@ set SETUP=%PYTHON% -u setup.py
 rem "c" --> clean
 iff "%1" == "c" then
        shift
 rem "c" --> clean
 iff "%1" == "c" then
        shift

-       set CMD=%SETUP% %FLAGS% clean
-       set OTHERCMD=del wxPython\*.pyd
+       set CMD=%SETUP% %FLAGS% clean %1 %2 %3 %4 %5 %6 %7 %8 %9
+       set OTHERCMD=del wx\*.pyd

 
 rem just remove the *.pyd's
 elseiff "%1" == "d" then
        shift
 
 rem just remove the *.pyd's
 elseiff "%1" == "d" then
        shift

-       set CMD=del wxPython\*.pyd
+       set CMD=del wx\*.pyd
+       set OTHERCMD=del wx\*.pdb

 
 rem touch all the *.i files so swig will regenerate
 elseiff "%1" == "t" then
        shift
 
 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
 
 rem "i" --> install
 elseiff "%1" == "i" then


@@ -43,7 +49,7 @@ elseiff "%1" == "i" then
 rem "r" --> make installer
 elseiff "%1" == "r" then
        shift
 rem "r" --> make installer
 elseiff "%1" == "r" then
        shift

-       set CMD=%PYTHON% distrib\make_installer.py
+       set CMD=%PYTHON% -u distrib\make_installer.py %1 %2 %3 %4 %5 %6 %7 %8 %9

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


@@ -60,6 +66,33 @@ 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 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
        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