BuildSystem: osx packaging updated to create .dmg in 2 passes; results in ~9% filesiz...

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2543 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/pkg/darwin/module.defs b/pkg/darwin/module.defs
index 50d68cad833cd47bccacfbdc9b58fc52d13b02d5..33115a2a85ba99393dcdbdb300bef41e48ef2230 100644 (file)
--- a/pkg/darwin/module.defs
+++ b/pkg/darwin/module.defs
@@ -1,6 +1,9 @@
 PKG.cli.dmg = $(PKG.out/)$(HB.name)-$(HB.version)-MacOSX.5_CLI_$(BUILD.machine).dmg
 PKG.gui.dmg = $(PKG.out/)$(HB.name)-$(HB.version)-MacOSX.5_GUI_$(BUILD.machine).dmg
 
+PKG.cli.tmp.dmg = $(PKG.out/)$(HB.name)-$(HB.version)-MacOSX.5_CLI_$(BUILD.machine).tmp.dmg
+PKG.gui.tmp.dmg = $(PKG.out/)$(HB.name)-$(HB.version)-MacOSX.5_GUI_$(BUILD.machine).tmp.dmg
+
 STAGE.cli/ = $(BUILD/)stage/cli/
 STAGE.gui/ = $(BUILD/)stage/gui/
 

diff --git a/pkg/darwin/module.rules b/pkg/darwin/module.rules
index bef593bf3ef067b8f6abca1d0381e16512a4f798..f6aa2d610864f7f4df30b63e56f1c8a8ca027874 100644 (file)
--- a/pkg/darwin/module.rules
+++ b/pkg/darwin/module.rules
@@ -2,13 +2,19 @@ pkg.create:: $(PKG.cli.dmg) $(PKG.gui.dmg)
 
 $(PKG.cli.dmg): | $(dir $(PKG.cli.dmg))
 $(PKG.cli.dmg): | $(STAGE.cli/)
-       hdiutil create -srcfolder $(STAGE.cli/) -format UDBZ -mode 755 \
-           -volname $(basename $(notdir $@)) $@
+       hdiutil create -srcfolder $(STAGE.cli/) -format UDRO -mode 755 \
+           -volname $(basename $(notdir $@)) \
+           -ov $(PKG.cli.tmp.dmg)
+       hdiutil convert -format UDBZ -o $@ $(PKG.cli.tmp.dmg)
+       $(RM.exe) $(PKG.cli.tmp.dmg)
 
 $(PKG.gui.dmg): | $(dir $(PKG.gui.dmg))
 $(PKG.gui.dmg): | $(STAGE.gui/)
-       hdiutil create -srcfolder $(STAGE.gui/) -format UDBZ -mode 755 \
-           -volname $(basename $(notdir $@)) $@
+       hdiutil create -srcfolder $(STAGE.gui/) -format UDRO -mode 755 \
+           -volname $(basename $(notdir $@)) \
+           -ov $(PKG.gui.tmp.dmg)
+       hdiutil convert -format UDBZ -o $@ $(PKG.gui.tmp.dmg)
+       $(RM.exe) $(PKG.gui.tmp.dmg)
 
 pkg.cli.clean:
        $(RM.exe) -fr $(STAGE.cli/)