Bug 489313, bustage fix for l10n repacks in release mode, r=nthomas GECKO1912_20090729_RELBRANCH
☠☠ backed out by 79b6e73e853a ☠ ☠
authorAxel Hecht <l10n@mozilla.com>
Thu, 30 Jul 2009 19:25:48 +1200
branchGECKO1912_20090729_RELBRANCH
changeset 26173 d57f05bcdbe11ca8c96269eac4223f1c6f9dc92d
parent 26172 001b77ffc015a286c75a00a70926fe13ef3d2645
child 26174 23ce84f60a0a208afc7feb0394acb84de1c8939d
child 26179 79b6e73e853a228a5d85809328294ed8b0d18e1d
push id1841
push usernthomas@mozilla.com
push dateThu, 30 Jul 2009 07:35:11 +0000
reviewersnthomas
bugs489313
milestone1.9.1.2
Bug 489313, bustage fix for l10n repacks in release mode, r=nthomas
toolkit/locales/l10n.mk
--- a/toolkit/locales/l10n.mk
+++ b/toolkit/locales/l10n.mk
@@ -140,17 +140,18 @@ endif
 	$(NSINSTALL) -D $(DIST)/l10n-stage/$(PKG_PATH)
 	cd $(DIST)/l10n-stage; \
 	  $(MAKE_PACKAGE)
 ifdef MOZ_MAKE_COMPLETE_MAR
 	$(MAKE) -C $(DEPTH)/tools/update-packaging full-update AB_CD=$(AB_CD) \
 	  MOZ_PKG_PRETTYNAMES=$(MOZ_PKG_PRETTYNAMES) \
 	  PACKAGE_BASE_DIR="$(_ABS_DIST)/l10n-stage" \
 	  DIST="$(_ABS_DIST)"
-	$(MAKE) generate-snippet-$(AB_CD)  
+# XXX switch this back on once bug 496196's generate-snippet lands on 1.9.1
+#	$(MAKE) generate-snippet-$(AB_CD)  
 endif
 # packaging done, undo l10n stuff
 ifneq (en,$(AB))
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
 	mv $(_ABS_DIST)/l10n-stage/$(MOZ_PKG_APPNAME)/$(_APPNAME)/Contents/Resources/$(AB).lproj $(_ABS_DIST)/l10n-stage/$(MOZ_PKG_APPNAME)/$(_APPNAME)/Contents/Resources/en.lproj
 endif
 endif
 	$(MAKE) clobber-zip AB_CD=$(AB_CD)