disable debugreport option

[wxWidgets.git] / wxPython / distrib / mac / wxPythonOSX / build

diff --git a/wxPython/distrib/mac/wxPythonOSX/build b/wxPython/distrib/mac/wxPythonOSX/build
index 01beddfae5263fb10b04ff05c879017cc98cf737..fbe9a17c1e03df5aa1b2d84d48fa6ef0c416b0c7 100755 (executable)
--- a/wxPython/distrib/mac/wxPythonOSX/build
+++ b/wxPython/distrib/mac/wxPythonOSX/build
@@ -99,9 +99,10 @@ else
     PYUNICODEOPT=0
 fi
 
-if [ "$HOSTNAME" = "bigmac.alldunn.com" ]; then
-    MAKEJOBS="--jobs=2"
-fi
+#if [ "$HOSTNAME" = "bigmac.alldunn.com" ]; then
+#    MAKEJOBS="--jobs=2"
+#fi
+
 
 if [ -z "$TARBALLDIR" ]; then
     # this is a spot on my fileserver where the tarballs go, adjust
@@ -200,6 +201,9 @@ echo "Using source tree: $WXDIR"
 
 #----------------------------------------------------------------------
 
+if [ $KIND = panther ]; then 
+    OTHER_CFG_OPTS=--enable-mediactrl
+fi
 
 # Configure wxWidgets
 if [ $skipconfig != yes ]; then
@@ -214,8 +218,8 @@ if [ $skipconfig != yes ]; then
        --enable-debug_flag \
        --enable-precomp=no \
        --enable-optimise \
-       $UNICODEOPT
-
+       --disable-debugreport \
+       $UNICODEOPT $OTHER_CFG_OPTS
 
 fi
 
@@ -224,16 +228,16 @@ if [ $skipbuild != yes ]; then
 
     # Make wxWidgets and some contribs
 
-    # For some reason Rez and DeRez have started locking up if run as
-    # root, figure out why, but in the meantime...
-    if [ "$UID" = "0" ]; then
-       chmod a+w lib
-       if [ "$CHARTYPE" = "ansi" ]; then
-           su robind -c "make lib/libwx_macd-2.5.3.r"
-       else
-           su robind -c "make lib/libwx_macud-2.5.3.r"
-       fi
+    # 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/gizmos
@@ -595,7 +599,7 @@ EOF
 
 
     # and then finally make a disk image containing everything
-    dmgname=wxPython${SHORTVER}-osx-docs-demos-$VERSION
+    dmgname=wxPython${SHORTVER}-osx-docs-demos-$VERSION-$KIND
     $PROGDIR/../makedmg $DMGAPPS $DMGDIR $dmgname
 
     echo Moving $DMGDIR/$dmgname.dmg to $DESTDIR