bash version of wxPython's b script for win32

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27699 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/b b/wxPython/b
index 699d41eef31a71debba71ec10dff35ffa874415c..ffbfea4b233704c2ba659caa9273b8f671695259 100755 (executable)
--- a/wxPython/b
+++ b/wxPython/b
@@ -1,4 +1,11 @@
-#!/bin/sh
+#!/bin/bash
+
+# Are we using bash on win32?  If so source that file and then exit.
+if [ "$OSTYPE" = "cygwin" ]; then
+    source b.win32
+    exit
+fi
+
 
 function getpyver {
     if [ "$1" = "15" ]; then

diff --git a/wxPython/b.bat b/wxPython/b.bat
index a57cd4fb74c2efcb9667387b1c3f9357f7e75f29..de64c6a6d79846a8e8edcc0c0ad8f7462679f92b 100755 (executable)
--- a/wxPython/b.bat
+++ b/wxPython/b.bat
@@ -1,109 +1,2 @@
 @echo off
-REM ----------------------------------------------------------------------
-REM Note:  This is a 4NT script
-REM ----------------------------------------------------------------------
-call wxset.btm
-setlocal
-
-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
-       set VER=%1
-       set PYTHON=%TOOLS%\python%1%\python.exe
-       shift
-else
-       beep
-       echo You must specify Python version as first parameter.
-       quit
-endiff
-set SETUP=%PYTHON% -u setup.py
-
-
-%PYTHON% -c "import sys;print '\n', sys.version, '\n'"
-
-
-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 wx\*.pyd
-
-rem just remove the *.pyd's
-elseiff "%1" == "d" then
-       shift
-       set CMD=del wx\*.pyd
-
-rem touch all the *.i files so swig will regenerate
-elseiff "%1" == "t" then
-       shift
-       set CMD=echo Finished!
-       find . -name "*.i" | xargs -l touch
-
-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% -u distrib\make_installer.py %1 %2 %3 %4 %5 %6 %7 %8 %9
-
-rem "s" --> source dist
-elseiff "%1" == "s" then
-       shift
-       set CMD=%SETUP sdist
-
-rem "f" --> FINAL
-elseiff "%1" == "f" then
-       shift
-       set CMD=%SETUP% %FLAGS% FINAL=1 build_ext --inplace %1 %2 %3 %4 %5 %6 %7 %8 %9
-
-rem "h" --> HYBRID
-elseiff "%1" == "h" then
-       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
-endiff
-
-
-
-echo %CMD%
-%CMD%
-
-iff "%OTHERCMD%" != "" then
-       echo %OTHERCMD%
-       %OTHERCMD%
-endiff
-
+call bash.bat b.win32 %*

diff --git a/wxPython/b.win32 b/wxPython/b.win32
new file mode 100644 (file)
index 0000000..b153902
--- /dev/null
+++ b/wxPython/b.win32
@@ -0,0 +1,107 @@
+#!/bin/bash
+# ----------------------------------------------------------------------
+
+
+FLAGS="USE_SWIG=1 SWIG=e:/projects/SWIG-cvs/swig.exe"
+
+#  Use non-default python?
+if [[ "$1" = "15" || "$1" = "20" || "$1" = "21" || "$1" = "22" || "$1" = "23" ]]; then
+    VER=$1
+    PYTHON=$TOOLS/python$1/python.exe
+    shift
+else
+    echo You must specify the Python version as first parameter.
+    exit -1
+fi
+
+SETUP="$PYTHON -u setup.py"
+$PYTHON -c "import sys;print '\n', sys.version, '\n'"
+
+
+
+# "c" --> clean
+if [ "$1" = "c" ]; then
+    shift
+    CMD="$SETUP $FLAGS clean $@"
+    OTHERCMD="rm wx/*.pyd"
+
+# just remove the *.pyd's
+elif [ "$1" = "d" ]; then
+    shift
+    CMD="rm wx/*.pyd"
+
+# touch all the *.i files so swig will regenerate
+elif [ "$1" = "t" ]; then
+    shift
+    CMD=
+    find . -name "*.i" | xargs -l touch
+
+# "i" --> install
+elif [ "$1" = "i" ]; then
+    shift
+    CMD="$SETUP build install"
+
+# "r" --> make installer
+elif [ "$1" = "r" ]; then
+    shift
+    CMD="$PYTHON -u distrib\make_installer.py $@"
+
+# "s" --> source dist
+elif [ "$1" = "s" ]; then
+    shift
+    CMD="$SETUP sdist"
+
+# "f" --> FINAL
+elif [ "$1" == "f" ]; then
+    shift
+    CMD="$SETUP $FLAGS FINAL=1 build_ext --inplace $@"
+
+# "h" --> HYBRID
+elif [ "$1" = "h" ]; then
+    shift
+    CMD="$SETUP $FLAGS HYBRID=1 build_ext --inplace $@"
+
+# "a" --> make all installers
+elif [ "$1" = "a" ]; then
+    shift
+    CMD=
+
+    $0 22 d
+    $0 22 h
+    $0 22 r
+    $0 22 d UNICODE=1
+    $0 22 h UNICODE=1
+    $0 22 r UNICODE=1
+    
+    $0 23 d
+    $0 23 h
+    $0 23 r
+    $0 23 d UNICODE=1
+    $0 23 h UNICODE=1
+    $0 23 r UNICODE=1
+
+
+# "b" --> both debug and hybrid builds
+elif [ "$1" = "b" ]; then
+    shift
+    CMD="echo Finished!"
+    $0 $VER   $@
+    $0 $VER h $@
+
+# (no command arg) --> normal build for development
+else
+    CMD="$SETUP $FLAGS HYBRID=0 build_ext --inplace --debug $@"
+fi
+
+
+
+if [ "$CMD" != "" ]; then
+    echo $CMD
+    $CMD
+fi
+
+if [ "$OTHERCMD" != "" ]; then
+    echo $OTHERCMD
+    $OTHERCMD
+fi
+

diff --git a/wxPython/demo/.cvsignore b/wxPython/demo/.cvsignore
index fbb6996b154b7ad0aed0a08e7ec7366c96cfba42..93615ade44a8d0fd517dfb2a40ffeb62c352fd5f 100644 (file)
--- a/wxPython/demo/.cvsignore
+++ b/wxPython/demo/.cvsignore
@@ -3,6 +3,7 @@
 ._demo.py
 .emacs.desktop
 .gdb_history
+.setup
 .setup.bat
 .setup.sh
 b.bat