Closed Bug 1382839 Opened 7 years ago Closed 7 years ago

Only package payments.manifest in Nightly browser builds

Categories

(Firefox :: WebPayments UI, defect)

defect
Not set
normal

Tracking

()

RESOLVED FIXED
Firefox 56
Tracking Status
firefox56 --- fixed

People

(Reporter: jonathanGB, Assigned: jonathanGB)

References

Details

Attachments

(1 file)

Follow-up on Bug 1381141, probably going to be fixed by adding pre-processor guards in the "package-manifest.in" around the line added in the previous bug.
rail: I pushed the fix. It compiled and ran well locally, maybe you'd like to try push with specific rules to make sure it works well before pushing to autoland? 

thanks!
Flags: needinfo?(rail)
Comment on attachment 8888579 [details]
Bug 1382839 - add pre-processor guards around payments manifest.

https://reviewboard.mozilla.org/r/159556/#review164964
Attachment #8888579 - Flags: review?(rail) → review+
Thanks for the quick fix. It worked fine on jamun: https://treeherder.mozilla.org/#/jobs?repo=jamun&revision=4bf74711677b7f92ebfaade79b606a253497b79e
Flags: needinfo?(rail)
Component: General → WebPayments UI
Summary: Follow-up on "Bug 1381141" patch → Only package payments.manifest in Nightly browser builds
Comment on attachment 8888579 [details]
Bug 1382839 - add pre-processor guards around payments manifest.

https://reviewboard.mozilla.org/r/159556/#review164996

::: browser/installer/package-manifest.in:400
(Diff revision 1)
>  @RESPATH@/components/nsCrashMonitor.js
>  @RESPATH@/components/toolkitsearch.manifest
>  @RESPATH@/components/nsSearchService.js
>  @RESPATH@/components/nsSearchSuggestions.js
>  @RESPATH@/components/nsSidebar.js
> +#ifdef define(NIGHTLY_BUILD) && defined(MOZ_BUILD_APP_IS_BROWSER)

This should be #if, not #ifdef
Attachment #8888579 - Flags: review+
Pushed by mozilla@noorenberghe.ca:
https://hg.mozilla.org/integration/autoland/rev/70e1925b92ae
add pre-processor guards around payments manifest. r=MattN,rail
Pushed by gszorc@mozilla.com:
https://hg.mozilla.org/integration/autoland/rev/ffb8e24e573e
Fix typo in preprocessor directive; r=me
https://hg.mozilla.org/mozilla-central/rev/70e1925b92ae
https://hg.mozilla.org/mozilla-central/rev/ffb8e24e573e
Status: ASSIGNED → RESOLVED
Closed: 7 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla56
Product: Toolkit → Firefox
Target Milestone: mozilla56 → Firefox 56
Version: unspecified → Trunk
You need to log in before you can comment on or make changes to this bug.

Attachment

General

Created:
Updated:
Size: