Merge branch 'master-isolate' into v0.6-isolate

Makefile

@@ -1,35 +1,20 @@
-WAF=python tools/waf-light
+BUILDTYPE ?= Release
 
-web_root = [email protected]:~/web/nodejs.org/
+all: out/Makefile
+	$(MAKE) -C out BUILDTYPE=$(BUILDTYPE)
+	-ln -fs out/Release/node node
+	-ln -fs out/Debug/node node_g
 
-#
-# Because we recursively call make from waf we need to make sure that we are
-# using the correct make. Not all makes are GNU Make, but this likely only
-# works with gnu make. To deal with this we remember how the user invoked us
-# via a make builtin variable and use that in all subsequent operations
-#
-export NODE_MAKE := $(MAKE)
-
-all: program
-	@-[ -f out/Release/node ] && ls -lh out/Release/node
-
-all-progress:
-	@$(WAF) -p build
-
-program:
-	@$(WAF) --product-type=program build
-
-staticlib:
-	@$(WAF) --product-type=cstaticlib build
+out/Release/node: all
 
-dynamiclib:
-	@$(WAF) --product-type=cshlib build
+out/Makefile: node.gyp deps/uv/uv.gyp
 
-install:
-	@$(WAF) install
+clean:
+	rm -rf out
 
-uninstall:
-	@$(WAF) uninstall
+distclean:
+	-rm -rf out
+	-rm options.gypi
 
 test: all
 	python tools/test.py --mode=release simple message
@@ -67,8 +52,194 @@ test-pummel: all
 test-internet: all
 	python tools/test.py internet
 
