core: move all include files except uv.h to uv/

Fixes https://github.com/libuv/libuv/issues/1161
PR-URL: https://github.com/libuv/libuv/pull/1429
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Santiago Gimeno <santiago.gimeno@gmail.com>

Makefile.am

@@ -17,7 +17,10 @@ ACLOCAL_AMFLAGS = -I m4
 AM_CPPFLAGS = -I$(top_srcdir)/include \
               -I$(top_srcdir)/src
 
-include_HEADERS=include/uv.h include/uv-errno.h include/uv-threadpool.h include/uv-version.h
+include_HEADERS=include/uv.h
+
+uvincludedir = $(includedir)/uv
+uvinclude_HEADERS=include/uv/errno.h include/uv/threadpool.h include/uv/version.h
 
 CLEANFILES =
 
@@ -43,7 +46,7 @@ endif
 
 if WINNT
 
-include_HEADERS += include/uv-win.h include/tree.h
+uvinclude_HEADERS += include/uv/win.h include/uv/tree.h
 AM_CPPFLAGS += -I$(top_srcdir)/src/win \
                -DWIN32_LEAN_AND_MEAN \
                -D_WIN32_WINNT=0x0600
@@ -80,7 +83,7 @@ libuv_la_SOURCES += src/win/async.c \
 
 else  # WINNT
 
-include_HEADERS += include/uv-unix.h
+uvinclude_HEADERS += include/uv/unix.h
 AM_CPPFLAGS += -I$(top_srcdir)/src/unix
 libuv_la_SOURCES += src/unix/async.c \
                    src/unix/atomic-ops.h \
@@ -321,13 +324,13 @@ libuv_la_CFLAGS += -D_ALL_SOURCE \
                    -D_LINUX_SOURCE_COMPAT \
                    -D_THREAD_SAFE \
                    -DHAVE_SYS_AHAFS_EVPRODS_H
-include_HEADERS += include/uv-aix.h
+uvinclude_HEADERS += include/uv/aix.h
 libuv_la_SOURCES += src/unix/aix.c
 endif
 
 if ANDROID
-include_HEADERS += include/android-ifaddrs.h \
+uvinclude_HEADERS += include/uv/android-ifaddrs.h \
-                   include/pthread-barrier.h
+                   include/uv/pthread-barrier.h
 libuv_la_SOURCES += src/unix/android-ifaddrs.c \
                     src/unix/pthread-fixes.c \
                     src/unix/pthread-barrier.c
@@ -347,8 +350,8 @@ libuv_la_SOURCES += src/unix/cygwin.c \
 endif
 
 if DARWIN
-include_HEADERS += include/uv-darwin.h \
+uvinclude_HEADERS += include/uv/darwin.h \
-                   include/pthread-barrier.h
+                   include/uv/pthread-barrier.h
 libuv_la_CFLAGS += -D_DARWIN_USE_64_BIT_INODE=1
 libuv_la_CFLAGS += -D_DARWIN_UNLIMITED_SELECT=1
 libuv_la_SOURCES += src/unix/bsd-ifaddrs.c \
@@ -362,7 +365,7 @@ test_run_tests_LDFLAGS += -lutil
 endif
 
 if DRAGONFLY
-include_HEADERS += include/uv-bsd.h
+uvinclude_HEADERS += include/uv/bsd.h
 libuv_la_SOURCES += src/unix/bsd-ifaddrs.c \
                     src/unix/freebsd.c \
                     src/unix/kqueue.c \
@@ -371,7 +374,7 @@ test_run_tests_LDFLAGS += -lutil
 endif
 
 if FREEBSD
-include_HEADERS += include/uv-bsd.h
+uvinclude_HEADERS += include/uv/bsd.h
 libuv_la_SOURCES += src/unix/bsd-ifaddrs.c \
                     src/unix/freebsd.c \
                     src/unix/kqueue.c \
@@ -380,7 +383,7 @@ test_run_tests_LDFLAGS += -lutil
 endif
 
 if LINUX
