Closed Bug 1264499 Opened 4 years ago Closed 4 years ago

Update and remove references to mozconfig.vs2013 since we use vs2015 now

Categories

(Firefox Build System :: General, defect)

defect
Not set

Tracking

(firefox48 fixed)

RESOLVED FIXED
mozilla48
Tracking Status
firefox48 --- fixed

People

(Reporter: jgilbert, Assigned: jgilbert)

References

Details

Attachments

(5 files)

There's a high likelihood that any remaining references to vs2013 have actually just been missed during the effort to upgrade to vs2015.
Depends on: vs2015
From e9d464224f8b162fff0afb30c4e7335c29ec0c03 Mon Sep 17 00:00:00 2001
 use where appropriate.
---
 b2g/config/mozconfigs/win32_gecko/debug              | 6 +-----
 b2g/config/mozconfigs/win32_gecko/nightly            | 6 +-----
 b2g/graphene/config/horizon-mozconfigs/win32/debug   | 6 +-----
 b2g/graphene/config/horizon-mozconfigs/win32/nightly | 6 +-----
 b2g/graphene/config/horizon-mozconfigs/win64/debug   | 2 +-
 b2g/graphene/config/horizon-mozconfigs/win64/nightly | 2 +-
 b2g/graphene/config/mozconfigs/win32/debug           | 6 +-----
 b2g/graphene/config/mozconfigs/win32/nightly         | 6 +-----
 b2g/graphene/config/mozconfigs/win64/debug           | 2 +-
 b2g/graphene/config/mozconfigs/win64/nightly         | 2 +-
 browser/config/mozconfigs/win32/l10n-mozconfig       | 6 +-----
 build/win32/mozconfig.vs-latest                      | 5 +++++
 build/win64/mozconfig.vs-latest                      | 1 +
 13 files changed, 17 insertions(+), 39 deletions(-)
 create mode 100644 build/win32/mozconfig.vs-latest
 create mode 100644 build/win64/mozconfig.vs-latest

Review commit: https://reviewboard.mozilla.org/r/46253/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/46253/
Attachment #8741176 - Flags: review?(gps)
From 2f93700ff067b5f83bc47f0f99174ac714796fb2 Mon Sep 17 00:00:00 2001
---
 browser/config/mozconfigs/win32/common-opt            | 2 +-
 browser/config/mozconfigs/win32/debug                 | 2 +-
 browser/config/mozconfigs/win32/debug-static-analysis | 2 +-
 browser/config/mozconfigs/win64/common-opt            | 2 +-
 browser/config/mozconfigs/win64/debug                 | 2 +-
 browser/config/mozconfigs/win64/l10n-mozconfig        | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

Review commit: https://reviewboard.mozilla.org/r/46255/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/46255/
From 7eb8b070809043091ed559467b38d1830b2bddca Mon Sep 17 00:00:00 2001
---
 js/src/devtools/automation/winbuildenv.sh | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

Review commit: https://reviewboard.mozilla.org/r/46257/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/46257/
Attachment #8741177 - Flags: review?(gps)
Attachment #8741178 - Flags: review?(sphink)
Comment on attachment 8741178 [details]
MozReview Request: r?sfink - Update js/src/devtools/automation/winbuildenv.sh.

https://reviewboard.mozilla.org/r/46257/#review43037

Looks good to me, though I can't guess whether it still works with VS2015. It's still an awful hack, and the mozconfigs are still trying to make it difficult (by overriding all of the paths unconditionally, although it at least now sets VSPATH conditionally.)

In a perfect world, this winbuildenv.sh crap would be unnecessary; the mozconfigs would not enforce the automation filesystem layout if there were already valid settings.

Anyway, r=me, but I don't know if it'll actually work on developers' machines like it used to. And I can't test myself, because VS2015 is refusing to run on my Windows machine. Still working on fixing that. But go ahead and land, I'll fix it up after the fact if I need to.
Attachment #8741178 - Flags: review?(sphink) → review+
Comment on attachment 8741176 [details]
MozReview Request: Bug 1264499 - r?gps - Add build/win{32,64}/mozconfig.vs-latest and

https://reviewboard.mozilla.org/r/46253/#review43241

Nice abstraction.

I wouldn't be surprised if some compiler warning snuck into the switch and broke the b2g builds. But, I /think/ b2g builds aren't tier-1 now, so we can break those and leave the mess for someone else to clean up. If you don't want to take a risk, please do a try push before landing.
Attachment #8741176 - Flags: review?(gps) → review+
Comment on attachment 8741177 [details]
MozReview Request: r?gps - Update browser/configs.

https://reviewboard.mozilla.org/r/46255/#review43243
Attachment #8741177 - Flags: review?(gps) → review+
Comment on attachment 8741178 [details]
MozReview Request: r?sfink - Update js/src/devtools/automation/winbuildenv.sh.

https://reviewboard.mozilla.org/r/46257/#review43245
Attachment #8741178 - Flags: review+
From 08bc73bc87f435970ea86f4049c573de52afd54a Mon Sep 17 00:00:00 2001
---
 build/win32/mozconfig.vs2010 | 13 -------------
 1 file changed, 13 deletions(-)
 delete mode 100644 build/win32/mozconfig.vs2010

Review commit: https://reviewboard.mozilla.org/r/47341/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/47341/
Attachment #8742606 - Flags: review?(gps)
Attachment #8742607 - Flags: review?(gps)
From 1907a0f06f2c8bffbd946de78fd9b47ce091d7d3 Mon Sep 17 00:00:00 2001
---
 build/win32/mozconfig.vs-latest | 6 +-----
 build/win64/mozconfig.vs-latest | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

Review commit: https://reviewboard.mozilla.org/r/47343/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/47343/
Comment on attachment 8741176 [details]
MozReview Request: Bug 1264499 - r?gps - Add build/win{32,64}/mozconfig.vs-latest and

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/46253/diff/1-2/
Comment on attachment 8741177 [details]
MozReview Request: r?gps - Update browser/configs.

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/46255/diff/1-2/
Comment on attachment 8741178 [details]
MozReview Request: r?sfink - Update js/src/devtools/automation/winbuildenv.sh.

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/46257/diff/1-2/
Attachment #8742606 - Flags: review?(gps) → review+
Comment on attachment 8742606 [details]
MozReview Request: Remove win32/mozconfig.vs2010. r?gps

https://reviewboard.mozilla.org/r/47341/#review44195
Comment on attachment 8742607 [details]
MozReview Request: Use full path for mozconfig.vs-latest. r?gps

https://reviewboard.mozilla.org/r/47343/#review44197
Attachment #8742607 - Flags: review?(gps) → review+
https://hg.mozilla.org/mozilla-central/rev/68a682ef9e59
Status: NEW → RESOLVED
Closed: 4 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla48
Product: Core → Firefox Build System
You need to log in before you can comment on or make changes to this bug.