9
9
--- a/tools/wafadmin/Tools/node_addon.py
10
10
+++ b/tools/wafadmin/Tools/node_addon.py
12
@feature('node_addon')
13
@before('apply_bundle')
14
def init_node_addon(self):
15
- self.default_install_path = '${PREFIX_NODE}/lib/node/libraries'
16
+ self.default_install_path = '${PREFIX_NODE}/lib/nodejs'
17
self.uselib = self.to_list(getattr(self, 'uselib', ''))
18
if not 'NODE' in self.uselib: self.uselib.append('NODE')
19
self.env['MACBUNDLE'] = True
24
- abspath = os.path.abspath
25
- wafadmin = abspath(join(os.path.dirname(__file__), '..'))
26
- libnode = abspath(join(wafadmin, '..'))
27
- lib = abspath(join(libnode, '..'))
28
- prefix = abspath(join(lib, '..'))
30
+ lib = join(prefix, 'lib')
32
conf.env['PREFIX_NODE'] = prefix
12
lib = join(prefix, 'lib')
33
14
conf.env['LIBPATH_NODE'] = lib
34
- conf.env['CPPPATH_NODE'] = join(prefix, 'include/node')
35
+ conf.env['CPPPATH_NODE'] = join(prefix, 'include/nodejs')
15
- conf.env['CPPPATH_NODE'] = join(prefix, 'include', 'node')
16
+ conf.env['CPPPATH_NODE'] = join(prefix, 'include', 'nodejs')
36
17
conf.env['CPPFLAGS_NODE'] = '-D_GNU_SOURCE'
37
18
- conf.env['CPPFLAGS_NODE'] = '-DEV_MULTIPLICITY=0'
40
21
conf.env.append_value('CCFLAGS', ['-g'])
41
conf.env.append_value('CXXFLAGS', ['-g'])
43
- found = os.path.exists(join(prefix, "bin/node"))
44
+ # this changes the install path of cxx task_gen
45
+ conf.env['LIBDIR'] = join(prefix, 'lib/nodejs')
47
+ found = os.path.exists(join(prefix, "bin/nodejs"))
23
found = os.path.exists(conf.env['NODE_PATH'])
24
conf.check_message('node path', '', found, conf.env['NODE_PATH'])
26
- found = os.path.exists(join(prefix, 'bin', 'node'))
27
+ found = os.path.exists(join(prefix, 'bin', 'nodejs'))
48
28
conf.check_message('node prefix', '', found, prefix)
50
## On Mac OSX we need to use mac bundles
30
## On Cygwin we need to link to the generated symbol definitions
33
if not os.environ.has_key('NODE_PATH'):
34
if not os.environ.has_key('HOME'):
35
- nodePath = join(get_prefix(), 'lib', 'node')
36
+ nodePath = join(get_prefix(), 'lib', 'nodejs')
38
nodePath = join(os.environ['HOME'], '.node_libraries')
41
prefix = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..', '..', '..'))
43
prefix = os.environ['PREFIX_NODE']
45
\ No newline at end of file