@flun/nodejs-mobile-gyp 1.0.2 → 1.1.1

package/gyp/pylib/gyp/common.py

@@ -153,7 +153,9 @@ def RelativePath(path, relative_to, follow_path_symlink=True):
         os.path.splitdrive(path)[0].lower()
         != os.path.splitdrive(relative_to)[0].lower()
     ):
-        return path
+        # Makefile / cmake / ninja 等生成器要求 POSIX 路径，统一用正斜杠。
+        # MSBuild 也接受正斜杠，故对 msvs 无影响。
+        return path.replace(os.sep, "/")
 
     # Split the paths into components.
     path_split = path.split(os.path.sep)
@@ -173,7 +175,8 @@ def RelativePath(path, relative_to, follow_path_symlink=True):
         return ""
 
     # Turn it back into a string and we're done.
-    return os.path.join(*relative_split)
+    # Makefile / cmake / ninja 等生成器要求 POSIX 路径，统一用正斜杠。
+    return os.path.join(*relative_split).replace(os.sep, "/")
 
 
 @memoize

package/gyp/pylib/gyp/generator/make.py

@@ -24,6 +24,7 @@
 
 import os
 import re
+import sys
 import subprocess
 import gyp
 import gyp.common
@@ -410,6 +411,7 @@ unreplace_spaces = $(subst """
     + SPACE_REPLACEMENT
     + """,$(space),$1)
 dirx = $(call unreplace_spaces,$(dir $(call replace_spaces,$1)))
+slashpath = $(subst \\,/,$(1))
 
 # Flags to make gcc output dependency info.  Note that you need to be
 # careful here to use the flags that ccache and distcc can understand.
