Make clean opt-in and suppress UCRT API-set false positives

Author: Erotemic

dev/_installers/all_deps.py

@@ -36,6 +36,20 @@ def default_search_dirs(target: Path, extra_dirs):
             out.append(d)
     return out
 
+
+
+def has_ucrtbase(search_dirs):
+    for d in search_dirs:
+        if (d / "ucrtbase.dll").is_file():
+            return True
+    return False
+
+
+def is_ucrt_apiset(dll_name: str) -> bool:
+    name = dll_name.lower()
+    return name.startswith("api-ms-win-crt-") and name.endswith(".dll")
+
+
 def resolve_dll(name: str, search_dirs):
     # If it’s already an absolute path
     p = Path(name)
@@ -49,7 +63,7 @@ def resolve_dll(name: str, search_dirs):
             return cand.resolve()
     return None
 
-def walk(pe_path: Path, search_dirs, indent=0):
+def walk(pe_path: Path, search_dirs, indent=0, ucrtbase_present=False):
     pe_path = pe_path.resolve()
     key = str(pe_path).lower()
     if key in VISITED:
@@ -64,14 +78,17 @@ def walk(pe_path: Path, search_dirs, indent=0):
     for dll in imports:
         hit = resolve_dll(dll, search_dirs)
         if hit is None:
+            if ucrtbase_present and is_ucrt_apiset(dll):
+                print(f"{pad}  OK(APISET): {dll} (ucrtbase.dll present)")
+                continue
             missing += 1
             print(f"{pad}  MISSING: {dll}")
         else:
             print(f"{pad}  OK: {dll} -> {hit}")
             # Recurse only into non-system DLLs (heuristic)
             if "windows\\system32" not in str(hit).lower():
                 try:
-                    walk(hit, search_dirs, indent + 1)
+                    walk(hit, search_dirs, indent + 1, ucrtbase_present=ucrtbase_present)
                 except pefile.PEFormatError:
                     pass
 
@@ -87,4 +104,7 @@ def walk(pe_path: Path, search_dirs, indent=0):
     extra = [Path(p) for p in sys.argv[2:]]
 
     search_dirs = default_search_dirs(target, extra)
-    walk(target, search_dirs)
+    ucrtbase_present = has_ucrtbase(search_dirs)
+    if ucrtbase_present:
+        print("INFO: ucrtbase.dll detected in search dirs; treating api-ms-win-crt-*.dll as API-set forwarders.")
+    walk(target, search_dirs, ucrtbase_present=ucrtbase_present)

dev/_installers/build_installer.ps1

@@ -2,10 +2,11 @@
 # Build IBEIS with PyInstaller (onedir) and optionally produce Inno Setup installer.
 # Run from repo root:
 #   powershell -ExecutionPolicy Bypass -File .\dev\_installers\build_installer.ps1 -SmokeTest
+# Optional cleanup (opt-in): add -Clean
 
 [CmdletBinding()]
 param(
-    [switch]$NoClean,
+    [switch]$Clean,
     [switch]$SkipPyInstaller,
     [switch]$SkipInno,
     [switch]$SmokeTest,
@@ -90,7 +91,7 @@ try {
     & $VenvPy -m pip install -U PyInstaller pywin32-ctypes pefile | Out-Host
     & $VenvPy -c "import win32ctypes.pywin32; import win32ctypes.pywin32.win32api, win32ctypes.pywin32.pywintypes; print('win32ctypes OK')" | Out-Host
 
-    if (-not $NoClean) {
+    if ($Clean) {
         Write-Section "Clean build/dist"
         Remove-Item -Recurse -Force (Join-Path $RepoRoot "build"), (Join-Path $RepoRoot "dist") -ErrorAction SilentlyContinue
         New-Item -ItemType Directory -Force $DistDir | Out-Null