Bug 1355584 Make NSIS an optional requirement for MINGW builds r=glandium
authorTom Ritter <tom@mozilla.com>
Wed, 12 Apr 2017 11:21:13 -0500
changeset 401560 213fdb422bb90f7ecc573052671471cb38d11b02
parent 401559 225683fed1d130c925065724dc9a6084deb54407
child 401561 6a67766147fbb5f15eb3c3c0354b0f88e6c431d2
push id7391
push usermtabara@mozilla.com
push dateMon, 12 Jun 2017 13:08:53 +0000
treeherdermozilla-beta@2191d7f87e2e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1355584
milestone55.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1355584 Make NSIS an optional requirement for MINGW builds r=glandium MozReview-Commit-ID: JCrLbEeApxy
moz.configure
--- a/moz.configure
+++ b/moz.configure
@@ -330,17 +330,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',