Browse files

Merge tag 'v0.1.33' of git://github.com/ry/node into ry-rebase

  • Loading branch information...
2 parents 7c64827 + 618296e commit 985b906a47554342cce81bc558d7fce8c948e076 Herbert Vojcik committed Mar 20, 2010
Showing with 49 additions and 6 deletions.
  1. +4 −0 AUTHORS
  2. +12 −1 ChangeLog
  3. +1 −1 doc/api.txt
  4. +2 −2 doc/index.html
  5. +30 −2 wscript
View
4 AUTHORS
@@ -59,3 +59,7 @@ Kris Kowal <kris.kowal@cixar.com>
Jacek Becela <jacek.becela@gmail.com>
Rob Ellis <kazoomer@gmail.com>
Tim-Smart <timehAndGod@gmail.com>
+Herbert Voj????k <herby@mailbox.sk>
+Krishna Rajendran <krishna@emptybox.org>
+pyrotechnick <pyrotechnick@feistystudios.com>
+Carson McDonald <carson@ioncannon.net>
View
13 ChangeLog
@@ -1,4 +1,15 @@
-2010.03.12, Version 0.1.32
+2010.03.19, Version 0.1.33
+
+ * Include lib/ directory in node executable. Compile on demand.
+
+ * evalcx clean ups (Isaac Z. Schlueter, Tim-Smart)
+
+ * Various fixes, clean ups
+
+ * V8 upgraded to 2.1.5
+
+
+2010.03.12, Version 0.1.32, 61c801413544a50000faa7f58376e9b33ba6254f
* Optimize event emitter for single listener
View
2 doc/api.txt
@@ -1,7 +1,7 @@
NODE(1)
=======
Ryan Dahl <ry@tinyclouds.org>
-Version, 0.1.32, 2010.03.12
+Version, 0.1.33, 2010.03.19
== NAME
View
4 doc/index.html
@@ -96,8 +96,8 @@ <h2 id="download">Download</h2>
<a href="http://github.com/ry/node/tree/master">git repo</a>
</p>
<p>
- 2010.03.12
- <a href="http://nodejs.org/dist/node-v0.1.32.tar.gz">node-v0.1.32.tar.gz</a>
+ 2010.03.19
+ <a href="http://nodejs.org/dist/node-v0.1.33.tar.gz">node-v0.1.33.tar.gz</a>
</p>
<h2 id="build">Build</h2>
View
32 wscript
@@ -7,7 +7,7 @@ from os.path import join, dirname, abspath
from logging import fatal
cwd = os.getcwd()
-VERSION="0.1.32"
+VERSION="0.1.33"
APPNAME="node.js"
import js2c
@@ -337,10 +337,37 @@ def build(bld):
coupling.clone("debug")
### src/native.cc
+ def make_macros(loc, content):
+ f = open(loc, 'w')
+ f.write(content)
+ f.close
+
+ macros_loc_debug = join(
+ bld.srcnode.abspath(bld.env_of_name("debug")),
+ "macros.py"
+ )
+
+ macros_loc_default = join(
+ bld.srcnode.abspath(bld.env_of_name("default")),
+ "macros.py"
+ )
+
+ make_macros(macros_loc_debug, "") # leave debug(x) as is in debug build
+ # replace debug(x) with nothing in release build
+ make_macros(macros_loc_default, "macro debug(x) = ;\n")
+
def javascript_in_c(task):
env = task.env
source = map(lambda x: x.srcpath(env), task.inputs)
targets = map(lambda x: x.srcpath(env), task.outputs)
+ source.append(macros_loc_default)
+ js2c.JS2C(source, targets)
+
+ def javascript_in_c_debug(task):
+ env = task.env
+ source = map(lambda x: x.srcpath(env), task.inputs)
+ targets = map(lambda x: x.srcpath(env), task.outputs)
+ source.append(macros_loc_debug)
js2c.JS2C(source, targets)
native_cc = bld.new_task_gen(
@@ -356,7 +383,8 @@ def build(bld):
# where.)
if bld.env["USE_DEBUG"]:
native_cc_debug = native_cc.clone("debug")
- native_cc_debug.rule = javascript_in_c
+ native_cc_debug.rule = javascript_in_c_debug
+
native_cc.rule = javascript_in_c
### node lib

0 comments on commit 985b906

Please sign in to comment.