Bug 474461 l10n afterpush builds incorrectly reported as testfailed status - don't warn about dictionaries if they aren't pulled in. SeaMonkey and Sunbird parts. r=KaiRo
authorMark Banner <bugzilla@standard8.plus.com>
Thu, 19 Feb 2009 12:05:07 +0000
changeset 2003 4be98d27a58ac43f26b8dada4edf5889c2020d78
parent 2002 ce0e94b8b4334c656e4bae2e4e086da4157e1656
child 2004 bdac17168ebf21267c60f3832e74ac47a89bb156
push idunknown
push userunknown
push dateunknown
reviewersKaiRo
bugs474461
Bug 474461 l10n afterpush builds incorrectly reported as testfailed status - don't warn about dictionaries if they aren't pulled in. SeaMonkey and Sunbird parts. r=KaiRo
calendar/locales/Makefile.in
suite/locales/Makefile.in
--- a/calendar/locales/Makefile.in
+++ b/calendar/locales/Makefile.in
@@ -266,17 +266,21 @@ langpack-%: libs-%
 	@echo "Making langpack $(LANGPACK_FILE)"
 	$(NSINSTALL) -D $(DIST)/install
 	@$(MAKE) -C ../timezones/locales libs AB_CD=$* XPI_NAME=calendar-timezones USE_EXTENSION_MANIFEST=1
 	$(PERL) $(MOZILLA_SRCDIR)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) -I$(call EXPAND_MOZLOCALE_SRCDIR,toolkit/locales)/defines.inc -I$(LOCALE_SRCDIR)/defines.inc $(srcdir)/generic/install.rdf > $(FINAL_TARGET)/install.rdf
 	cd $(DIST)/xpi-stage/calendar-timezones/chrome && \
 	  tar $(TAR_CREATE_FLAGS) - * | ( cd $(_ABS_DIST)/xpi-stage/locale-$(AB_CD)/chrome && tar -xf - )
 	cat $(DIST)/xpi-stage/calendar-timezones/chrome.manifest >> $(_ABS_DIST)/xpi-stage/locale-$(AB_CD)/chrome.manifest
 	cd $(DIST)/xpi-stage/locale-$(AB_CD) && \
-	  $(ZIP) -r9D $(LANGPACK_FILE) install.rdf chrome chrome.manifest defaults dictionaries -x chrome/$(AB_CD).manifest -x chrome/sunbird-$(AB_CD).manifest -x chrome/calendar-$(AB_CD).manifest
+	  if test -d dictionaries; then \
+	    $(ZIP) -r9D $(LANGPACK_FILE) install.rdf chrome chrome.manifest defaults dictionaries -x chrome/$(AB_CD).manifest -x chrome/sunbird-$(AB_CD).manifest -x chrome/calendar-$(AB_CD).manifest; \
+	  else \
+	    $(ZIP) -r9D $(LANGPACK_FILE) install.rdf chrome chrome.manifest defaults -x chrome/$(AB_CD).manifest -x chrome/sunbird-$(AB_CD).manifest -x chrome/calendar-$(AB_CD).manifest; \
+	  fi
 
 # This is a generic target that will make a langpack, repack ZIP (+tarball)
 # builds, and repack an installer if applicable. It is called from the
 # tinderbox scripts. Alter it with caution.
 
 installers-%: clobber-% langpack-% repackage-win32-installer-% repackage-zip-%
 	@echo "repackaging done"
 
--- a/suite/locales/Makefile.in
+++ b/suite/locales/Makefile.in
@@ -297,17 +297,21 @@ repackage-zip-%: $(ZIP_IN) $(STAGEDIST) 
 langpack-%: LANGPACK_FILE=$(_ABS_DIST)/$(PKG_LANGPACK_PATH)$(PKG_LANGPACK_BASENAME).xpi
 langpack-%: AB_CD=$*
 langpack-%: XPI_NAME=locale-$*
 langpack-%: libs-%
 	@echo "Making langpack $(LANGPACK_FILE)"
 	@$(NSINSTALL) -D $(DIST)/$(PKG_LANGPACK_PATH)
 	$(PYTHON) $(MOZILLA_SRCDIR)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) -I$(call EXPAND_LOCALE_SRCDIR,toolkit/locales)/defines.inc -I$(LOCALE_SRCDIR)/defines.inc $(srcdir)/generic/install.rdf > $(FINAL_TARGET)/install.rdf
 	cd $(DIST)/xpi-stage/locale-$(AB_CD) && \
-	  $(ZIP) -r9D $(LANGPACK_FILE) install.rdf chrome chrome.manifest defaults dictionaries searchplugins -x chrome/$(AB_CD).manifest
+	  if test -d dictionaries; then \
+	    $(ZIP) -r9D $(LANGPACK_FILE) install.rdf chrome chrome.manifest defaults dictionaries searchplugins -x chrome/$(AB_CD).manifest; \
+	  else \
+	    $(ZIP) -r9D $(LANGPACK_FILE) install.rdf chrome chrome.manifest defaults searchplugins -x chrome/$(AB_CD).manifest; \
+	  fi
 
 # This is a generic target that will make a langpack, repack ZIP (+tarball)
 # builds, and repack an installer if applicable. It is called from the
 # tinderbox scripts. Alter it with caution.
 
 installers-%: clobber-% langpack-% repackage-win32-installer-% repackage-zip-%
 	@echo "repackaging done"