Some more string concatenations

[wxWidgets.git] / wxPython / b.bat

diff --git a/wxPython/b.bat b/wxPython/b.bat
index 79c75bddc0642f39e7c79b434993f584fb9b8a2f..7d8e917fea1b0cc7bcd8f5090987db562deb41a1 100755 (executable)
--- a/wxPython/b.bat
+++ b/wxPython/b.bat
@@ -2,10 +2,10 @@
 REM ----------------------------------------------------------------------
 REM Note:  This is a 4NT script
 REM ----------------------------------------------------------------------
+call wxset.btm
 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?
 iff "%1" == "15" .or. "%1" == "20" .or. "%1" == "21" .or. "%1" == "22" .or. "%1" == "23" then
@@ -27,13 +27,13 @@ rem "c" --> clean
 iff "%1" == "c" then
        shift
        set CMD=%SETUP% %FLAGS% clean %1 %2 %3 %4 %5 %6 %7 %8 %9
-       set OTHERCMD=del wxPython\*.pyd
+       set OTHERCMD=del wx\*.pyd
 
 rem just remove the *.pyd's
 elseiff "%1" == "d" then
        shift
-       set CMD=del wxPython\*.pyd
-       set OTHERCMD=del wxPython\*.pdb
+       set CMD=del wx\*.pyd
+       set OTHERCMD=del wx\*.pdb
 
 rem touch all the *.i files so swig will regenerate
 elseiff "%1" == "t" then
@@ -49,7 +49,7 @@ elseiff "%1" == "i" then
 rem "r" --> make installer
 elseiff "%1" == "r" then
        shift
-       set CMD=%PYTHON% distrib\make_installer.py %1 %2 %3 %4 %5 %6 %7 %8 %9
+       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
@@ -71,13 +71,6 @@ elseiff "%1" == "a" then
        shift
        set CMD=echo Finished!
 
-       call b.bat 21 d
-       call b.bat 21 h
-       call b.bat 21 r
-       call b.bat 21 d UNICODE=1
-       call b.bat 21 h UNICODE=1
-       call b.bat 21 r UNICODE=1
-
        call b.bat 22 d
        call b.bat 22 h
        call b.bat 22 r