Mac v2 signing - Bug 1076370 - Fix Firefox.app l10n repacks for Mac v2 signing. r=jmaher
authorRobert Strong <robert.bugzilla@gmail.com>
Thu, 02 Oct 2014 09:12:36 -0700
changeset 231696 ddbbf282044179f2c436d8441e878a104c7dc7c6
parent 231695 7009237d5e47c9e15d1fde75d19c2744afe3322b
child 231697 74871c4df0a7fba0b772de9a22dd63890add7a67
push id4187
push userbhearsum@mozilla.com
push dateFri, 28 Nov 2014 15:29:12 +0000
treeherdermozilla-beta@f23cc6a30c11 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjmaher
bugs1076370
milestone35.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Mac v2 signing - Bug 1076370 - Fix Firefox.app l10n repacks for Mac v2 signing. r=jmaher
b2g/installer/removed-files.in
browser/installer/removed-files.in
toolkit/locales/l10n.mk
--- a/b2g/installer/removed-files.in
+++ b/b2g/installer/removed-files.in
@@ -1,18 +1,18 @@
 # Due to Apple Mac OS X packaging requirements files that are in the same
 # directory on other platforms must be located in different directories on
 # Mac OS X. The following defines allow specifying the Mac OS X bundle
 # location which also work on other platforms.
 #
 # @DIR_MACOS@
-# Equals Contents/MacOS/ on Mac OX X and is an empty string on other platforms.
+# Equals Contents/MacOS/ on Mac OS X and is an empty string on other platforms.
 #
 # @DIR_RESOURCES@
-# Equals Contents/Resources/ on Mac OX X and is an empty string on other
+# Equals Contents/Resources/ on Mac OS X and is an empty string on other
 # platforms.
 
 # Mac OS X v2 signing removals
 #ifdef XP_MACOSX
   @DIR_MACOS@active-update.xml
   @DIR_MACOS@update-settings.ini
   @DIR_MACOS@updates.xml
   @DIR_MACOS@defaults/*
--- a/browser/installer/removed-files.in
+++ b/browser/installer/removed-files.in
@@ -53,20 +53,20 @@
 # Example: path/to/dir/*
 
 # Due to Apple Mac OS X packaging requirements files that are in the same
 # directory on other platforms must be located in different directories on
 # Mac OS X. The following defines allow specifying the Mac OS X bundle
 # location which also work on other platforms.
 #
 # @DIR_MACOS@
-# Equals Contents/MacOS/ on Mac OX X and is an empty string on other platforms.
+# Equals Contents/MacOS/ on Mac OS X and is an empty string on other platforms.
 #
 # @DIR_RESOURCES@
-# Equals Contents/Resources/ on Mac OX X and is an empty string on other
+# Equals Contents/Resources/ on Mac OS X and is an empty string on other
 # platforms.
 
 # Common File Removals
 # This is located under the "distribution/" directory and it was added before
 # Firefox 27
 @DIR_MACOS@distribution/extensions/testpilot@labs.mozilla.com.xpi
 
 # Some users are ending up with unpacked chrome instead of omni.ja. This
--- a/toolkit/locales/l10n.mk
+++ b/toolkit/locales/l10n.mk
@@ -57,17 +57,17 @@ DEFINES += \
 
 clobber-%:
 	$(RM) -rf $(DIST)/xpi-stage/locale-$*
 
 
 PACKAGER_NO_LIBS = 1
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-STAGEDIST = $(_ABS_DIST)/l10n-stage/$(MOZ_PKG_DIR)/$(_APPNAME)/Contents/MacOS
+STAGEDIST = $(_ABS_DIST)/l10n-stage/$(MOZ_PKG_DIR)/$(_APPNAME)/Contents/Resources
 else
 STAGEDIST = $(_ABS_DIST)/l10n-stage/$(MOZ_PKG_DIR)
 endif
 
 include $(MOZILLA_DIR)/toolkit/mozapps/installer/signing.mk
 include $(MOZILLA_DIR)/toolkit/mozapps/installer/packager.mk
 
 PACKAGE_BASE_DIR = $(_ABS_DIST)/l10n-stage
@@ -110,32 +110,32 @@ repackage-zip:  libs-$(AB_CD)
 # call a hook for apps to build the stub installer
 ifdef MOZ_STUB_INSTALLER
 	$(STUB_HOOK)
 endif
 	$(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/l10n-repack.py $(STAGEDIST) $(DIST)/xpi-stage/locale-$(AB_CD) \
 		$(if $(filter omni,$(MOZ_PACKAGER_FORMAT)),$(if $(NON_OMNIJAR_FILES),--non-resource $(NON_OMNIJAR_FILES)))
 ifneq (en,$(AB))
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-	mv $(_ABS_DIST)/l10n-stage/$(MOZ_PKG_DIR)/$(_APPNAME)/Contents/Resources/en.lproj $(_ABS_DIST)/l10n-stage/$(MOZ_PKG_DIR)/$(_APPNAME)/Contents/Resources/$(AB).lproj
+	mv $(STAGEDIST)/en.lproj $(STAGEDIST)/$(AB).lproj
 endif
 endif
 	$(NSINSTALL) -D $(DIST)/l10n-stage/$(PKG_PATH)
 	cd $(DIST)/l10n-stage; \
 	  $(MAKE_PACKAGE)
 ifdef MAKE_COMPLETE_MAR
 	$(MAKE) -C $(MOZDEPTH)/tools/update-packaging full-update AB_CD=$(AB_CD) \
 	  MOZ_PKG_PRETTYNAMES=$(MOZ_PKG_PRETTYNAMES) \
 	  PACKAGE_BASE_DIR='$(_ABS_DIST)/l10n-stage' \
 	  DIST='$(_ABS_DIST)'
 endif
 # packaging done, undo l10n stuff
 ifneq (en,$(AB))
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-	mv $(_ABS_DIST)/l10n-stage/$(MOZ_PKG_DIR)/$(_APPNAME)/Contents/Resources/$(AB).lproj $(_ABS_DIST)/l10n-stage/$(MOZ_PKG_DIR)/$(_APPNAME)/Contents/Resources/en.lproj
+	mv $(STAGEDIST)/$(AB).lproj $(STAGEDIST)/en.lproj
 endif
 endif
 	$(NSINSTALL) -D $(DIST)/$(PKG_PATH)
 	mv -f '$(DIST)/l10n-stage/$(PACKAGE)' '$(ZIP_OUT)'
 	if test -f '$(DIST)/l10n-stage/$(PACKAGE).asc'; then mv -f '$(DIST)/l10n-stage/$(PACKAGE).asc' '$(ZIP_OUT).asc'; fi
 
 repackage-zip-%: $(STAGEDIST)
 	@$(MAKE) repackage-zip AB_CD=$* ZIP_IN='$(ZIP_IN)'