On MacOS X, create a compressed disk image using hdiutil rather than

gzipping an uncompressed disk image.  b=242845, r=bryner, sr=bsmedberg

build/package/mac_osx/make-diskimage

@@ -22,6 +22,7 @@
 # Contributor(s):
 #  Brian Ryner <bryner@brianryner.com>
 #  Jean-Jacques Enser <jj@netscape.com>
+#  Arthur Wiebe <artooro@gmail.com>
 #
 # Alternatively, the contents of this file may be used under the terms of
 # either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -122,9 +123,9 @@ fi
 echo "unmounting disk image"
 hdiutil detach $DEV_NAME
 
-# convert to read-only image
-echo "converting disk image to read-only"
-hdiutil convert $DMG_TEMP_NAME -format UDRO -o ${DMG_DIR}/${DMG_NAME}
+# compress image
+echo "compressing disk image"
+hdiutil convert $DMG_TEMP_NAME -format UDZO -imagekey zlib-level=9 -o ${DMG_DIR}/${DMG_NAME}
 rm -f $DMG_TEMP_NAME
 
 # adding EULA resources

calendar/installer/Makefile.in

@@ -20,6 +20,7 @@
 #
 # Contributor(s):
 #  Brian Ryner <bryner@brianryner.com>
+#  Arthur Wiebe <artooro@gmail.com>
 #
 # Alternatively, the contents of this file may be used under the terms of
 # either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -93,7 +94,7 @@ ifeq ($(OS_ARCH), WINNT)
 PACKAGE_NAME = Sunbird-win32.zip
 else
 ifeq ($(OS_ARCH), Darwin)
-PACKAGE_NAME = Sunbird-mac.dmg.gz
+PACKAGE_NAME = Sunbird-mac.dmg
 endif
 endif
 endif

toolkit/mozapps/installer/packager.mk

@@ -21,6 +21,7 @@
 #
 # Contributor(s):
 #   Benjamin Smedberg <bsmedberg@covad.net>
+#   Arthur Wiebe <artooro@gmail.com>
 #
 # Alternatively, the contents of this file may be used under the terms of
 # either of the GNU General Public License Version 2 or later (the "GPL"),
@@ -94,9 +95,9 @@ _APPNAME	= $(MOZ_APP_DISPLAYNAME)Debug.app
 else
 _APPNAME	= $(MOZ_APP_DISPLAYNAME).app
 endif
-PKG_SUFFIX	= .dmg.gz
+PKG_SUFFIX	= .dmg
 _ABS_TOPSRCDIR	= $(shell cd $(topsrcdir) && pwd)
-MAKE_PACKAGE	= $(_ABS_TOPSRCDIR)/build/package/mac_osx/make-diskimage $(PKG_BASENAME).dmg $(MOZ_PKG_APPNAME) $(MOZ_APP_DISPLAYNAME) && gzip -vf9 $(PKG_BASENAME).dmg
+MAKE_PACKAGE	= $(_ABS_TOPSRCDIR)/build/package/mac_osx/make-diskimage $(PKG_BASENAME).dmg $(MOZ_PKG_APPNAME) $(MOZ_APP_DISPLAYNAME)
 endif
 
 # dummy macro if we don't have PSM built
@@ -175,7 +176,7 @@ PLATFORM_EXCLUDE_LIST = ! -name "*.ico"
 endif
 
 $(PACKAGE): $(MOZILLA_BIN)
-	@rm -rf $(DIST)/$(MOZ_PKG_APPNAME) $(DIST)/$(PKG_BASENAME).tar $(DIST)/$(PKG_BASENAME).dmg $(DIST)/$(PKG_BASENAME).dmg.gz $@ $(EXCLUDE_LIST)
+	@rm -rf $(DIST)/$(MOZ_PKG_APPNAME) $(DIST)/$(PKG_BASENAME).tar $(DIST)/$(PKG_BASENAME).dmg $@ $(EXCLUDE_LIST)
 # NOTE: this must be a tar now that dist links into the tree so that we
 # do not strip the binaries actually in the tree.
 	@echo "Creating package directory..."

xpinstall/packager/Makefile.in

@@ -21,6 +21,7 @@
 # the Initial Developer. All Rights Reserved.
 #
 # Contributor(s):
+#   Arthur Wiebe <artooro@gmail.com>
 #
 # Alternatively, the contents of this file may be used under the terms of
 # either of the GNU General Public License Version 2 or later (the "GPL"),
@@ -131,9 +132,9 @@ _APPNAME	= $(MOZ_PKG_APPNAME)Debug.app
 else
 _APPNAME	= $(MOZ_PKG_APPNAME).app
 endif
-PKG_SUFFIX	= .dmg.gz
+PKG_SUFFIX	= .dmg
 _ABS_TOPSRCDIR	= $(shell cd $(topsrcdir) && pwd)
-MAKE_PACKAGE	= $(_ABS_TOPSRCDIR)/build/package/mac_osx/make-diskimage $(PKG_BASENAME).dmg $(MOZ_PKG_APPNAME) $(MOZ_PKG_APPNAME) && gzip -vf9 $(PKG_BASENAME).dmg
+MAKE_PACKAGE	= $(_ABS_TOPSRCDIR)/build/package/mac_osx/make-diskimage $(PKG_BASENAME).dmg $(MOZ_PKG_APPNAME) $(MOZ_PKG_APPNAME)
 MAKE_SDK	=
 endif
 ifeq ($(MOZ_PKG_FORMAT),RPM)