Permalink
Browse files

Merged upstream changes.

  • Loading branch information...
2 parents ad3ae24 + cc15299 commit cf84db779f49c0c3eba3a764dcfe41c4780e180f @tomyan tomyan committed Apr 2, 2012
Showing 1,273 changed files with 80,429 additions and 21,178 deletions.
View
@@ -38,3 +38,6 @@ ipch/
/dist-osx
/npm.wxs
/tools/msvs/npm.wixobj
+email.md
+blog.html
+deps/v8-*
View
@@ -172,6 +172,7 @@ Scott McWhirter <scott.mcwhirter@joyent.com>
Jakub Lekstan <jakub.lekstan@dreamlab.pl>
Tim Baumann <tim@timbaumann.info>
Robert Mustacchi <rm@joyent.com>
+Håvard Stranden <havard.stranden@gmail.com>
George Miroshnykov <george.miroshnykov@gmail.com>
Marcel Laverdet <marcel@laverdet.com>
Alexandre Marangone <a.marangone@gmail.com>
@@ -263,3 +264,34 @@ Dan VerWeire <dverweire@gmail.com>
Matthew Fitzsimmons <matt@joyent.com>
Philip Tellis <philip.tellis@gmail.com>
Christopher Jeffrey <chjjeffrey@gmail.com>
+Paddy Byers <paddy.byers@gmail.com>
+Seth Fitzsimmons <seth@mojodna.net>
+Einar Otto Stangvik <einaros@gmail.com>
+Paul Vorbach <paul@vorb.de>
+Luke Gallagher <notfornoone@gmail.com>
+Tomasz Buchert <tomek.buchert@gmail.com>
+Myles Byrne <myles@myles.id.au>
+T.C. Hollingsworth <tchollingsworth@gmail.com>
+Cam Pedersen <diffference@gmail.com>
+Roly Fentanes <roly426@gmail.com>
+Ted Young <ted@radicaldesigns.org>
+Joshua Holbrook <josh.holbrook@gmail.com>
+Blake Miner <miner.blake@gmail.com>
+Vincent Ollivier <contact@vincentollivier.com>
+Jimb Esser <jimb@railgun3d.com>
+Sambasiva Suda <sambasivarao@gmail.com>
+Sadique Ali <sadiqalikm@gmail.com>
+Dmitry Nizovtsev <dmitry@ukrteam.com>
+Alex Kocharin <rlidwka@kocharin.ru>
+Ming Liu <vmliu1@gmail.com>
+Shea Levy <shea@shealevy.com>
+Nao Iizuka <iizuka@kyu-mu.net>
+Christian Ress <christian@ressonline.de>
+Rod Vagg <rod@vagg.org>
+Matt Ezell <ezell.matt@gmail.com>
+Charlie McConnell <charlie@charlieistheman.com>
+Farid Neshat <FaridN_SOAD@yahoo.com>
+Johannes Wüller <johanneswueller@gmail.com>
+Erik Lundin <mjor.himself@gmail.com>
+Mikael Bourges-Sevenier <mikeseven@gmail.com>
+Yosef Dinerstein <yosefd@microsoft.com>
View
@@ -1,4 +1,121 @@
-2012.02.14, Version 0.7.4 (unstable)
+2012.03.30, Version 0.7.7 (unstable)
+
+* Upgrade V8 to 3.9.24.7
+
+* Upgrade npm to 1.1.15
+
+* Handle Emoji characters properly (Erik Corry, Bert Belder)
+
+* readline: migrate ansi/vt100 logic from tty to readline (Nathan Rajlich)
+
+* readline: Fix multiline handling (Alex Kocharin)
+
+* add a -i/--interactive flag to force the REPL (Nathan Rajlich)
+
+* debugger: add breakOnException command (Fedor Indutny)
+
+* cluster: kill workers when master dies (Andreas Madsen)
+
+* cluster: add graceful disconnect support (Andreas Madsen)
+
+* child_process: Separate 'close' event from 'exit' (Charlie McConnell)
+
+* typed arrays: add Uint8ClampedArray (Mikael Bourges-Sevenier)
+
+* buffer: Fix byte alignment issues (Ben Noordhuis, Erik Lundin)
+
+* tls: fix CryptoStream.setKeepAlive() (Shigeki Ohtsu)
+
+* Expose http parse error codes (Felix Geisendörfer)
+
+* events: don't delete the listeners array (Ben Noordhuis, Nathan Rajlich)
+
+* process: add process.config to view node's ./configure settings (Nathan Rajlich)
+
+* process: process.execArgv to see node's arguments (Micheil Smith)
+
+* process: fix process.title setter (Ben Noordhuis)
+
+* timers: handle negative or non-numeric timeout values (Ben Noordhuis)
+
+
+2012.03.13, Version 0.7.6 (unstable), f06abda6f58e517349d1b63a2cbf5a8d04a03505
+
+* Upgrade v8 to 3.9.17
+
+* Upgrade npm to 1.1.8
+ - Add support for os/cpu fields in package.json (Adam Blackburn)
+ - Automatically node-gyp packages containing a binding.gyp
+ - Fix failures unpacking in UNC shares
+ - Never create un-listable directories
+ - Handle cases where an optionalDependency fails to build
+
+* events: newListener emit correct fn when using 'once' (Roly Fentanes)
+
+* url: Ignore empty port component (Łukasz Walukiewicz)
+
+* module: replace 'children' array (isaacs)
+
+* tls: parse multiple values of a key in ssl certificate (Sambasiva Suda)
+
+* cluster: support passing of named pipes (Ben Noordhuis)
+
+* Windows: include syscall in fs errors (Bert Belder)
+
+* http: #2888 Emit end event only once (Igor Zinkovsky)
+
+* readline: add multiline support (Rlidwka)
+
+* process: add `process.hrtime()` (Nathan Rajlich)
+
+* net, http, https: add localAddress option (Dmitry Nizovtsev)
+
+* addon improvements (Nathan Rajlich)
+
+* build improvements (Ben Noordhuis, Sadique Ali, T.C. Hollingsworth, Nathan Rajlich)
+
+* add support for "SEARCH" request methods (Nathan Rajlich)
+
+* expose the zlib and http_parser version in process.versions (Nathan Rajlich)
+
+
+2012.02.23, Version 0.7.5 (unstable), d384b8b0d2ab7f05465f0a3e15fe20b4e25b5f86
+
+* startup speed improvements (Maciej Małecki)
+
+* crypto: add function getDiffieHellman() (Tomasz Buchert)
+
+* buffer: support decoding of URL-safe base64 (Ben Noordhuis)
+
+* Make QueryString.parse() even faster (Brian White)
+
+* url: decode url entities in auth section (Ben Noordhuis)
+
+* http: support PURGE request method (Ben Noordhuis)
+
+* http: Generate Date headers on responses (Mark Nottingham)
+
+* Fix #2762: Add callback to close function. (Mikeal Rogers)
+
+* dgram: fix out-of-bound memory read (Ben Noordhuis)
+
+* repl: add automatic loading of built-in libs (Brandon Benvie)
+
+* repl: remove double calls where possible (Fedor Indutny)
+
+* Readline improvements. Related: #2737 #2756 (Colton Baker)
+
+* build: disable -fomit-frame-pointer on solaris (Dave Pacheco)
+
+* build: arch detection improvements (Nathan Rajlich)
+
+* build: Make a fat binary for the OS X `make pkg`. (Nathan Rajlich)
+
+* jslint src/ and lib/ on 'make test' (isaacs)
+
+
+
+2012.02.14, Version 0.7.4 (unstable), de21de920cf93ec40736ada3792a7f85f3eadeda
* Upgrade V8 to 3.9.5
@@ -97,7 +214,111 @@
* Bug fixes
-2012.02.02, Version 0.6.10 (stable)
+2012.03.15 Version 0.6.13 (stable), 9f7f86b534f8556290eb8cad915984ff4ca54996
+
+* Windows: Many libuv test fixes (Bert Belder)
+
+* Windows: avoid uv_guess_handle crash in when fd < 0 (Bert Belder)
+
+* Map EBUSY and ENOTEMPTY errors (Bert Belder)
+
+* Windows: include syscall in fs errors (Bert Belder)
+
+* Fix fs.watch ENOSYS on Linux kernel version mismatch (Ben Noordhuis)
+
+* Update npm to 1.1.9
+ - upgrade node-gyp to 0.3.5 (Nathan Rajlich)
+ - Fix isaacs/npm#2249 Add cache-max and cache-min configs
+ - Properly redirect across https/http registry requests
+ - log config usage if undefined key in set function (Kris Windham)
+ - Add support for os/cpu fields in package.json (Adam Blackburn)
+ - Automatically node-gyp packages containing a binding.gyp
+ - Fix failures unpacking in UNC shares
+ - Never create un-listable directories
+ - Handle cases where an optionalDependency fails to build
+
+
+2012.03.02 Version 0.6.12 (stable), 48a2d34cfe6b7e1c9d15202a4ef5e3c82d1fba35
+
+* Upgrade V8 to 3.6.6.24
+
+* dtrace ustack helper improvements (Dave Pacheco)
+
+* API Documentation refactor (isaacs)
+
+* #2827 net: fix race write() before and after connect() (koichik)
+
+* #2554 #2567 throw if fs args for 'start' or 'end' are strings (AJ ONeal)
+
+* punycode: Update to v1.0.0 (Mathias Bynens)
+
+* Make a fat binary for the OS X pkg (isaacs)
+
+* Fix hang on accessing process.stdin (isaacs)
+
+* repl: make tab completion work on non-objects (Nathan Rajlich)
+
+* Fix fs.watch on OS X (Ben Noordhuis)
+
+* Fix #2515 nested setTimeouts cause premature process exit (Ben Noordhuis)
+
+* windows: fix time conversion in stat (Igor Zinkovsky)
+
+* windows: fs: handle EOF in read (Brandon Philips)
+
+* windows: avoid IOCP short-circuit on non-ifs lsps (Igor Zinkovsky)
+
+* Upgrade npm to 1.1.4 (isaacs)
+ - windows fixes
+ - Bundle nested bundleDependencies properly
+ - install: support --save with url install targets
+ - shrinkwrap: behave properly with url-installed modules
+ - support installing uncompressed tars or single file modules from urls etc.
+ - don't run make clean on rebuild
+ - support HTTPS-over-HTTP proxy tunneling
+
+
+2012.02.17 Version 0.6.11 (stable), 1eb1fe32250fc88cb5b0a97cddf3e02be02e3f4a
+
+* http: allow multiple WebSocket RFC6455 headers (Einar Otto Stangvik)
+
+* http: allow multiple WWW-Authenticate headers (Ben Noordhuis)
+
+* windows: support unicode argv and environment variables (Bert Belder)
+
+* tls: mitigate session renegotiation attacks (Ben Noordhuis)
+
+* tcp, pipe: don't assert on uv_accept() errors (Ben Noordhuis)
+
+* tls: Allow establishing secure connection on the existing socket (koichik)
+
+* dgram: handle close of dgram socket before DNS lookup completes (Seth Fitzsimmons)
+
+* windows: Support half-duplex pipes (Igor Zinkovsky)
+
+* build: disable omit-frame-pointer on solaris systems (Dave Pacheco)
+
+* debugger: fix --debug-brk (Ben Noordhuis)
+
+* net: fix large file downloads failing (koichik)
+
+* fs: fix ReadStream failure to read from existing fd (Christopher Jeffrey)
+
+* net: destroy socket on DNS error (Stefan Rusu)
+
+* dtrace: add missing translator (Dave Pacheco)
+
+* unix: don't flush tty on switch to raw mode (Ben Noordhuis)
+
+* windows: reset brightness when reverting to default text color (Bert Belder)
+
+* npm: update to 1.1.1
+ - Update which, fstream, mkdirp, request, and rimraf
+ - Fix #2123 Set path properly for lifecycle scripts on windows
+ - Mark the root as seen, so we don't recurse into it. Fixes #1838. (Martin Cooper)
+
+
+2012.02.02, Version 0.6.10 (stable), 051908e023f87894fa68f5b64d0b99a19a7db01e
* Update V8 to 3.6.6.20
View
@@ -79,8 +79,13 @@ The externally maintained libraries used by Node are:
licensed under a permissive free software license. See
deps/zlib/LICENSE.
- - deps/npm npm is a package manager program copyright 2009, 2010, 2011
+ - deps/npm npm is a package manager program copyright 2009 - 2012
Isaac Z. Schlueter and licensed under MIT. npm includes several
subpackages MIT or Apache licenses, see deps/npm/LICENSE for more
information. npm is included in the Node .msi and .pkg distributions
but not in the Node binary itself.
+
+ - tools/doc/node_modules/marked Marked is a Markdown parser Copyright
+ (c) 2011-2012, Christopher Jeffrey (https://github.com/chjj/). Marked
+ is used in the generation of node documentation, but not distributed in
+ any node binaries.
View
@@ -33,22 +33,24 @@ out/Makefile: common.gypi deps/uv/uv.gyp deps/http_parser/http_parser.gyp deps/z
tools/gyp_node -f make
install: all
- out/Release/node tools/installer.js ./config.gypi install
+ out/Release/node tools/installer.js install
uninstall:
- out/Release/node tools/installer.js ./config.gypi uninstall
+ out/Release/node tools/installer.js uninstall
clean:
- -rm -rf out/Makefile node node_g out/$(BUILDTYPE)/node
+ -rm -rf out/Makefile node node_g out/$(BUILDTYPE)/node blog.html email.md
-find out/ -name '*.o' -o -name '*.a' | xargs rm -rf
distclean:
-rm -rf out
-rm -f config.gypi
-rm -f config.mk
+ -rm -rf node node_g blog.html email.md
test: all
$(PYTHON) tools/test.py --mode=release simple message
+ PYTHONPATH=tools/closure_linter/ $(PYTHON) tools/closure_linter/closure_linter/gjslint.py --unix_mode --strict --nojsdoc -r lib/ -r src/ --exclude_files lib/punycode.js
test-http1: all
$(PYTHON) tools/test.py --mode=release --use-http1 simple message
@@ -91,7 +93,8 @@ test-npm-publish: node
npm_package_config_publishtest=true ./node deps/npm/test/run.js
apidoc_sources = $(wildcard doc/api/*.markdown)
-apidocs = $(addprefix out/,$(apidoc_sources:.markdown=.html))
+apidocs = $(addprefix out/,$(apidoc_sources:.markdown=.html)) \
+ $(addprefix out/,$(apidoc_sources:.markdown=.json))
apidoc_dirs = out/doc out/doc/api/ out/doc/api/assets out/doc/about out/doc/community out/doc/logos out/doc/images
@@ -114,21 +117,32 @@ website_files = \
out/doc/logos/index.html \
$(doc_images)
-doc: node $(apidoc_dirs) $(website_files) $(apiassets) $(apidocs)
+doc: program $(apidoc_dirs) $(website_files) $(apiassets) $(apidocs) tools/doc/
$(apidoc_dirs):
mkdir -p $@
out/doc/api/assets/%: doc/api_assets/% out/doc/api/assets/
cp $< $@
+out/doc/%.html: doc/%.html
+ cat $< | sed -e 's|__VERSION__|'$(VERSION)'|g' > $@
+
out/doc/%: doc/%
cp -r $< $@
-out/doc/api/%.html: doc/api/%.markdown node $(apidoc_dirs) $(apiassets) tools/doctool/doctool.js
- out/Release/node tools/doctool/doctool.js doc/template.html $< > $@
+out/doc/api/%.json: doc/api/%.markdown
+ out/Release/node tools/doc/generate.js --format=json $< > $@
+
+out/doc/api/%.html: doc/api/%.markdown
+ out/Release/node tools/doc/generate.js --format=html --template=doc/template.html $< > $@
-out/doc/%:
+email.md: ChangeLog tools/email-footer.md
+ bash tools/changelog-head.sh > $@
+ cat tools/email-footer.md | sed -e 's|__VERSION__|'$(VERSION)'|g' >> $@
+
+blog.html: email.md
+ cat $< | node tools/doc/node_modules/.bin/marked > $@
website-upload: doc
rsync -r out/doc/ node@nodejs.org:~/web/nodejs.org/
@@ -152,9 +166,19 @@ PKGDIR=out/dist-osx
pkg: $(PKG)
$(PKG):
- -rm -rf $(PKGDIR)
- ./configure --prefix=$(PKGDIR)/usr/local --without-snapshot
+ rm -rf $(PKGDIR)
+ rm -rf out/deps out/Release
+ ./configure --prefix=$(PKGDIR)/32/usr/local --without-snapshot --dest-cpu=ia32
+ $(MAKE) install
+ rm -rf out/deps out/Release
+ ./configure --prefix=$(PKGDIR)/usr/local --without-snapshot --dest-cpu=x64
$(MAKE) install
+ lipo $(PKGDIR)/32/usr/local/bin/node \
+ $(PKGDIR)/usr/local/bin/node \
+ -output $(PKGDIR)/usr/local/bin/node-universal \
+ -create
+ mv $(PKGDIR)/usr/local/bin/node-universal $(PKGDIR)/usr/local/bin/node
+ rm -rf $(PKGDIR)/32
$(packagemaker) \
--id "org.nodejs.NodeJS-$(VERSION)" \
--doc tools/osx-pkg.pmdoc \
Oops, something went wrong.

0 comments on commit cf84db7

Please sign in to comment.