We have an ugly hack in the old L10n repackaging configuration to make it work with our inclusion of dist/bin/README.txt in the app bundle - we copied the file from the L10n directory to dist/bin before calling make-installers-%. With moving to the new generic repackage factories, it's time to do this properly in the code and package the L10n file directly.

Here's a fix that I tested to work in both standard non-L10n and L10n scenarios on one of our Mac buildslaves. I'm somewhat at a loss as to who can review it though.

Comment on attachment 379373 [details] [diff] [review] include the L10n file directly >diff --git a/suite/installer/Makefile.in b/suite/installer/Makefile.in >--- a/suite/installer/Makefile.in >+++ b/suite/installer/Makefile.in >@@ -34,16 +34,17 @@ > # the terms of any one of the MPL, the GPL or the LGPL. > # > # ***** END LICENSE BLOCK ***** > > DEPTH = ../.. > topsrcdir = @top_srcdir@ > srcdir = @srcdir@ > VPATH = @srcdir@ >+relativesrcdir = suite/installer Remove this line, it's wrong. [...] > MOZ_PKG_MAC_EXTRA=--format UDBZ \ > --symlink "/Applications: " \ >- --copy "bin/README.txt" >+ --copy "$(LOCALE_SRCDIR)/installer/mac/README.txt" Replace with --copy "$(call EXPAND_LOCALE_SRCDIR,suite/locales)/installer/mac/README.txt" >diff --git a/suite/locales/Makefile.in b/suite/locales/Makefile.in >--- a/suite/locales/Makefile.in >+++ b/suite/locales/Makefile.in >@@ -213,17 +213,17 @@ > @$(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 > MOZ_PKG_MAC_ICON=$(_ABS_DIST)/branding/disk.icns > MOZ_PKG_MAC_EXTRA=--format UDBZ \ > --symlink "/Applications: " \ >- --copy "$(_ABS_DIST)/bin/README.txt" >+ --copy "$(LOCALE_SRCDIR)/installer/mac/README.txt" Replace with --copy "$(call EXPAND_LOCALE_SRCDIR,suite/locales)/installer/mac/README.txt" r+ with that.

Pushed as http://hg.mozilla.org/comm-central/rev/b0f2034767c7 - we cleared up via IRC that the version in my here-attached patch was correct for locales/Makefile.in as there (and only there) $(LOCALE_SRCDIR) resolves to $(call EXPAND_LOCALE_SRCDIR,suite/locales).