Upgrade libuv to 48877ed

deps/uv/.gitignore

@@ -7,12 +7,5 @@
 *.orig
 *.sdf
 *.suo
-Makefile
-out/
-build/gyp
-build/all.Makefile
-build/all.xcodeproj/
-build/run-tests.target.mk
-build/run-benchmarks.target.mk
-build/uv.target.mk
-gyp-mac-tool
+/out/
+/build/gyp

deps/uv/Makefile

@@ -0,0 +1,24 @@
+BUILDTYPE ?= Release
+
+all: out/Makefile
+	$(MAKE) -C out BUILDTYPE=$(BUILDTYPE)
+
+out/Makefile: build/gyp
+	build/gyp_uv -f make
+
+build/gyp:
+	svn co http://gyp.googlecode.com/svn/trunk@983 build/gyp
+
+clean:
+	rm -rf out
+
+distclean:
+	rm -rf out
+
+test: all
+	./out/$(BUILDTYPE)/run-tests
+
+bench: all
+	./out/$(BUILDTYPE)/run-benchmarks
+
+.PHONY: all clean distclean test bench

deps/uv/README

@@ -4,12 +4,25 @@ all platform differences in this library.
 
 http://nodejs.org/
 
-(This was previously called liboio)
+= Build Instructions
 
-Supported Platforms:
+The build system requires python and subversion.
+
+On Unix systems just type
+
+    make
+
+On Windows you can generate the MSVS solution files by running
+
+    create-msvs-files.bat
+
+Open build/all.sln afterwards.
+
+
+= Supported Platforms
 
 Microsoft Windows operating systems since Windows XP sp2. It can be built
-with either Visual Studio or MinGW.
+with either Visual Studio.
 
 Linux 2.6 and MacOS using the GCC toolchain.
 

deps/uv/build/all.gyp

@@ -202,6 +202,7 @@
         '../test/benchmark-ares.c',
         '../test/benchmark-getaddrinfo.c',
         '../test/benchmark-ping-pongs.c',
+        '../test/benchmark-pound.c',
         '../test/benchmark-pump.c',
         '../test/benchmark-sizes.c',
         '../test/benchmark-spawn.c'

deps/uv/build/gyp_uv

@@ -6,10 +6,15 @@ import sys
 
 script_dir = os.path.dirname(__file__)
 uv_root = os.path.normpath(os.path.join(script_dir, os.pardir))
+print("uv_root " + uv_root)
 
 sys.path.insert(0, os.path.join(uv_root, 'build', 'gyp', 'pylib'))
 import gyp
 
+# Directory within which we want all generated files (including Makefiles)
+# to be written.
+output_dir = os.path.join(os.path.abspath(uv_root), 'out')
+
 
 def run_gyp(args):
   rc = gyp.main(args)
@@ -19,7 +24,19 @@ def run_gyp(args):
 
 if __name__ == '__main__':
   args = sys.argv[1:]
+
   args.append(os.path.join(script_dir, 'all.gyp'))
+
   args.append('--depth=' + uv_root)
+
+  # There's a bug with windows which doesn't allow this feature.
+  if sys.platform != 'win32':
+
+    # Tell gyp to write the Makefiles into output_dir
+    args.extend(['--generator-output', output_dir])
+
+    # Tell make to write its output into the same dir
+    args.extend(['-Goutput_dir=' + output_dir])
+
   gyp_args = list(args)
   run_gyp(gyp_args)

deps/uv/create-msvs-files.bat

@@ -0,0 +1,14 @@
+@REM Hello World
+
+cd %~dp0
+
+IF EXIST %~dp0build\gyp GOTO WINDIR
+
+
+svn co http://gyp.googlecode.com/svn/trunk@983 build/gyp
+
+:WINDIR
+
+@python build\gyp_uv
+
+