Allow crosscompiling for Windows without NSIS

RESOLVED FIXED in mozilla14

Status

()

Core
Build Config
RESOLVED FIXED
6 years ago
6 years ago

People

(Reporter: Jacek Caban, Assigned: Jacek Caban)

Tracking

({regression})

Trunk
mozilla14
All
Windows XP
regression
Points:
---
Dependency tree / graph

Firefox Tracking Flags

(Not tracked)

Details

Attachments

(2 attachments)

(Assignee)

Description

6 years ago
Created attachment 609290 [details] [diff] [review]
fix v1.0

From bug 604266 comment 28:

The patch removing --disable-installer broke cross compilation. Ideally, cross compiling installer should be fixed. I've tried playing with that. nsis seems prepared for this. It has POSIX version that produces win32 binaries. Sadly, the Unicode NSIS fork totally broke this ability.

That's why I think the solution is to make it still possible to compile without installer, but limit the code it affects so that it doesn't complicate supported configurations. The attached patch does it by making lack of Unicode NSIS not critical when cross compiling (this way no configure option is needed). Also, instead of using MOZ_INSTALLER, it uses MAKENSISU variable in a few makefile-related places, so that MOZ_INSTALLER can still be removed.


Attaching fixed patch.
(Assignee)

Updated

6 years ago
Blocks: 604266
Could you attach a "diff -w" too, to ease review?
Keywords: regression
OS: Linux → Windows XP
Hardware: x86_64 → All
(Assignee)

Comment 2

6 years ago
Created attachment 609306 [details] [diff] [review]
diff -w

Sure. I usually use git, trying to make the diff as similar to hg as possible, but I'm not sure how to emulate diff -w. The attached patch is produced by |hg diff -w| from plain mercurial repository.

I'm waiting with r? for try results:
https://tbpl.mozilla.org/?tree=Try&rev=b0833861ede4
(Assignee)

Comment 3

6 years ago
Comment on attachment 609290 [details] [diff] [review]
fix v1.0

Succeeded on try
Attachment #609290 - Flags: review?(sgautherie.bz)

Comment 4

6 years ago
Try run for b0833861ede4 is complete.
Detailed breakdown of the results available here:
    https://tbpl.mozilla.org/?tree=Try&rev=b0833861ede4
Results (out of 2 total builds):
    success: 2
Builds (or logs if builds failed) available at:
http://ftp.mozilla.org/pub/mozilla.org/firefox/try-builds/jacek@codeweavers.com-b0833861ede4
Comment on attachment 609290 [details] [diff] [review]
fix v1.0

Serge is not a Firefox build config peer, redirecting to kyle
Attachment #609290 - Flags: review?(sgautherie.bz) → review?(khuey)
Comment on attachment 609290 [details] [diff] [review]
fix v1.0

Redirecting assuming you want this reviewed before May.
Attachment #609290 - Flags: review?(khuey) → review?(ted.mielczarek)
Comment on attachment 609290 [details] [diff] [review]
fix v1.0

Review of attachment 609290 [details] [diff] [review]:
-----------------------------------------------------------------

This seems fine for now. Kind of unfortunate that you don't have a working makesnsisu for cross-compiling :-/
Attachment #609290 - Flags: review?(ted.mielczarek) → review+
(Assignee)

Comment 8

6 years ago
Thanks for the review.

https://hg.mozilla.org/integration/mozilla-inbound/rev/6e232128a8ca

Comment 9

6 years ago
Please can you set the target milestone when landing on inbound, along the lines of http://blog.bonardo.net/2012/03/23/how-you-can-help-mozilla-inbound-sheriffs-when-pushing :-)

https://hg.mozilla.org/mozilla-central/rev/6e232128a8ca
Status: NEW → RESOLVED
Last Resolved: 6 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla14
Blocks: 741340
You need to log in before you can comment on or make changes to this bug.