@flun/nodejs-mobile-gyp 1.0.1 → 1.1.0

package/lib/build.js

@@ -1,221 +1,225 @@
-import gracefulFs from 'graceful-fs'
-import path from 'path'
-import { glob } from 'glob'
-import * as log from './log.js'
-import which from 'which'
-import os from 'os'
-
-const fs = gracefulFs.promises
-const win = process.platform === 'win32'
-
-/**
- * 调用 make/msbuild 构建原生模块
- */
-const build = async (gyp, argv) => {
-  let platformMake = 'make'
-  if (process.platform === 'aix') {
-    platformMake = 'gmake'
-  } else if (process.platform === 'os400') {
-    platformMake = 'gmake'
-  } else if (process.platform.indexOf('bsd') !== -1) {
-    platformMake = 'gmake'
-  } else if (win && argv.length > 0) {
-    argv = argv.map(function (target) {
-      return '/t:' + target
-    })
-  }
-
-  const makeCommand = gyp.opts.make || process.env.MAKE || platformMake
-  let command = win ? 'msbuild' : makeCommand
-  const jobs = gyp.opts.jobs || process.env.JOBS
-  let buildType
-  let config
-  let arch
-  let nodeDir
-  let guessedSolution
-  let python
-  let buildBinsDir
-
-  await loadConfigGypi()
-
+import gracefulFs from 'graceful-fs';
+import path from 'path';
+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,
   /**
-   * 加载 configure 阶段生成的 config.gypi
+   * Windows 上 GNU make 需要 sh.exe 来执行 Makefile 里的 Unix 命令
+   * （printf / xargs / rm 等）。优先复用 Git for Windows 自带的 usr/bin，
+   * 避免要求用户额外安装 MSYS2。通过 "where git" 反推，不硬编码路径。
    */
-  async function loadConfigGypi () {
-    let data
-    try {
-      const configPath = path.resolve('build', 'config.gypi')
-      data = await fs.readFile(configPath, 'utf8')
-    } catch (err) {
-      if (err.code === 'ENOENT') {
-        throw new Error('You must run `node-gyp configure` first!')
-      } else {
-        throw err
+  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 { }
       }
     }
-
-    config = JSON.parse(data.replace(/#.+\n/, ''))
-
-    // 从 config 中取出 arch、buildType、nodeDir
-    buildType = config.target_defaults.default_configuration
-    arch = config.variables.target_arch
-    nodeDir = config.variables.nodedir
-    python = config.variables.python
-
-    if ('debug' in gyp.opts) {
-      buildType = gyp.opts.debug ? 'Debug' : 'Release'
-    }
-    if (!buildType) {
-      buildType = 'Release'
-    }
-
-    log.verbose('build type', buildType)
-    log.verbose('architecture', arch)
-    log.verbose('node dev dir', nodeDir)
-    log.verbose('python', python)
-
-    if (win) {
-      await findSolutionFile()
-    } else {
-      await doWhich()
-    }
-  }
-
-  /**
-   * Windows 下查找第一个 build/*.sln 文件
-   */
-  async function findSolutionFile () {
-    const files = await glob('build/*.sln')
-    if (files.length === 0) {
-      throw new Error('Could not find *.sln file. Did you run "configure"?')
+    // 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 { }
     }
-    guessedSolution = files[0]
-    log.verbose('found first Solution file', guessedSolution)
-    await doWhich()
-  }
-
-  /**
-   * 用 node-which 定位 msbuild / make 可执行文件
-   */
-  async function doWhich () {
-    // Windows 使用 node-gyp configure 提供的 msbuild
-    if (win) {
-      if (!config.variables.msbuild_path) {
-        throw new Error('MSBuild is not set, please run `node-gyp configure`.')
+    // 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;
       }
-      command = config.variables.msbuild_path
-      log.verbose('using MSBuild:', command)
-      await doBuild()
-      return
     }
-
-    // 先确认构建命令在 PATH 中
-    const execPath = await which(command)
-    log.verbose('`which` succeeded for `' + command + '`', execPath)
-    await doBuild()
-  }
+    return null;
+  },
 
   /**
-   * 真正启动子进程并编译模块
+   * 调用 make/msbuild 构建原生模块
    */
-  async function doBuild () {
-    // 启用 verbose 构建
-    const verbose = log.logger.isVisible('verbose')
-    let j
-
-    if (!win && verbose) {
-      argv.push('V=1')
-    }
-
-    if (win && !verbose) {
-      argv.push('/clp:Verbosity=minimal')
-    }
-
-    if (win) {
-      // Windows 上关闭 Microsoft logo
-      argv.push('/nologo')
-    }
-
-    // 指定构建类型，默认 Release
-    if (win) {
-      // 把 .gypi 配置中的 target_arch 转换为 MSBuild 的 /Platform
-      // 因为表示"32 位 Intel"的方式很多，默认按此处理
-      // 注意：msbuild 的 Condition 字符串相等比较不区分大小写
-      const archLower = arch.toLowerCase()
-      const p = archLower === 'x64'
-        ? 'x64'
-        : (archLower === 'arm'
-            ? 'ARM'
-            : (archLower === 'arm64' ? 'ARM64' : 'Win32'))
-      argv.push('/p:Configuration=' + buildType + ';Platform=' + p)
-      if (jobs) {
-        j = parseInt(jobs, 10)
-        if (!isNaN(j) && j > 0) {
-          argv.push('/m:' + j)
-        } else if (jobs.toUpperCase() === 'MAX') {
-          argv.push('/m:' + os.cpus().length)
+  build = async (gyp, argv) => {
+    let platformMake = 'make';
+
+    if (['aix', 'os400'].includes(process.platform) || process.platform.includes('bsd')) platformMake = 'gmake';
+    else if (win && argv.length > 0) argv = argv.map(target => '/t:' + target);
+
+    const makeCommand = gyp.opts.make || process.env.MAKE || platformMake, jobs = gyp.opts.jobs || process.env.JOBS;
+    let command = win ? 'msbuild' : makeCommand, buildType, config, arch, nodeDir, guessedSolution, python, buildBinsDir;
+
+    /**
+     * 真正启动子进程并编译模块
+     */
+    const doBuild = async () => {
+      // 启用 verbose 构建
+      const verbose = log.logger.isVisible('verbose');
+      let j;
+
+      if (!win && verbose) argv.push('V=1');
+      if (win && !verbose) argv.push('/clp:Verbosity=minimal');
+      if (win) argv.push('/nologo'); // Windows 上关闭 Microsoft logo
+
+      // 指定构建类型，默认 Release
+      if (win) {
+        // 把 .gypi 配置中的 target_arch 转换为 MSBuild 的 /Platform
+        // 因为表示"32 位 Intel"的方式很多，默认按此处理
+        // 注意：msbuild 的 Condition 字符串相等比较不区分大小写
+        const archLower = arch.toLowerCase(), p = archLower === 'x64' ? 'x64' : (archLower === 'arm' ? 'ARM'
+          : (archLower === 'arm64' ? 'ARM64' : 'Win32'));
+        argv.push('/p:Configuration=' + buildType + ';Platform=' + p)
+        if (jobs) {
+          j = parseInt(jobs, 10)
+          if (!isNaN(j) && j > 0) argv.push('/m:' + j);
+          else if (jobs.toUpperCase() === 'MAX') argv.push('/m:' + os.cpus().length);
         }
       }
-    } else {
-      argv.push('BUILDTYPE=' + buildType)
       // 调用 build 目录下的 Makefile
-      argv.push('-C')
-      argv.push('build')
-      if (jobs) {
-        j = parseInt(jobs, 10)
-        if (!isNaN(j) && j > 0) {
-          argv.push('--jobs')
-          argv.push(j)
-        } else if (jobs.toUpperCase() === 'MAX') {
-          argv.push('--jobs')
-          argv.push(os.cpus().length)
+      else {
+        argv.push('BUILDTYPE=' + buildType), argv.push('-C'), argv.push('build');
+        if (jobs) {
+          j = parseInt(jobs, 10);
+          if (!isNaN(j) && j > 0) argv.push('--jobs'), argv.push(j);
+          else if (jobs.toUpperCase() === 'MAX') argv.push('--jobs'), argv.push(os.cpus().length);
         }
       }
-    }
 
-    if (win) {
-      // 用户是否指定了自己的 .sln 文件？
-      const hasSln = argv.some(function (arg) {
-        return path.extname(arg) === '.sln'
-      })
-      if (!hasSln) {
-        argv.unshift(gyp.opts.solution || guessedSolution)
+      if (win) {
+        // 用户是否指定了自己的 .sln 文件？
+        const hasSln = argv.some(arg => path.extname(arg) === '.sln');
+        if (!hasSln) argv.unshift(gyp.opts.solution || guessedSolution);
       }
-    }
 
-    if (!win) {
-      // 把构建期依赖的符号链接（如 Python）加入 PATH
-      buildBinsDir = path.resolve('build', 'node_gyp_bins')
-      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 (!win) {
+        // 把构建期依赖的符号链接（如 Python）加入 PATH
+        buildBinsDir = path.resolve('build', 'node_gyp_bins');
+        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 });
+
+        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)
-    await new Promise((resolve, reject) => proc.on('exit', async (code, signal) => {
-      if (buildBinsDir) {
-        // 清理构建期依赖的符号链接：
-        await fs.rm(buildBinsDir, { recursive: true })
-      }
+      const proc = gyp.spawn(command, argv);
+      await new Promise((resolve, reject) => proc.on('exit', async (code, signal) => {
+        if (buildBinsDir) await fs.rm(buildBinsDir, { recursive: true }); // 清理构建期依赖的符号链接
+
+        if (code !== 0) return reject(new Error('`' + command + '` failed with exit code: ' + code));
+        if (signal) return reject(new Error('`' + command + '` got signal: ' + signal));
+        resolve();
+      }))
+    },
+      /**
+       * 用 node-which 定位 msbuild / make 可执行文件
+       */
+      doWhich = async () => {
+        // Windows 使用 node-gyp configure 提供的 msbuild
+        if (win) {
+          if (!config.variables.msbuild_path) throw new Error('MSBuild 未设置，请先运行 `node-gyp configure`');
+          command = config.variables.msbuild_path, log.verbose('using MSBuild:', command), await doBuild();
+          return;
+        }
 
-      if (code !== 0) {
-        return reject(new Error('`' + command + '` failed with exit code: ' + code))
-      }
-      if (signal) {
-        return reject(new Error('`' + command + '` got signal: ' + signal))
-      }
-      resolve()
-    }))
-  }
-}
+        // 先确认构建命令在 PATH 中
+        const execPath = await which(command);
+        log.verbose('`which` succeeded for `' + command + '`', execPath), await doBuild();
+      },
+      /**
+       * Windows 下查找第一个 build/*.sln 文件
+       */
+      findSolutionFile = async () => {
+        const files = await glob('build/*.sln')
+        if (files.length === 0) throw new Error('未找到 *.sln 文件，是否运行过 configure？');
+        guessedSolution = files[0], log.verbose('found first Solution file', guessedSolution), await doWhich();
+      },
+      /**
+       * 加载 configure 阶段生成的 config.gypi
+       */
+      loadConfigGypi = async () => {
+        let data;
+        try {
+          const configPath = path.resolve('build', 'config.gypi');
+          data = await fs.readFile(configPath, 'utf8');
+        } catch (err) {
+          if (err.code === 'ENOENT') throw new Error('请先运行 `node-gyp configure`');
+          else throw err;
+        }
+
+        // 从 config 中取出 arch、buildType、nodeDir
+        config = JSON.parse(data.replace(/#.+\n/, '')), buildType = config.target_defaults.default_configuration;
+        arch = config.variables.target_arch, nodeDir = config.variables.nodedir, python = config.variables.python;
+
+        if ('debug' in gyp.opts) buildType = gyp.opts.debug ? 'Debug' : 'Release';
+        if (!buildType) buildType = 'Release';
+
+        log.verbose('build type', buildType), log.verbose('architecture', arch), log.verbose('node dev dir', nodeDir);
+        log.verbose('python', python);
 
-build.usage = 'Invokes `' + (win ? 'msbuild' : 'make') + '` and builds the module'
+        win ? await findSolutionFile() : await doWhich();
+      };
+    await loadConfigGypi();
+  };
 
-export { build }
+build.usage = 'Invokes `' + (win ? 'msbuild' : 'make') + '` and builds the module';
+export { build };

package/lib/clean.js

@@ -1,19 +1,16 @@
-import gracefulFs from 'graceful-fs'
-import * as log from './log.js'
+import gracefulFs from 'graceful-fs';
+import * as log from './log.js';
 
-const fs = gracefulFs.promises
+const fs = gracefulFs.promises,
+  /**
+   * 清理：删除 build 目录
+   */
+  clean = async (gyp, argv) => {
+    const buildDir = 'build';
 
-/**
- * 清理：删除 build 目录
- */
-const clean = async (gyp, argv) => {
-  // 删除 build 目录
-  const buildDir = 'build'
+    log.verbose('clean', 'removing "%s" directory', buildDir);
+    await fs.rm(buildDir, { recursive: true, force: true });
+  }
 
-  log.verbose('clean', 'removing "%s" directory', buildDir)
-  await fs.rm(buildDir, { recursive: true, force: true })
-}
-
-clean.usage = 'Removes any generated build files and the "out" dir'
-
-export { clean }
+clean.usage = 'Removes any generated build files and the "out" dir';
+export { clean };