changed background color reference from light gray to assigned bkgd color

[wxWidgets.git] / wxPython / b

diff --git a/wxPython/b b/wxPython/b
index a7cd21961122aa8983b113353c7e54bdbf7a8caa..ffa2477fb1a2eb45b3204649304e8a5a4d70cecb 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
 
 function getpyver {
     if [ "$1" = "15" ]; then


@@ -11,6 +18,8 @@ function getpyver {
        PYVER=2.2
     elif [ "$1" = "23" ]; then
        PYVER=2.3
        PYVER=2.2
     elif [ "$1" = "23" ]; then
        PYVER=2.3

+    elif [ "$1" = "24" ]; then
+       PYVER=2.4

     else
        echo You must specify Python version as first parameter.
         exit
     else
        echo You must specify Python version as first parameter.
         exit


@@ -24,8 +33,23 @@ python$PYVER -c "import sys;print '\n', sys.version, '\n'"
 
 
 SETUP="python$PYVER -u setup.py"
 
 
 SETUP="python$PYVER -u setup.py"

-FLAGS="USE_SWIG=1 SWIG=/opt/swig/bin/swig" # BUILD_GLCANVAS=0"
+FLAGS="USE_SWIG=1 SWIG=/opt/swig/bin/swig" 

 OTHERFLAGS=""
 OTHERFLAGS=""

+PORTFLAGS=""
+
+
+
+if [ "$1" = "gtk1" -o "$1" = "gtk" ]; then 
+    PORTFLAGS="WXPORT=gtk UNICODE=0"
+    shift
+elif [ "$1" = "gtk2" ]; then 
+    PORTFLAGS="WXPORT=gtk2 UNICODE=1"
+    shift
+fi
+
+FLAGS="$FLAGS $PORTFLAGS"
+
+

 
 
 # "c" --> clean
 
 
 # "c" --> clean


@@ -42,7 +66,6 @@ elif [ "$1" = "d" ]; then
 # "t" --> touch *.i files
 elif [ "$1" = "t" ]; then
     shift
 # "t" --> touch *.i files
 elif [ "$1" = "t" ]; then
     shift

-    #CMD="set CMD=touch src\*.i; touch contrib\glcanvas\*.i; touch contrib\ogl\*.i; touch contrib\stc\*.i"

     CMD='find . -name "*.i" | xargs touch'
 
 # "i" --> install
     CMD='find . -name "*.i" | xargs touch'
 
 # "i" --> install


@@ -113,10 +136,12 @@ fi
 
 echo $CMD
 eval $CMD
 
 echo $CMD
 eval $CMD

+RC=$?

 
 

-
-if [ "$OTHERCMD" != "" ]; then
+if [ "$RC" = "0" -a  "$OTHERCMD" != "" ]; then

     echo $OTHERCMD
     $OTHERCMD
     echo $OTHERCMD
     $OTHERCMD

+    RC=$?

 fi
 
 fi
 

+exit $RC