X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c1ebcef04d27f76ca87d2b814c3a17b30390a1bb..5c8ac0b6ca243b5bcc6c5e98b229c66abe932884:/wxPython/distrib/build_packages.sh?ds=sidebyside

diff --git a/wxPython/distrib/build_packages.sh b/wxPython/distrib/build_packages.sh
index c54265f133..10e9308b78 100755
--- a/wxPython/distrib/build_packages.sh
+++ b/wxPython/distrib/build_packages.sh
@@ -5,7 +5,7 @@ debug=no
 reswig=no
 all=no
 
-if [ "$1" = "all" ]; then 
+if [ "$1" = all ]; then
   all=yes
 else
   PY_VERSION=$1
@@ -77,7 +77,6 @@ if [ "$OSTYPE" = "cygwin" ]; then
 
   # update the language files
   $TOOLS/Python$PY_VERSION/python `cygpath -d $WXWIN/wxPython/distrib/makemo.py`
-
   rm -rf build build.unicode
   rm -rf wx/*.pyd
   
@@ -100,15 +99,18 @@ if [ "$OSTYPE" = "cygwin" ]; then
   $WXWIN/wxPython/distrib/makedemo
   
   $TOOLS/Python$PY_VERSION/python `cygpath -d $WXWIN/wxPython/distrib/make_installer_inno4.py` $UNICODE_FLAG
-elif [ "$OSTYPE" = "darwin" ]; then
+elif [ "${OSTYPE:0:6}" = "darwin" ]; then
+  OSX_VERSION=`sw_vers -productVersion`
+  echo "OS X Version: ${OSX_VERSION:0:4}"
   cd $WXWIN/wxPython
   
   if [ ! -d dist ]; then
     mkdir dist
   fi
   # re-generate SWIG files
+  RESWIG=
   if [ $reswig = yes ]; then
-    $WXWIN/wxPython/b $PY_VERSION t
+    RESWIG=reswig
   fi
   
   PY_DOT_VER=2.3
@@ -121,11 +123,22 @@ elif [ "$OSTYPE" = "darwin" ]; then
     UNICODE_OPT=unicode
   fi 
   
+  DEBUG_OPT=
+  if [ $debug = yes ]; then
+    DEBUG_OPT=debug
+  fi
+  # On Tiger, build Universal.
+  UNIV_OPT=
+  if [ ${OSX_VERSION:0:4} = "10.4" ]; then
+    UNIV_OPT="universal"
+  fi
+  
   #sudo $WXWIN/wxPython/distrib/makedocs
   $WXWIN/wxPython/distrib/makedemo
   export TARBALLDIR=$WXWIN/wxPython/dist
+  echo "distrib/mac/wxPythonOSX/build $PY_DOT_VER inplace $UNICODE_OPT $RESWIG"
   
-  distrib/mac/wxPythonOSX/build $PY_DOT_VER panther inplace $UNICODE_OPT
+  distrib/mac/wxPythonOSX/build $PY_DOT_VER inplace $UNICODE_OPT $DEBUG_OPT $RESWIG $UNIV_OPT
 else
   echo "OSTYPE $OSTYPE not yet supported by this build script."
 fi