537152 - make generate-snippet-ab-CD is broken on Thunderbird trunk

Status: RESOLVED FIXED

(Thunderbird :: Build Config, defect)

Description

[Philippe M. Chiasson (:gozer)]

As of a while ago, the mozilla-central tools/update-packaging/generatesnippet.py tool requires a --platform argument.

The generate-snippet-ab-CD target in mail/locales/Makefile.in doesn't include it, so l10n repacks can't produce update snippets. The errors produced look like this one:

/d/mozilla-build/python25/python ../../mozilla/tools/update-packaging/generatesnippet.py \
	    --mar-path=/e/buildbot/comm-central-trunk-win32-l10n-full/build/comm-central/mozilla/dist/update \
	    --application-ini-file=/e/buildbot/comm-central-trunk-win32-l10n-full/build/comm-central/mozilla/dist/l10n-stage/thunderbird/application.ini \
	    --locale=fy-NL \
	    --product=thunderbird \
	    --download-base-URL=http://ftp.mozilla.org/pub/mozilla.org/thunderbird/nightly \
	    --verbose
[Errno 2] No such file or directory: 'e:/buildbot/comm-central-trunk-win32-l10n-full/build/comm-central/mozilla/dist/update\\thunderbird-3.1a1pre.fy-NL.None.complete.mar'

Notice the 'None' architecture, since the tool doesn't seem to even check that a platform is provided. 

Attached simple patch should fix us up.

Comment 3

[Mark Banner (:standard8)]

Attachment: The fix

This ports the relevant part of bug 531275 attachment 417356 [details] [diff] [review] to mail/locales/Makefile.in.

Using the ifdef as despite that bug having approval, it hasn't landed on 1.9.2 yet.

At some stage we should switch to using l10n.mk which would mean we wouldn't need work arounds such as this, however, that's slightly more complex, and this will mean that we at least get nightly updates working again for l10n users on trunk.

Comment 4

[Mark Banner (:standard8)]

Comment on attachment 420520 [details] [diff] [review]
The fix

I've checked that MOZ_PKG_PLATFORM gets into our makefile (via packager.mk / package-name.mk) so we should be all set to go forward with this.

David, mind signing this off?

Comment 5

[Mark Banner (:standard8)]

Checked in:

http://hg.mozilla.org/comm-central/rev/15b39d7bf60c

This might kick in for today's 3.2a1pre trunk Mac nightlies, but I'm not sure, it should kick in tomorrow on all platforms.

Comment 6

[Mark Banner (:standard8)]

The comm-central + mozilla-central nightlies (3.2a1pre) are now generating snippets fine (although I've not checked update offers).

The comm-central + mozilla-1.9.2 nightlies (Lanikai / 3.1a1pre) are now failing as bug 531275 has landed on mozilla-1.9.2. Therefore I've just landed a bustage fix for that:

http://hg.mozilla.org/comm-central/rev/e7e643ed049a

(which just removes the appropriate part of the ifdef).

so make snippets should work all round tomorrow, but the 3.1a1pre updates will still be busted because of bug 538132.