diff options
| -rw-r--r-- | pkg/darwin/module.defs | 3 | ||||
| -rw-r--r-- | pkg/darwin/module.rules | 14 |
2 files changed, 13 insertions, 4 deletions
diff --git a/pkg/darwin/module.defs b/pkg/darwin/module.defs index 50d68cad8..33115a2a8 100644 --- 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 bef593bf3..f6aa2d610 100644 --- 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/) |