Closed Bug 1256966 Opened 8 years ago Closed 8 years ago

Move NIGHTLY_BUILD and RELEASE_BUILD to Python configure

Categories

(Firefox Build System :: General, defect)

defect
Not set
normal

Tracking

(firefox48 fixed)

RESOLVED FIXED
mozilla48
Tracking Status
firefox48 --- fixed

People

(Reporter: chmanchester, Assigned: chmanchester)

References

(Blocks 1 open bug)

Details

Attachments

(1 file)

These only depend on the contents of $topsrcdir/config/milestone.txt, but a few checks in old-configure still depend on them.
Assignee: nobody → cmanchester
Comment on attachment 8731412 [details]
MozReview Request: Bug 1256966 - Move NIGHTLY_BUILD and RELEASE_BUILD to Python configure.

https://reviewboard.mozilla.org/r/40561/#review37143

In bugzilla land, that'd be a f+, but mozreview doesn't know how to do that.

::: moz.configure:26
(Diff revision 1)
> +# - otherwise, if we have "a" in GRE_MILESTONE, we're building Nightly or Aurora
> +# - otherwise, we're building Release/Beta (define RELEASE_BUILD)
> +@depends(check_build_environment)
> +@advanced
> +def release_options(build_env):
> +    add_old_configure_assignment('MOZ_CHROME_FILE_FORMAT', 'flat')

Where does this come from?

::: moz.configure:48
(Diff revision 1)
> +
> +# Multiprocess Firefox Testing UI - Nightly and Aurora
> +# To be removed in Bug 1003313
> +@depends(release_options)
> +def e10s_testing_only(release_opts):
> +    if release_opts.get('RELEASE_BUILD') is None:

I'd rather have something nicer out of release_options, like:
namespace(is_release=True, is_nightly=False)

in which case, you can check release_opts.is_release.

You could also add the milestone in there, making it:
namespace(version=milestone, is_release=..., is_nightly=...), rename the function to milestone instead of release_options, and then other function can access:
milestone.version
milestone.is_release
milestone.is_nightly

Although currently nothing would use milestone.version, eventually I expect those namespace objects to make it to moz.build, so that would replace GRE_MILESTONE, RELEASE_BUILD and NIGHTLY_BUILD uses in moz.build. But that's not on today's menu.
Attachment #8731412 - Flags: review?(mh+mozilla)
https://reviewboard.mozilla.org/r/40561/#review37143

> Where does this come from?

I'm sure that was meant for a different patch...
Attachment #8731412 - Flags: review?(mh+mozilla)
Comment on attachment 8731412 [details]
MozReview Request: Bug 1256966 - Move NIGHTLY_BUILD and RELEASE_BUILD to Python configure.

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/40561/diff/1-2/
Comment on attachment 8731412 [details]
MozReview Request: Bug 1256966 - Move NIGHTLY_BUILD and RELEASE_BUILD to Python configure.

https://reviewboard.mozilla.org/r/40561/#review37487

::: moz.configure:26
(Diff revisions 1 - 2)
>  # - otherwise, if we have "a" in GRE_MILESTONE, we're building Nightly or Aurora
>  # - otherwise, we're building Release/Beta (define RELEASE_BUILD)
>  @depends(check_build_environment)
>  @advanced
> -def release_options(build_env):
> +def milestone(build_env):
>      add_old_configure_assignment('MOZ_CHROME_FILE_FORMAT', 'flat')

You forgot to remove this.

::: moz.configure:35
(Diff revisions 1 - 2)
>      with open(milestone_path, 'r') as fh:
>          milestone = fh.read().splitlines()[-1]
>  
>      set_config('GRE_MILESTONE', milestone)
>  
> +    is_nightly, is_release = False, False

you could write is_nightly = is_release = False
Attachment #8731412 - Flags: review?(mh+mozilla) → review+
https://hg.mozilla.org/mozilla-central/rev/a8bf53269074
Status: NEW → RESOLVED
Closed: 8 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.