]>
Commit | Line | Data |
---|---|---|
210abff9 | 1 | Only in node-v0.1.31-o/tools: js2c.pyc |
2 | Only in node-v0.1.31-o/tools/wafadmin: ansiterm.pyc | |
3 | Only in node-v0.1.31-o/tools/wafadmin: Build.pyc | |
4 | Only in node-v0.1.31-o/tools/wafadmin: Configure.pyc | |
5 | Only in node-v0.1.31-o/tools/wafadmin: Constants.pyc | |
6 | Only in node-v0.1.31-o/tools/wafadmin: Environment.pyc | |
7 | Only in node-v0.1.31-o/tools/wafadmin: Logs.pyc | |
8 | Only in node-v0.1.31-o/tools/wafadmin: Node.pyc | |
9 | Only in node-v0.1.31-o/tools/wafadmin: Options.pyc | |
10 | Only in node-v0.1.31-o/tools/wafadmin: pproc.pyc | |
11 | Only in node-v0.1.31-o/tools/wafadmin: Runner.pyc | |
12 | Only in node-v0.1.31-o/tools/wafadmin: Scripting.pyc | |
13 | Only in node-v0.1.31-o/tools/wafadmin: TaskGen.pyc | |
14 | Only in node-v0.1.31-o/tools/wafadmin: Task.pyc | |
15 | Only in node-v0.1.31-o/tools/wafadmin: Utils.pyc | |
16 | diff -ur node-v0.1.31-o/wscript node-v0.1.31/wscript | |
17 | --- node-v0.1.31-o/wscript 2010-03-11 23:03:36.000000000 -0700 | |
18 | +++ node-v0.1.31/wscript 2010-03-11 23:22:45.000000000 -0700 | |
19 | @@ -144,14 +144,6 @@ | |
20 | if not conf.check(lib='nsl', uselib_store="NSL"): | |
21 | conf.fatal("Cannot find nsl library") | |
22 | ||
23 | - conf.sub_config('deps/libeio') | |
24 | - conf.sub_config('deps/libev') | |
25 | - | |
26 | - if sys.platform.startswith("sunos"): | |
27 | - conf_subproject(conf, 'deps/udns', 'LIBS="-lsocket -lnsl" ./configure') | |
28 | - else: | |
29 | - conf_subproject(conf, 'deps/udns', './configure') | |
30 | - | |
31 | conf.define("HAVE_CONFIG_H", 1) | |
32 | ||
33 | conf.env.append_value("CCFLAGS", "-DX_STACKSIZE=%d" % (1024*64)) | |
34 | @@ -247,16 +239,13 @@ | |
21952d78 | 35 | |
36 | def build_v8(bld): | |
37 | v8 = bld.new_task_gen( | |
38 | - source = 'deps/v8/SConstruct ' | |
39 | - + bld.path.ant_glob('v8/include/*') | |
40 | - + bld.path.ant_glob('v8/src/*'), | |
41 | - target = bld.env["staticlib_PATTERN"] % "v8", | |
42 | - rule = v8_cmd(bld, "default"), | |
43 | + source = '', | |
44 | + rule = '', | |
45 | before = "cxx", | |
46 | install_path = None | |
47 | ) | |
48 | v8.uselib = "EXECINFO" | |
49 | - bld.env["CPPPATH_V8"] = "deps/v8/include" | |
50 | + bld.env["CPPPATH_V8"] = "/usr/include" | |
51 | t = join(bld.srcnode.abspath(bld.env_of_name("default")), v8.target) | |
52 | if sys.platform.startswith("sunos"): | |
53 | bld.env_of_name('default')["LINKFLAGS_V8"] = ["-mt", t] | |
210abff9 | 54 | @@ -275,14 +264,9 @@ |
21952d78 | 55 | else: |
56 | bld.env_of_name('debug')["LINKFLAGS_V8"] = ["-pthread", t] | |
57 | ||
58 | - bld.install_files('${PREFIX}/include/node/', 'deps/v8/include/*.h') | |
59 | + bld.install_files('${PREFIX}/include/node/') | |
60 | ||
61 | def build(bld): | |
210abff9 | 62 | - bld.add_subdirs('deps/libeio deps/libev') |
63 | - | |
64 | - build_udns(bld) | |
21952d78 | 65 | - build_v8(bld) |
210abff9 | 66 | - |
21952d78 | 67 | ### evcom |
68 | evcom = bld.new_task_gen("cc") | |
210abff9 | 69 | evcom.source = "deps/evcom/evcom.c" |
70 | @@ -359,17 +343,14 @@ | |
71 | """ | |
72 | node.includes = """ | |
73 | src/ | |
74 | - deps/v8/include | |
75 | - deps/libev | |
76 | - deps/udns | |
77 | - deps/libeio | |
78 | deps/evcom | |
79 | deps/http_parser | |
80 | deps/coupling | |
81 | """ | |
82 | - node.add_objects = 'ev eio evcom http_parser coupling' | |
83 | + node.add_objects = 'evcom http_parser coupling' | |
21952d78 | 84 | node.uselib_local = '' |
85 | node.uselib = 'GNUTLS GPGERROR UDNS V8 EXECINFO DL KVM SOCKET NSL' | |
210abff9 | 86 | + node.env["LINKFLAGS_V8"] = ["-lpthread", '-lv8', '-lev', '-leio', '-ludns'] |
21952d78 | 87 | |
88 | node.install_path = '${PREFIX}/lib' | |
89 | node.install_path = '${PREFIX}/bin' |