X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f2c9093fc109433c1cbf96813d94046a0a353257..11f0bb6988110777c5ed8ef944cbdd8f8684d786:/wxPython/b.bat

diff --git a/wxPython/b.bat b/wxPython/b.bat
index d68095f808..7d8e917fea 100755
--- a/wxPython/b.bat
+++ b/wxPython/b.bat
@@ -2,13 +2,13 @@
 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" then
+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
@@ -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,37 +71,27 @@ 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 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
-
-	call b.bat 22 c
-	call b.bat 22 f
-	call b.bat 22 r
-	call b.bat 22 c
+	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% h %1 %2 %3 %4 %5 %6 %7 %8 %9
 	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