+UVTEST += simple/test-assert
+UVTEST += simple/test-buffer
+UVTEST += simple/test-c-ares
+UVTEST += simple/test-chdir
+UVTEST += simple/test-delayed-require
+UVTEST += simple/test-eio-race2
+UVTEST += simple/test-eio-race4
+UVTEST += simple/test-event-emitter-add-listeners
+UVTEST += simple/test-event-emitter-modify-in-emit
+UVTEST += simple/test-event-emitter-num-args
+UVTEST += simple/test-event-emitter-once
+UVTEST += simple/test-event-emitter-remove-all-listeners
+UVTEST += simple/test-event-emitter-remove-listeners
+UVTEST += simple/test-exception-handler
+UVTEST += simple/test-exception-handler2
+UVTEST += simple/test-exception-handler
+UVTEST += simple/test-executable-path
+UVTEST += simple/test-file-read-noexist
+UVTEST += simple/test-file-write-stream
+UVTEST += simple/test-fs-fsync
+UVTEST += simple/test-fs-open
+UVTEST += simple/test-fs-readfile-empty
+UVTEST += simple/test-fs-read-file-sync
+UVTEST += simple/test-fs-read-file-sync-hostname
+UVTEST += simple/test-fs-sir-writes-alot
+UVTEST += simple/test-fs-write
+UVTEST += simple/test-fs-write-buffer
+UVTEST += simple/test-fs-write-file
+UVTEST += simple/test-fs-write-file-buffer
+UVTEST += simple/test-fs-write-stream
+UVTEST += simple/test-fs-write-stream-end
+UVTEST += simple/test-fs-write-sync
+UVTEST += simple/test-global
+UVTEST += simple/test-http
+UVTEST += simple/test-http-1.0
+UVTEST += simple/test-http-abort-client
+UVTEST += simple/test-http-allow-req-after-204-res
+UVTEST += simple/test-http-blank-header
+UVTEST += simple/test-http-buffer-sanity
+UVTEST += simple/test-http-cat
+UVTEST += simple/test-http-chunked
+UVTEST += simple/test-http-client-abort
+UVTEST += simple/test-http-client-parse-error
+UVTEST += simple/test-http-client-race
+UVTEST += simple/test-http-client-race-2
+UVTEST += simple/test-http-client-upload
+UVTEST += simple/test-http-client-upload-buf
+UVTEST += simple/test-http-contentLength0
+UVTEST += simple/test-http-default-encoding
+UVTEST += simple/test-http-dns-fail
+UVTEST += simple/test-http-eof-on-connect
+UVTEST += simple/test-http-exceptions
+UVTEST += simple/test-http-expect-continue
+UVTEST += simple/test-http-extra-response
+UVTEST += simple/test-http-head-request
+UVTEST += simple/test-http-head-response-has-no-body
+UVTEST += simple/test-http-keep-alive
+UVTEST += simple/test-http-keep-alive-close-on-header
+UVTEST += simple/test-http-malformed-request
+UVTEST += simple/test-http-many-keep-alive-connections
+UVTEST += simple/test-http-mutable-headers
+UVTEST += simple/test-http-parser
+UVTEST += simple/test-http-proxy
+UVTEST += simple/test-http-request-end
+UVTEST += simple/test-http-response-close
+UVTEST += simple/test-http-response-readable
+UVTEST += simple/test-http-unix-socket
+UVTEST += simple/test-http-server
+UVTEST += simple/test-http-server-multiheaders
+UVTEST += simple/test-http-set-cookies
+UVTEST += simple/test-http-set-timeout
+UVTEST += simple/test-http-set-trailers
+UVTEST += simple/test-http-upgrade-agent
+UVTEST += simple/test-http-upgrade-client
+UVTEST += simple/test-http-upgrade-client2
+UVTEST += simple/test-http-upgrade-server
+UVTEST += simple/test-http-upgrade-server2
+UVTEST += simple/test-http-wget
+UVTEST += simple/test-http-write-empty-string
+UVTEST += simple/test-http-wget
+UVTEST += simple/test-mkdir-rmdir
+UVTEST += simple/test-net-binary
+UVTEST += simple/test-net-pingpong
+UVTEST += simple/test-net-can-reset-timeout
+UVTEST += simple/test-net-connect-buffer
+UVTEST += simple/test-net-connect-timeout
+UVTEST += simple/test-net-create-connection
+UVTEST += simple/test-net-eaddrinuse
+UVTEST += simple/test-net-isip
+UVTEST += simple/test-net-keepalive
+UVTEST += simple/test-net-pingpong
+UVTEST += simple/test-net-reconnect
+UVTEST += simple/test-net-remote-address-port
+UVTEST += simple/test-net-server-bind
+UVTEST += simple/test-net-server-max-connections
+UVTEST += simple/test-net-server-try-ports
+UVTEST += simple/test-net-stream
+UVTEST += simple/test-net-socket-timeout
+UVTEST += simple/test-next-tick
+UVTEST += simple/test-next-tick-doesnt-hang
+UVTEST += simple/test-next-tick-errors
+UVTEST += simple/test-next-tick-ordering
+UVTEST += simple/test-next-tick-ordering2
+UVTEST += simple/test-next-tick-starvation
+UVTEST += simple/test-module-load-list
+UVTEST += simple/test-path
+UVTEST += simple/test-pipe-stream
+UVTEST += simple/test-pump-file2tcp
+UVTEST += simple/test-pump-file2tcp-noexist
+UVTEST += simple/test-punycode
+UVTEST += simple/test-querystring
+UVTEST += simple/test-readdir
+UVTEST += simple/test-readdouble
+UVTEST += simple/test-readfloat
+UVTEST += simple/test-readint
+UVTEST += simple/test-readuint
+UVTEST += simple/test-regress-GH-819
+UVTEST += simple/test-regress-GH-897
+UVTEST += simple/test-regression-object-prototype
+UVTEST += simple/test-require-cache
+UVTEST += simple/test-require-cache-without-stat
+UVTEST += simple/test-require-exceptions
+UVTEST += simple/test-require-resolve
+UVTEST += simple/test-script-context
+UVTEST += simple/test-script-new
+UVTEST += simple/test-script-static-context
+UVTEST += simple/test-script-static-new
+UVTEST += simple/test-script-static-this
+UVTEST += simple/test-script-this
+UVTEST += simple/test-stream-pipe-cleanup
+UVTEST += simple/test-stream-pipe-error-handling
+UVTEST += simple/test-stream-pipe-event
+UVTEST += simple/test-stream-pipe-multi
+UVTEST += simple/test-string-decoder
+UVTEST += simple/test-sys
+UVTEST += simple/test-tcp-wrap
+UVTEST += simple/test-tcp-wrap-connect
+UVTEST += simple/test-tcp-wrap-listen
+UVTEST += simple/test-timers-linked-list
+UVTEST += simple/test-tty-stdout-end
+UVTEST += simple/test-url
+UVTEST += simple/test-utf8-scripts
+UVTEST += simple/test-vm-create-context-circular-reference
+UVTEST += simple/test-writedouble
+UVTEST += simple/test-writefloat
+UVTEST += simple/test-writeint
+UVTEST += simple/test-writeuint
+UVTEST += simple/test-zerolengthbufferbug
+UVTEST += pummel/test-http-client-reconnect-bug
+UVTEST += pummel/test-http-upload-timeout
+UVTEST += pummel/test-net-many-clients
+UVTEST += pummel/test-net-pause
+UVTEST += pummel/test-net-pingpong-delay
+UVTEST += pummel/test-net-timeout
+UVTEST += pummel/test-timers
+UVTEST += pummel/test-timer-wrap
+UVTEST += pummel/test-timer-wrap2
+UVTEST += pummel/test-vm-memleak
+UVTEST += internet/test-dns
+UVTEST += simple/test-tls-client-abort
+UVTEST += simple/test-tls-client-verify
+UVTEST += simple/test-tls-connect
+#UVTEST += simple/test-tls-ext-key-usage # broken
+UVTEST += simple/test-tls-junk-closes-server
+UVTEST += simple/test-tls-npn-server-client
+UVTEST += simple/test-tls-request-timeout
+#UVTEST += simple/test-tls-securepair-client # broken
+UVTEST += simple/test-tls-securepair-server 
+#UVTEST += simple/test-tls-server-verify # broken
+UVTEST += simple/test-tls-set-encoding
+
+# child_process
+UVTEST += simple/test-child-process-exit-code
+UVTEST += simple/test-child-process-buffering
+UVTEST += simple/test-child-process-exec-cwd
+UVTEST += simple/test-child-process-cwd
+UVTEST += simple/test-child-process-env
+UVTEST += simple/test-child-process-stdin
+UVTEST += simple/test-child-process-ipc
+UVTEST += simple/test-child-process-deprecated-api
+
+
+test-uv: all
+	NODE_USE_UV=1 python tools/test.py $(UVTEST)
+
+test-uv-debug: all
+	NODE_USE_UV=1 python tools/test.py --mode=debug $(UVTEST)
 
