@flun/nodejs-mobile-gyp 1.0.1 → 1.0.2

package/addon.gypi

@@ -146,6 +146,18 @@
         ],
       }],
       [ 'OS=="win"', {
+        'msvs_settings': {
+          'VCCLCompilerTool': {
+            # /external:anglebrackets：把 <...> 引用的 Node / V8 头视为外部头，
+            # 只对它们抑制警告；下游自己代码（#include "..."）不受影响。
+            # 警告级别用 ExternalWarningLevel 属性设置，而不是命令行 /external:W0，
+            # 避免与 MSBuild 默认的 /external:W3 冲突而产生 D9025。
+            'AdditionalOptions': [
+              '/external:anglebrackets'
+            ],
+            'ExternalWarningLevel': 'TurnOffAllWarnings'
+          }
+        },
         'conditions': [
           ['node_engine=="chakracore"', {
             'library_dirs': [ '<(node_root_dir)/$(ConfigurationName)' ],
@@ -154,7 +166,7 @@
           ['node_with_ltcg=="true"', {
             'msvs_settings': {
               'VCCLCompilerTool': {
-                'WholeProgramOptimization': 'true' # /GL, whole program optimization, needed for LTCG
+                'WholeProgramOptimization': 'true', # /GL, whole program optimization, needed for LTCG
               },
               'VCLibrarianTool': {
                 'AdditionalOptions': [

package/bin/node-gyp.js

@@ -1,68 +1,51 @@
 #!/usr/bin/env node
 
-import envPaths from 'env-paths'
-import os from 'os'
-import fs from 'fs'
-import { Gyp } from '../lib/node-gyp.js'
-import * as log from '../lib/log.js'
+import envPaths from 'env-paths';
+import os from 'os';
+import fs from 'fs';
+import { Gyp } from '../lib/node-gyp.js';
+import * as log from '../lib/log.js';
 
-process.title = 'node-gyp'
+process.title = 'node-gyp';
 
 /**
  * 处理并执行选中的命令。
  */
 
-const prog = new Gyp()
-let completed = false
-prog.parseArgv(process.argv)
-prog.devDir = prog.opts.devdir
+const prog = new Gyp(), homeDir = os.homedir();
+let completed = false;
+prog.parseArgv(process.argv), prog.devDir = prog.opts.devdir;
 
-const homeDir = os.homedir()
-if (prog.devDir) {
-  prog.devDir = prog.devDir.replace(/^~/, homeDir)
-} else if (homeDir) {
-  prog.devDir = envPaths('node-gyp', { suffix: '' }).cache
-} else {
+if (prog.devDir) prog.devDir = prog.devDir.replace(/^~/, homeDir);
+else if (homeDir) prog.devDir = envPaths('node-gyp', { suffix: '' }).cache;
+else {
   throw new Error(
     "node-gyp requires that the user's home directory is specified " +
     'in either of the environmental variables HOME or USERPROFILE. ' +
-    'Overide with: --devdir /path/to/.node-gyp')
+    'Overide with: --devdir /path/to/.node-gyp');
 }
 
 if (prog.todo.length === 0) {
-  if (~process.argv.indexOf('-v') || ~process.argv.indexOf('--version')) {
-    log.stdout('v%s', prog.version)
-  } else {
-    log.stdout('%s', prog.usage())
-  }
-  process.exit(0)
+  if (~process.argv.indexOf('-v') || ~process.argv.indexOf('--version')) log.stdout('v%s', prog.version);
+  else log.stdout('%s', prog.usage());
+  process.exit(0);
 }
 
-log.info('it worked if it ends with', 'ok')
-log.verbose('cli', process.argv)
-log.info('using', 'node-gyp@%s', prog.version)
-log.info('using', 'node@%s | %s | %s', process.versions.node, process.platform, process.arch)
+log.info('it worked if it ends with', 'ok'), log.verbose('cli', process.argv), log.info('using', 'node-gyp@%s', prog.version);
+log.info('using', 'node@%s | %s | %s', process.versions.node, process.platform, process.arch);
 
 /**
- * 如果传了 -C/--directory，切换到该目录。
+ * 如果传了 -C/--directory,切换到该目录;
  */
-
-const dir = prog.opts.directory
+const dir = prog.opts.directory;
 if (dir) {
   try {
-    const stat = fs.statSync(dir)
-    if (stat.isDirectory()) {
-      log.info('chdir', dir)
-      process.chdir(dir)
-    } else {
-      log.warn('chdir', dir + ' is not a directory')
-    }
+    const stat = fs.statSync(dir);
+    if (stat.isDirectory()) log.info('chdir', dir), process.chdir(dir);
+    else log.warn('chdir', dir + ' 不是目录');
   } catch (e) {
-    if (e.code === 'ENOENT') {
-      log.warn('chdir', dir + ' is not a directory')
-    } else {
-      log.warn('chdir', 'error during chdir() "%s"', e.message)
-    }
+    if (e.code === 'ENOENT') log.warn('chdir', dir + ' 不是目录');
+    else log.warn('chdir', 'chdir() 出错 "%s"', e.message);
   }
 }
 
@@ -71,74 +54,48 @@ if (dir) {
  */
 const errorMessage = () => {
   // 复制自 npm 的 lib/utils/error-handler.js
-  log.error('System', os.type() + ' ' + os.release())
-  log.error('command', process.argv
-    .map(JSON.stringify).join(' '))
-  log.error('cwd', process.cwd())
-  log.error('node -v', process.version)
-  log.error('node-gyp -v', 'v' + prog.package.version)
-}
-
-/**
- * 打印最终诊断信息
- */
-const issueMessage = () => {
-  errorMessage()
-  log.error('', ['Node-gyp failed to build your package.',
-    'Try to update npm and/or node-gyp and if it does not help file an issue with the package author.'
-  ].join('\n'))
-}
-
-/**
- * 依次执行队列中的命令
- */
-const run = async () => {
-  const command = prog.todo.shift()
-  if (!command) {
-    // 完成！
-    completed = true
-    log.info('ok')
-    return
-  }
-
-  try {
-    const args = await prog.commands[command.name](command.args) ?? []
-
-    if (command.name === 'list') {
-      if (args.length) {
-        args.forEach((version) => log.stdout(version))
-      } else {
-        log.stdout('No node development files installed. Use `node-gyp install` to install a version.')
+  log.error('System', os.type() + ' ' + os.release());
+  log.error('command', process.argv.map(JSON.stringify).join(' ')), log.error('cwd', process.cwd());
+  log.error('node -v', process.version), log.error('node-gyp -v', 'v' + prog.package.version);
+},
+  /**
+   * 打印最终诊断信息
+   */
+  issueMessage = () => {
+    errorMessage();
+    log.error('', ['node-gyp 构建你的包失败!', '请尝试更新 npm 和/或 node-gyp;若仍无法解决,请向包作者反馈;'].join('\n'));
+  },
+  /**
+   * 依次执行队列中的命令
+   */
+  run = async () => {
+    const command = prog.todo.shift()
+    if (!command) {
+      // 完成！
+      completed = true, log.info('ok');
+      return;
+    };
+
+    try {
+      const args = await prog.commands[command.name](command.args) ?? [];
+
+      if (command.name === 'list') {
+        if (args.length) args.forEach((version) => log.stdout(version));
+        else log.stdout('尚未安装任何 Node 开发文件;可用 `node-gyp install` 安装指定版本;')
       }
-    } else if (args.length >= 1) {
-      log.stdout(...args.slice(1))
+      else if (args.length >= 1) log.stdout(...args.slice(1))
+      return run(); // 继续执行队列中的下一条命令
+    } catch (err) {
+      log.error(command.name + ' error'), log.error('stack', err.stack), errorMessage(), log.error('not ok');
+      return process.exit(1);
     }
+  };
 
-    // 继续执行队列中的下一条命令
-    return run()
-  } catch (err) {
-    log.error(command.name + ' error')
-    log.error('stack', err.stack)
-    errorMessage()
-    log.error('not ok')
-    return process.exit(1)
-  }
-}
-
-process.on('exit', function (code) {
-  if (!completed && !code) {
-    log.error('Completion callback never invoked!')
-    issueMessage()
-    process.exit(6)
-  }
-})
-
-process.on('uncaughtException', function (err) {
-  log.error('UNCAUGHT EXCEPTION')
-  log.error('stack', err.stack)
-  issueMessage()
-  process.exit(7)
-})
+process.on('exit', code => {
+  if (!completed && !code) log.error('完成回调未被调用！'), issueMessage(), process.exit(6);
+});
+process.on('uncaughtException', err => {
+  log.error('未捕获的异常'), log.error('stack', err.stack), issueMessage(), process.exit(7);
+});
 
-// 开始执行给定命令！
-run()
+run(); // 开始执行给定命令！

package/gyp/pylib/gyp/MSVSSettings.py

@@ -797,6 +797,19 @@ _MSBuildOnly(_compile, "MultiProcessorCompilation", _boolean)  # /MP
 _MSBuildOnly(_compile, "PreprocessOutputPath", _string)  # /Fi
 _MSBuildOnly(_compile, "ProcessorNumber", _integer)  # the number of processors
 _MSBuildOnly(_compile, "TrackerLogDirectory", _folder_name)
+_MSBuildOnly(
+    _compile,
+    "ExternalWarningLevel",
+    _Enumeration(
+        [
+            "TurnOffAllWarnings",  # /external:W0
+            "Level1",  # /external:W1
+            "Level2",  # /external:W2
+            "Level3",  # /external:W3
+            "Level4",  # /external:W4
+        ]
+    ),
+)  # /external:W
 _MSBuildOnly(_compile, "TreatSpecificWarningsAsErrors", _string_list)  # /we
 _MSBuildOnly(_compile, "UseUnicodeForAssemblerListing", _boolean)  # /FAu
 

package/lib/build.js

@@ -1,221 +1,139 @@
-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()
-
-  /**
-   * 加载 configure 阶段生成的 config.gypi
-   */
-  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
-      }
-    }
-
-    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"?')
-    }
-    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`.')
-      }
-      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()
-  }
-
+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, win = process.platform === 'win32',
   /**
-   * 真正启动子进程并编译模块
+   * 调用 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) {
-      // 把构建期依赖的符号链接（如 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
-      }
-      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 })
-      }
 
-      if (code !== 0) {
-        return reject(new Error('`' + command + '` failed with exit code: ' + code))
+      if (win) {
+        // 用户是否指定了自己的 .sln 文件？
+        const hasSln = argv.some(arg => path.extname(arg) === '.sln');
+        if (!hasSln) argv.unshift(gyp.opts.solution || guessedSolution);
       }
-      if (signal) {
-        return reject(new Error('`' + command + '` got signal: ' + signal))
+
+      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;
+        }
+        await fs.symlink(python, symlinkDestination);
+        log.verbose('bin symlinks', `created symlink to "${python}" in "${buildBinsDir}" and added to PATH`);
       }
-      resolve()
-    }))
-  }
-}
 
-build.usage = 'Invokes `' + (win ? 'msbuild' : 'make') + '` and builds the module'
+      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;
+        }
+
+        // 先确认构建命令在 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);
+
+        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 };