1355584 - Make NSIS an optional build dependency for MinGW

Status: RESOLVED FIXED

(Firefox Build System :: General, enhancement)

Description

[Tom Ritter [:tjr]]

For phase 1 of Bug 1330608, we want to build Firefox with MinGW but we aren't worrying about packaging it. Make NSIS an optional build dependency.

Comment 1

[Tom Ritter [:tjr]]

Attachment: Bug 1355584 Make NSIS an optional requirement for MINGW builds

Review commit: https://reviewboard.mozilla.org/r/129068/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/129068/

Comment 2

[Mike Hommey [:glandium]]

Comment on attachment 8857133 [details]
Bug 1355584 Make NSIS an optional requirement for MINGW builds

https://reviewboard.mozilla.org/r/129068/#review131726

::: moz.configure:306
(Diff revision 1)
> -@depends(target)
> +@depends(target, c_compiler)
>  @imports('os')
> -def makensis_progs(target):
> +def makensis_progs(target, compiler):
>      if target.kernel != 'WINNT':
>          return
> +    elif target.kernel == 'WINNT' and compiler.type not in ['msvc', 'clang-cl']:

That's rather arbitrary. In fact, that will skip finding nsis on mingw builds done on Windows, which is a sad consequence. You should just add allow_missing=True to the corresponding check_prog.

Comment 3

[Tom Ritter [:tjr]]

Comment on attachment 8857133 [details]
Bug 1355584 Make NSIS an optional requirement for MINGW builds

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/129068/diff/1-2/

Comment 4

[Mike Hommey [:glandium]]

Comment on attachment 8857133 [details]
Bug 1355584 Make NSIS an optional requirement for MINGW builds

https://reviewboard.mozilla.org/r/129068/#review133254

::: commit-message-df8eb:1
(Diff revision 2)
> +Bug 1355584 Make NSIS an optional requirement for MinGW builds

s/for MINGW builds//

Comment 5

[Tom Ritter [:tjr]]

Comment on attachment 8857133 [details]
Bug 1355584 Make NSIS an optional requirement for MINGW builds

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/129068/diff/2-3/

Comment 6

[Ryan VanderMeulen [:RyanVM]]

Autoland can't push this until all pending issues in MozReview are marked as resolved.

Comment 7

[Tom Ritter [:tjr]]

Sorry, I keep forgetting to do that...

Comment 8

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/213fdb422bb9
Make NSIS an optional requirement for MINGW builds r=glandium

Comment 9

[Wes Kocher (:KWierso) (Not reading bugmail; email directly if needed)]

https://hg.mozilla.org/mozilla-central/rev/213fdb422bb9