From 10c7a340e1345c46ef9a57891b93984d42381986 Mon Sep 17 00:00:00 2001 From: "bsmedberg%covad.net" Date: Thu, 5 May 2005 12:38:27 +0000 Subject: [PATCH] Bug 287262 - build locales by starting with the en-US packages (mac bits) r=Chase (build/packaging bits only, a=Chase) --- browser/locales/Makefile.in | 15 ++++++++++----- build/package/mac_osx/make-diskimage | 11 +++++++---- config/rules.mk | 4 ++-- toolkit/mozapps/installer/packager.mk | 9 ++++++++- 4 files changed, 27 insertions(+), 12 deletions(-) diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in index 2aeee32a209..c5d509cfab0 100644 --- a/browser/locales/Makefile.in +++ b/browser/locales/Makefile.in @@ -49,7 +49,7 @@ _ABS_DIST := $(shell cd $(DIST) && pwd) # below. If you don't understand what this means, talk to bsmedberg # before altering this makefile. -AB_CD = $(MOZ_UI_LOCALE) +AB = $(firstword $(subst -, ,$(AB_CD))) APP_VERSION := $(shell cat $(srcdir)/../config/version.txt) @@ -119,7 +119,7 @@ install:: $(addsuffix .src,$(SEARCH_PLUGIN_PREFIX)) $(foreach base,$(SEARCH_PLUG libs-%: @$(MAKE) -C ../../toolkit/locales libs-$* - @$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* + @$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref ifneq (,$(filter reporter,$(MOZ_EXTENSIONS))) @$(MAKE) -C ../../extensions/reporter/locales libs AB_CD=$* XPI_NAME=locale-$* endif @@ -169,7 +169,7 @@ repackage-win32-installer-%: $(WIN32_INSTALLER_IN) @$(MAKE) repackage-win32-installer AB_CD=$* WIN32_INSTALLER_IN=$(WIN32_INSTALLER_IN) ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) -STAGEDIST = $(_ABS_DIST)/l10n-stage/$(MOZ_PKG_APPNAME)/Contents/MacOS +STAGEDIST = $(_ABS_DIST)/l10n-stage/$(MOZ_PKG_APPNAME)/$(_APPNAME)/Contents/MacOS else STAGEDIST = $(_ABS_DIST)/l10n-stage/$(MOZ_PKG_APPNAME) endif @@ -183,13 +183,18 @@ repackage-zip: $(ZIP_IN) $(UNMAKE_PACKAGE) $(RM) $(STAGEDIST)/chrome/en-US.jar \ $(STAGEDIST)/chrome/en-US.manifest \ - $(STAGEDIST)/chrome/defaults/pref/firefox-l10n.js + $(STAGEDIST)/defaults/pref/firefox-l10n.js $(RM) -r $(STAGEDIST)/searchplugins \ - $(STAGEDIST)/defaults/profile + $(STAGEDIST)/defaults/profile \ + $(STAGEDIST)/chrome/en-US $(RM) -rf $(DIST)/xpi-stage/locale-$(AB_CD) $(MAKE) libs-$(AB_CD) + $(RM) -r $(DIST)/xpi-stage/locale-$(AB_CD)/chrome/$(AB_CD) cd $(DIST)/xpi-stage/locale-$(AB_CD) && \ tar $(TAR_CREATE_FLAGS) - * | ( cd $(STAGEDIST) && tar -xf - ) +ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) + mv $(_ABS_DIST)/l10n-stage/$(MOZ_PKG_APPNAME)/$(_APPNAME)/Contents/Resources/en.lproj $(_ABS_DIST)/l10n-stage/$(MOZ_PKG_APPNAME)/$(_APPNAME)/Contents/Resources/$(AB).lproj +endif cd $(DIST)/l10n-stage; \ $(MAKE_PACKAGE) mv -f $(DIST)/l10n-stage/$(PACKAGE) $(DIST) diff --git a/build/package/mac_osx/make-diskimage b/build/package/mac_osx/make-diskimage index 3de99051457..87246b93955 100755 --- a/build/package/mac_osx/make-diskimage +++ b/build/package/mac_osx/make-diskimage @@ -50,6 +50,8 @@ # tip: use '-null-' for if you only want to # provide <.dsstore_file> and +set -e; + DMG_DIRNAME=`dirname $1` DMG_DIR=`cd $DMG_DIRNAME; pwd` DMG_NAME=`basename $1` @@ -78,13 +80,14 @@ echo IMAGE_SIZE=$IMAGE_SIZE # Create the image echo "creating disk image" +rm -f $DMG_TEMP_NAME hdiutil create -sectors $IMAGE_SIZE -fs HFS+ $DMG_TEMP_NAME -volname $VOLUME_NAME # mount it echo "mounting disk image" -# `hdid -nomount rw.$DMG_NAME | grep "^/dev/disk.s2" | sed -e "s?^/dev/??" -e "s/[^0-9a-z].*//"` -DEV_NAME=`hdid $DMG_TEMP_NAME | sed 1q | awk '{print $1}'` -MOUNT_DIR=`hdid $DMG_TEMP_NAME | grep Apple_HFS | awk '{print $3}'` +MOUNT_DIR=dmg-temp +mkdir -p $MOUNT_DIR +DEV_NAME=`hdiutil attach -readwrite -private -noautoopen -mountpoint $MOUNT_DIR $DMG_TEMP_NAME | egrep '^/dev/' | sed 1q | awk '{print $1}'` # copy content via ditto # @@ -112,7 +115,7 @@ fi # make sure it's not world writeable echo "fixing permissions" -chmod -R go-w ${MOUNT_DIR} +chmod -R go-w ${MOUNT_DIR} || true # make the top window open itself on mount: if [ -x /usr/local/bin/openUp ]; then diff --git a/config/rules.mk b/config/rules.mk index 5b00b2d5e0a..a462bedc1ff 100644 --- a/config/rules.mk +++ b/config/rules.mk @@ -1320,7 +1320,7 @@ PREF_PPFLAGS = --line-endings=crlf endif ifndef NO_DIST_INSTALL -export:: $(PREF_JS_EXPORTS) $(PREF_DIST_DIR)/$(PREF_DIR) +libs:: $(PREF_JS_EXPORTS) $(PREF_DIST_DIR)/$(PREF_DIR) $(EXIT_ON_ERROR) \ for i in $(PREF_JS_EXPORTS); \ do $(PERL) $(topsrcdir)/config/preprocessor.pl $(PREF_PPFLAGS) $(DEFINES) $(ACDEFINES) $$i > $(PREF_DIST_DIR)/$(PREF_DIR)/`basename $$i`; \ @@ -1328,7 +1328,7 @@ export:: $(PREF_JS_EXPORTS) $(PREF_DIST_DIR)/$(PREF_DIR) ifdef GRE_MODULE ifndef _SKIP_OLD_GRE_INSTALL -export:: $(PREF_JS_EXPORTS) $(FINAL_TARGET)/$(PREF_DIR) +libs:: $(PREF_JS_EXPORTS) $(FINAL_TARGET)/$(PREF_DIR) $(EXIT_ON_ERROR) \ for i in $(PREF_JS_EXPORTS); \ do $(PERL) $(topsrcdir)/config/preprocessor.pl $(PREF_PPFLAGS) $(DEFINES) $(ACDEFINES) $$i > $(FINAL_TARGET)/$(PREF_DIR)/`basename $$i`; \ diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk index a7f497f5aec..1956dc221ab 100644 --- a/toolkit/mozapps/installer/packager.mk +++ b/toolkit/mozapps/installer/packager.mk @@ -103,7 +103,14 @@ endif 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) -UNMAKE_PACKAGE = $(error XXX Need to implement this!) +UNMAKE_PACKAGE = \ + set -e; \ + mkdir mount-temp; \ + hdiutil attach -readonly -mountpoint mount-temp -private -noautoopen $(UNPACKAGE) > hdi.output; \ + DEV_NAME=`egrep '^/dev' < hdi.output | sed 1q | awk '{print $$1}'`; \ + rsync -a mount-temp/$(_APPNAME) $(MOZ_PKG_APPNAME); \ + hdiutil detach $${DEV_NAME}; \ + $(NULL) endif # dummy macro if we don't have PSM built