Mac v2 signing - Bug 1076370 - Fix Firefox.app l10n repacks for Mac v2 signing. r=jmaher
authorRobert Strong <robert.bugzilla@gmail.com>
Wed, 01 Oct 2014 20:47:42 -0700
changeset 491303 eafb515f6ab6325f407f6bdc46dc57e38cc91bea
parent 491302 2444de3042c104aee9dcbbc0351c4ca88fb3dc7d
child 491304 09d82d7ed24e8acd524211d1fdcd6d5dd5b7c55d
push id47343
push userbmo:dothayer@mozilla.com
push dateWed, 01 Mar 2017 22:58:58 +0000
reviewersjmaher
bugs1076370
milestone35.0a1
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)'