@@ -547,7 +549,7 @@ endef
 define do_cmd
 $(if $(or $(command_changed),$(prereq_changed)),
   @$(call exact_echo,  $($(quiet)cmd_$(1)))
-  @mkdir -p "$(call dirx,$@)" "$(dir $(depfile))"
+  @mkdir -p "$(call slashpath,$(call dirx,$@))" "$(call slashpath,$(dir $(depfile)))"
   $(if $(findstring flock,$(word %(flock_index)d,$(cmd_$1))),
     @$(cmd_$(1))
     @echo "  $(quiet_cmd_$(1)): Finished",
@@ -2318,7 +2320,9 @@ $(obj).$(TOOLSET)/$(TARGET)/%%.o: $(obj)/%%%s FORCE_DO_CMD
             # path too aggressively if it features '..'. However it's still
             # important to strip trailing slashes.
             return path.rstrip("/")
-        return os.path.normpath(os.path.join(self.path, path))
+        # Makefile 要求 POSIX 路径；Windows 上 normpath 会把 "/" 变成 "\"，
+        # 导致编译产物路径（.o / .d.raw）带反斜杠，sh 与 sed 解析失败。
+        return os.path.normpath(os.path.join(self.path, path)).replace(os.sep, "/")
 
     def ExpandInputRoot(self, template, expansion, dirname):
         if "%(INPUT_ROOT)s" not in template and "%(INPUT_DIRNAME)s" not in template:
@@ -2361,6 +2365,17 @@ def WriteAutoRegenerationRule(params, root_makefile, makefile_name, build_files)
     if not gyp_binary.startswith(os.sep):
         gyp_binary = os.path.join(".", gyp_binary)
 
+    # Windows 下 GNU make（NDK 自带）对深层相对路径的解析有缺陷，会把
+    # 形如 $(srcdir)/../../.. 的外部 gypi 判为 "No rule to make target"。
+    # 这里跳过所有来自 node_modules 的依赖——它们是只读的外部 gypi，
+    # 内容不会在编译过程中变化；如确需重新生成 Makefile，重跑 configure 即可。
+    # 本地的 binding.gyp 与 build/config.gypi 仍会保留，足以触发自动重新生成。
+    deps_list = []
+    for bf in build_files:
+        if sys.platform == "win32" and "node_modules" in bf.replace("\\", "/"):
+            continue
+        deps_list.append(SourceifyAndQuoteSpaces(bf))
+
     root_makefile.write(
         "quiet_cmd_regen_makefile = ACTION Regenerating $@\n"
         "cmd_regen_makefile = cd $(srcdir); %(cmd)s\n"
@@ -2368,7 +2383,7 @@ def WriteAutoRegenerationRule(params, root_makefile, makefile_name, build_files)
         "\t$(call do_cmd,regen_makefile)\n\n"
         % {
             "makefile_name": makefile_name,
-            "deps": " ".join(SourceifyAndQuoteSpaces(bf) for bf in build_files),
+            "deps": " ".join(deps_list),
             "cmd": gyp.common.EncodePOSIXShellList(
                 [gyp_binary, "-fmake"] + gyp.RegenerateFlags(options) + build_files_args
             ),

package/lib/build.js

@@ -4,8 +4,75 @@ import { glob } from 'glob';
 import * as log from './log.js';
 import which from 'which';
 import os from 'os';
+import { spawnSync } from 'child_process';
+import fsSync from 'fs';
+
+const fs = gracefulFs.promises,
+  _hostIsWindows = process.platform === 'win32',
+  // Android 交叉编译即使宿主是 Windows，也必须走 make（make-android 生成器）
+  _isAndroidCrossBuild = process.env.npm_config_platform === 'android' || process.env.npm_config_format === 'make-android',
+  // win 在此文件中语义为"使用 MSBuild"：仅 Windows 宿主且非 Android 交叉编译
+  win = _hostIsWindows && !_isAndroidCrossBuild,
+  /**
+   * Windows 上 GNU make 需要 sh.exe 来执行 Makefile 里的 Unix 命令
+   * （printf / xargs / rm 等）。优先复用 Git for Windows 自带的 usr/bin，
+   * 避免要求用户额外安装 MSYS2。通过 "where git" 反推，不硬编码路径。
+   */
+  findWindowsShellDir = () => {
+    if (process.platform !== 'win32') return null;
+    const tryShDir = (dir) => {
+      try { return fsSync.existsSync(path.join(dir, 'sh.exe')) ? dir : null } catch { return null }
+    };
+    const toShDir = (gitRoot) => tryShDir(path.join(gitRoot, 'usr', 'bin'));
+    // 1) 注册表：Git for Windows 安装时必写，与 PATH 无关（最可靠）
+    const reg = process.env.SystemRoot ? path.join(process.env.SystemRoot, 'System32', 'reg.exe') : 'reg.exe';
+    for (const hive of ['HKLM', 'HKCU']) {
+      for (const key of ['SOFTWARE\\GitForWindows', 'SOFTWARE\\WOW6432Node\\GitForWindows']) {
+        try {
+          const r = spawnSync(reg, ['query', hive + '\\' + key, '/v', 'InstallPath'], { encoding: 'utf8' });
+          if (r.status === 0) {
+            const m = (r.stdout || '').match(/REG_SZ\s+(.+)/);
+            if (m) {
+              const dir = toShDir(m[1].trim());
+              if (dir) return dir;
+            }
+          }
+        } catch { }
+      }
+    }
+    // 2) which.sync（PATH 中能找到 git 时可用）
+    try {
+      const gitPath = which.sync('git');
+      if (gitPath) {
+        const dir = path.resolve(path.dirname(gitPath), '..', 'usr', 'bin');
+        const r = tryShDir(dir);
+        if (r) return r;
+      }
+    } catch { }
+    // 3) PATH 中找 git.exe，再反推 ../usr/bin
+    for (const pd of (process.env.PATH || '').split(';')) {
+      if (!pd) continue;
+      try {
+        if (fsSync.existsSync(path.join(pd, 'git.exe'))) {
+          const dir = path.resolve(pd, '..', 'usr', 'bin');
+          const r = tryShDir(dir);
+          if (r) return r;
+        }
+      } catch { }
+    }
+    // 4) 全盘符常见位置兜底
+    const suffixes = [
+      'Program Files\\Git', 'Program Files (x86)\\Git', 'Git', 'msys64',
+    ];
+    for (const drv of ['C:', 'D:', 'E:', 'F:']) {
+      for (const sfx of suffixes) {
+        const dir = tryShDir(drv + '\\' + sfx);
+        if (dir) return dir;
+      }
+    }
+    return null;
+  },
 
-const fs = gracefulFs.promises, win = process.platform === 'win32',
   /**
    * 调用 make/msbuild 构建原生模块
    */
@@ -63,16 +130,35 @@ const fs = gracefulFs.promises, win = process.platform === 'win32',
       if (!win) {
         // 把构建期依赖的符号链接（如 Python）加入 PATH
         buildBinsDir = path.resolve('build', 'node_gyp_bins');
-        process.env.PATH = `${buildBinsDir}:${process.env.PATH}`;
+        if (_hostIsWindows) {
+          const shellDir = findWindowsShellDir();
+          if (shellDir) {
+            process.env.PATH = `${shellDir};${process.env.PATH}`;
+            log.verbose('bin shell', `prepended ${shellDir} to PATH for make`);
+          } else {
+            log.warn('bin shell', 'no sh.exe found; GNU make 的 Unix 命令可能失败。建议安装 Git for Windows');
+          }
+        }
+        process.env.PATH = _hostIsWindows
+          ? `${buildBinsDir};${process.env.PATH}`
+          : `${buildBinsDir}:${process.env.PATH}`;
         await fs.mkdir(buildBinsDir, { recursive: true });
-        const symlinkDestination = path.join(buildBinsDir, 'python3');
-        try {
-          await fs.unlink(symlinkDestination);
-        } catch (err) {
-          if (err.code !== 'ENOENT') throw err;
+
+        if (_hostIsWindows) {
+          // Windows 无 python3 名称，且创建符号链接需要管理员权限；改用 .cmd 桥接
+          const shimPath = path.join(buildBinsDir, 'python3.cmd');
+          await fs.writeFile(shimPath, `@echo off\r\n"${python}" %*\r\n`);
+          log.verbose('bin shims', `created python3.cmd shim to "${python}" and added to PATH`);
+        } else {
+          const symlinkDestination = path.join(buildBinsDir, 'python3');
+          try {
+            await fs.unlink(symlinkDestination);
+          } catch (err) {
+            if (err.code !== 'ENOENT') throw err;
+          }
+          await fs.symlink(python, symlinkDestination);
+          log.verbose('bin symlinks', `created symlink to "${python}" in "${buildBinsDir}" and added to PATH`);
         }
-        await fs.symlink(python, symlinkDestination);
-        log.verbose('bin symlinks', `created symlink to "${python}" in "${buildBinsDir}" and added to PATH`);
       }
 
       const proc = gyp.spawn(command, argv);

package/lib/configure.js

@@ -13,7 +13,7 @@ import { fileURLToPath } from 'url';
 const fs = gracefulFs.promises, win = process.platform === 'win32', __dirname = path.dirname(fileURLToPath(import.meta.url));
 
 // 条件加载：仅在 Windows 上需要
-let findVisualStudio = null, nodeDir;
+let findVisualStudio = null, nodeDir, vsInfo = null;
 if (win) {
   const { VisualStudioFinder } = await import('./find-visualstudio.js');
   findVisualStudio = VisualStudioFinder.findVisualStudio;
@@ -127,7 +127,12 @@ const configure = async (gyp, argv) => {
       argv.push('-Dnode_engine=' + (gyp.opts.node_engine || process.jsEngine || 'v8'));
       argv.push('--depth=.'), argv.push('--no-parallel');
       argv.push('--generator-output', outputDir); // 告诉 gyp 把 Makefile/Solution 文件写到 output_dir
-      if (win) argv.push('-Gmsvs_toolset=v145');
+      // 使用 find-visualstudio 探测到的实际 toolset（v140/v141/v142/v143/v145...），
+      // 不再硬编码，以兼容 VS2013+ 各版本
+      if (win) {
+        if (vsInfo?.toolset) argv.push('-Gmsvs_toolset=' + vsInfo.toolset);
+        else log.warn('gyp', '未能探测到 VS toolset，将使用 gyp 默认值');
+      }
 
       argv.push('-Goutput_dir=.'); // 告诉 make 把输出写到同一目录
       argv.unshift('binding.gyp'); // 强制使用 binding.gyp 文件
@@ -160,7 +165,7 @@ const configure = async (gyp, argv) => {
 
       return findConfigs();
     },
-    createConfigFile = async vsInfo => {
+    createConfigFile = async () => {
       if (win) {
         process.env.GYP_MSVS_VERSION = Math.min(vsInfo.versionYear, 2015);
         process.env.GYP_MSVS_OVERRIDE_PATH = vsInfo.path;
@@ -174,8 +179,8 @@ const configure = async (gyp, argv) => {
 
       const isNew = await fs.mkdir(buildDir, { recursive: true });
       log.verbose('build dir', '"build" dir needed to be created?', isNew ? 'Yes' : 'No');
-      const vsInfo = win ? await findVisualStudio(release.semver, gyp.opts['msvs-version']) : null;
-      return createConfigFile(vsInfo);
+      vsInfo = win ? await findVisualStudio(release.semver, gyp.opts['msvs-version']) : null;
+      return createConfigFile();
     },
     getNodeDir = async () => {
       // 此时 python 已确定
@@ -196,7 +201,6 @@ const configure = async (gyp, argv) => {
         }
 
         if (!release.semver) throw new Error('版本号无效: ' + release.version); // 无法用 semver 解析版本字符串
-
         // 如果指定了 tarball 选项，总是删除并重装 headers 到 devdir，
         // 否则只在不存在时安装
         gyp.opts.ensure = !gyp.opts.tarball, await gyp.commands.install([release.version]);

package/lib/find-python.js

@@ -1,7 +1,8 @@
-import * as log from './log.js';
+import * as log from './log.js';
 import semver from 'semver';
 import { execFile } from './util.js';
 import os from 'os';
+import fs from 'fs';
 
 const win = process.platform === 'win32',
   /**
@@ -10,29 +11,39 @@ const win = process.platform === 'win32',
   getOsUserInfo = () => {
     try { return os.userInfo().username } catch { }
   },
-  systemDrive = process.env.SystemDrive || 'C:', username = process.env.USERNAME || process.env.USER || getOsUserInfo(),
+  systemDrive = process.env.SystemDrive || 'C:',
+  username = process.env.USERNAME || process.env.USER || getOsUserInfo(),
   localAppData = process.env.LOCALAPPDATA || `${systemDrive}\\${username}\\AppData\\Local`,
   foundLocalAppData = process.env.LOCALAPPDATA || username,
   programFiles = process.env.ProgramW6432 || process.env.ProgramFiles || `${systemDrive}\\Program Files`,
-  programFilesX86 = process.env['ProgramFiles(x86)'] || `${programFiles} (x86)`, winDefaultLocationsArray = [];
+  programFilesX86 = process.env['ProgramFiles(x86)'] || `${programFiles} (x86)`,
+  systemRoot = process.env.SystemRoot || `${systemDrive}\\Windows`,
+  /**
+   * 动态扫描 Windows 上所有已安装的 Python，不硬编码版本号。
+   * 官方安装器目录命名：3.14 -> Python314，3.9 -> Python39，32 位加 -32 后缀。
+   */
+  scanWindowsPythonLocations = () => {
+    const results = [], bases = [foundLocalAppData ? `${localAppData}\\Programs\\Python` : null, `${programFiles}\\Python`,
+    `${programFilesX86}\\Python`].filter(Boolean), seen = new Set();
 
-for (const majorMinor of ['311', '310', '39', '38']) {
-  if (foundLocalAppData) {
-    winDefaultLocationsArray.push(
-      `${localAppData}\\Programs\\Python\\Python${majorMinor}\\python.exe`,
-      `${programFiles}\\Python${majorMinor}\\python.exe`,
-      `${localAppData}\\Programs\\Python\\Python${majorMinor}-32\\python.exe`,
-      `${programFiles}\\Python${majorMinor}-32\\python.exe`,
-      `${programFilesX86}\\Python${majorMinor}-32\\python.exe`
-    );
-  } else {
-    winDefaultLocationsArray.push(
-      `${programFiles}\\Python${majorMinor}\\python.exe`,
-      `${programFiles}\\Python${majorMinor}-32\\python.exe`,
-      `${programFilesX86}\\Python${majorMinor}-32\\python.exe`
-    );
-  }
-}
+    for (const base of bases) {
+      if (seen.has(base)) continue;
+      seen.add(base);
+      let entries;
+      try { entries = fs.readdirSync(base); } catch { continue; }
+      for (const name of entries) {
+        if (!/^Python\d+/i.test(name)) continue;
+        const exe = `${base}\\${name}\\python.exe`;
+        try { if (fs.statSync(exe).isFile()) results.push(exe); } catch { }
+      }
+    }
+    return results;
+  },
+  /**
+   * py.exe 启动器候选：先试 PATH 中的，再试常见绝对路径，
+   * 避免 Gradle / CI 环境下 PATH 不含 C:\Windows 的情况。
+   */
+  pyLauncherCandidates = win ? ['py.exe', `${systemRoot}\\py.exe`, `${systemRoot}\\System32\\py.exe`] : [];
 
 /**
  * Python 查找器：按顺序尝试多种途径定位可用的 Python 3.6+
@@ -45,12 +56,11 @@ class PythonFinder {
   argsVersion = ['-c', 'import sys; print("%s.%s.%s" % sys.version_info[:3]);'];
   semverRange = '>=3.6.0';
 
-  // 以下可在测试时覆盖：
   execFile = execFile;
   env = process.env;
   win = win;
   pyLauncher = 'py.exe';
-  winDefaultLocations = winDefaultLocationsArray;
+  winDefaultLocations = win ? scanWindowsPythonLocations() : [];
 
   constructor(configPython) {
     this.configPython = configPython, this.errorLog = [];
@@ -71,7 +81,7 @@ class PythonFinder {
               this.addLog('checking Python explicitly set from NODE_GYP_FORCE_PYTHON');
               this.addLog('- process.env.NODE_GYP_FORCE_PYTHON is ' + `"${this.env.NODE_GYP_FORCE_PYTHON}"`);
             }, check: () => this.checkCommand(this.env.NODE_GYP_FORCE_PYTHON)
-          }]
+          }];
         }
         const checks = [
           {
@@ -80,8 +90,8 @@ class PythonFinder {
                 this.addLog('Python is not set from command line or npm configuration');
                 return SKIP;
               }
-              this.addLog('checking Python explicitly set from command line or ' + 'npm configuration')
-              this.addLog('- "--python=" or "npm config get python" is ' + `"${this.configPython}"`)
+              this.addLog('checking Python explicitly set from command line or ' + 'npm configuration');
+              this.addLog('- "--python=" or "npm config get python" is ' + `"${this.configPython}"`);
             }, check: () => this.checkCommand(this.configPython)
           },
           {
@@ -98,23 +108,28 @@ class PythonFinder {
         ];
 
         if (this.win) {
+          for (const launcher of pyLauncherCandidates) {
+            checks.push({
+              before: () => this.addLog(`checking if "${launcher}" can be used to find Python 3`),
+              check: () => this.checkPyLauncher(launcher)
+            });
+          }
           checks.push({
-            before: () => {
-              this.addLog('checking if the py launcher can be used to find Python 3');
-            }, check: () => this.checkPyLauncher()
-          })
+            before: () => this.addLog('enumerating installed Pythons via "py -0p"'),
+            check: () => this.checkPyList()
+          });
         }
 
         checks.push(...[
           {
-            before: () => { this.addLog('checking if "python3" can be used') },
+            before: () => { this.addLog('checking if "python3" can be used'); },
             check: () => this.checkCommand('python3')
           },
           {
-            before: () => { this.addLog('checking if "python" can be used') },
+            before: () => { this.addLog('checking if "python" can be used'); },
             check: () => this.checkCommand('python')
           }
-        ])
+        ]);
 
         if (this.win) {
           for (let i = 0; i < this.winDefaultLocations.length; ++i) {
@@ -122,7 +137,7 @@ class PythonFinder {
             checks.push({
               before: () => this.addLog(`checking if Python is ${location}`),
               check: () => this.checkExecPath(location)
-            })
+            });
           }
         }
 
@@ -130,7 +145,7 @@ class PythonFinder {
       })();
 
     for (const check of toCheck) {
-      const before = check.before()
+      const before = check.before();
       if (before === SKIP) continue;
       if (before === FAIL) return this.fail();
       try {
@@ -143,52 +158,64 @@ class PythonFinder {
     return this.fail();
   }
 
-  // 检查命令是否为可用的 Python。成功则返回结果。
-  // Windows 下需在 CMD shell 中运行以支持 BAT/CMD 启动器。
+  // 检查命令是否为可用的 Python。
   async checkCommand(command) {
-    let exec = command, args = this.argsExecutable, shell = false;
-    // 参数需手动加引号
-    if (this.win) exec = `"${exec}"`, args = args.map(a => `"${a}"`), shell = true;
-
     this.log.verbose(`- executing "${command}" to get executable path`);
-    // 可能结果：
-    // - 报错：不在 PATH、不可执行或执行失败
-    // - 乱码：后续版本检查会失败
-    // - 可执行文件的绝对路径
     try {
-      const execPath = await this.run(exec, args, shell);
+      const execPath = await this.run(command, this.argsExecutable, false);
       this.addLog(`- executable path is "${execPath}"`);
-      return this.checkExecPath(execPath)
+      return this.checkExecPath(execPath);
     } catch (err) {
       this.addLog(`- "${command}" is not in PATH or produced an error`);
       throw err;
     }
   }
 
-  // 检查 py 启动器是否能找到可用的 Python。成功则返回结果。
-  // Windows 上的 Python 发行版默认安装 "py.exe" 启动器，比 python.exe 出现在 PATH 更常见。
-  // 因为 py 启动器同时支持 Python 2 和 3，这里显式请求 Python 3：用 "-3" 作为首个参数。
-  // 由于 "py.exe -3" 对 execFile 来说不是合法可执行文件，需要用启动器找出真正的 python.exe 路径。
-  async checkPyLauncher() {
-    this.log.verbose(`- executing "${this.pyLauncher}" to get Python 3 executable path`)
-    // 可能结果：与 checkCommand 相同
+  // 检查指定 py 启动器是否能找到 Python 3。
+  async checkPyLauncher(launcher = this.pyLauncher) {
+    this.log.verbose(`- executing "${launcher}" to get Python 3 executable path`);
     try {
-      const execPath = await this.run(this.pyLauncher, ['-3', ...this.argsExecutable], false);
+      const execPath = await this.run(launcher, ['-3', ...this.argsExecutable], false);
       this.addLog(`- executable path is "${execPath}"`);
       return this.checkExecPath(execPath);
     } catch (err) {
-      this.addLog(`- "${this.pyLauncher}" is not in PATH or produced an error`);
+      this.addLog(`- "${launcher}" is not in PATH or produced an error`);
       throw err;
     }
   }
 
-  // 检查某个 Python 可执行文件版本是否可用。成功则返回结果。
+  // 通过 "py -0p" 枚举所有已注册的 Python，覆盖非标准安装位置。
+  async checkPyList() {
+    this.log.verbose('- executing "py -0p" to list registered Pythons');
+    let lastErr;
+    for (const launcher of pyLauncherCandidates) {
+      try {
+        const stdout = await this.run(launcher, ['-0p'], false);
+        const paths = [];
+        for (const line of stdout.split(/\r?\n/)) {
+          const m = line.match(/([A-Za-z]:\\[^\s]+)/);
+          if (m && /python\.exe$/i.test(m[1])) paths.push(m[1]);
+        }
+        this.addLog(`- "py -0p" (via ${launcher}) found ${paths.length} path(s)`);
+        for (const p of paths) {
+          try {
+            return await this.checkExecPath(p);
+          } catch (err) {
+            lastErr = err;
+            this.log.silly('checkPyList: skipping %s: %s', p, err.message);
+          }
+        }
+      } catch (err) {
+        lastErr = err;
+        this.addLog(`- "py -0p" via "${launcher}" failed`);
+      }
+    }
+    throw lastErr || new Error('py -0p returned no usable Python');
+  }
+
+  // 检查某个 Python 可执行文件版本是否可用。
   async checkExecPath(execPath) {
-    this.log.verbose(`- executing "${execPath}" to get version`)
-    // 可能结果：
-    // - 报错：可执行文件无法运行（多半上一步输出了乱码）
-    // - 乱码：上一步不知为何输出了可执行文件路径，验证版本时会失败
-    // - Python 可执行文件的版本号
+    this.log.verbose(`- executing "${execPath}" to get version`);
     try {
       const version = await this.run(execPath, this.argsVersion, false);
       this.addLog(`- version is "${version}"`);
@@ -215,24 +242,20 @@ class PythonFinder {
     }
   }
 
-  // 运行可执行文件或 shell 命令，并去除输出两端空白
+  // 执行外部命令。execFile 包装不 reject，通过 [err, stdout, stderr] 返回结果，
+  // 必须显式检查 err，否则失败会被当成"成功但空输出"，掩盖真实原因。
   async run(exec, args, shell) {
     const env = Object.assign({}, this.env), opts = { env, shell };
-
     env.TERM = 'dumb';
     this.log.silly('execFile: exec = %j', exec);
     this.log.silly('execFile: args = %j', args);
     this.log.silly('execFile: opts = %j', opts);
-    try {
-      const [err, stdout, stderr] = await this.execFile(exec, args, opts)
-      this.log.silly('execFile result: err = %j', (err && err.stack) || err);
-      this.log.silly('execFile result: stdout = %j', stdout);
-      this.log.silly('execFile result: stderr = %j', stderr);
-      return stdout.trim();
-    } catch (err) {
-      this.log.silly('execFile: threw:\n%s', err.stack);
-      throw err;
-    }
+    const [err, stdout, stderr] = await this.execFile(exec, args, opts);
+    this.log.silly('execFile result: err = %j', (err && err.stack) || err);
+    this.log.silly('execFile result: stdout = %j', stdout);
+    this.log.silly('execFile result: stderr = %j', stderr);
+    if (err) throw err;
+    return stdout.trim();
   }
 
   succeed(execPath, version) {
@@ -243,7 +266,6 @@ class PythonFinder {
   fail() {
     const errorLog = this.errorLog.join('\n'),
       pathExample = this.win ? 'C:\\Path\\To\\python.exe' : '/path/to/pythonexecutable',
-      // Windows 80 列控制台，用到 X 标记列之前（含日志前缀共 79 字符，可用 58 字符）
       info = [
         '**********************************************************',
         'You need to install the latest version of Python.',

package/package.json

@@ -11,7 +11,7 @@
     "bindings",
     "gyp"
   ],
-  "version": "1.0.2",
+  "version": "1.1.1",
   "installVersion": 11,
   "author": "flun <open@flun.top>",
   "bin": {