-include_HEADERS += include/uv-linux.h
+uvinclude_HEADERS += include/uv/linux.h
 libuv_la_CFLAGS += -D_GNU_SOURCE
 libuv_la_SOURCES += src/unix/linux-core.c \
                     src/unix/linux-inotify.c \
@@ -407,7 +410,7 @@ libuv_la_SOURCES += src/unix/cygwin.c \
 endif
 
 if NETBSD
-include_HEADERS += include/uv-bsd.h
+uvinclude_HEADERS += include/uv/bsd.h
 libuv_la_SOURCES += src/unix/bsd-ifaddrs.c \
                     src/unix/kqueue.c \
                     src/unix/netbsd.c \
@@ -416,7 +419,7 @@ test_run_tests_LDFLAGS += -lutil
 endif
 
 if OPENBSD
-include_HEADERS += include/uv-bsd.h
+uvinclude_HEADERS += include/uv/bsd.h
 libuv_la_SOURCES += src/unix/bsd-ifaddrs.c \
                     src/unix/kqueue.c \
                     src/unix/openbsd.c \
@@ -425,14 +428,14 @@ test_run_tests_LDFLAGS += -lutil
 endif
 
 if SUNOS
-include_HEADERS += include/uv-sunos.h
+uvinclude_HEADERS += include/uv/sunos.h
 libuv_la_CFLAGS += -D__EXTENSIONS__ -D_XOPEN_SOURCE=600
 libuv_la_SOURCES += src/unix/no-proctitle.c \
                     src/unix/sunos.c
 endif
 
 if OS390
-include_HEADERS += include/pthread-fixes.h include/pthread-barrier.h
+uvinclude_HEADERS += include/uv/pthread-barrier.h
 libuv_la_CFLAGS += -D_UNIX03_THREADS \
                    -D_UNIX03_SOURCE \
                    -D_OPEN_SYS_IF_EXT=1 \

checksparse.sh

@@ -26,8 +26,8 @@ SPARSE_FLAGS=${SPARSE_FLAGS:-"
 "}
 
 SOURCES="
-include/tree.h
+include/uv/tree.h
-include/uv-unix.h
+include/uv/unix.h
 include/uv.h
 src/fs-poll.c
 src/inet.c
@@ -181,7 +181,7 @@ AIX)
 Darwin)
   SPARSE_FLAGS="$SPARSE_FLAGS -D__APPLE__=1"
   SOURCES="$SOURCES
-           include/uv-bsd.h
+           include/uv/bsd.h
            src/unix/darwin.c
            src/unix/kqueue.c
            src/unix/fsevents.c"
@@ -189,21 +189,21 @@ Darwin)
 DragonFly)
   SPARSE_FLAGS="$SPARSE_FLAGS -D__DragonFly__=1"
   SOURCES="$SOURCES
-           include/uv-bsd.h
+           include/uv/bsd.h
            src/unix/kqueue.c
            src/unix/freebsd.c"
   ;;
 FreeBSD)
   SPARSE_FLAGS="$SPARSE_FLAGS -D__FreeBSD__=1"
   SOURCES="$SOURCES
-           include/uv-bsd.h
+           include/uv/bsd.h
            src/unix/kqueue.c
            src/unix/freebsd.c"
   ;;
 Linux)
   SPARSE_FLAGS="$SPARSE_FLAGS -D__linux__=1"
   SOURCES="$SOURCES
-           include/uv-linux.h
+           include/uv/linux.h
            src/unix/linux-inotify.c
            src/unix/linux-core.c
            src/unix/linux-syscalls.c
@@ -212,21 +212,21 @@ Linux)
 NetBSD)
   SPARSE_FLAGS="$SPARSE_FLAGS -D__NetBSD__=1"
   SOURCES="$SOURCES
-           include/uv-bsd.h
+           include/uv/bsd.h
            src/unix/kqueue.c
            src/unix/netbsd.c"
   ;;
 OpenBSD)
   SPARSE_FLAGS="$SPARSE_FLAGS -D__OpenBSD__=1"
   SOURCES="$SOURCES
