l10n installer-% does more than it should on Windows

NEW
Unassigned

Status

()

Firefox
Build Config
7 years ago
4 years ago

People

(Reporter: bhearsum, Unassigned)

Tracking

Firefox Tracking Flags

(Not tracked)

Details

(Whiteboard: [l10n])

(Reporter)

Description

7 years ago
I noticed recently that we're doing a lot more work for Windows repacks than we have to. The targets I of note that I see called are, in order:
make clobber-zip AB_CD=en-US
make -C ../../other-licenses/branding/firefox export
make -C ../installer/windows CONFIG_DIR=l10ngen l10ngen/setup.exe l10ngen/7zSD.sfx
make repackage-zip \
      AB_CD=be \
      MOZ_PKG_FORMAT=SFX7Z \
      ZIP_IN="/e/builds/moz2_slave/release-mozilla-central-win32_repack_1/build/firefox.exe" \
      ZIP_OUT=/e/builds/moz2_slave/release-mozilla-central-win32_repack_1/build/mozilla-central/obj-l10n/browser/locales/../../dist/win32/be/Firefox\ Setup\ 4.0b8pre.exe \
      SFX_HEADER="/e/builds/moz2_slave/release-mozilla-central-win32_repack_1/build/mozilla-central/obj-l10n/browser/locales/../installer/windows/l10ngen/7zSD.sfx \
                  /e/builds/moz2_slave/release-mozilla-central-win32_repack_1/build/mozilla-central/browser/installer/windows/app.tag"

make -C ../../tools/update-packaging full-update AB_CD=be \
      MOZ_PKG_PRETTYNAMES=1 \
      PACKAGE_BASE_DIR="/e/builds/moz2_slave/release-mozilla-central-win32_repack_1/build/mozilla-central/obj-l10n/browser/locales/../../dist/l10n-stage" \
      DIST="/e/builds/moz2_slave/release-mozilla-central-win32_repack_1/build/mozilla-central/obj-l10n/browser/locales/../../dist"

make clobber-zip AB_CD=be
make -C ../../tools/update-packaging full-update AB_CD=be \
      MOZ_PKG_PRETTYNAMES=1 \
      PACKAGE_BASE_DIR="/e/builds/moz2_slave/release-mozilla-central-win32_repack_1/build/mozilla-central/obj-l10n/browser/locales/../../dist/l10n-stage" \
      DIST="/e/builds/moz2_slave/release-mozilla-central-win32_repack_1/build/mozilla-central/obj-l10n/browser/locales/../../dist"

make clobber-zip AB_CD=be

So, it looks like we actually only create the MAR twice, not the MAR and the installer.

Updated

7 years ago
Whiteboard: [l10n]

Comment 1

7 years ago
mar twice, zip once, exe once?

Not sure if bug 313956 is anyhow related in the fix?
(Reporter)

Comment 2

7 years ago
(In reply to comment #1)
> mar twice, zip once, exe once?

That's the way I see it, yeah.

> Not sure if bug 313956 is anyhow related in the fix?

Rail told me that this issue is breaking his work there, so definitely related.
I've added a patch to bug 313956 (attachment #313956 [details]), which should fix this bug as well.
Grr, I mean attachment #497194 [details] [diff] [review]
You need to log in before you can comment on or make changes to this bug.