Merged modifications from the 2.6 branch

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

diff --git a/wxPython/distrib/mac/wxPythonOSX/build b/wxPython/distrib/mac/wxPythonOSX/build
index d06e2147ced27bdfcbcd2171fcae10001875f321..9f715731710d1fd0e9c2f3b7dc1794b26a69b868 100755 (executable)
--- a/wxPython/distrib/mac/wxPythonOSX/build
+++ b/wxPython/distrib/mac/wxPythonOSX/build
@@ -182,6 +182,9 @@ mkdir -p $DMGROOT
 mkdir -p $DMGAPPS/Docs
 mkdir -p $DMGAPPS/Samples
 
+if [ ! -d $DESTDIR ]; then
+  mkdir $DESTDIR
+fi
 
 pushd $BUILDROOT
 
@@ -246,16 +249,16 @@ 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
@@ -416,7 +419,7 @@ EOF
        $INSTALLROOT \
        $RESOURCEDIR
 
-    mv $PKGNAME.pkg $DMGROOT
+    mv $PKGNAME.pkg $DMGROOT/$PKGNAME.pkg
 
     rm $RESOURCEDIR/postflight
     rm $RESOURCEDIR/preflight
@@ -470,7 +473,7 @@ EOF
     $PROGDIR/../makedmg $DMGROOT $DMGDIR $dmgname
 
     echo Moving $DMGDIR/$dmgname.dmg to $DESTDIR
-    mv $DMGDIR/$dmgname.dmg  $DESTDIR
+    mv $DMGDIR/$dmgname.dmg  $DESTDIR/$dmgname.dmg
 
 
 #---------------------------------------------------------------------------
@@ -566,7 +569,7 @@ EOF
     if [ ! -e $TARBALLDIR/wxPython-demo-$VERSION.tar.gz ]; then
        cat > "$DMGAPPS/Samples/Build ERROR.txt" <<EOF
 
-The wxPython-demo tarball was not found when building this disk image!
+The wxPython-$VERSION-demo tarball was not found when building this disk image!
 
 EOF
        cp "$DMGAPPS/Samples/Build ERROR.txt" $DMGAPPS
@@ -626,7 +629,7 @@ EOF
     $PROGDIR/../makedmg $DMGAPPS $DMGDIR $dmgname
 
     echo Moving $DMGDIR/$dmgname.dmg to $DESTDIR
-    mv $DMGDIR/$dmgname.dmg  $DESTDIR
+    mv $DMGDIR/$dmgname.dmg  $DESTDIR/$dmgname.dmg
 fi