Bug 1731168 - Only look for non-versioned nsis. r=firefox-build-system-reviewers,mhentges

Now that we bootstrap it, we don't need to look for old versioned
versions from mozilla-build. While here stop looking for makensis when
not building for Windows.

Differential Revision: https://phabricator.services.mozilla.com/D125906

moz.configure

@@ -887,41 +887,21 @@ check_prog("HFS_TOOL", extra_programs.HFS_TOOL, allow_missing=True)
 check_prog("RPMBUILD", extra_programs.RPMBUILD, allow_missing=True)
 
 
-@depends(target)
-@imports("os")
-def makensis_progs(target):
-    if target.kernel != "WINNT":
-        return
-
-    candidates = [
-        "makensis-3.01",
-        "makensis-3.0b3",
-        "makensis-3.0b1",
-        "makensis",
-        "makensis.exe",
-    ]
-
-    # Look for nsis installed by msys environment. But only the 32-bit version.
-    # 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, bootstrap="nsis/bin", allow_missing=True)
+nsis = check_prog(
+    "MAKENSISU",
+    ("makensis", "makensis.exe"),
+    bootstrap="nsis/bin",
+    allow_missing=True,
+    when=target_is_windows,
+)
 
 # Make sure the version of makensis is up to date.
 
 
-@depends(nsis, wine)
+@depends(nsis, wine, when=nsis)
 @checking("for NSIS version")
 @imports("re")
 def nsis_version(nsis, wine):
-    if not nsis:
-        return None
     nsis_min_version = "3.0b1"
 
     def onerror():

python/mozbuild/mozbuild/test/configure/test_moz_configure.py

@@ -155,7 +155,7 @@ class TestMozConfigure(BaseConfigureTest):
             sandbox = self.get_sandbox(
                 {"/usr/bin/makensis": FakeNSIS(version)},
                 {},
-                [],
+                ["--target=x86_64-pc-mingw32", "--disable-bootstrap"],
                 {"PATH": "/usr/bin", "MAKENSISU": "/usr/bin/makensis"},
             )
             return sandbox._value_for(sandbox["nsis_version"])