@@ -17,7 +17,7 @@ if (win) {
1717function configure ( gyp , argv , callback ) {
1818var python
1919var buildDir = path . resolve ( 'build' )
20- var configNames = [ 'config.gypi' , 'common.gypi' ]
20+ var configNames = [ 'config.gypi' , 'common.gypi' ]
2121var configs = [ ]
2222var nodeDir
2323var release = processRelease ( argv , gyp , process . version , process . release )
@@ -60,7 +60,7 @@ function configure (gyp, argv, callback) {
6060// into devdir. Otherwise only install if they're not already there.
6161gyp . opts . ensure = ! gyp . opts . tarball
6262
63- gyp . commands . install ( [ release . version ] , function ( err ) {
63+ gyp . commands . install ( [ release . version ] , function ( err ) {
6464if ( err ) {
6565return callback ( err )
6666}
@@ -132,7 +132,7 @@ function configure (gyp, argv, callback) {
132132// set the target_arch variable
133133variables . target_arch = gyp . opts . arch || process . arch || 'ia32'
134134if ( variables . target_arch === 'arm64' ) {
135- defaults [ ' msvs_configuration_platform' ] = 'ARM64'
135+ defaults . msvs_configuration_platform = 'ARM64'
136136}
137137
138138// set the node development directory
@@ -142,22 +142,22 @@ function configure (gyp, argv, callback) {
142142variables . standalone_static_library = gyp . opts . thin ? 0 : 1
143143
144144if ( win ) {
145- process . env [ ' GYP_MSVS_VERSION' ] = Math . min ( vsInfo . versionYear , 2015 )
146- process . env [ ' GYP_MSVS_OVERRIDE_PATH' ] = vsInfo . path
147- defaults [ ' msbuild_toolset' ] = vsInfo . toolset
145+ process . env . GYP_MSVS_VERSION = Math . min ( vsInfo . versionYear , 2015 )
146+ process . env . GYP_MSVS_OVERRIDE_PATH = vsInfo . path
147+ defaults . msbuild_toolset = vsInfo . toolset
148148if ( vsInfo . sdk ) {
149- defaults [ ' msvs_windows_target_platform_version' ] = vsInfo . sdk
149+ defaults . msvs_windows_target_platform_version = vsInfo . sdk
150150}
151151if ( variables . target_arch === 'arm64' ) {
152152if ( vsInfo . versionMajor > 15 ||
153153( vsInfo . versionMajor === 15 && vsInfo . versionMajor >= 9 ) ) {
154- defaults [ ' msvs_enable_marmasm' ] = 1
154+ defaults . msvs_enable_marmasm = 1
155155} else {
156156log . warn ( 'Compiling ARM64 assembly is only available in\n' +
157157'Visual Studio 2017 version 15.9 and above' )
158158}
159159}
160- variables [ ' msbuild_path' ] = vsInfo . msBuild
160+ variables . msbuild_path = vsInfo . msBuild
161161}
162162
163163// loop through the rest of the opts and add the unknown ones as variables.
@@ -190,7 +190,7 @@ function configure (gyp, argv, callback) {
190190var json = JSON . stringify ( config , boolsToString , 2 )
191191log . verbose ( 'build/' + configFilename , 'writing out config file: %s' , configPath )
192192configs . push ( configPath )
193- fs . writeFile ( configPath , [ prefix , json , '' ] . join ( '\n' ) , findConfigs )
193+ fs . writeFile ( configPath , [ prefix , json , '' ] . join ( '\n' ) , findConfigs )
194194}
195195
196196function findConfigs ( err ) {
@@ -335,7 +335,7 @@ function configure (gyp, argv, callback) {
335335argv . unshift ( gypScript )
336336
337337// make sure python uses files that came with this particular node package
338- var pypath = [ path . join ( __dirname , '..' , 'gyp' , 'pylib' ) ]
338+ var pypath = [ path . join ( __dirname , '..' , 'gyp' , 'pylib' ) ]
339339if ( process . env . PYTHONPATH ) {
340340pypath . push ( process . env . PYTHONPATH )
341341}
0 commit comments