Bug 1550775 - Add repack to SeaMonkey locales Makefile. r=frg a=frg DONTBUILD SEAMONKEY_2_49_ESR_RELBRANCH
authorIan Neal <iann_cvs@blueyonder.co.uk>
Mon, 15 Jul 2019 18:08:20 +0200
branchSEAMONKEY_2_49_ESR_RELBRANCH
changeset 28315 30f931e2beb44a76a61ef289d214a78ebeb85d95
parent 28314 908f70442daa21da7c272ade9cec99204b235437
child 28316 2000e8c0a698caa7d2c52a4a5e11b562c2df18a4
push id2136
push userfrgrahl@gmx.net
push dateMon, 15 Jul 2019 16:13:42 +0000
treeherdercomm-esr52@6b30146aa411 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfrg, frg
bugs1550775
Bug 1550775 - Add repack to SeaMonkey locales Makefile. r=frg a=frg DONTBUILD SeaMonkey ESR52 release branch only.
suite/locales/Makefile.in
--- a/suite/locales/Makefile.in
+++ b/suite/locales/Makefile.in
@@ -204,16 +204,17 @@ ident:
 	    $(STAGEDIST)/platform.ini Build SourceStamp
 	@printf 'buildid '
 	@$(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py \
 	    $(STAGEDIST)/application.ini App BuildID
 
 merge-%:
 ifdef LOCALE_MERGEDIR
 	$(RM) -rf $(LOCALE_MERGEDIR)
+	$(MKDIR) -p $(LOCALE_MERGEDIR)
 	$(topsrcdir)/mozilla/mach compare-locales --merge-dir $(LOCALE_MERGEDIR) --l10n-ini $(srcdir)/l10n.ini $*
 endif
 	@echo
 
 .PHONY: repackage-extensions
 
 MOZ_PKG_EXTRAL10N += extensions/langpack-$(AB_CD)@chatzilla.mozilla.org=$(DIST)/xpi-stage/chatzilla-$(AB_CD)
 
@@ -273,8 +274,14 @@ CALENDAR_INSTALLERS_TARGETS = calendar-m
 endif
 
 # This is a generic target that will make a langpack, repack ZIP (+tarball)
 # builds, and repack and installer if applicable. It is called from the
 # tinderbox scripts. Alter it with caution.
 INSTALLERS_TARGETS = clobber-% $(CALENDAR_INSTALLERS_TARGETS) langpack-% repackage-win32-installer-% repackage-zip-%
 installers-%: $(INSTALLERS_TARGETS)
 	@echo 'repackaging done'
+
+repack-%: AB_CD=$*
+repack-%:
+	$(MAKE) clobber-zip AB_CD=$(AB_CD)
+	$(MAKE) merge-$(AB_CD)
+	$(MAKE) installers-$(AB_CD) MOZ_MAKE_COMPLETE_MAR=1