Bug 1355584 Make NSIS an optional requirement for MINGW builds draft
authorTom Ritter <tom@mozilla.com>
Wed, 12 Apr 2017 11:21:13 -0500
changeset 563604 39ff30cb89a647443b36e6ded1cad311d74b2a20
parent 560672 df8eb6be7edc72840f38f25cd6b1ded0e4988c6c
child 624528 963305dd090da833d1ca8aab6c484d9ea9d23b28
push id54369
push userbmo:tom@mozilla.com
push dateMon, 17 Apr 2017 13:15:41 +0000
bugs1355584
milestone55.0a1
Bug 1355584 Make NSIS an optional requirement for MINGW builds MozReview-Commit-ID: JCrLbEeApxy
moz.configure
--- a/moz.configure
+++ b/moz.configure
@@ -316,17 +316,17 @@ def makensis_progs(target):
     # We use an absolute path and insert as the first entry so it is preferred
     # over a 64-bit exe that may be in PATH.
     if 'MSYSTEM_PREFIX' in os.environ:
         prefix = os.path.dirname(os.environ['MSYSTEM_PREFIX'])
         candidates.insert(0, os.path.join(prefix, 'mingw32', 'bin', 'makensis.exe'))
 
     return tuple(candidates)
 
-nsis = check_prog('MAKENSISU', makensis_progs)
+nsis = check_prog('MAKENSISU', makensis_progs, allow_missing=True)
 
 # Make sure the version of makensis is up to date.
 @depends_if(nsis)
 @checking('for NSIS version')
 @imports('re')
 def nsis_version(nsis):
     nsis_min_version = '3.0b1'
     out = check_cmd_output(nsis, '-version',