Bug 1585370 - Make NSIS a required component for builds r=dmajor
☠☠ backed out by 06ea2371f897 ☠ ☠
authorTom Ritter <tom@mozilla.com>
Sat, 12 Oct 2019 02:51:45 +0000
changeset 497339 ed90ca2fb5a80c666487a2fb23fc0cb111974484
parent 497338 1102d533350abd512fe7f424c275664b0e68cb92
child 497340 1a7f07b833e14e8e667a405c0641200103185939
push id36682
push userncsoregi@mozilla.com
push dateSat, 12 Oct 2019 09:52:03 +0000
treeherdermozilla-central@06ea2371f897 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdmajor
bugs1585370, 1355584
milestone71.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 1585370 - Make NSIS a required component for builds r=dmajor This reverts Bug 1355584 which made it optional for MinGW. We now use it in MinGW so let's make it required again. Differential Revision: https://phabricator.services.mozilla.com/D48883
moz.configure
--- a/moz.configure
+++ b/moz.configure
@@ -553,17 +553,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, allow_missing=True)
+nsis = check_prog('MAKENSISU', makensis_progs)
 
 # 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',