Permalink
Browse files

tools: remove "addon.gypi" and "gyp_addon"

They've been merged into `node-gyp` and aren't serving any purpose
in the node repo. Fixes #3760.
  • Loading branch information...
1 parent 320ae69 commit 00fa8864b4b8ff0650e9c82a2ee1f5e87f452c4a @TooTallNate TooTallNate committed Aug 12, 2012
Showing with 0 additions and 66 deletions.
  1. +0 −24 tools/addon.gypi
  2. +0 −42 tools/gyp_addon
View
@@ -1,24 +0,0 @@
-{
- 'target_defaults': {
- 'type': 'loadable_module',
- 'product_extension': 'node',
- 'product_prefix': '',
- 'include_dirs': [
- '<(node_root_dir)/src',
- '<(node_root_dir)/deps/uv/include',
- '<(node_root_dir)/deps/v8/include'
- ],
-
- 'conditions': [
- [ 'OS=="mac"', {
- 'libraries': [ '-undefined dynamic_lookup' ],
- }],
- [ 'OS=="win"', {
- 'libraries': [ '-l<(node_root_dir)/$(Configuration)/node.lib' ],
- }],
- [ 'OS=="freebsd" or OS=="openbsd" or OS=="solaris" or (OS=="linux" and target_arch!="ia32")', {
- 'cflags': [ '-fPIC' ],
- }]
- ]
- }
-}
View
@@ -1,42 +0,0 @@
-#!/usr/bin/env python
-import os
-import sys
-
-script_dir = os.path.dirname(__file__)
-node_root = os.path.abspath(os.path.join(script_dir, os.pardir))
-module_root = os.getcwd()
-if sys.platform == 'win32':
- output_dir = os.path.join(module_root, 'build')
-else:
- output_dir = 'build'
-
-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_root, 'tools', 'addon.gypi')
- common_gypi = os.path.join(node_root, 'common.gypi')
- config_gypi = os.path.join(node_root, 'config.gypi')
- args.extend(['-I', addon_gypi])
- args.extend(['-I', common_gypi])
- if os.path.exists(config_gypi):
- args.extend(['-I', config_gypi])
- args.extend(['-Dlibrary=shared_library'])
- args.extend(['-Dvisibility=default'])
- args.extend(['-Dnode_root_dir=%s' % node_root])
- args.extend(['-Dmodule_root_dir=%s' % module_root])
- args.extend(['--depth=.']);
-
- # Tell gyp to write the Makefile/Solution files into output_dir
- args.extend(['--generator-output', output_dir])
-
- # Tell make to write its output into the same dir
- args.extend(['-Goutput_dir=.'])
-
- gyp_args = list(args)
- rc = gyp.main(gyp_args)
- if rc != 0:
- print 'Error running GYP'
- sys.exit(rc)
-

6 comments on commit 00fa886

ry replied Aug 13, 2012

:)

Member

jbergstroem replied Aug 13, 2012

Fyi, this breaks the buildbots: http://buildbot.nodejs.org/builders/Gentoo%2032bit/builds/2426/steps/shell_2/logs/stdio. Probably need to update the build receipt?

@jbergstroem That was more or less a bug in node-gyp. v0.6.5 fixed it.

Member

jbergstroem replied Aug 13, 2012

@TooTallNate Ok, but why is it still happening (that build was against commit 22804a9)?

I guess because @isaacs hasn't updated the bundled version of node-gyp inside npm to that version yet.

Member

jbergstroem replied Aug 13, 2012

Figures, thanks. I pinged him on irc an hour ago, lets see what happens :-)

Please sign in to comment.