modif comtabilite
This commit is contained in:
+28
-27
@@ -72,8 +72,10 @@ function configure (gyp, argv, callback) {
|
||||
return callback(new Error('Invalid version number: ' + release.version))
|
||||
}
|
||||
|
||||
// ensure that the target node version's dev files are installed
|
||||
gyp.opts.ensure = true
|
||||
// If the tarball option is set, always remove and reinstall the headers
|
||||
// into devdir. Otherwise only install if they're not already there.
|
||||
gyp.opts.ensure = gyp.opts.tarball ? false : true
|
||||
|
||||
gyp.commands.install([ release.version ], function (err, version) {
|
||||
if (err) return callback(err)
|
||||
log.verbose('get node dir', 'target node version installed:', release.versionDir)
|
||||
@@ -242,28 +244,35 @@ function configure (gyp, argv, callback) {
|
||||
argv.push('-I', config)
|
||||
})
|
||||
|
||||
// for AIX we need to set up the path to the exp file
|
||||
// which contains the symbols needed for linking.
|
||||
// The file will either be in one of the following
|
||||
// depending on whether it is an installed or
|
||||
// development environment:
|
||||
// - the include/node directory
|
||||
// - the out/Release directory
|
||||
// - the out/Debug directory
|
||||
// - the root directory
|
||||
// For AIX and z/OS we need to set up the path to the exports file
|
||||
// which contains the symbols needed for linking.
|
||||
var node_exp_file = undefined
|
||||
if (process.platform === 'aix') {
|
||||
if (process.platform === 'aix' || process.platform === 'os390') {
|
||||
var ext = process.platform === 'aix' ? 'exp' : 'x'
|
||||
var node_root_dir = findNodeDirectory()
|
||||
var candidates = ['include/node/node.exp',
|
||||
'out/Release/node.exp',
|
||||
'out/Debug/node.exp',
|
||||
'node.exp']
|
||||
var candidates = undefined
|
||||
if (process.platform === 'aix') {
|
||||
candidates = ['include/node/node',
|
||||
'out/Release/node',
|
||||
'out/Debug/node',
|
||||
'node'
|
||||
].map(function(file) {
|
||||
return file + '.' + ext
|
||||
})
|
||||
} else {
|
||||
candidates = ['out/Release/obj.target/libnode',
|
||||
'out/Debug/obj.target/libnode',
|
||||
'lib/libnode'
|
||||
].map(function(file) {
|
||||
return file + '.' + ext
|
||||
})
|
||||
}
|
||||
var logprefix = 'find exports file'
|
||||
node_exp_file = findAccessibleSync(logprefix, node_root_dir, candidates)
|
||||
if (node_exp_file !== undefined) {
|
||||
log.verbose(logprefix, 'Found exports file: %s', node_exp_file)
|
||||
} else {
|
||||
var msg = msgFormat('Could not find node.exp file in %s', node_root_dir)
|
||||
var msg = msgFormat('Could not find node.%s file in %s', ext, node_root_dir)
|
||||
log.error(logprefix, 'Could not find exports file')
|
||||
return callback(new Error(msg))
|
||||
}
|
||||
@@ -292,7 +301,7 @@ function configure (gyp, argv, callback) {
|
||||
argv.push('-Dlibrary=shared_library')
|
||||
argv.push('-Dvisibility=default')
|
||||
argv.push('-Dnode_root_dir=' + nodeDir)
|
||||
if (process.platform === 'aix') {
|
||||
if (process.platform === 'aix' || process.platform === 'os390') {
|
||||
argv.push('-Dnode_exp_file=' + node_exp_file)
|
||||
}
|
||||
argv.push('-Dnode_gyp_dir=' + nodeGypDir)
|
||||
@@ -439,7 +448,7 @@ PythonFinder.prototype = {
|
||||
},
|
||||
|
||||
checkPythonVersion: function checkPythonVersion () {
|
||||
var args = ['-c', 'import platform; print(platform.python_version());']
|
||||
var args = ['-c', 'import sys; print "%s.%s.%s" % sys.version_info[:3];']
|
||||
var env = extend({}, this.env)
|
||||
env.TERM = 'dumb'
|
||||
|
||||
@@ -451,14 +460,6 @@ PythonFinder.prototype = {
|
||||
'`%s -c "' + args[1] + '"` returned: %j',
|
||||
this.python, stdout)
|
||||
var version = stdout.trim()
|
||||
if (~version.indexOf('+')) {
|
||||
this.log.silly('stripping "+" sign(s) from version')
|
||||
version = version.replace(/\+/g, '')
|
||||
}
|
||||
if (~version.indexOf('rc')) {
|
||||
this.log.silly('stripping "rc" identifier from version')
|
||||
version = version.replace(/rc(.*)$/ig, '')
|
||||
}
|
||||
var range = semver.Range('>=2.5.0 <3.0.0')
|
||||
var valid = false
|
||||
try {
|
||||
|
||||
Reference in New Issue
Block a user