Added GetCurrentPage

[wxWidgets.git] / wxPython / b

diff --git a/wxPython/b b/wxPython/b
index 5c97518e564efeeaa0eab49bf6440bbdecde8ed7..e748313184049b38d63ee59820fea0e13f95395e 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


@@ -29,8 +36,9 @@ OTHERFLAGS=""
 PORTFLAGS=""
 
 
 PORTFLAGS=""
 
 

-if [ "$1" = "gtk1" ]; then 
-    PORTFLAGS=""
+
+if [ "$1" = "gtk1" -o "$1" = "gtk" ]; then 
+    PORTFLAGS="WXPORT=gtk UNICODE=0"

     shift
 elif [ "$1" = "gtk2" ]; then 
     PORTFLAGS="WXPORT=gtk2 UNICODE=1"
     shift
 elif [ "$1" = "gtk2" ]; then 
     PORTFLAGS="WXPORT=gtk2 UNICODE=1"


@@ -126,10 +134,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