libuv: Update CMake-internal buildsystem

4 files changed, 31 insertions, 23 deletions

diff --git a/Utilities/IWYU/mapping.imp b/Utilities/IWYU/mapping.imp
index aee8a69..482a08d 100644
--- a/Utilities/IWYU/mapping.imp
+++ b/Utilities/IWYU/mapping.imp
@@ -97,7 +97,7 @@
   { include: [ "<json/writer.h>", private, "\"cm_jsoncpp_writer.h\"", public ] },
   { include: [ "<rhash.h>", private, "\"cm_rhash.h\"", public ] },
   { include: [ "<uv.h>", private, "\"cm_uv.h\"", public ] },
-  { include: [ "@<uv-.+\\.h>", private, "\"cm_uv.h\"", public ] },
+  { include: [ "@<uv[/-].+\\.h>", private, "\"cm_uv.h\"", public ] },
   { include: [ "<kwiml/abi.h>", private, "\"cm_kwiml.h\"", public ] },
   { include: [ "<kwiml/int.h>", private, "\"cm_kwiml.h\"", public ] },
   { include: [ "<zconf.h>", private, "\"cm_zlib.h\"", public ] },
@@ -114,7 +114,7 @@
   { include: [ "\"cmjsoncpp/include/json/writer.h\"", private, "\"cm_jsoncpp_writer.h\"", public ] },
   { include: [ "\"cmlibrhash/librhash/rhash.h\"", private, "\"cm_rhash.h\"", public ] },
   { include: [ "\"cmlibuv/include/uv.h\"", private, "\"cm_uv.h\"", public ] },
-  { include: [ "@\"cmlibuv/include/uv-.+\\.h\"", private, "\"cm_uv.h\"", public ] },
+  { include: [ "@\"cmlibuv/include/uv/.+\\.h\"", private, "\"cm_uv.h\"", public ] },
   { include: [ "\"KWIML/include/kwiml/abi.h\"", private, "\"cm_kwiml.h\"", public ] },
   { include: [ "\"KWIML/include/kwiml/int.h\"", private, "\"cm_kwiml.h\"", public ] },
   { include: [ "\"cmzlib/cm_zlib_mangle.h\"", private, "\"cm_zlib.h\"", public ] },
diff --git a/Utilities/cmlibuv/CMakeLists.txt b/Utilities/cmlibuv/CMakeLists.txt
index a503041..a62c516 100644
--- a/Utilities/cmlibuv/CMakeLists.txt
+++ b/Utilities/cmlibuv/CMakeLists.txt
@@ -14,16 +14,21 @@ set(uv_libraries ${CMAKE_THREAD_LIBS_INIT})
 set(uv_includes include src)
 set(uv_headers
   include/uv.h
-  include/uv-errno.h
-  include/uv-threadpool.h
-  include/uv-version.h
+  include/uv/errno.h
+  include/uv/threadpool.h
+  include/uv/version.h
   )
 set(uv_sources
   src/fs-poll.c
   src/heap-inl.h
+  src/idna.c
+  src/idna.h
   src/inet.c
   src/queue.h
+  src/strscpy.c
+  src/strscpy.h
   src/threadpool.c
+  src/timer.c
   src/uv-common.c
   src/uv-common.h
   src/uv-data-getter-setters.c
@@ -45,7 +50,7 @@ if(WIN32)
     _WIN32_WINNT=0x0600
     )
   list(APPEND uv_headers
-    include/uv-win.h
+    include/uv/win.h
     include/tree.h
     )
   list(APPEND uv_sources
@@ -67,7 +72,6 @@ if(WIN32)
     src/win/poll.c
     src/win/process-stdio.c
     src/win/process.c
-    src/win/req.c
     src/win/req-inl.h
     src/win/signal.c
     src/win/snprintf.c
@@ -75,7 +79,6 @@ if(WIN32)
     src/win/stream-inl.h
     src/win/tcp.c
     src/win/thread.c
-    src/win/timer.c
     src/win/tty.c
     src/win/udp.c
     src/win/util.c
@@ -89,7 +92,7 @@ else()
     src/unix
     )
   list(APPEND uv_headers
-    include/uv-unix.h
+    include/uv/unix.h
     )
   list(APPEND uv_sources
     src/unix/async.c
@@ -110,7 +113,6 @@ else()
     src/unix/stream.c
     src/unix/tcp.c
     src/unix/thread.c
-    src/unix/timer.c
     src/unix/tty.c
     src/unix/udp.c
     )
