configure tests for nsis are duplicated for Web App Runtime

RESOLVED FIXED in mozilla15

Status

()

Core
Build Config
RESOLVED FIXED
5 years ago
5 years ago

People

(Reporter: Jacek Caban, Assigned: Jacek Caban)

Tracking

Trunk
mozilla15
x86
Windows 7
Points:
---

Firefox Tracking Flags

(Not tracked)

Details

Attachments

(1 attachment)

(Assignee)

Description

5 years ago
Created attachment 616058 [details] [diff] [review]
fix v1.0

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

5 years ago
Successful try build:

https://tbpl.mozilla.org/?tree=Try&rev=4d4ac1546f20

Updated

5 years ago
Blocks: 731054
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

5 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
Last Resolved: 5 years ago
Resolution: --- → FIXED

Updated

5 years ago
No longer blocks: 731054
You need to log in before you can comment on or make changes to this bug.