X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c451eded2caf020c5bff772d74a9621ec6fc2eec..ee45c548e61fa0ce1f8adbcf29d7678769f2c0ed:/wxPython/distrib/mac/wxPythonOSX/build

diff --git a/wxPython/distrib/mac/wxPythonOSX/build b/wxPython/distrib/mac/wxPythonOSX/build
index 8f4f703fca..62b695ffa3 100755
--- a/wxPython/distrib/mac/wxPythonOSX/build
+++ b/wxPython/distrib/mac/wxPythonOSX/build
@@ -3,6 +3,8 @@
 # Build wxMac and wxPythonOSX from the tarball and then make an
 # Installer package out of it.
 
+##set -x
+
 spectemplate=distrib/wxPythonFull.spec.in
 
 if [ ! -d wxPython -o ! -e ${spectemplate} ]; then
@@ -43,7 +45,7 @@ function usage {
 }
 
 
-if [ $# -lt 1 ]; then
+if [ $# -lt 2 ]; then
     usage
     exit 1
 fi
@@ -244,20 +246,20 @@ if [ $skipbuild != yes ]; then
 
     # Make wxWidgets and some contribs
 
-    # For some reason Rez and DeRez have started locking up if run via
-    # an ssh terminal.  Figure out why, but in the meantime...
-    if [ "$CHARTYPE" = "ansi" ]; then
-	echo cp /projects/wx2.5/bld/lib/libwx_macd-2.5.?.r* lib
-	     cp /projects/wx2.5/bld/lib/libwx_macd-2.5.?.r* lib
-    else
-	echo cp /projects/wx2.5/bld-unicode/lib/libwx_macud-2.5.?.r* lib
-             cp /projects/wx2.5/bld-unicode/lib/libwx_macud-2.5.?.r* lib
-    fi
-    touch lib/libwx*.r*
+#     # For some reason Rez and DeRez have started locking up if run via
+#     # an ssh terminal.  Figure out why, but in the meantime...
+#     if [ "$CHARTYPE" = "ansi" ]; then
+# 	echo cp /projects/wx2.5/bld/lib/libwx_macd-2.5.?.r* lib
+# 	     cp /projects/wx2.5/bld/lib/libwx_macd-2.5.?.r* lib
+#     else
+# 	echo cp /projects/wx2.5/bld-unicode/lib/libwx_macud-2.5.?.r* lib
+#              cp /projects/wx2.5/bld-unicode/lib/libwx_macud-2.5.?.r* lib
+#     fi
+#     touch lib/libwx*.r*
 
     make $MAKEJOBS
+    make $MAKEJOBS -C contrib/src/animate
     make $MAKEJOBS -C contrib/src/gizmos
-    make $MAKEJOBS -C contrib/src/ogl CXXFLAGS="-DwxUSE_DEPRECATED=0"
     make $MAKEJOBS -C contrib/src/stc
 
     # Build wxPython
@@ -276,10 +278,10 @@ fi
 if [ $skipinstall != yes ]; then
     # Install wxWidgets
     cd $WXBLD
-    make prefix=$INSTALLROOT$PREFIX install
-    make -C contrib/src/gizmos prefix=$INSTALLROOT$PREFIX install
-    make -C contrib/src/ogl CXXFLAGS="-DwxUSE_DEPRECATED=0" prefix=$INSTALLROOT/$PREFIX install
-    make -C contrib/src/stc prefix=$INSTALLROOT$PREFIX install
+    make                        prefix=$INSTALLROOT$PREFIX install
+    make -C contrib/src/animate prefix=$INSTALLROOT$PREFIX install
+    make -C contrib/src/gizmos  prefix=$INSTALLROOT$PREFIX install
+    make -C contrib/src/stc     prefix=$INSTALLROOT$PREFIX install
 
 
     # relink wx-config with a relative link
@@ -399,9 +401,13 @@ EOF
     
 
     # Build the main Installer Package...
-    rm -rf wxPython${SHORTVER}-osx-$CHARTYPE-$KIND.pkg
-    python $PROGDIR/../buildpkg.py \
-	--Title=wxPython${SHORTVER}-osx-$CHARTYPE-$KIND \
+    PKGNAME=wxPython${SHORTVER}-osx-$CHARTYPE-$KIND
+    if [ $PYVER != 2.3 ]; then
+	PKGNAME=wxPython${SHORTVER}-osx-$CHARTYPE-$KIND-py$PYVER
+    fi
+    rm -rf $PKGNAME.pkg
+    $PYTHON $PROGDIR/../buildpkg.py \
+	--Title=$PKGNAME \
 	--Version=$VERSION \
 	--Description="wxPython $CHARTYPE runtime $VERSION for $W_MSG MacPython-OSX $PYVER" \
 	--NeedsAuthorization="YES" \
@@ -410,7 +416,7 @@ EOF
 	$INSTALLROOT \
 	$RESOURCEDIR
 
-    mv wxPython${SHORTVER}-osx-$CHARTYPE-$KIND.pkg $DMGROOT
+    mv $PKGNAME.pkg $DMGROOT
 
     rm $RESOURCEDIR/postflight
     rm $RESOURCEDIR/preflight
@@ -616,7 +622,7 @@ EOF
 
 
     # and then finally make a disk image containing everything
-    dmgname=wxPython${SHORTVER}-osx-docs-demos-$VERSION-$TAG
+    dmgname=wxPython${SHORTVER}-osx-docs-demos-$VERSION-$TAG-py$PYVER
     $PROGDIR/../makedmg $DMGAPPS $DMGDIR $dmgname
 
     echo Moving $DMGDIR/$dmgname.dmg to $DESTDIR