-out/Release/node: all
 
 apidoc_sources = $(wildcard doc/api/*.markdown)
 apidocs = $(addprefix out/,$(apidoc_sources:.markdown=.html))
@@ -89,10 +260,7 @@ website_files = \
   out/doc/favicon.ico   \
 	out/doc/pipe.css
 
-doc: doc
-
-out/doc: out/Release/node $(apidoc_dirs) $(website_files) $(apiassets) $(apidocs)
-
+doc: out/Release/node $(apidoc_dirs) $(website_files) $(apiassets) $(apidocs)
 
 $(apidoc_dirs):
 	mkdir -p $@
@@ -117,31 +285,11 @@ docopen: out/doc/api/all.html
 docclean:
 	-rm -rf out/doc
 
-clean:
-	$(WAF) clean
-	-find tools -name "*.pyc" | xargs rm -f
-
-distclean: docclean
-	-find tools -name "*.pyc" | xargs rm -f
-	-rm -rf dist-osx
-	-rm -rf out/ node node_g
-
-check:
-	@tools/waf-light check
-
-VERSION=v$(shell python tools/getnodeversion.py)
+VERSION=$(shell git describe)
 TARNAME=node-$(VERSION)
-TARBALL=$(TARNAME).tar.gz
-PKG=dist-osx/$(TARNAME).pkg
 
 #dist: doc/node.1 doc/api
-dist: $(TARBALL) $(PKG)
-
-$(PKG):
-	-rm -rf dist-osx
-	tools/osx-dist.sh
-
-$(TARBALL): out/doc
+dist: doc
 	git archive --format=tar --prefix=$(TARNAME)/ HEAD | tar xf -
 	mkdir -p $(TARNAME)/doc
 	cp doc/node.1 $(TARNAME)/doc/node.1
@@ -152,11 +300,6 @@ $(TARBALL): out/doc
 	rm -rf $(TARNAME)
 	gzip -f -9 $(TARNAME).tar
 
-dist-upload: $(TARBALL) $(PKG)
-	ssh [email protected] mkdir -p web/nodejs.org/dist/$(VERSION)
-	scp $(TARBALL) [email protected]:~/web/nodejs.org/dist/$(VERSION)/$(TARBALL)
-	scp $(PKG) [email protected]:~/web/nodejs.org/dist/$(VERSION)/$(TARNAME).pkg
-
 bench:
 	 benchmark/http_simple_bench.sh
 
@@ -173,4 +316,4 @@ cpplint:
 
 lint: jslint cpplint
 
-.PHONY: lint cpplint jslint bench clean docopen docclean doc dist distclean dist-upload check uninstall install all program staticlib dynamiclib test test-all website-upload
+.PHONY: lint cpplint jslint bench clean docopen docclean doc dist distclean check uninstall install all program staticlib dynamiclib test test-all website-upload