bug 500205 - L10n repack fails if ChatZilla or venkman are missing from build, test for the directories instead, r=Standard8
authorRobert Kaiser <kairo@kairo.at>
Thu, 02 Jul 2009 15:13:57 +0200
changeset 2993 b9dd4c1ffd4d8a05db0cad8782528b1758b8fce1
parent 2992 92104969108137412332222f683144869daff1a4
child 2994 e347074037b062fd847f0fb167f6b69cd4679b65
push idunknown
push userunknown
push dateunknown
reviewersStandard8
bugs500205
bug 500205 - L10n repack fails if ChatZilla or venkman are missing from build, test for the directories instead, r=Standard8
suite/locales/Makefile.in
--- a/suite/locales/Makefile.in
+++ b/suite/locales/Makefile.in
@@ -200,22 +200,22 @@ clobber-%:
 	$(RM) -rf $(DIST)/xpi-stage/locale-$*
 	$(RM) -rf $(DIST)/xpi-stage/chatzilla-$* $(DIST)/xpi-stage/chatzilla-*.$*.xpi
 	$(RM) -rf $(DIST)/xpi-stage/venkman-$* $(DIST)/xpi-stage/venkman-*.$*.xpi
 
 libs-%:
 	$(NSINSTALL) -D $(DIST)/install
 	@$(MAKE) -C ../../mozilla/toolkit/locales libs-$* BOTH_MANIFESTS=1
 	@$(MAKE) -C ../../editor/ui/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
-ifneq (,$(filter irc,$(MOZ_EXTENSIONS)))
-	@$(MAKE) -C ../../mozilla/extensions/irc/locales libs-$* BOTH_MANIFESTS=1
-endif
-ifneq (,$(filter venkman,$(MOZ_EXTENSIONS)))
-	@$(MAKE) -C ../../mozilla/extensions/venkman/locales libs-$* BOTH_MANIFESTS=1
-endif
+	if test -d ../../mozilla/extensions/irc; then \
+	  $(MAKE) -C ../../mozilla/extensions/irc/locales libs-$* BOTH_MANIFESTS=1; \
+	fi
+	if test -d ../../mozilla/extensions/venkman; then \
+	  $(MAKE) -C ../../mozilla/extensions/venkman/locales libs-$* BOTH_MANIFESTS=1; \
+	fi
 	@$(MAKE) -C ../../mozilla/extensions/reporter/locales libs AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
 	@$(MAKE) -C ../../mozilla/extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
 	@$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref BOTH_MANIFESTS=1
 	@$(MAKE) tests AB_CD=$*
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
 MOZ_PKG_MAC_DSSTORE=$(_ABS_DIST)/branding/dsstore
 MOZ_PKG_MAC_BACKGROUND=$(_ABS_DIST)/branding/background.png
@@ -239,22 +239,22 @@ 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
-ifneq (,$(filter irc,$(MOZ_EXTENSIONS)))
-	$(MAKE) -C ../../mozilla/extensions/irc/locales repackage-win32-installer-$(AB_CD) STAGEDIST=$(shell pwd)/l10n-stage
-endif
-ifneq (,$(filter venkman,$(MOZ_EXTENSIONS)))
-	$(MAKE) -C ../../mozilla/extensions/venkman/locales repackage-win32-installer-$(AB_CD) STAGEDIST=$(shell pwd)/l10n-stage
-endif
+	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
 	$(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 \
@@ -316,22 +316,22 @@ ifeq (WINNT,$(OS_ARCH))
 	$(RM) -r $(STAGEDIST)/uninstall
 	$(NSINSTALL) -D $(STAGEDIST)/uninstall
 	cp ../installer/windows/l10ngen/helper.exe $(STAGEDIST)/uninstall
 endif
 # copy xpi-stage over, but not install.rdf and chrome.manifest,
 # those are just for language packs
 	cd $(DIST)/xpi-stage/locale-$(AB_CD) && \
 	  tar --exclude=install.rdf --exclude=chrome.manifest $(TAR_CREATE_FLAGS) - * | ( cd $(STAGEDIST) && tar -xf - )
-ifneq (,$(filter irc,$(MOZ_EXTENSIONS)))
-	$(MAKE) -C ../../mozilla/extensions/irc/locales repackage-zip-$(AB_CD) STAGEDIST=$(STAGEDIST)
-endif
-ifneq (,$(filter venkman,$(MOZ_EXTENSIONS)))
-	$(MAKE) -C ../../mozilla/extensions/venkman/locales repackage-zip-$(AB_CD) STAGEDIST=$(STAGEDIST)
-endif
+	if test -d ../../mozilla/extensions/irc; then \
+	  $(MAKE) -C ../../mozilla/extensions/irc/locales repackage-zip-$(AB_CD) STAGEDIST=$(STAGEDIST); \
+	fi
+	if test -d ../../mozilla/extensions/venkman; then \
+	  $(MAKE) -C ../../mozilla/extensions/venkman/locales repackage-zip-$(AB_CD) STAGEDIST=$(STAGEDIST); \
+	fi
 ifneq (en,$(AB))
 ifneq (,$(filter cocoa,$(MOZ_WIDGET_TOOLKIT)))
 	mv $(_ABS_DIST)/l10n-stage/$(MOZ_PKG_APPNAME)/$(_APPNAME)/Contents/Resources/en.lproj $(_ABS_DIST)/l10n-stage/$(MOZ_PKG_APPNAME)/$(_APPNAME)/Contents/Resources/$(AB).lproj
 endif
 endif
 	$(NSINSTALL) -D $(DIST)/l10n-stage/$(PKG_PATH)
 	cd $(DIST)/l10n-stage; \
 	  $(MAKE_PACKAGE)