Mac v2 signing - Bug 1076370 - Fix Firefox.app l10n repacks for Mac v2 signing. r=jmaher

Robert Strong · Robert Strong · commit 43f38a791e68 · 2014-10-02T09:12:36.000-07:00
diff --git a/b2g/installer/removed-files.in b/b2g/installer/removed-files.in
@@ -4,10 +4,10 @@
 # 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
diff --git a/browser/installer/removed-files.in b/browser/installer/removed-files.in
@@ -58,10 +58,10 @@
 # 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
diff --git a/toolkit/locales/l10n.mk b/toolkit/locales/l10n.mk
@@ -62,7 +62,7 @@ clobber-%:
 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
@@ -115,7 +115,7 @@ endif
 		$(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)
@@ -130,7 +130,7 @@ 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)

Original file line number	Diff line number	Diff line change
`@@ -4,10 +4,10 @@`
`4`	`4`	`# location which also work on other platforms.`
`5`	`5`	`#`
`6`	`6`	`# @DIR_MACOS@`
`7`		`-# Equals Contents/MacOS/ on Mac OX X and is an empty string on other platforms.`
	`7`	`+# Equals Contents/MacOS/ on Mac OS X and is an empty string on other platforms.`
`8`	`8`	`#`
`9`	`9`	`# @DIR_RESOURCES@`
`10`		`-# Equals Contents/Resources/ on Mac OX X and is an empty string on other`
	`10`	`+# Equals Contents/Resources/ on Mac OS X and is an empty string on other`
`11`	`11`	`# platforms.`
`12`	`12`
`13`	`13`	`# Mac OS X v2 signing removals`
Original file line number	Diff line number	Diff line change
`@@ -58,10 +58,10 @@`
`58`	`58`	`# location which also work on other platforms.`
`59`	`59`	`#`
`60`	`60`	`# @DIR_MACOS@`
`61`		`-# Equals Contents/MacOS/ on Mac OX X and is an empty string on other platforms.`
	`61`	`+# Equals Contents/MacOS/ on Mac OS X and is an empty string on other platforms.`
`62`	`62`	`#`
`63`	`63`	`# @DIR_RESOURCES@`
`64`		`-# Equals Contents/Resources/ on Mac OX X and is an empty string on other`
	`64`	`+# Equals Contents/Resources/ on Mac OS X and is an empty string on other`
`65`	`65`	`# platforms.`
`66`	`66`
`67`	`67`	`# Common File Removals`