Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Revert "gyp: install node-gyp"

No.

This reverts commit 3d1476a.
  • Loading branch information...
commit 1afd0b52fe9bb4642a44b48dabf9d7b26d00e4ab 1 parent 3d1476a
@ry ry authored
View
17 tools/addon.gypi
@@ -3,20 +3,15 @@
'type': 'loadable_module',
'product_extension': 'node',
'product_prefix': '',
+ 'include_dirs': [
+ '../src',
+ '../deps/uv/include',
+ '../deps/v8/include'
+ ],
'conditions': [
[ 'OS=="mac"', {
- 'libraries': [ '-undefined dynamic_lookup' ]
- }],
- [ 'OS=="win"', {
- 'include_dirs': [
- '../src',
- '../deps/uv/include',
- '../deps/v8/include'
- ],
- 'libraries': [ '-l<(node_root_dir>/Debug/node.lib' ],
- }, {
- 'include_dirs': ['../../../include/node']
+ 'libraries': [ '-undefined dynamic_lookup' ],
}]
]
}
View
8 tools/node-gyp → tools/gyp_addon
@@ -4,20 +4,18 @@ import sys
script_dir = os.path.dirname(__file__)
node_root = os.path.normpath(os.path.join(script_dir, os.pardir))
-node_tools = os.path.join(node_root, 'lib', 'node', 'tools')
-sys.path.insert(0, os.path.join(node_tools, 'gyp', 'pylib'))
+sys.path.insert(0, os.path.join(node_root, 'tools', 'gyp', 'pylib'))
import gyp
if __name__ == '__main__':
args = sys.argv[1:]
- addon_gypi = os.path.join(node_tools, 'addon.gypi')
- common_gypi = os.path.join(node_root, 'lib', 'node', 'common.gypi')
+ addon_gypi = os.path.join(node_root, 'tools', 'addon.gypi')
+ common_gypi = os.path.join(node_root, 'common.gypi')
args.extend(['-I', addon_gypi])
args.extend(['-I', common_gypi])
args.extend(['-Dlibrary=shared_library'])
args.extend(['-Dvisibility=default'])
- args.extend(['-Dnode_root_dir=%s' % node_root])
args.extend(['--depth=.']);
gyp_args = list(args)
View
11 tools/installer.js
@@ -93,13 +93,7 @@ if (cmd === 'install') {
copy([
'deps/uv/include/ares.h',
'deps/uv/include/ares_version.h'
- ], 'include/node/');
-
- // Copy node-gyp files
- copy('common.gypi', 'lib/node/');
- copy('tools/*', 'lib/node/tools/');
- queue.push('ln -sf ../lib/node/tools/node-gyp ' +
- path.join(node_prefix, 'bin/node-gyp'));
+ ], 'include/node/c-ares/');
// Copy binary file
copy('out/Release/node', 'bin/node');
@@ -112,8 +106,7 @@ if (cmd === 'install') {
}
} else {
remove([
- 'bin/node', 'bin/npm', 'bin/node-gyp', 'include/node/*',
- 'lib/node', 'lib/node_modules'
+ 'bin/node', 'bin/npm', 'include/node/*', 'lib/node_modules'
]);
}
Please sign in to comment.
Something went wrong with that request. Please try again.