Skip to content

Commit

Permalink
Create tools directory
Browse files Browse the repository at this point in the history
Users will need to "make distclean" to recompile from scratch since I've
moved a lot of the core build tools around.
  • Loading branch information
ry committed Jun 22, 2009
1 parent 00d9b88 commit 115c494
Show file tree
Hide file tree
Showing 189 changed files with 12 additions and 9 deletions.
6 changes: 5 additions & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,11 @@ are:
snippit. It is copyrighted 2007 by Steven Levithan and released under an
MIT license.

- WAF build system. Copyrighted Thomas Nagy. Released under an MIT license.
- WAF build system, located at tools/waf. Copyrighted Thomas Nagy.
Released under an MIT license.

- The SCONS build system, located at tools/scons. Copyrighted by the SCONS
Foundation. Released under an MIT license.

Additionally deps/http_parser is based on Zed Shaw's Mongrel. Mongrel is
copyrighted by Zed Shaw and distributed under GPL2 or a permissive open
Expand Down
4 changes: 0 additions & 4 deletions TODO
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
Major features planned: (somewhat ordered)

- require/include HTTP URLs

- C++ API for external modules/plugins
(Some sort of module build system?)

Expand All @@ -12,8 +10,6 @@ Major features planned: (somewhat ordered)

- Signal handlers

- popen() (perhaps with bidirectional stream?)

- Internally replace getaddrinfo() with udns
http://www.corpit.ru/mjt/udns.html
JS resolver interface
Expand Down
2 changes: 2 additions & 0 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ cd $WORKINGDIR
WORKINGDIR=`pwd`
cd $CUR_DIR

WAF="${WORKINGDIR}/tools/waf"

# Checks for WAF. Honours $WAF if set. Stores path to 'waf' in $WAF.
# Requires that $PYTHON is set.
#
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
9 changes: 5 additions & 4 deletions wscript
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ import os
from os.path import join, dirname, abspath
from logging import fatal


import js2c

VERSION='0.0.5'
APPNAME='node'

srcdir = '.'
blddir = 'build'
cwd = os.getcwd()

def set_options(opt):
# the gcc module provides a --debug-level option
Expand Down Expand Up @@ -83,14 +83,15 @@ def build(bld):
deps_tgt = join(bld.srcnode.abspath(bld.env_of_name("default")),"deps")
v8dir_src = join(deps_src,"v8")
v8dir_tgt = join(deps_tgt, "v8")
scons = os.path.join(cwd, 'tools/scons/scons.py')

v8rule = 'cp -rf %s %s && ' \
'cd %s && ' \
'python scons.py -Q mode=%s library=static snapshot=on'
'python %s -Q mode=%s library=static snapshot=on'

v8 = bld.new_task_gen(
target = join("deps/v8", bld.env["staticlib_PATTERN"] % "v8"),
rule=v8rule % ( v8dir_src , deps_tgt , v8dir_tgt, "release"),
rule=v8rule % ( v8dir_src , deps_tgt , v8dir_tgt, scons, "release"),
before="cxx",
install_path = None
)
Expand All @@ -108,7 +109,7 @@ def build(bld):
bld.env_of_name('debug')["STATICLIB_V8"] = "v8_g"
bld.env_of_name('debug')["LIBPATH_V8"] = v8dir_tgt
bld.env_of_name('debug')["LINKFLAGS_V8"] = "-pthread"
v8_debug.rule = v8rule % ( v8dir_src , deps_tgt , v8dir_tgt, "debug")
v8_debug.rule = v8rule % ( v8dir_src , deps_tgt , v8dir_tgt, scons, "debug")
v8_debug.target = join("deps/v8", bld.env["staticlib_PATTERN"] % "v8_g")

### oi
Expand Down

0 comments on commit 115c494

Please sign in to comment.