-           include/uv-bsd.h
+           include/uv/bsd.h
            src/unix/kqueue.c
            src/unix/openbsd.c"
   ;;
 SunOS)
   SPARSE_FLAGS="$SPARSE_FLAGS -D__sun=1"
   SOURCES="$SOURCES
-           include/uv-sunos.h
+           include/uv/sunos.h
            src/unix/sunos.c"
   ;;
 esac

docs/src/conf.py

@@ -18,7 +18,7 @@ import sys
 
 
 def get_libuv_version():
-    with open('../../include/uv-version.h') as f:
+    with open('../../include/uv/version.h') as f:
         data = f.read()
     try:
         m = re.search(r"""^#define UV_VERSION_MAJOR (\d+)$""", data, re.MULTILINE)

include/uv.h

@@ -45,18 +45,18 @@ extern "C" {
 # define UV_EXTERN /* nothing */
 #endif
 
-#include "uv-errno.h"
+#include "uv/errno.h"
-#include "uv-version.h"
+#include "uv/version.h"
 #include <stddef.h>
 #include <stdint.h>
 
 #if defined(_WIN32)
-# include "uv-win.h"
+# include "uv/win.h"
 # if !defined(BUILDING_UV_SHARED)
 #   include "io.h" /* this header is not correct in a shared library environment */
 # endif
 #else
-# include "uv-unix.h"
+# include "uv/unix.h"
 #endif
 
 /* Expand this list if necessary. */

include/uv/unix.h

@@ -42,30 +42,30 @@
 #include <pthread.h>
 #include <signal.h>
 
-#include "uv-threadpool.h"
+#include "uv/threadpool.h"
 
 #if defined(__linux__)
-# include "uv-linux.h"
+# include "uv/linux.h"
 #elif defined (__MVS__)
-# include "uv-os390.h"
+# include "uv/os390.h"
 #elif defined(_AIX)
-# include "uv-aix.h"
+# include "uv/aix.h"
 #elif defined(__sun)
-# include "uv-sunos.h"
+# include "uv/sunos.h"
 #elif defined(__APPLE__)
-# include "uv-darwin.h"
+# include "uv/darwin.h"
 #elif defined(__DragonFly__)       || \
       defined(__FreeBSD__)         || \
       defined(__FreeBSD_kernel__)  || \
       defined(__OpenBSD__)         || \
       defined(__NetBSD__)
-# include "uv-bsd.h"
+# include "uv/bsd.h"
 #elif defined(__CYGWIN__) || defined(__MSYS__)
-# include "uv-posix.h"
+# include "uv/posix.h"
 #endif
 
 #ifndef PTHREAD_BARRIER_SERIAL_THREAD
-# include "pthread-barrier.h"
+# include "uv/pthread-barrier.h"
 #endif
 
 #ifndef NI_MAXHOST

include/uv/win.h

@@ -41,8 +41,8 @@ typedef intptr_t ssize_t;
 
 #include <stdint.h>
 
-#include "tree.h"
+#include "uv/tree.h"
-#include "uv-threadpool.h"
+#include "uv/threadpool.h"
 
 #define MAX_PIPENAME_LEN 256
 

libuv.nsi

@@ -49,11 +49,11 @@ Section "Files" SecInstall
 
 	SetOutPath "$INSTDIR\include"
 	File "include\uv.h"
-	File "include\uv-errno.h"
+	File "include\uv\errno.h"
-	File "include\uv-threadpool.h"
+	File "include\uv\threadpool.h"
-	File "include\uv-version.h"
+	File "include\uv\version.h"
-	File "include\uv-win.h"
+	File "include\uv\win.h"
-	File "include\tree.h"
+	File "include\uv\tree.h"
 
 	WriteUninstaller "$INSTDIR\Uninstall.exe"
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\libuv-${ARCH}-${VERSION}" "DisplayName" "libuv-${ARCH}-${VERSION}"
@@ -73,11 +73,11 @@ Section "Uninstall"
 	Delete "$INSTDIR\README.md"
 
 	Delete "$INSTDIR\include\uv.h"
-	Delete "$INSTDIR\include\uv-errno.h"
+	Delete "$INSTDIR\include\uv\errno.h"
-	Delete "$INSTDIR\include\uv-threadpool.h"
+	Delete "$INSTDIR\include\uv\threadpool.h"
-	Delete "$INSTDIR\include\uv-version.h"
+	Delete "$INSTDIR\include\uv\version.h"
-	Delete "$INSTDIR\include\uv-win.h"
+	Delete "$INSTDIR\include\uv\win.h"
-	Delete "$INSTDIR\include\tree.h"
+	Delete "$INSTDIR\include\uv\tree.h"
 
 	Delete "$INSTDIR\Uninstall.exe"
 	RMDir "$INSTDIR"

src/unix/android-ifaddrs.c

@@ -23,7 +23,7 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "android-ifaddrs.h"
+#include "uv/android-ifaddrs.h"
 #include "uv-common.h"
 
 #include <string.h>

src/unix/linux-core.c

@@ -51,7 +51,7 @@
 
 #ifdef HAVE_IFADDRS_H
 # if defined(__ANDROID__)
-#  include "android-ifaddrs.h"
+#  include "uv/android-ifaddrs.h"
 # else
 #  include <ifaddrs.h>
 # endif

src/unix/linux-inotify.c

@@ -19,7 +19,7 @@
  */
 
 #include "uv.h"
-#include "tree.h"
+#include "uv/tree.h"
 #include "internal.h"
 
 #include <stdint.h>

src/unix/loop.c

@@ -20,7 +20,7 @@
  */
 
 #include "uv.h"
-#include "tree.h"
+#include "uv/tree.h"
 #include "internal.h"
 #include "heap-inl.h"
 #include <stdlib.h>

src/unix/pthread-barrier.c

@@ -13,7 +13,7 @@ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
-#include "pthread-barrier.h"
+#include "uv/pthread-barrier.h"
 
 #include <stdlib.h>
 #include <assert.h>

src/uv-common.h

@@ -33,7 +33,7 @@
 #include <stdint.h>
 
 #include "uv.h"
-#include "tree.h"
+#include "uv/tree.h"
 #include "queue.h"
 
 

src/win/internal.h

@@ -25,7 +25,7 @@
 #include "uv.h"
 #include "../uv-common.h"
 
-#include "tree.h"
+#include "uv/tree.h"
 #include "winapi.h"
 #include "winsock.h"
 

uv.gyp

@@ -69,10 +69,10 @@
       'sources': [
         'common.gypi',
         'include/uv.h',
-        'include/tree.h',
+        'include/uv/tree.h',
-        'include/uv-errno.h',
+        'include/uv/errno.h',
-        'include/uv-threadpool.h',
+        'include/uv/threadpool.h',
-        'include/uv-version.h',
+        'include/uv/version.h',
         'src/fs-poll.c',
         'src/heap-inl.h',
         'src/inet.c',
@@ -91,7 +91,7 @@
             '_GNU_SOURCE',
           ],
           'sources': [
-            'include/uv-win.h',
+            'include/uv/win.h',
             'src/win/async.c',
             'src/win/core.c',
             'src/win/detect-wakeup.c',
@@ -136,12 +136,12 @@
           },
         }, { # Not Windows i.e. POSIX
           'sources': [
-            'include/uv-unix.h',
+            'include/uv/unix.h',
-            'include/uv-linux.h',
+            'include/uv/linux.h',
-            'include/uv-sunos.h',
+            'include/uv/sunos.h',
-            'include/uv-darwin.h',
+            'include/uv/darwin.h',
-            'include/uv-bsd.h',
+            'include/uv/bsd.h',
-            'include/uv-aix.h',
+            'include/uv/aix.h',
             'src/unix/async.c',
             'src/unix/atomic-ops.h',
             'src/unix/core.c',
@@ -189,7 +189,7 @@
             ['uv_library=="shared_library" and OS!="mac" and OS!="os390"', {
               # This will cause gyp to set soname
               # Must correspond with UV_VERSION_MAJOR
-              # in include/uv-version.h
+              # in include/uv/version.h
               'product_extension': 'so.1',
             }],
           ],