Skip to content
This repository has been archived by the owner on Aug 4, 2022. It is now read-only.

Commit

Permalink
Bug 1489355 - Windows installer build fixes r=Callek
Browse files Browse the repository at this point in the history
Bug 1484264 made changes to how the repackage tasks is configured.
The package-name field was hard-coded to "firefox". This field is later
used to build the Windows installer, and Thunderbird requires that it
be set to "thunderbird" or the build fails.

This patch changes package-name to be a templated field like the others.

Differential Revision: https://phabricator.services.mozilla.com/D5222
  • Loading branch information
jfx2006 committed Sep 7, 2018
1 parent 126715c commit e071867
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
4 changes: 2 additions & 2 deletions taskcluster/taskgraph/transforms/repackage.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@

# The configuration passed to the mozharness repackage script. This defines the
# arguments passed to `mach repackage`
# - `args` is interpolated by mozharness (`{installer-tag}`,
# - `args` is interpolated by mozharness (`{package-name}`, `{installer-tag}`,
# `{stub-installer-tag}`, `{sfx-stub}`) with values from the mozharness
# config.
# - `inputs` are passed as long-options, with the filename prefixed by
Expand Down Expand Up @@ -117,7 +117,7 @@
'installer': {
'args': [
"installer",
"--package-name", "firefox",
"--package-name", "{package-name}",
"--tag", "{installer-tag}",
"--sfx-stub", "{sfx-stub}",
],
Expand Down
1 change: 1 addition & 0 deletions testing/mozharness/configs/repackage/base.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
config = {
"package-name": "firefox",
"installer-tag": "browser/installer/windows/app.tag",
"stub-installer-tag": "browser/installer/windows/stub.tag",
"sfx-stub": "other-licenses/7zstub/firefox/7zSD.sfx",
Expand Down
1 change: 1 addition & 0 deletions testing/mozharness/scripts/repackage.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ def repackage(self):
dirs = self.query_abs_dirs()

subst = {
'package-name': config['package-name'],
'sfx-stub': config['sfx-stub'],
'installer-tag': config['installer-tag'],
'stub-installer-tag': config['stub-installer-tag'],
Expand Down

0 comments on commit e071867

Please sign in to comment.