Closed
Bug 746512
Opened 12 years ago
Closed 12 years ago
configure tests for nsis are duplicated for Web App Runtime
Categories
(Firefox Build System :: General, defect)
Tracking
(Not tracked)
RESOLVED
FIXED
mozilla15
People
(Reporter: jacek, Assigned: jacek)
References
Details
Attachments
(1 file)
4.06 KB,
patch
|
ted
:
review+
|
Details | Diff | Splinter Review |
Bug 725408 introduced duplicated nsis configure checks that do not contain fix for 739188 (I guess they were copied before removing --disable-installer option). The attached patch fixes it. It also automatically disables webapp-runtime for windows if nsis is not found (which is possible only when cross compiling). If requirement for explicit disabling is preferred, I will change the patch.
Attachment #616058 -
Flags: review?(ted.mielczarek)
Assignee | ||
Comment 1•12 years ago
|
||
Successful try build: https://tbpl.mozilla.org/?tree=Try&rev=4d4ac1546f20
Comment 2•12 years ago
|
||
Comment on attachment 616058 [details] [diff] [review] fix v1.0 Review of attachment 616058 [details] [diff] [review]: ----------------------------------------------------------------- ::: configure.in @@ +6321,5 @@ > +MOZ_ARG_DISABLE_BOOL(webapp-runtime, > +[ --disable-webapp-runtime Disable Web App Runtime], > + MOZ_WEBAPP_RUNTIME=, > + MOZ_WEBAPP_RUNTIME=1) > +if test "$OS_ARCH" = "WINNT" -a -z "$MAKENSISU"; then Can you explicitly check CROSS_COMPILE here? That'd make me feel better.
Attachment #616058 -
Flags: review?(ted.mielczarek) → review+
Assignee | ||
Comment 3•12 years ago
|
||
I've added a check for CROSS_COMPILE and pushed to m-i. Thanks for review. https://hg.mozilla.org/integration/mozilla-inbound/rev/1aadea66098c
Target Milestone: --- → mozilla15
https://hg.mozilla.org/mozilla-central/rev/1aadea66098c
Status: NEW → RESOLVED
Closed: 12 years ago
Resolution: --- → FIXED
Updated•6 years ago
|
Product: Core → Firefox Build System
You need to log in
before you can comment on or make changes to this bug.
Description
•