@@ -121,7 +123,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "AIX")
     perfstat
     )
   list(APPEND uv_headers
-    include/uv-aix.h
+    include/uv/aix.h
     )
   list(APPEND uv_defines
     _ALL_SOURCE
@@ -139,7 +141,7 @@ if(CMAKE_SYSTEM_NAME MATCHES "CYGWIN")
   list(APPEND uv_libraries
     )
   list(APPEND uv_headers
-    include/uv-posix.h
+    include/uv/posix.h
     )
   list(APPEND uv_defines
     )
@@ -158,8 +160,7 @@ endif()
 
 if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
   list(APPEND uv_headers
-    include/uv-darwin.h
-    include/pthread-barrier.h
+    include/uv/darwin.h
     )
   list(APPEND uv_defines
     _DARWIN_USE_64_BIT_INODE=1
@@ -178,7 +179,7 @@ endif()
 if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
   list(APPEND uv_libraries dl rt)
   list(APPEND uv_headers
-    include/uv-linux.h
+    include/uv/linux.h
     )
   list(APPEND uv_defines _GNU_SOURCE)
   list(APPEND uv_sources
@@ -198,10 +199,11 @@ if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
     kvm
     )
   list(APPEND uv_headers
-    include/uv-bsd.h
+    include/uv/bsd.h
     )
   list(APPEND uv_sources
     src/unix/bsd-ifaddrs.c
+    src/unix/bsd-proctitle.c
     src/unix/freebsd.c
     src/unix/kqueue.c
     src/unix/posix-hrtime.c
@@ -214,10 +216,11 @@ if(CMAKE_SYSTEM_NAME STREQUAL "kFreeBSD")
     kvm
     )
   list(APPEND uv_headers
-    include/uv-bsd.h
+    include/uv/bsd.h
     )
   list(APPEND uv_sources
     src/unix/bsd-ifaddrs.c
+    src/unix/bsd-proctitle.c
     src/unix/freebsd.c
     src/unix/kqueue.c
     src/unix/posix-hrtime.c
@@ -229,10 +232,11 @@ if(CMAKE_SYSTEM_NAME STREQUAL "NetBSD")
     kvm
     )
   list(APPEND uv_headers
-    include/uv-bsd.h
+    include/uv/bsd.h
     )
   list(APPEND uv_sources
     src/unix/bsd-ifaddrs.c
+    src/unix/bsd-proctitle.c
     src/unix/netbsd.c
     src/unix/kqueue.c
     src/unix/posix-hrtime.c
@@ -244,10 +248,11 @@ if(CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
     kvm
     )
   list(APPEND uv_headers
-    include/uv-bsd.h
+    include/uv/bsd.h
     )
   list(APPEND uv_sources
     src/unix/bsd-ifaddrs.c
+    src/unix/bsd-proctitle.c
     src/unix/openbsd.c
     src/unix/kqueue.c
     src/unix/posix-hrtime.c
@@ -263,7 +268,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
     rt
     )
   list(APPEND uv_headers
-    include/uv-sunos.h
+    include/uv/sunos.h
     )
   list(APPEND uv_defines
     __EXTENSIONS__
diff --git a/Utilities/cmlibuv/src/unix/cmake-bootstrap.c b/Utilities/cmlibuv/src/unix/cmake-bootstrap.c
index 4f32d03..309ec79 100644
--- a/Utilities/cmlibuv/src/unix/cmake-bootstrap.c
+++ b/Utilities/cmlibuv/src/unix/cmake-bootstrap.c
@@ -46,6 +46,7 @@ void uv__async_stop(uv_loop_t* loop) {
 }
 
 void uv__work_submit(uv_loop_t* loop, struct uv__work* w,
+                     enum uv__work_kind kind,
                      void (*work)(struct uv__work* w),
                      void (*done)(struct uv__work* w, int status)) {
   abort();
diff --git a/bootstrap b/bootstrap
index dcc3a83..901bc10 100755
--- a/bootstrap
+++ b/bootstrap
@@ -491,8 +491,11 @@ KWSYS_FILES="\
 if ${cmake_system_mingw}; then
   LIBUV_C_SOURCES="\
     src/fs-poll.c \
+    src/idna.c
     src/inet.c \
     src/threadpool.c \
+    src/strscpy.c \
+    src/timer.c \
     src/uv-common.c \
     src/win/async.c \
     src/win/core.c \
@@ -509,12 +512,10 @@ if ${cmake_system_mingw}; then
     src/win/poll.c \
     src/win/process-stdio.c \
     src/win/process.c \
-    src/win/req.c \
     src/win/signal.c \
     src/win/stream.c \
     src/win/tcp.c \
     src/win/thread.c \
-    src/win/timer.c \
     src/win/tty.c \
     src/win/udp.c \
     src/win/util.c \
@@ -523,6 +524,8 @@ if ${cmake_system_mingw}; then
     "
 else
   LIBUV_C_SOURCES="\
+    src/strscpy.c \
+    src/timer.c \
     src/uv-common.c \
     src/unix/cmake-bootstrap.c \
     src/unix/core.c \
@@ -537,7 +540,6 @@ else
     src/unix/process.c \
     src/unix/signal.c \
     src/unix/stream.c \
-    src/unix/timer.c \
     "
 fi