Bustage fix for locale builds - port part of Bug 579718 part B so that localized builds get the right version of localized.manifest. a=Standard8 for bustage fix checkin to CLOSED TREE
authorMark Banner <bugzilla@standard8.plus.com>
Tue, 10 Aug 2010 21:17:55 +0100
changeset 6132 cbb5e2c0fec63a5e5772da07632a01d04c721439
parent 6131 6bf5559f73a77ed817426a3b60541bbae3298db5
child 6133 7667f2321d072e3a199209f6ca9de5cd64ecb7b3
push idunknown
push userunknown
push dateunknown
reviewersStandard8
bugs579718
Bustage fix for locale builds - port part of Bug 579718 part B so that localized builds get the right version of localized.manifest. a=Standard8 for bustage fix checkin to CLOSED TREE
mail/locales/Makefile.in
suite/locales/Makefile.in
--- a/mail/locales/Makefile.in
+++ b/mail/locales/Makefile.in
@@ -128,16 +128,17 @@ repackage-win32-installer: $(WIN32_INSTA
 	$(NSINSTALL) -D l10n-stage
 	$(CYGWIN_WRAPPER) 7z x -ol10n-stage $(WIN32_INSTALLER_IN)
 	$(RM) -r l10n-stage/localized
 	$(RM) l10n-stage/setup.exe
 # copy xpi-stage over, but not install.rdf and chrome.manifest,
 # those are just for language packs
 	cp -r $(DIST)/xpi-stage/locale-$(AB_CD) l10n-stage/localized
 	$(RM) l10n-stage/localized/install.rdf l10n-stage/localized/chrome.manifest
+	mv l10n-stage/localized/chrome/$(AB_CD).manifest l10n-stage/localized/chrome/localized.manifest
 	$(MAKE) -C ../installer/windows CONFIG_DIR=l10ngen l10ngen/setup.exe l10ngen/7zSD.sfx
 	cp ../installer/windows/l10ngen/setup.exe l10n-stage
 	$(NSINSTALL) -D l10n-stage/localized/uninstall
 	cp ../installer/windows/l10ngen/helper.exe l10n-stage/localized/uninstall
 	rm -f app.7z
 	cd l10n-stage && \
 	  $(CYGWIN_WRAPPER) 7z a -r -t7z ../app.7z -mx -m0=BCJ2 -m1=LZMA:d24 -m2=LZMA:d19 -m3=LZMA:d19 -mb0:1 -mb0s1:2 -mb0s2:3
 	cat ../installer/windows/l10ngen/7zSD.sfx \
--- a/suite/locales/Makefile.in
+++ b/suite/locales/Makefile.in
@@ -232,16 +232,17 @@ repackage-win32-installer: $(WIN32_INSTA
 	$(NSINSTALL) -D l10n-stage
 	$(CYGWIN_WRAPPER) 7z x -ol10n-stage $(WIN32_INSTALLER_IN)
 	$(RM) -r l10n-stage/localized
 	$(RM) l10n-stage/setup.exe
 # copy xpi-stage over, but not install.rdf and chrome.manifest,
 # those are just for language packs
 	cp -r $(DIST)/xpi-stage/locale-$(AB_CD) l10n-stage/localized
 	$(RM) l10n-stage/localized/install.rdf l10n-stage/localized/chrome.manifest
+	mv l10n-stage/localized/chrome/$(AB_CD).manifest l10n-stage/localized/chrome/localized.manifest
 	if test -d ../../mozilla/extensions/irc; then \
 	  $(MAKE) -C ../../mozilla/extensions/irc/locales repackage-win32-installer-$(AB_CD) STAGEDIST=$(shell pwd)/l10n-stage; \
 	fi
 	if test -d ../../mozilla/extensions/venkman; then \
 	  $(MAKE) -C ../../mozilla/extensions/venkman/locales repackage-win32-installer-$(AB_CD) STAGEDIST=$(shell pwd)/l10n-stage; \
 	fi
 	$(MAKE) -C ../installer/windows CONFIG_DIR=l10ngen l10ngen/setup.exe l10ngen/7zSD.sfx
 	cp ../installer/windows/l10ngen/setup.exe l10n-stage