739188 - Allow crosscompiling for Windows without NSIS

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Jacek Caban]

Attachment: 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.

Comment 1

[Serge Gautherie (:sgautherie)]

Could you attach a "diff -w" too, to ease review?

Comment 2

[Jacek Caban]

Attachment: 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

Comment 3

[Jacek Caban]

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

Succeeded on try

Comment 4

[Mozilla RelEng Bot]

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/[e-mail]-b0833861ede4

Comment 5

[Justin Wood (:Callek)]

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

Serge is not a Firefox build config peer, redirecting to kyle

Comment 6

[Kyle Huey (Exited; not receiving bugmail, old account, do not use)]

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

Redirecting assuming you want this reviewed before May.

Comment 7

[(not currently active) 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 :-/

Comment 8

[Jacek Caban]

Thanks for the review.

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

Comment 9

[Ed Morley [:emorley]]

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