configure: supply target_arch define to gyp.js

Since version 1.1.1 gyp.js uses environment files. Set --target_arch
command-line option with value of node-gyp --arch option in order to
generate proper ninja environment file.

Removed findMSVS() function and `vcvars.bat` invocation before building with
`ninja` because `gyp.js` supports target environments and the actual
`target_arch` is set before on `configure` stage.

Author: pmed

lib/build.js

@@ -15,7 +15,7 @@ var fs = require('graceful-fs')
   , processRelease = require('./process-release')
   , win = process.platform == 'win32'
 
-exports.usage = 'Invokes `' + (process.env.npm_config_gypjs? 'ninja' : (win ? 'msbuild' : 'make')) + '` and builds the module'
+exports.usage = 'Invokes `' + (process.env.npm_config_gypjs ? 'ninja' : (win ? 'msbuild' : 'make')) + '` and builds the module'
 
 function build (gyp, argv, callback) {
   var platformMake = 'make'
@@ -35,7 +35,6 @@ function build (gyp, argv, callback) {
     , config
     , arch
     , nodeDir
-    , vcDir
 
   if (gyp.opts.gypjs) {
     command = gyp.opts.ninja || process.env.NINJA || 'ninja'
@@ -74,41 +73,14 @@ function build (gyp, argv, callback) {
       log.verbose('architecture', arch)
       log.verbose('node dev dir', nodeDir)
 
-      if (win) {
-        gyp.opts.gypjs? findMSVS() : findSolutionFile()
+      if (!gyp.opts.gypjs && win) {
+        findSolutionFile()
       } else {
         doWhich()
       }
     })
   }
 
-  /**
-   * On Windows, find Visual C++ toolset
-   */
-
-  function findMSVS () {
-    var msvs_version = gyp.opts.msvs_version || 'auto'
-    var vs_versions = (msvs_version === 'auto'? [14, 12, 10] : [msvs_version])
-    vs_versions.find(function(version) {
-      var vscomntools = process.env['VS' + version + '0COMNTOOLS']
-      if (vscomntools) {
-        // remove quotes to work with path.join()
-        if (vscomntools.substr(0, 1) === '"' && vscomntools.substr(-1, 1) === '"') {
-          vscomntools = vscomntools.substr(1, vscomntools.length - 2)
-        }
-        vcDir = path.join(vscomntools, '..', '..', 'VC')
-        if (vcDir) {
-          log.verbose('found Visual C++ in ', vcDir)
-          return true
-        }
-      }
-    })
-    if (!vcDir) {
-      callback(new Error('Visual C++ not found, please setup a C++ compiler toolset'))
-    }
-    doWhich()
-  }
-
   /**
    * On Windows, find the first build/*.sln file.
    */
@@ -280,11 +252,6 @@ function build (gyp, argv, callback) {
           argv.push('-j' + j)
         }
       }
-      // invoke vcvarsall.bat before build
-      if (win && vcDir) {
-        argv.unshift(arch === 'ia32'? 'x86' : arch, '&', command)
-        command = path.join(vcDir, 'vcvarsall.bat')
-      }
     }
 
     var proc = gyp.spawn(command, argv)

lib/configure.js

@@ -23,14 +23,15 @@ var fs = require('graceful-fs')
   , findNodeDirectory = require('./find-node-directory')
   , gypjs = require('gyp.js')
 
-exports.usage = 'Generates ' + (process.env.npm_config_gypjs? 'ninja build files' : (win ? 'MSVC project files' : 'a Makefile')) + ' for the current module'
+exports.usage = 'Generates ' + (process.env.npm_config_gypjs ? 'ninja build files' : (win ? 'MSVC project files' : 'a Makefile')) + ' for the current module'
 
 function configure (gyp, argv, callback) {
 
   var python = gyp.opts.python || process.env.PYTHON || 'python2'
     , buildDir = path.resolve('build')
     , configNames = [ 'config.gypi', 'common.gypi' ]
     , configs = []
+    , arch
     , nodeDir
     , release = processRelease(argv, gyp, process.version, process.release)
 
@@ -130,7 +131,7 @@ function configure (gyp, argv, callback) {
     }
 
     // set the target_arch variable
-    variables.target_arch = gyp.opts.arch || process.arch || 'ia32'
+    variables.target_arch = arch = gyp.opts.arch || process.arch || 'ia32'
 
     // set the node development directory
     variables.nodedir = nodeDir
@@ -193,7 +194,7 @@ function configure (gyp, argv, callback) {
       if (!~argv.indexOf('-f') && !~argv.indexOf('--format')) {
         if (win) {
           log.verbose('gyp', 'gyp format was not specified; forcing "msvs"')
-          // force the 'make' target for non-Windows
+          // force the 'msvs' target for non-Windows
           argv.push('-f', 'msvs')
         } else {
           log.verbose('gyp', 'gyp format was not specified; forcing "make"')
@@ -297,6 +298,7 @@ function configure (gyp, argv, callback) {
         var cp = gyp.spawn(python, argv)
         cp.on('exit', onCpExit)
       } else {
+        argv.push('-Dtarget_arch=' + arch)
         onCpExit(gypjs.main(argv))
       }
     })