diff options
author | Ryan Dahl <ry@tinyclouds.org> | 2011-08-04 04:23:38 +0400 |
---|---|---|
committer | Ryan Dahl <ry@tinyclouds.org> | 2011-08-06 14:11:33 +0400 |
commit | 81a999c954b09803f74ac3959ab78ea14172c0a4 (patch) | |
tree | 5e34ea7f07b05df748b45d2687fe5c955c233698 /deps | |
parent | 4f3c8b397215f96e29b314c661e469f9afa58d64 (diff) |
Upgrade libuv for gyp support
Diffstat (limited to 'deps')
-rw-r--r-- | deps/uv/.gitignore | 43 | ||||
-rw-r--r-- | deps/uv/CMakeLists.txt | 32 | ||||
-rw-r--r-- | deps/uv/Makefile | 119 | ||||
-rw-r--r-- | deps/uv/build/all.gyp | 200 | ||||
-rwxr-xr-x | deps/uv/build/gyp_uv | 25 | ||||
-rw-r--r-- | deps/uv/config-mingw.mk | 67 | ||||
-rw-r--r-- | deps/uv/config-unix.mk | 121 | ||||
-rwxr-xr-x | deps/uv/configure | 11 | ||||
-rw-r--r-- | deps/uv/msvs/c-ares.vcxproj | 189 | ||||
-rw-r--r-- | deps/uv/msvs/libuv-benchmark.vcxproj | 169 | ||||
-rw-r--r-- | deps/uv/msvs/libuv-test.vcxproj | 187 | ||||
-rw-r--r-- | deps/uv/msvs/libuv.sln | 56 | ||||
-rw-r--r-- | deps/uv/msvs/libuv.vcxproj | 160 | ||||
-rw-r--r-- | deps/uv/src/eio/CMakeLists.txt | 23 | ||||
-rw-r--r-- | deps/uv/src/ev/CMakeLists.txt | 16 |
15 files changed, 245 insertions, 1173 deletions
diff --git a/deps/uv/.gitignore b/deps/uv/.gitignore index 9d142354bf3..9b55284ee0e 100644 --- a/deps/uv/.gitignore +++ b/deps/uv/.gitignore @@ -7,37 +7,12 @@ *.orig *.sdf *.suo -*.vcxproj.filters -*.vcxproj.user -ev/.deps/ -ev/.libs/ -ev/Makefile -ev/config.h -ev/config.log -ev/config.status -ev/libtool -ev/stamp-h1 -ev/autom4te.cache -/msvs/ipch/ -/build/ -test/run-tests -test/run-benchmarks -test/run-tests.exe -test/run-benchmarks.exe -test/run-benchmarks.dSYM/ -test/run-tests.dSYM/ - - -c-ares/.deps/ -c-ares/.libs/ -c-ares/Makefile -c-ares/acountry -c-ares/adig -c-ares/ahost -c-ares/ares_config.h -c-ares/config.log -c-ares/config.status -c-ares/libcares.pc -c-ares/libtool -c-ares/stamp-h1 -c-ares/stamp-h2 +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 diff --git a/deps/uv/CMakeLists.txt b/deps/uv/CMakeLists.txt deleted file mode 100644 index 0df75c3f27d..00000000000 --- a/deps/uv/CMakeLists.txt +++ /dev/null @@ -1,32 +0,0 @@ -cmake_minimum_required(VERSION 2.6) - -project(uv) - -string(TOLOWER ${CMAKE_SYSTEM_NAME} uv_platform) - -set(uv_platform_source ${uv_SOURCE_DIR}/src/uv-${uv_platform}.c) - -set(uv_source - src/uv-common.c - src/uv-eio.c - src/uv-unix.c) - -if(EXISTS ${uv_platform_source}) - set(uv_source ${uv_source} ${uv_platform_source}) -else() - message(FATAL_ERROR "Unsupported platform: ${uv_platform}") -endif() - -include_directories( - include - src/ares/config_${uv_platform}) - -add_subdirectory(src/ev) -add_subdirectory(src/eio) -add_subdirectory(src/ares) - -add_library(uv ${uv_source}) -target_link_libraries(uv - ev - eio - ares) diff --git a/deps/uv/Makefile b/deps/uv/Makefile deleted file mode 100644 index cbbf635d3d6..00000000000 --- a/deps/uv/Makefile +++ /dev/null @@ -1,119 +0,0 @@ -# Copyright Joyent, Inc. and other Node contributors. All rights reserved. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to -# deal in the Software without restriction, including without limitation the -# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -# sell copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -# IN THE SOFTWARE. - -uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') - -ifdef MSVC -uname_S := MINGW -endif - -CPPFLAGS += -Iinclude - -CARES_OBJS = -CARES_OBJS += src/ares/ares__close_sockets.o -CARES_OBJS += src/ares/ares__get_hostent.o -CARES_OBJS += src/ares/ares__read_line.o -CARES_OBJS += src/ares/ares__timeval.o -CARES_OBJS += src/ares/ares_cancel.o -CARES_OBJS += src/ares/ares_data.o -CARES_OBJS += src/ares/ares_destroy.o -CARES_OBJS += src/ares/ares_expand_name.o -CARES_OBJS += src/ares/ares_expand_string.o -CARES_OBJS += src/ares/ares_fds.o -CARES_OBJS += src/ares/ares_free_hostent.o -CARES_OBJS += src/ares/ares_free_string.o -CARES_OBJS += src/ares/ares_gethostbyaddr.o -CARES_OBJS += src/ares/ares_gethostbyname.o -CARES_OBJS += src/ares/ares_getnameinfo.o -CARES_OBJS += src/ares/ares_getopt.o -CARES_OBJS += src/ares/ares_getsock.o -CARES_OBJS += src/ares/ares_init.o -CARES_OBJS += src/ares/ares_library_init.o -CARES_OBJS += src/ares/ares_llist.o -CARES_OBJS += src/ares/ares_mkquery.o -CARES_OBJS += src/ares/ares_nowarn.o -CARES_OBJS += src/ares/ares_options.o -CARES_OBJS += src/ares/ares_parse_a_reply.o -CARES_OBJS += src/ares/ares_parse_aaaa_reply.o -CARES_OBJS += src/ares/ares_parse_mx_reply.o -CARES_OBJS += src/ares/ares_parse_ns_reply.o -CARES_OBJS += src/ares/ares_parse_ptr_reply.o -CARES_OBJS += src/ares/ares_parse_srv_reply.o -CARES_OBJS += src/ares/ares_parse_txt_reply.o -CARES_OBJS += src/ares/ares_process.o -CARES_OBJS += src/ares/ares_query.o -CARES_OBJS += src/ares/ares_search.o -CARES_OBJS += src/ares/ares_send.o -CARES_OBJS += src/ares/ares_strcasecmp.o -CARES_OBJS += src/ares/ares_strdup.o -CARES_OBJS += src/ares/ares_strerror.o -CARES_OBJS += src/ares/ares_timeout.o -CARES_OBJS += src/ares/ares_version.o -CARES_OBJS += src/ares/ares_writev.o -CARES_OBJS += src/ares/bitncmp.o -CARES_OBJS += src/ares/inet_net_pton.o -CARES_OBJS += src/ares/inet_ntop.o - -ifneq (,$(findstring MINGW,$(uname_S))) -include config-mingw.mk -else -include config-unix.mk -endif - -TESTS=test/echo-server.c test/test-*.c -BENCHMARKS=test/echo-server.c test/dns-server.c test/benchmark-*.c - -all: uv.a test/run-tests test/run-benchmarks - -$(CARES_OBJS): %.o: %.c - $(CC) -o $*.o -c $(CFLAGS) $(CPPFLAGS) $< -DHAVE_CONFIG_H - -test/run-tests$(E): test/*.h test/run-tests.c $(RUNNER_SRC) test/runner-unix.c $(TESTS) uv.a - $(CC) $(CPPFLAGS) $(RUNNER_CFLAGS) $(RUNNER_LINKFLAGS) -o test/run-tests test/run-tests.c \ - test/runner.c $(RUNNER_SRC) $(TESTS) uv.a $(RUNNER_LIBS) - -test/run-benchmarks$(E): test/*.h test/run-benchmarks.c test/runner.c $(RUNNER_SRC) $(BENCHMARKS) uv.a - $(CC) $(CPPFLAGS) $(RUNNER_CFLAGS) $(RUNNER_LINKFLAGS) -o test/run-benchmarks test/run-benchmarks.c \ - test/runner.c $(RUNNER_SRC) $(BENCHMARKS) uv.a $(RUNNER_LIBS) - -test/echo.o: test/echo.c test/echo.h - $(CC) $(CPPFLAGS) $(CFLAGS) -c test/echo.c -o test/echo.o - - -.PHONY: clean clean-platform distclean distclean-platform test bench - - -test: test/run-tests$(E) - test/run-tests - -#test-%: test/run-tests$(E) -# test/run-tests $(@:test-%=%) - -bench: test/run-benchmarks$(E) - test/run-benchmarks - -#bench-%: test/run-benchmarks$(E) -# test/run-benchmarks $(@:bench-%=%) - -clean: clean-platform - $(RM) -f src/*.o *.a test/run-tests$(E) test/run-benchmarks$(E) - -distclean: distclean-platform - $(RM) -f src/*.o *.a test/run-tests$(E) test/run-benchmarks$(E) diff --git a/deps/uv/build/all.gyp b/deps/uv/build/all.gyp new file mode 100644 index 00000000000..debee7d866c --- /dev/null +++ b/deps/uv/build/all.gyp @@ -0,0 +1,200 @@ +{ + 'targets': [ + { + 'target_name': 'uv', + 'type': 'static_library', + 'include_dirs': [ '../include' ], + 'direct_dependent_settings': { + 'include_dirs': [ '../include' ], + }, + 'defines': [ + 'HAVE_CONFIG_H' + ], + 'sources': [ + '../src/uv-common.c', + '../src/uv-eio.c', + '../src/eio/eio.c', + '../src/ares/ares__close_sockets.c', + '../src/ares/ares__get_hostent.c', + '../src/ares/ares__read_line.c', + '../src/ares/ares__timeval.c', + '../src/ares/ares_cancel.c', + '../src/ares/ares_data.c', + '../src/ares/ares_destroy.c', + '../src/ares/ares_expand_name.c', + '../src/ares/ares_expand_string.c', + '../src/ares/ares_fds.c', + '../src/ares/ares_free_hostent.c', + '../src/ares/ares_free_string.c', + '../src/ares/ares_gethostbyaddr.c', + '../src/ares/ares_gethostbyname.c', + '../src/ares/ares_getnameinfo.c', + '../src/ares/ares_getopt.c', + '../src/ares/ares_getsock.c', + '../src/ares/ares_init.c', + '../src/ares/ares_library_init.c', + '../src/ares/ares_llist.c', + '../src/ares/ares_mkquery.c', + '../src/ares/ares_nowarn.c', + '../src/ares/ares_options.c', + '../src/ares/ares_parse_a_reply.c', + '../src/ares/ares_parse_aaaa_reply.c', + '../src/ares/ares_parse_mx_reply.c', + '../src/ares/ares_parse_ns_reply.c', + '../src/ares/ares_parse_ptr_reply.c', + '../src/ares/ares_parse_srv_reply.c', + '../src/ares/ares_parse_txt_reply.c', + '../src/ares/ares_process.c', + '../src/ares/ares_query.c', + '../src/ares/ares_search.c', + '../src/ares/ares_send.c', + '../src/ares/ares_strcasecmp.c', + '../src/ares/ares_strdup.c', + '../src/ares/ares_strerror.c', + '../src/ares/ares_timeout.c', + '../src/ares/ares_version.c', + '../src/ares/ares_writev.c', + '../src/ares/bitncmp.c', + '../src/ares/inet_net_pton.c', + '../src/ares/inet_ntop.c', + ], + 'conditions': [ + [ 'OS=="win"', { + 'include_dirs': [ + '../src/ares/config_win32' + ], + 'sources': [ '../src/ares/windows_port.c' ], + 'libraries': [ '-lws2_32', '-lm' ], + 'defines': [ + '_WIN32_WINNT=0x0501', + 'EIO_STACKSIZE=262144', + '_GNU_SOURCE', + ], + 'sources': [ + '../src/win/async.c', + '../src/win/cares.c', + '../src/win/core.c', + '../src/win/error.c', + '../src/win/getaddrinfo.c', + '../src/win/handle.c', + '../src/win/loop-watcher.c', + '../src/win/pipe.c', + '../src/win/process.c', + '../src/win/req.c', + '../src/win/stdio.c', + '../src/win/stream.c', + '../src/win/tcp.c', + '../src/win/timer.c', + '../src/win/util.c', + ] + }, { # Not Windows i.e. POSIX + 'cflags': [ + '-g', + '--std=c89', + '-pedantic', + '-Wall', + '-Wextra', + '-Wno-unused-parameter' + ], + 'sources': [ + '../src/uv-unix.c', + '../src/ev/ev.c', + ], + 'include_dirs': [ + '../src/ev' + ], + 'defines': [ + '_LARGEFILE_SOURCE', + '_FILE_OFFSET_BITS=64', + '_GNU_SOURCE', + 'EIO_STACKSIZE=262144' + ], + 'libraries': [ '-lm' ] + }], + [ 'OS=="mac"', { + 'include_dirs': [ '../src/ares/config_darwin' ], + 'sources': [ '../src/uv-darwin.c' ], + 'direct_dependent_settings': { + 'libraries': [ '-framework CoreServices' ], + }, + 'defines': [ + 'EV_CONFIG_H="config_darwin.h"', + 'EIO_CONFIG_H="config_darwin.h"', + ] + }], + # TODO add OS=='linux', OS=='sun' + ] + }, + + { + 'target_name': 'run-tests', + 'type': 'executable', + 'dependencies': [ 'uv' ], + 'sources': [ + '../test/runner.c', + '../test/run-tests.c', + '../test/test-async.c', + '../test/echo-server.c', + '../test/test-callback-stack.c', + '../test/test-connection-fail.c', + '../test/test-delayed-accept.c', + '../test/test-fail-always.c', + '../test/test-get-currentexe.c', + '../test/test-getaddrinfo.c', + '../test/test-gethostbyname.c', + '../test/test-getsockname.c', + '../test/test-hrtime.c', + '../test/test-idle.c', + '../test/test-loop-handles.c', + '../test/test-pass-always.c', + '../test/test-ping-pong.c', + '../test/test-pipe-bind-error.c', + '../test/test-ref.c', + '../test/test-shutdown-eof.c', + '../test/test-spawn.c', + '../test/test-tcp-bind-error.c', + '../test/test-tcp-bind6-error.c', + '../test/test-tcp-writealot.c', + '../test/test-timer-again.c', + '../test/test-timer.c', + ], + 'conditions': [ + [ 'OS=="win"', { + 'sources': [ '../test/runner-win.c' ] + }, { # POSIX + 'cflags': [ '_GNU_SOURCE' ], + 'ldflags': [ '-pthread' ], + 'sources': [ '../test/runner-unix.c' ] + }] + ] + }, + + { + 'target_name': 'run-benchmarks', + 'type': 'executable', + 'dependencies': [ 'uv' ], + 'sources': [ + '../test/runner.c', + '../test/run-benchmarks.c', + '../test/echo-server.c', + '../test/dns-server.c', + '../test/benchmark-ares.c', + '../test/benchmark-getaddrinfo.c', + '../test/benchmark-ping-pongs.c', + '../test/benchmark-pump.c', + '../test/benchmark-sizes.c', + '../test/benchmark-spawn.c' + ], + 'conditions': [ + [ 'OS=="win"', { + 'sources': [ '../test/runner-win.c' ] + }, { # POSIX + 'cflags': [ '_GNU_SOURCE' ], + 'ldflags': [ '-pthread' ], + 'sources': [ '../test/runner-unix.c' ] + }] + ] + } + ] +} + diff --git a/deps/uv/build/gyp_uv b/deps/uv/build/gyp_uv new file mode 100755 index 00000000000..a50e1ad04bd --- /dev/null +++ b/deps/uv/build/gyp_uv @@ -0,0 +1,25 @@ +#!/usr/bin/python +import glob +import os +import shlex +import sys + +script_dir = os.path.dirname(__file__) +uv_root = os.path.normpath(os.path.join(script_dir, os.pardir)) + +sys.path.insert(0, os.path.join(uv_root, 'build', 'gyp', 'pylib')) +import gyp + + +def run_gyp(args): + rc = gyp.main(args) + if rc != 0: + print 'Error running GYP' + sys.exit(rc) + +if __name__ == '__main__': + args = sys.argv[1:] + args.append(os.path.join(script_dir, 'all.gyp')) + args.append('--depth=' + uv_root) + gyp_args = list(args) + run_gyp(gyp_args) diff --git a/deps/uv/config-mingw.mk b/deps/uv/config-mingw.mk deleted file mode 100644 index abd244e3aef..00000000000 --- a/deps/uv/config-mingw.mk +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright Joyent, Inc. and other Node contributors. All rights reserved. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to -# deal in the Software without restriction, including without limitation the -# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -# sell copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -# IN THE SOFTWARE. - -# Use make -f Makefile.gcc PREFIX=i686-w64-mingw32- -# for cross compilation -CC = $(PREFIX)gcc -AR = $(PREFIX)ar -E=.exe - -CFLAGS=$(CPPFLAGS) -g --std=gnu89 -D_WIN32_WINNT=0x0501 -Isrc/ares/config_win32 -LINKFLAGS=-lm - -CARES_OBJS += src/ares/windows_port.o -WIN_SRCS=$(wildcard src/win/*.c) -WIN_OBJS=$(WIN_SRCS:.c=.o) - -RUNNER_CFLAGS=$(CFLAGS) -D_GNU_SOURCE # Need _GNU_SOURCE for strdup? -RUNNER_LINKFLAGS=$(LINKFLAGS) -RUNNER_LIBS=-lws2_32 -RUNNER_SRC=test/runner-win.c - -uv.a: $(WIN_OBJS) src/uv-common.o src/uv-eio.o src/eio/eio.o $(CARES_OBJS) - $(AR) rcs uv.a src/win/*.o src/uv-common.o src/uv-eio.o src/eio/eio.o $(CARES_OBJS) - -src/win/%.o: src/win/%.c src/win/internal.h - $(CC) $(CFLAGS) -o $@ -c $< - -src/uv-common.o: src/uv-common.c include/uv.h include/uv-win.h - $(CC) $(CFLAGS) -c src/uv-common.c -o src/uv-common.o - -EIO_CPPFLAGS += $(CPPFLAGS) -EIO_CPPFLAGS += -DEIO_CONFIG_H=\"$(EIO_CONFIG)\" -EIO_CPPFLAGS += -DEIO_STACKSIZE=65536 -EIO_CPPFLAGS += -D_GNU_SOURCE - -src/eio/eio.o: src/eio/eio.c - $(CC) $(EIO_CPPFLAGS) $(CFLAGS) -c src/eio/eio.c -o src/eio/eio.o - -src/uv-eio.o: src/uv-eio.c - $(CC) $(CPPFLAGS) -Isrc/eio/ $(CFLAGS) -c src/uv-eio.c -o src/uv-eio.o - -clean-platform: - -rm -f src/ares/*.o - -rm -f src/eio/*.o - -rm -f src/win/*.o - -distclean-platform: - -rm -f src/ares/*.o - -rm -f src/eio/*.o - -rm -f src/win/*.o diff --git a/deps/uv/config-unix.mk b/deps/uv/config-unix.mk deleted file mode 100644 index 5776109150d..00000000000 --- a/deps/uv/config-unix.mk +++ /dev/null @@ -1,121 +0,0 @@ -# Copyright Joyent, Inc. and other Node contributors. All rights reserved. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to -# deal in the Software without restriction, including without limitation the -# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -# sell copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -# IN THE SOFTWARE. - -CC = $(PREFIX)gcc -AR = $(PREFIX)ar -E= -CSTDFLAG=--std=c89 -pedantic -Wall -Wextra -Wno-unused-parameter -CFLAGS=-g -CPPFLAGS += -Isrc/ev -LINKFLAGS=-lm - -CPPFLAGS += -D_LARGEFILE_SOURCE -CPPFLAGS += -D_FILE_OFFSET_BITS=64 - -ifeq (SunOS,$(uname_S)) -EV_CONFIG=config_sunos.h -EIO_CONFIG=config_sunos.h -CPPFLAGS += -Isrc/ares/config_sunos -D__EXTENSIONS__ -LINKFLAGS+=-lsocket -lnsl -UV_OS_FILE=uv-sunos.c -endif - -ifeq (Darwin,$(uname_S)) -EV_CONFIG=config_darwin.h -EIO_CONFIG=config_darwin.h -CPPFLAGS += -Isrc/ares/config_darwin -LINKFLAGS+=-framework CoreServices -UV_OS_FILE=uv-darwin.c -endif - -ifeq (Linux,$(uname_S)) -EV_CONFIG=config_linux.h -EIO_CONFIG=config_linux.h -CSTDFLAG += -D_XOPEN_SOURCE=600 -CPPFLAGS += -Isrc/ares/config_linux -LINKFLAGS+=-lrt -UV_OS_FILE=uv-linux.c -endif - -ifeq (FreeBSD,$(uname_S)) -EV_CONFIG=config_freebsd.h -EIO_CONFIG=config_freebsd.h -CPPFLAGS += -Isrc/ares/config_freebsd -LINKFLAGS+= -UV_OS_FILE=uv-freebsd.c -endif - -ifneq (,$(findstring CYGWIN,$(uname_S))) -EV_CONFIG=config_cygwin.h -EIO_CONFIG=config_cygwin.h -# We drop the --std=c89, it hides CLOCK_MONOTONIC on cygwin -CSTDFLAG = -D_GNU_SOURCE -CPPFLAGS += -Isrc/ares/config_cygwin -LINKFLAGS+= -UV_OS_FILE=uv-cygwin.c -endif - -# Need _GNU_SOURCE for strdup? -RUNNER_CFLAGS=$(CFLAGS) -D_GNU_SOURCE - -RUNNER_LINKFLAGS=$(LINKFLAGS) -pthread -RUNNER_LIBS= -RUNNER_SRC=test/runner-unix.c - -uv.a: src/uv-unix.o src/uv-common.o src/uv-platform.o src/ev/ev.o src/uv-eio.o src/eio/eio.o $(CARES_OBJS) - $(AR) rcs uv.a src/uv-unix.o src/uv-platform.o src/uv-common.o src/uv-eio.o src/ev/ev.o \ - src/eio/eio.o $(CARES_OBJS) - -src/uv-platform.o: src/$(UV_OS_FILE) include/uv.h include/uv-unix.h - $(CC) $(CSTDFLAG) $(CPPFLAGS) $(CFLAGS) -c src/$(UV_OS_FILE) -o src/uv-platform.o - -src/uv-unix.o: src/uv-unix.c include/uv.h include/uv-unix.h - $(CC) $(CSTDFLAG) $(CPPFLAGS) -Ieio $(CFLAGS) -c src/uv-unix.c -o src/uv-unix.o - -src/uv-common.o: src/uv-common.c include/uv.h include/uv-unix.h - $(CC) $(CSTDFLAG) $(CPPFLAGS) $(CFLAGS) -c src/uv-common.c -o src/uv-common.o - -src/ev/ev.o: src/ev/ev.c - $(CC) $(CPPFLAGS) $(CFLAGS) -c src/ev/ev.c -o src/ev/ev.o -DEV_CONFIG_H=\"$(EV_CONFIG)\" - - -EIO_CPPFLAGS += $(CPPFLAGS) -EIO_CPPFLAGS += -DEIO_CONFIG_H=\"$(EIO_CONFIG)\" -EIO_CPPFLAGS += -DEIO_STACKSIZE=262144 -EIO_CPPFLAGS += -D_GNU_SOURCE - -src/eio/eio.o: src/eio/eio.c - $(CC) $(EIO_CPPFLAGS) $(CFLAGS) -c src/eio/eio.c -o src/eio/eio.o - -src/uv-eio.o: src/uv-eio.c - $(CC) $(CPPFLAGS) -Isrc/eio/ $(CSTDFLAG) $(CFLAGS) -c src/uv-eio.c -o src/uv-eio.o - - -clean-platform: - -rm -f src/ares/*.o - -rm -f src/ev/*.o - -rm -f src/eio/*.o - -rm -rf test/run-tests.dSYM run-benchmarks.dSYM - -distclean-platform: - -rm -f src/ares/*.o - -rm -f src/ev/*.o - -rm -f src/eio/*.o - -rm -rf test/run-tests.dSYM run-benchmarks.dSYM diff --git a/deps/uv/configure b/deps/uv/configure new file mode 100755 index 00000000000..d7573b5b84d --- /dev/null +++ b/deps/uv/configure @@ -0,0 +1,11 @@ +#!/bin/sh + +# TODO write this script in python so that it works x-platform + +set -e + +if [ ! -d build/gyp ]; then + svn checkout http://gyp.googlecode.com/svn/trunk/ build/gyp +fi + +python build/gyp_uv -f make diff --git a/deps/uv/msvs/c-ares.vcxproj b/deps/uv/msvs/c-ares.vcxproj deleted file mode 100644 index 0b23fade765..00000000000 --- a/deps/uv/msvs/c-ares.vcxproj +++ /dev/null @@ -1,189 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|x64"> - <Configuration>Debug</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|x64"> - <Configuration>Release</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <Keyword>Win32Proj</Keyword> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="ExtensionSettings"> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <OutDir>$(SolutionDir)..\build\$(Platform)\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)..\build\$(Platform)\$(Configuration)\</IntDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <OutDir>$(SolutionDir)..\build\$(Platform)\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)..\build\$(Platform)\$(Configuration)\</IntDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <OutDir>$(SolutionDir)..\build\$(Platform)\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)..\build\$(Platform)\$(Configuration)\</IntDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <OutDir>$(SolutionDir)..\build\$(Platform)\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)..\build\$(Platform)\$(Configuration)\</IntDir> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <PreprocessorDefinitions>WIN32;HAVE_CONFIG_H;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>..\include;..\src\ares\config_win32</AdditionalIncludeDirectories> - </ClCompile> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <ClCompile> - <PreprocessorDefinitions>WIN32;HAVE_CONFIG_H;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>..\include;..\src\ares\config_win32</AdditionalIncludeDirectories> - </ClCompile> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <AdditionalIncludeDirectories>..\include;..\src\ares\config_win32</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;HAVE_CONFIG_H;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <WholeProgramOptimization>true</WholeProgramOptimization> - <OmitFramePointers>true</OmitFramePointers> - </ClCompile> - <Lib> - <LinkTimeCodeGeneration>true</LinkTimeCodeGeneration> - </Lib> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <ClCompile> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <AdditionalIncludeDirectories>..\include;..\src\ares\config_win32</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;HAVE_CONFIG_H;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <WholeProgramOptimization>true</WholeProgramOptimization> - <OmitFramePointers>true</OmitFramePointers> - </ClCompile> - <Lib> - <LinkTimeCodeGeneration>true</LinkTimeCodeGeneration> - </Lib> - </ItemDefinitionGroup> - <ItemGroup> - <ClCompile Include="..\src\ares\ares__close_sockets.c" /> - <ClCompile Include="..\src\ares\ares__get_hostent.c" /> - <ClCompile Include="..\src\ares\ares__read_line.c" /> - <ClCompile Include="..\src\ares\ares__timeval.c" /> - <ClCompile Include="..\src\ares\ares_cancel.c" /> - <ClCompile Include="..\src\ares\ares_data.c" /> - <ClCompile Include="..\src\ares\ares_destroy.c" /> - <ClCompile Include="..\src\ares\ares_expand_name.c" /> - <ClCompile Include="..\src\ares\ares_expand_string.c" /> - <ClCompile Include="..\src\ares\ares_fds.c" /> - <ClCompile Include="..\src\ares\ares_free_hostent.c" /> - <ClCompile Include="..\src\ares\ares_free_string.c" /> - <ClCompile Include="..\src\ares\ares_gethostbyaddr.c" /> - <ClCompile Include="..\src\ares\ares_gethostbyname.c" /> - <ClCompile Include="..\src\ares\ares_getnameinfo.c" /> - <ClCompile Include="..\src\ares\ares_getsock.c" /> - <ClCompile Include="..\src\ares\ares_init.c" /> - <ClCompile Include="..\src\ares\ares_library_init.c" /> - <ClCompile Include="..\src\ares\ares_llist.c" /> - <ClCompile Include="..\src\ares\ares_mkquery.c" /> - <ClCompile Include="..\src\ares\ares_nowarn.c" /> - <ClCompile Include="..\src\ares\ares_options.c" /> - <ClCompile Include="..\src\ares\ares_parse_a_reply.c" /> - <ClCompile Include="..\src\ares\ares_parse_aaaa_reply.c" /> - <ClCompile Include="..\src\ares\ares_parse_mx_reply.c" /> - <ClCompile Include="..\src\ares\ares_parse_ns_reply.c" /> - <ClCompile Include="..\src\ares\ares_parse_ptr_reply.c" /> - <ClCompile Include="..\src\ares\ares_parse_srv_reply.c" /> - <ClCompile Include="..\src\ares\ares_parse_txt_reply.c" /> - <ClCompile Include="..\src\ares\ares_process.c" /> - <ClCompile Include="..\src\ares\ares_query.c" /> - <ClCompile Include="..\src\ares\ares_search.c" /> - <ClCompile Include="..\src\ares\ares_send.c" /> - <ClCompile Include="..\src\ares\ares_strcasecmp.c" /> - <ClCompile Include="..\src\ares\ares_strdup.c" /> - <ClCompile Include="..\src\ares\ares_strerror.c" /> - <ClCompile Include="..\src\ares\ares_timeout.c" /> - <ClCompile Include="..\src\ares\ares_version.c" /> - <ClCompile Include="..\src\ares\ares_writev.c" /> - <ClCompile Include="..\src\ares\bitncmp.c" /> - <ClCompile Include="..\src\ares\inet_net_pton.c" /> - <ClCompile Include="..\src\ares\inet_ntop.c" /> - <ClCompile Include="..\src\ares\windows_port.c" /> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\include\ares.h" /> - <ClInclude Include="..\include\ares_version.h" /> - <ClInclude Include="..\src\ares\ares_data.h" /> - <ClInclude Include="..\src\ares\ares_dns.h" /> - <ClInclude Include="..\src\ares\ares_iphlpapi.h" /> - <ClInclude Include="..\src\ares\ares_ipv6.h" /> - <ClInclude Include="..\src\ares\ares_library_init.h" /> - <ClInclude Include="..\src\ares\ares_llist.h" /> - <ClInclude Include="..\src\ares\ares_nowarn.h" /> - <ClInclude Include="..\src\ares\ares_private.h" /> - <ClInclude Include="..\src\ares\ares_rules.h" /> - <ClInclude Include="..\src\ares\ares_setup.h" /> - <ClInclude Include="..\src\ares\ares_strcasecmp.h" /> - <ClInclude Include="..\src\ares\ares_strdup.h" /> - <ClInclude Include="..\src\ares\ares_version.h" /> - <ClInclude Include="..\src\ares\ares_writev.h" /> - <ClInclude Include="..\src\ares\bitncmp.h" /> - <ClInclude Include="..\src\ares\config_win32\ares_config.h" /> - <ClInclude Include="..\src\ares\inet_net_pton.h" /> - <ClInclude Include="..\src\ares\inet_ntop.h" /> - <ClInclude Include="..\src\ares\nameser.h" /> - <ClInclude Include="..\src\ares\setup_once.h" /> - </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project> diff --git a/deps/uv/msvs/libuv-benchmark.vcxproj b/deps/uv/msvs/libuv-benchmark.vcxproj deleted file mode 100644 index 17132dc3bf0..00000000000 --- a/deps/uv/msvs/libuv-benchmark.vcxproj +++ /dev/null @@ -1,169 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|x64"> - <Configuration>Debug</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|x64"> - <Configuration>Release</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <Keyword>Win32Proj</Keyword> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="ExtensionSettings"> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <IntDir>$(SolutionDir)..\build\$(Platform)\$(Configuration)\</IntDir> - <OutDir>$(SolutionDir)..\build\$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <IntDir>$(SolutionDir)..\build\$(Platform)\$(Configuration)\</IntDir> - <OutDir>$(SolutionDir)..\build\$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <IntDir>$(SolutionDir)..\build\$(Platform)\$(Configuration)\</IntDir> - <OutDir>$(SolutionDir)..\build\$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <IntDir>$(SolutionDir)..\build\$(Platform)\$(Configuration)\</IntDir> - <OutDir>$(SolutionDir)..\build\$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>..\include;..\src\ares\config_win32</AdditionalIncludeDirectories> - </ClCompile> - <Link> - <TargetMachine>MachineX86</TargetMachine> - <GenerateDebugInformation>true</GenerateDebugInformation> - <SubSystem>Console</SubSystem> - <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <ClCompile> - <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>..\include;..\src\ares\config_win32</AdditionalIncludeDirectories> - </ClCompile> - <Link> - <GenerateDebugInformation>true</GenerateDebugInformation> - <SubSystem>Console</SubSystem> - <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <AdditionalIncludeDirectories>..\include;..\src\ares\config_win32</AdditionalIncludeDirectories> - <WholeProgramOptimization>true</WholeProgramOptimization> - <OmitFramePointers>true</OmitFramePointers> - </ClCompile> - <Link> - <TargetMachine>MachineX86</TargetMachine> - <GenerateDebugInformation>true</GenerateDebugInformation> - <SubSystem>Console</SubSystem> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> - <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <ClCompile> - <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <AdditionalIncludeDirectories>..\include;..\src\ares\config_win32</AdditionalIncludeDirectories> - <WholeProgramOptimization>true</WholeProgramOptimization> - <OmitFramePointers>true</OmitFramePointers> - </ClCompile> - <Link> - <GenerateDebugInformation>true</GenerateDebugInformation> - <SubSystem>Console</SubSystem> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> - <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> - </Link> - </ItemDefinitionGroup> - <ItemGroup> - <ClCompile Include="..\test\benchmark-ares.c" /> - <ClCompile Include="..\test\benchmark-getaddrinfo.c" /> - <ClCompile Include="..\test\benchmark-ping-pongs.c" /> - <ClCompile Include="..\test\benchmark-pump.c" /> - <ClCompile Include="..\test\benchmark-sizes.c" /> - <ClCompile Include="..\test\dns-server.c" /> - <ClCompile Include="..\test\echo-server.c" /> - <ClCompile Include="..\test\run-benchmarks.c" /> - <ClCompile Include="..\test\runner-win.c" /> - <ClCompile Include="..\test\runner.c" /> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\test\benchmark-list.h" /> - <ClInclude Include="..\test\runner-win.h" /> - <ClInclude Include="..\test\runner.h" /> - <ClInclude Include="..\test\task.h" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="libuv.vcxproj"> - <Project>{301fe650-cd34-14e5-6b63-42e383fa02bc}</Project> - </ProjectReference> - </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project> diff --git a/deps/uv/msvs/libuv-test.vcxproj b/deps/uv/msvs/libuv-test.vcxproj deleted file mode 100644 index 44b138bdb61..00000000000 --- a/deps/uv/msvs/libuv-test.vcxproj +++ /dev/null @@ -1,187 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|x64"> - <Configuration>Debug</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|x64"> - <Configuration>Release</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <Keyword>Win32Proj</Keyword> - <ProjectGuid>{1D7C3F6C-A4AF-DD73-2D20-B2FC919B3744}</ProjectGuid> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="ExtensionSettings"> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <IntDir>$(SolutionDir)..\build\$(Platform)\$(Configuration)\</IntDir> - <OutDir>$(SolutionDir)..\build\$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <IntDir>$(SolutionDir)..\build\$(Platform)\$(Configuration)\</IntDir> - <OutDir>$(SolutionDir)..\build\$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <IntDir>$(SolutionDir)..\build\$(Platform)\$(Configuration)\</IntDir> - <OutDir>$(SolutionDir)..\build\$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <IntDir>$(SolutionDir)..\build\$(Platform)\$(Configuration)\</IntDir> - <OutDir>$(SolutionDir)..\build\$(Platform)\$(Configuration)\</OutDir> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>..\include;..\src\ares\config_win32</AdditionalIncludeDirectories> - </ClCompile> - <Link> - <TargetMachine>MachineX86</TargetMachine> - <GenerateDebugInformation>true</GenerateDebugInformation> - <SubSystem>Console</SubSystem> - <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <ClCompile> - <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>..\include;..\src\ares\config_win32</AdditionalIncludeDirectories> - </ClCompile> - <Link> - <GenerateDebugInformation>true</GenerateDebugInformation> - <SubSystem>Console</SubSystem> - <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <AdditionalIncludeDirectories>..\include;..\src\ares\config_win32</AdditionalIncludeDirectories> - <WholeProgramOptimization>true</WholeProgramOptimization> - <OmitFramePointers>true</OmitFramePointers> - </ClCompile> - <Link> - <TargetMachine>MachineX86</TargetMachine> - <GenerateDebugInformation>true</GenerateDebugInformation> - <SubSystem>Console</SubSystem> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> - <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <ClCompile> - <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <AdditionalIncludeDirectories>..\include;..\src\ares\config_win32</AdditionalIncludeDirectories> - <WholeProgramOptimization>true</WholeProgramOptimization> - <OmitFramePointers>true</OmitFramePointers> - </ClCompile> - <Link> - <GenerateDebugInformation>true</GenerateDebugInformation> - <SubSystem>Console</SubSystem> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> - <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration> - </Link> - </ItemDefinitionGroup> - <ItemGroup> - <ClCompile Include="..\test\echo-server.c" /> - <ClCompile Include="..\test\test-async.c" /> - <ClCompile Include="..\test\test-delayed-accept.c" /> - <ClCompile Include="..\test\test-callback-stack.c" /> - <ClCompile Include="..\test\test-connection-fail.c" /> - <ClCompile Include="..\test\test-get-currentexe.c" /> - <ClCompile Include="..\test\test-fail-always.c" /> - <ClCompile Include="..\test\test-gethostbyname.c" /> - <ClCompile Include="..\test\test-getaddrinfo.c" /> - <ClCompile Include="..\test\test-getsockname.c" /> - <ClCompile Include="..\test\test-hrtime.c" /> - <ClCompile Include="..\test\test-idle.c" /> - <ClCompile Include="..\test\test-loop-handles.c" /> - <ClCompile Include="..\test\test-pass-always.c" /> - <ClCompile Include="..\test\test-ping-pong.c" /> - <ClCompile Include="..\test\runner-win.c" /> - <ClCompile Include="..\test\runner.c" /> - <ClCompile Include="..\test\test-pipe-bind-error.c" /> - <ClCompile Include="..\test\test-ref.c" /> - <ClCompile Include="..\test\test-shutdown-eof.c" /> - <ClCompile Include="..\test\test-spawn.c" /> - <ClCompile Include="..\test\test-tcp-bind-error.c" /> - <ClCompile Include="..\test\test-tcp-bind6-error.c" /> - <ClCompile Include="..\test\test-tcp-writealot.c" /> - <ClCompile Include="..\test\test-timer-again.c" /> - <ClCompile Include="..\test\test-timer.c" /> - <ClCompile Include="..\test\run-tests.c" /> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\test\test-list.h" /> - <ClInclude Include="..\test\runner-win.h" /> - <ClInclude Include="..\test\runner.h" /> - <ClInclude Include="..\test\task.h" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="libuv.vcxproj"> - <Project>{301fe650-cd34-14e5-6b63-42e383fa02bc}</Project> - </ProjectReference> - </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project>
\ No newline at end of file diff --git a/deps/uv/msvs/libuv.sln b/deps/uv/msvs/libuv.sln deleted file mode 100644 index a4eca0a6d4b..00000000000 --- a/deps/uv/msvs/libuv.sln +++ /dev/null @@ -1,56 +0,0 @@ -
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libuv", "libuv.vcxproj", "{301FE650-CD34-14E5-6B63-42E383FA02BC}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libuv-test", "libuv-test.vcxproj", "{1D7C3F6C-A4AF-DD73-2D20-B2FC919B3744}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libuv-benchmark", "libuv-benchmark.vcxproj", "{6CCBDAFD-7A11-133D-357B-E2D2F4C621E4}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "c-ares", "c-ares.vcxproj", "{2B6A4644-EBA9-DFB5-AF35-6C56EDF05C7F}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Debug|x64 = Debug|x64
- Release|Win32 = Release|Win32
- Release|x64 = Release|x64
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {301FE650-CD34-14E5-6B63-42E383FA02BC}.Debug|Win32.ActiveCfg = Debug|Win32
- {301FE650-CD34-14E5-6B63-42E383FA02BC}.Debug|Win32.Build.0 = Debug|Win32
- {301FE650-CD34-14E5-6B63-42E383FA02BC}.Debug|x64.ActiveCfg = Debug|x64
- {301FE650-CD34-14E5-6B63-42E383FA02BC}.Debug|x64.Build.0 = Debug|x64
- {301FE650-CD34-14E5-6B63-42E383FA02BC}.Release|Win32.ActiveCfg = Release|Win32
- {301FE650-CD34-14E5-6B63-42E383FA02BC}.Release|Win32.Build.0 = Release|Win32
- {301FE650-CD34-14E5-6B63-42E383FA02BC}.Release|x64.ActiveCfg = Release|x64
- {301FE650-CD34-14E5-6B63-42E383FA02BC}.Release|x64.Build.0 = Release|x64
- {1D7C3F6C-A4AF-DD73-2D20-B2FC919B3744}.Debug|Win32.ActiveCfg = Debug|Win32
- {1D7C3F6C-A4AF-DD73-2D20-B2FC919B3744}.Debug|Win32.Build.0 = Debug|Win32
- {1D7C3F6C-A4AF-DD73-2D20-B2FC919B3744}.Debug|x64.ActiveCfg = Debug|x64
- {1D7C3F6C-A4AF-DD73-2D20-B2FC919B3744}.Debug|x64.Build.0 = Debug|x64
- {1D7C3F6C-A4AF-DD73-2D20-B2FC919B3744}.Release|Win32.ActiveCfg = Release|Win32
- {1D7C3F6C-A4AF-DD73-2D20-B2FC919B3744}.Release|Win32.Build.0 = Release|Win32
- {1D7C3F6C-A4AF-DD73-2D20-B2FC919B3744}.Release|x64.ActiveCfg = Release|x64
- {1D7C3F6C-A4AF-DD73-2D20-B2FC919B3744}.Release|x64.Build.0 = Release|x64
- {6CCBDAFD-7A11-133D-357B-E2D2F4C621E4}.Debug|Win32.ActiveCfg = Debug|Win32
- {6CCBDAFD-7A11-133D-357B-E2D2F4C621E4}.Debug|Win32.Build.0 = Debug|Win32
- {6CCBDAFD-7A11-133D-357B-E2D2F4C621E4}.Debug|x64.ActiveCfg = Debug|x64
- {6CCBDAFD-7A11-133D-357B-E2D2F4C621E4}.Debug|x64.Build.0 = Debug|x64
- {6CCBDAFD-7A11-133D-357B-E2D2F4C621E4}.Release|Win32.ActiveCfg = Release|Win32
- {6CCBDAFD-7A11-133D-357B-E2D2F4C621E4}.Release|Win32.Build.0 = Release|Win32
- {6CCBDAFD-7A11-133D-357B-E2D2F4C621E4}.Release|x64.ActiveCfg = Release|x64
- {6CCBDAFD-7A11-133D-357B-E2D2F4C621E4}.Release|x64.Build.0 = Release|x64
- {2B6A4644-EBA9-DFB5-AF35-6C56EDF05C7F}.Debug|Win32.ActiveCfg = Debug|Win32
- {2B6A4644-EBA9-DFB5-AF35-6C56EDF05C7F}.Debug|Win32.Build.0 = Debug|Win32
- {2B6A4644-EBA9-DFB5-AF35-6C56EDF05C7F}.Debug|x64.ActiveCfg = Debug|x64
- {2B6A4644-EBA9-DFB5-AF35-6C56EDF05C7F}.Debug|x64.Build.0 = Debug|x64
- {2B6A4644-EBA9-DFB5-AF35-6C56EDF05C7F}.Release|Win32.ActiveCfg = Release|Win32
- {2B6A4644-EBA9-DFB5-AF35-6C56EDF05C7F}.Release|Win32.Build.0 = Release|Win32
- {2B6A4644-EBA9-DFB5-AF35-6C56EDF05C7F}.Release|x64.ActiveCfg = Release|x64
- {2B6A4644-EBA9-DFB5-AF35-6C56EDF05C7F}.Release|x64.Build.0 = Release|x64
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
diff --git a/deps/uv/msvs/libuv.vcxproj b/deps/uv/msvs/libuv.vcxproj deleted file mode 100644 index 9d97bf8454b..00000000000 --- a/deps/uv/msvs/libuv.vcxproj +++ /dev/null @@ -1,160 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|x64"> - <Configuration>Debug</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|x64"> - <Configuration>Release</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <Keyword>Win32Proj</Keyword> - <ProjectGuid>{301FE650-CD34-14E5-6B63-42E383FA02BC}</ProjectGuid> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="ExtensionSettings"> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <OutDir>$(SolutionDir)..\build\$(Platform)\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)..\build\$(Platform)\$(Configuration)\</IntDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <OutDir>$(SolutionDir)..\build\$(Platform)\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)..\build\$(Platform)\$(Configuration)\</IntDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <OutDir>$(SolutionDir)..\build\$(Platform)\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)..\build\$(Platform)\$(Configuration)\</IntDir> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <OutDir>$(SolutionDir)..\build\$(Platform)\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)..\build\$(Platform)\$(Configuration)\</IntDir> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>..\include;..\src\ares\config_win32</AdditionalIncludeDirectories> - </ClCompile> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <ClCompile> - <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <WarningLevel>Level3</WarningLevel> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>..\include;..\src\ares\config_win32</AdditionalIncludeDirectories> - </ClCompile> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <AdditionalIncludeDirectories>..\include;..\src\ares\config_win32</AdditionalIncludeDirectories> - <WholeProgramOptimization>true</WholeProgramOptimization> - <OmitFramePointers>true</OmitFramePointers> - </ClCompile> - <Lib> - <LinkTimeCodeGeneration>true</LinkTimeCodeGeneration> - </Lib> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <ClCompile> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - <AdditionalIncludeDirectories>..\include;..\src\ares\config_win32</AdditionalIncludeDirectories> - <WholeProgramOptimization>true</WholeProgramOptimization> - <OmitFramePointers>true</OmitFramePointers> - </ClCompile> - <Lib> - <LinkTimeCodeGeneration>true</LinkTimeCodeGeneration> - </Lib> - </ItemDefinitionGroup> - <ItemGroup> - <ProjectReference Include="c-ares.vcxproj"> - <Project>{2b6a4644-eba9-dfb5-af35-6c56edf05c7f}</Project> - <Private>true</Private> - <ReferenceOutputAssembly>true</ReferenceOutputAssembly> - <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies> - <LinkLibraryDependencies>true</LinkLibraryDependencies> - <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs> - </ProjectReference> - </ItemGroup> - <ItemGroup> - <ClCompile Include="..\src\uv-common.c" /> - <ClCompile Include="..\src\win\async.c" /> - <ClCompile Include="..\src\win\cares.c" /> - <ClCompile Include="..\src\win\core.c" /> - <ClCompile Include="..\src\win\error.c" /> - <ClCompile Include="..\src\win\getaddrinfo.c" /> - <ClCompile Include="..\src\win\handle.c" /> - <ClCompile Include="..\src\win\loop-watcher.c" /> - <ClCompile Include="..\src\win\pipe.c" /> - <ClCompile Include="..\src\win\process.c" /> - <ClCompile Include="..\src\win\req.c" /> - <ClCompile Include="..\src\win\stdio.c" /> - <ClCompile Include="..\src\win\stream.c" /> - <ClCompile Include="..\src\win\tcp.c" /> - <ClCompile Include="..\src\win\timer.c" /> - <ClCompile Include="..\src\win\util.c" /> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\include\ares.h" /> - <ClInclude Include="..\include\ares_version.h" /> - <ClInclude Include="..\include\tree.h" /> - <ClInclude Include="..\include\uv-win.h" /> - <ClInclude Include="..\include\uv.h" /> - <ClInclude Include="..\src\uv-common.h" /> - <ClInclude Include="..\src\win\internal.h" /> - </ItemGroup> - <ItemGroup> - <None Include="..\config-mingw.mk" /> - <None Include="..\Makefile" /> - </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project> diff --git a/deps/uv/src/eio/CMakeLists.txt b/deps/uv/src/eio/CMakeLists.txt deleted file mode 100644 index 8248886f4d0..00000000000 --- a/deps/uv/src/eio/CMakeLists.txt +++ /dev/null @@ -1,23 +0,0 @@ -cmake_minimum_required(VERSION 2.6) - -include(FindThreads) - -project(eio) - -add_definitions(-D_GNU_SOURCE) - -if(!${CMAKE_USE_PTHREADS_INIT}) - message(FATAL_ERROR "Unable to find pthreads") -endif() - -string(TOLOWER ${CMAKE_SYSTEM_NAME} eio_platform) -set(config_header ${ev_SOURCE_DIR}/config_${eio_platform}.h) - -if(EXISTS ${config_header}) - add_definitions(-DEIO_CONFIG_H="${config_header}") -else() - message(FATAL_ERROR "Unsupported platform: ${eio_platform}") -endif() - -add_library(eio eio.c) -target_link_libraries(eio ${CMAKE_THREAD_LIBS_INIT}) diff --git a/deps/uv/src/ev/CMakeLists.txt b/deps/uv/src/ev/CMakeLists.txt deleted file mode 100644 index 256e4382fd7..00000000000 --- a/deps/uv/src/ev/CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ -cmake_minimum_required(VERSION 2.6) - -project(ev) - -add_definitions(-DEV_MULTIPLICITY=0) - -string(TOLOWER ${CMAKE_SYSTEM_NAME} ev_platform) -set(config_header ${ev_SOURCE_DIR}/config_${ev_platform}.h) - -if(EXISTS ${config_header}) - add_definitions(-DEV_CONFIG_H="${config_header}") -else() - message(FATAL_ERROR "Unsupported platform: ${ev_platform}") -endif() - -add_library (ev ev.c) |