Closed Bug 1395392 Opened 3 years ago Closed 3 years ago

Remove b2g references in toolkit/moz.configure

Categories

(Firefox Build System :: General, enhancement)

enhancement
Not set

Tracking

(firefox57 fixed)

RESOLVED FIXED
mozilla57
Tracking Status
firefox57 --- fixed

People

(Reporter: rillian, Assigned: rillian)

References

Details

Attachments

(3 files)

I noticed a few obsolete b2g references. These can be removed.
Comment on attachment 8902953 [details]
Bug 1395392 - Remove pocketsphinx options from configure.

https://reviewboard.mozilla.org/r/174708/#review179786

::: toolkit/moz.configure:916
(Diff revision 1)
>  
>  # Speech API pocketsphinx backend
>  # ==============================================================
>  @depends(build_project, milestone, webspeech)
>  def webspeech_pocketsphinx(build_project, milestone, webspeech):
> -    if webspeech and milestone.is_nightly and build_project == 'b2g':
> +    if webspeech and milestone.is_nightly:

and build_project == 'b2g' means this was never true. You're effectively enabling webspeech where it wasn't enabled.
Attachment #8902953 - Flags: review-
Comment on attachment 8902952 [details]
Bug 1395392 - Remove support for non-standard implied toolkit configs.

https://reviewboard.mozilla.org/r/174706/#review180618
Attachment #8902952 - Flags: review?(cmanchester) → review+
Comment on attachment 8902953 [details]
Bug 1395392 - Remove pocketsphinx options from configure.

https://reviewboard.mozilla.org/r/174708/#review180620

As glandium notes this changs the meaning of these conditionals. It probably wouldn't do harm as is because someone would still need to try to enable webspeech to end up with these set, but it seems like we should just see about removing these options instead.
Attachment #8902953 - Flags: review?(cmanchester)
Comment on attachment 8902954 [details]
Bug 1395392 - Clean up unnecessary variable.

https://reviewboard.mozilla.org/r/174710/#review180622

Sure
Attachment #8902954 - Flags: review?(cmanchester) → review+
Comment on attachment 8902953 [details]
Bug 1395392 - Remove pocketsphinx options from configure.

https://reviewboard.mozilla.org/r/174708/#review180632

::: toolkit/moz.configure:916
(Diff revision 1)
>  
>  # Speech API pocketsphinx backend
>  # ==============================================================
>  @depends(build_project, milestone, webspeech)
>  def webspeech_pocketsphinx(build_project, milestone, webspeech):
> -    if webspeech and milestone.is_nightly and build_project == 'b2g':
> +    if webspeech and milestone.is_nightly:

Oops. I assumed webspeech was disabled by default but I see it's not. This option is for speech recognition, but `webspeech` is also about the synthesis API we is on by default. Thanks!
Depends on: 1396158
Comment on attachment 8902953 [details]
Bug 1395392 - Remove pocketsphinx options from configure.

https://reviewboard.mozilla.org/r/174708/#review181520
Attachment #8902953 - Flags: review?(cmanchester) → review+
Pushed by rgiles@mozilla.com:
https://hg.mozilla.org/integration/mozilla-inbound/rev/02b546e3871b
Remove support for non-standard implied toolkit configs. r=chmanchester
https://hg.mozilla.org/integration/mozilla-inbound/rev/3861fad3e75a
Clean up unnecessary variable. r=chmanchester
https://hg.mozilla.org/integration/mozilla-inbound/rev/716bb5054bc7
Remove pocketsphinx options from configure. r=chmanchester
Product: Core → Firefox Build System
You need to log in before you can comment on or make changes to this bug.