diff options
author | Michael Steinert <mike.steinert@gmail.com> | 2012-05-16 12:31:06 -0600 |
---|---|---|
committer | Michael Steinert <mike.steinert@gmail.com> | 2012-05-17 11:44:46 -0600 |
commit | 93e04d3ae102937f301259b18d74accd40e069b4 (patch) | |
tree | 9c5356f68cf43f8894765e1b581d1fb0d2af847d | |
parent | c921feb829e79a33938300350e61e3c3fb217968 (diff) | |
download | rabbitmq-c-github-ask-93e04d3ae102937f301259b18d74accd40e069b4.tar.gz |
Cleanup Win32 artifacts
1. Standardize on `win32` vs `windows/win32`
2. Move `msinttypes` into platform directory
Signed-off-by: Michael Steinert <mike.steinert@gmail.com>
-rw-r--r-- | Makefile.am | 23 | ||||
-rw-r--r-- | README-win32.md (renamed from README.windows) | 0 | ||||
-rw-r--r-- | configure.ac | 3 | ||||
-rwxr-xr-x | etc/build-ms.sh | 2 | ||||
-rw-r--r-- | examples/CMakeLists.txt | 2 | ||||
-rw-r--r-- | examples/win32/platform_utils.c (renamed from examples/windows/platform_utils.c) | 0 | ||||
-rw-r--r-- | librabbitmq/CMakeLists.txt | 6 | ||||
-rw-r--r-- | librabbitmq/win32/msinttypes/inttypes.h (renamed from msinttypes/inttypes.h) | 0 | ||||
-rw-r--r-- | librabbitmq/win32/msinttypes/stdint.h (renamed from msinttypes/stdint.h) | 0 | ||||
-rw-r--r-- | librabbitmq/win32/socket.c (renamed from librabbitmq/windows/socket.c) | 0 | ||||
-rw-r--r-- | librabbitmq/win32/socket.h (renamed from librabbitmq/windows/socket.h) | 0 | ||||
-rw-r--r-- | tools/CMakeLists.txt | 2 | ||||
-rw-r--r-- | tools/win32/compat.c (renamed from tools/windows/compat.c) | 0 | ||||
-rw-r--r-- | tools/win32/compat.h (renamed from tools/windows/compat.h) | 0 | ||||
-rw-r--r-- | tools/win32/process.c (renamed from tools/windows/process.c) | 0 | ||||
-rw-r--r-- | tools/win32/process.h (renamed from tools/windows/process.h) | 0 |
16 files changed, 20 insertions, 18 deletions
diff --git a/Makefile.am b/Makefile.am index 09cb5e4..65e2dc2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,9 +26,9 @@ librabbitmq_librabbitmq_la_CFLAGS += -I$(top_srcdir)/librabbitmq/unix endif if OS_WIN32 -librabbitmq_librabbitmq_la_SOURCES += librabbitmq/windows/socket.c -librabbitmq_librabbitmq_la_SOURCES += librabbitmq/windows/socket.h -librabbitmq_librabbitmq_la_CFLAGS += -I$(top_srcdir)/librabbitmq/windows +librabbitmq_librabbitmq_la_SOURCES += librabbitmq/win32/socket.c +librabbitmq_librabbitmq_la_SOURCES += librabbitmq/win32/socket.h +librabbitmq_librabbitmq_la_CFLAGS += -I$(top_srcdir)/librabbitmq/win32 endif include_HEADERS = \ @@ -73,7 +73,7 @@ examples_libutils_la_SOURCES += examples/unix/platform_utils.c endif if OS_WIN32 -examples_libutils_la_SOURCES += examples/windows/platform_utils.c +examples_libutils_la_SOURCES += examples/win32/platform_utils.c endif noinst_PROGRAMS = \ @@ -136,18 +136,21 @@ tools_libcommon_la_CFLAGS = \ -I$(top_srcdir)/librabbitmq \ -I$(top_srcdir)/tools +tools_platform_CFLAGS = + if OS_UNIX tools_libcommon_la_SOURCES += tools/unix/process.c tools_libcommon_la_SOURCES += tools/unix/process.h -tools_platform_CFLAGS = -I$(top_srcdir)/tools/unix +tools_platform_CFLAGS += -I$(top_srcdir)/tools/unix endif if OS_WIN32 -tools_libcommon_la_SOURCES += tools/windows/compat.c -tools_libcommon_la_SOURCES += tools/windows/compat.h -tools_libcommon_la_SOURCES += tools/windows/process.c -tools_libcommon_la_SOURCES += tools/windows/process.h -tools_platform_CFLAGS = -I$(top_srcdir)/tools/windows +tools_libcommon_la_SOURCES += tools/win32/compat.c +tools_libcommon_la_SOURCES += tools/win32/compat.h +tools_libcommon_la_SOURCES += tools/win32/process.c +tools_libcommon_la_SOURCES += tools/win32/process.h +tools_platform_CFLAGS += -I$(top_srcdir)/tools/win32 +tools_platform_CFLAGS += -I$(top_srcdir)/tools/win32/msinttypes endif bin_PROGRAMS = \ diff --git a/README.windows b/README-win32.md index afa338a..afa338a 100644 --- a/README.windows +++ b/README-win32.md diff --git a/configure.ac b/configure.ac index 3f5801c..61daba2 100644 --- a/configure.ac +++ b/configure.ac @@ -67,8 +67,7 @@ AS_IF([test "x$os_win32" = xyes], [AC_DEFINE([OS_WIN32], [1], [Define to 1 for Win32.]) AS_IF([test "x$GCC" = xyes], [AX_LDFLAGS([-lws2_32])], - [AX_CFLAGS([-I$top_srcdir/msinttypes]) - AX_LDFLAGS([ws2_32.lib])])]) + [AX_LDFLAGS([ws2_32.lib])])]) # 64-bit option AC_ARG_ENABLE([64-bit], diff --git a/etc/build-ms.sh b/etc/build-ms.sh index 8567eac..02d024c 100755 --- a/etc/build-ms.sh +++ b/etc/build-ms.sh @@ -74,5 +74,5 @@ make # isn't too useful here. mkdir -p build/lib build/include build/bin cp -a librabbitmq/.libs/*.dll examples/.libs/*.exe build/bin -cp -a msinttypes/*.h librabbitmq/amqp.h librabbitmq/amqp_framing.h build/include +cp -a librabbitmq/win32/msinttypes/*.h librabbitmq/amqp.h librabbitmq/amqp_framing.h build/include cp -a librabbitmq/*.exp librabbitmq/*.lib build/lib diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index d5ea525..3194e13 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -1,7 +1,7 @@ include_directories(${LIBRABBITMQ_INCLUDE_DIRS}) if (WIN32) - set(PLATFORM_DIR windows) + set(PLATFORM_DIR win32) else (WIN32) set(PLATFORM_DIR unix) endif (WIN32) diff --git a/examples/windows/platform_utils.c b/examples/win32/platform_utils.c index ee97238..ee97238 100644 --- a/examples/windows/platform_utils.c +++ b/examples/win32/platform_utils.c diff --git a/librabbitmq/CMakeLists.txt b/librabbitmq/CMakeLists.txt index bced62e..c26d164 100644 --- a/librabbitmq/CMakeLists.txt +++ b/librabbitmq/CMakeLists.txt @@ -43,15 +43,15 @@ SET(CONFIG_CONTENTS "#define VERSION \"0.2\" file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/config.h" ${CONFIG_CONTENTS}) if(WIN32) - set(SOCKET_IMPL "windows") + set(SOCKET_IMPL "win32") else(WIN32) set(SOCKET_IMPL "unix") endif(WIN32) if(MSVC) if(MSVC_VERSION LESS 1600) - set(MSINTTYPES_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/../msinttypes") - set(STDINT_H_INSTALL_FILE "${CMAKE_CURRENT_SOURCE_DIR}/../msinttypes/stdint.h") + set(MSINTTYPES_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/win32/msinttypes") + set(STDINT_H_INSTALL_FILE "${CMAKE_CURRENT_SOURCE_DIR}/win32/msinttypes/stdint.h") endif(MSVC_VERSION LESS 1600) endif(MSVC) diff --git a/msinttypes/inttypes.h b/librabbitmq/win32/msinttypes/inttypes.h index 4b3828a..4b3828a 100644 --- a/msinttypes/inttypes.h +++ b/librabbitmq/win32/msinttypes/inttypes.h diff --git a/msinttypes/stdint.h b/librabbitmq/win32/msinttypes/stdint.h index d02608a..d02608a 100644 --- a/msinttypes/stdint.h +++ b/librabbitmq/win32/msinttypes/stdint.h diff --git a/librabbitmq/windows/socket.c b/librabbitmq/win32/socket.c index 43b919b..43b919b 100644 --- a/librabbitmq/windows/socket.c +++ b/librabbitmq/win32/socket.c diff --git a/librabbitmq/windows/socket.h b/librabbitmq/win32/socket.h index 4572410..4572410 100644 --- a/librabbitmq/windows/socket.h +++ b/librabbitmq/win32/socket.h diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index 579a3b9..bdeddaf 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -3,7 +3,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${librabbitmq_SOURCE_DIR} ${libr if (WIN32) set(PLATFORM_DIR win32) set(PLATFORM_SRCS - windows/compat.c + win32/compat.c ) else (WIN32) set(PLATFORM_DIR unix) diff --git a/tools/windows/compat.c b/tools/win32/compat.c index 07afa9a..07afa9a 100644 --- a/tools/windows/compat.c +++ b/tools/win32/compat.c diff --git a/tools/windows/compat.h b/tools/win32/compat.h index 9b9c96a..9b9c96a 100644 --- a/tools/windows/compat.h +++ b/tools/win32/compat.h diff --git a/tools/windows/process.c b/tools/win32/process.c index 8bc9337..8bc9337 100644 --- a/tools/windows/process.c +++ b/tools/win32/process.c diff --git a/tools/windows/process.h b/tools/win32/process.h index c2a8a0d..c2a8a0d 100644 --- a/tools/windows/process.h +++ b/tools/win32/process.h |