Moved common headers in install to wombat subdirectory (#492)

This was necessary to avoid conflict with various packaging formats. Mailing list email outlining plan: https://lists.openmama.org/g/Openmama-dev/message/2302 Signed-off-by: Frank Quinn <fquinn@cascadium.io>
finos · Jun 19, 2022 · d9cf1ce · d9cf1ce
1 parent 8dbdd09
commit d9cf1ce
Show file tree

Hide file tree

Showing 75 changed files with 84 additions and 98 deletions.
diff --git a/common/c_cpp/src/c/CMakeLists.txt b/common/c_cpp/src/c/CMakeLists.txt
@@ -44,34 +44,22 @@ if(WIN32)
 	target_link_libraries(wombatcommonstatic ws2_32 advapi32 kernel32 Pdh shlwapi)
 endif()
 
-file(GLOB wombat_inst_includes wombat/*.h ${system}/wombat/*.h)
-if(WIN32)
-    file(GLOB wombat_platform_inst_includes ${system}/*.h)
-endif()
-list(APPEND inst_includes
-     destroyHandle.h
-     list.h
-     lookup2.h
-     platform.h
-     property.h
-     wlock.h
-     timers.h)
-
 set_target_properties(wombatcommon PROPERTIES OUTPUT_NAME "wombatcommon${OPENMAMA_LIBRARY_SUFFIX}")
 set_target_properties(wombatcommonstatic PROPERTIES OUTPUT_NAME "wombatcommon${OPENMAMA_LIBRARY_STATIC_SUFFIX}")
 install(TARGETS wombatcommon wombatcommonstatic
         RUNTIME DESTINATION bin
         LIBRARY DESTINATION lib
         ARCHIVE DESTINATION lib)
 
+file(GLOB wombat_inst_includes wombat/*.h ${system}/wombat/*.h)
 install(FILES ${wombat_inst_includes}
 	DESTINATION include/wombat)
+
 if(WIN32)
+    file(GLOB wombat_platform_inst_includes ${system}/*.h)
     install(FILES ${wombat_platform_inst_includes}
-        DESTINATION include/${system})
+        DESTINATION include/wombat/${system})
 endif()
-install(FILES ${inst_includes}
-	DESTINATION include)
 
 if (WIN32 AND MSVC)
 	install(FILES $<TARGET_PDB_FILE:wombatcommon> DESTINATION bin OPTIONAL)

diff --git a/common/c_cpp/src/c/cmake/windows-files.cmake b/common/c_cpp/src/c/cmake/windows-files.cmake
@@ -1,10 +1,8 @@
 set(SYSTEM_SOURCES
 	windows/environment.c
 	windows/lock.c
-	windows/lock.h
 	windows/machine_win.c
 	windows/mman.c
-	windows/mman.h
 	windows/network.c
 	windows/platform.c
 	windows/port.c

diff --git a/common/c_cpp/src/c/destroyHandle.c b/common/c_cpp/src/c/destroyHandle.c
@@ -23,7 +23,7 @@
 /* Includes. */
 /* ************************************************************** */
 #include "wombat/port.h"
-#include "destroyHandle.h"
+#include "wombat/destroyHandle.h"
 #include <stdio.h>
 
 /* ************************************************************** */

diff --git a/common/c_cpp/src/c/linux/platform.c b/common/c_cpp/src/c/linux/platform.c
@@ -25,7 +25,7 @@
 #include <stdlib.h>
 #include <stddef.h>
 
-#include "platform.h"
+#include "wombat/platform.h"
 #include "wombat/wincompat.h"
 
 /**

diff --git a/common/c_cpp/src/c/list.c b/common/c_cpp/src/c/list.c
@@ -25,8 +25,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "wlock.h"
-#include "list.h"
+#include "wombat/wlock.h"
+#include "wombat/list.h"
 
 int gWListDebug;
 

diff --git a/common/c_cpp/src/c/lookup2.c b/common/c_cpp/src/c/lookup2.c
@@ -20,7 +20,7 @@ You can use this free for any purpose.  It has no warranty.
 #include <stddef.h>
 #include <stdlib.h>
 
-#include "lookup2.h"
+#include "wombat/lookup2.h"
 
 /*
 --------------------------------------------------------------------

diff --git a/common/c_cpp/src/c/property.c b/common/c_cpp/src/c/property.c
@@ -28,9 +28,9 @@
 #include <ctype.h>
 
 
-#include "property.h"
+#include "wombat/property.h"
 #include "propertyinternal.h"
-#include "lookup2.h"
+#include "wombat/lookup2.h"
 #include "wombat/memnode.h"
 #include "wombat/wtable.h"
 #include "wombat/strutils.h"

diff --git a/common/c_cpp/src/c/timers.c b/common/c_cpp/src/c/timers.c
@@ -20,7 +20,7 @@
  */
 
 #include "wombat/port.h"
-#include "timers.h"
+#include "wombat/timers.h"
 
 #include <sys/types.h>
 #include <stdio.h>

diff --git a/common/c_cpp/src/c/windows/lock.c b/common/c_cpp/src/c/windows/lock.c
@@ -19,7 +19,7 @@
  * 02110-1301 USA
  */
 
-#include "lock.h"
+#include "wombat/windows/lock.h"
 
 
 int wthread_mutex_lock (wthread_t thread)

diff --git a/common/c_cpp/src/c/windows/mman.c b/common/c_cpp/src/c/windows/mman.c
@@ -26,7 +26,7 @@
 #include <errno.h>
 #include <io.h>
 
-#include "mman.h"
+#include "wombat/windows/mman.h"
 
 #ifndef FILE_MAP_EXECUTE
 #define FILE_MAP_EXECUTE    0x0020

diff --git a/common/c_cpp/src/c/windows/platform.c b/common/c_cpp/src/c/windows/platform.c
@@ -22,7 +22,7 @@
 #include <stdio.h>
 #include <string.h>
 #include "wombat/port.h"
-#include "platform.h"
+#include "wombat/platform.h"
 
 #define PATH_SEPERATOR "\\"
 

diff --git a/common/c_cpp/src/c/windows/wombat/port.h b/common/c_cpp/src/c/windows/wombat/port.h
@@ -39,8 +39,8 @@
 
 #include "wombat/targetsxs.h"
 #include "wombat/wConfig.h"
-#include "windows/lock.h"
-#include "windows/mman.h"
+#include "wombat/windows/lock.h"
+#include "wombat/windows/mman.h"
 
 #if defined(__cplusplus)
 extern "C" {

diff --git a/common/c_cpp/src/c/wlock.c b/common/c_cpp/src/c/wlock.c
@@ -25,7 +25,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <wlock.h>
+#include <wombat/wlock.h>
 
 typedef struct
 {

diff --git a/common/c_cpp/src/c/wombat/MRSWLock.h b/common/c_cpp/src/c/wombat/MRSWLock.h
@@ -25,7 +25,7 @@
 /* ********************************************************** */
 /* Includes. */
 /* ********************************************************** */
-#include "wlock.h"
+#include "wombat/wlock.h"
 #include "wombat/wSemaphore.h"
 
 /* ********************************************************** */

diff --git a/common/c_cpp/src/c/destroyHandle.h → common/c_cpp/src/c/wombat/destroyHandle.h b/common/c_cpp/src/c/destroyHandle.h → common/c_cpp/src/c/wombat/destroyHandle.h
@@ -40,7 +40,7 @@ extern "C" {
 /* Includes. */
 /* ************************************************************** */
 #include <stdlib.h>
-#include "wlock.h"
+#include "wombat/wlock.h"
 
 /* ************************************************************** */
 /* Structures. */

diff --git a/common/c_cpp/src/c/list.h → common/c_cpp/src/c/wombat/list.h b/common/c_cpp/src/c/list.h → common/c_cpp/src/c/wombat/list.h
diff --git a/common/c_cpp/src/c/lookup2.h → common/c_cpp/src/c/wombat/lookup2.h b/common/c_cpp/src/c/lookup2.h → common/c_cpp/src/c/wombat/lookup2.h
diff --git a/common/c_cpp/src/c/platform.h → common/c_cpp/src/c/wombat/platform.h b/common/c_cpp/src/c/platform.h → common/c_cpp/src/c/wombat/platform.h
diff --git a/common/c_cpp/src/c/property.h → common/c_cpp/src/c/wombat/property.h b/common/c_cpp/src/c/property.h → common/c_cpp/src/c/wombat/property.h
diff --git a/common/c_cpp/src/c/timers.h → common/c_cpp/src/c/wombat/timers.h b/common/c_cpp/src/c/timers.h → common/c_cpp/src/c/wombat/timers.h
diff --git a/common/c_cpp/src/c/windows/lock.h → common/c_cpp/src/c/wombat/windows/lock.h b/common/c_cpp/src/c/windows/lock.h → common/c_cpp/src/c/wombat/windows/lock.h
diff --git a/common/c_cpp/src/c/windows/mman.h → common/c_cpp/src/c/wombat/windows/mman.h b/common/c_cpp/src/c/windows/mman.h → common/c_cpp/src/c/wombat/windows/mman.h
diff --git a/common/c_cpp/src/c/wlock.h → common/c_cpp/src/c/wombat/wlock.h b/common/c_cpp/src/c/wlock.h → common/c_cpp/src/c/wombat/wlock.h
diff --git a/common/c_cpp/src/c/wtable.c b/common/c_cpp/src/c/wtable.c
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "lookup2.h"
+#include "wombat/lookup2.h"
 #include "wombat/wtable.h"
 
 #define HASH_INITVAL 1

diff --git a/common/c_cpp/src/cpp/CommonStrUtils.cpp b/common/c_cpp/src/cpp/CommonStrUtils.cpp
@@ -1,4 +1,4 @@
-#include <wlock.h>
+#include <wombat/wlock.h>
 #include "wombat/CommonStrUtils.h"
 
 namespace Wombat

diff --git a/common/c_cpp/src/cpp/Lock.cpp b/common/c_cpp/src/cpp/Lock.cpp
@@ -18,7 +18,7 @@
  * 02110-1301 USA
  */
 
-#include <wlock.h>
+#include <wombat/wlock.h>
 #include "wombat/Lock.h"
 
 namespace Wombat {

diff --git a/common/c_cpp/src/gunittest/c/port.cpp b/common/c_cpp/src/gunittest/c/port.cpp
@@ -27,7 +27,7 @@
 #include <cstdlib>
 
 #include "wombat/port.h"
-#include "timers.h"
+#include "wombat/timers.h"
 #include <sys/types.h>
 
 class CommonPortTestC : public ::testing::Test

diff --git a/common/c_cpp/src/gunittest/c/timertest.cpp b/common/c_cpp/src/gunittest/c/timertest.cpp
@@ -27,7 +27,7 @@
 #include <cstdlib>
 
 #include "wombat/port.h"
-#include "timers.h"
+#include "wombat/timers.h"
 #include <sys/types.h>
 
 

diff --git a/mama/c_cpp/src/c/bridge.h b/mama/c_cpp/src/c/bridge.h
@@ -28,7 +28,7 @@
 #include "mama/subscmsgtype.h"
 #include "mamainternal.h"
 #include "conflation/manager_int.h"
-#include "wlock.h"
+#include "wombat/wlock.h"
 #include <wombat/thread.h>
 
 #ifndef OPENMAMA_INTEGRATION

diff --git a/mama/c_cpp/src/c/bridge/base/basedefs.h b/mama/c_cpp/src/c/bridge/base/basedefs.h
@@ -8,9 +8,9 @@
 
 #include <wombat/wSemaphore.h>
 #include <wombat/wtable.h>
-#include <list.h>
+#include <wombat/list.h>
 #include <wombat/mempool.h>
-#include <timers.h>
+#include <wombat/timers.h>
 
 #include <mama/integration/bridge.h>
 

diff --git a/mama/c_cpp/src/c/bridge/base/bridge.c b/mama/c_cpp/src/c/bridge/base/bridge.c
@@ -5,7 +5,7 @@
 #include <stdint.h>
 #include <mama/mama.h>
 #include <mama/version.h>
-#include <timers.h>
+#include <wombat/timers.h>
 #include <wombat/strutils.h>
 #include <mama/integration/bridge/base.h>
 #include <mama/integration/bridge.h>

diff --git a/mama/c_cpp/src/c/bridge/base/timer.c b/mama/c_cpp/src/c/bridge/base/timer.c
@@ -26,7 +26,7 @@
 
 #include <mama/mama.h>
 #include <mama/timer.h>
-#include <timers.h>
+#include <wombat/timers.h>
 #include <mama/integration/queue.h>
 #include <mama/integration/bridge/base.h>
 #include "basedefs.h"

diff --git a/mama/c_cpp/src/c/bridge/noop/bridge.c b/mama/c_cpp/src/c/bridge/noop/bridge.c
@@ -4,7 +4,7 @@
 
 #include <mama/mama.h>
 #include <mama/version.h>
-#include <timers.h>
+#include <wombat/timers.h>
 #include <wombat/strutils.h>
 #include <mama/integration/mama.h>
 #include "bridgefunctions.h"

diff --git a/mama/c_cpp/src/c/bridge/ompb/bridge.c b/mama/c_cpp/src/c/bridge/ompb/bridge.c
@@ -4,7 +4,7 @@
 
 #include <mama/mama.h>
 #include <mama/version.h>
-#include <timers.h>
+#include <wombat/timers.h>
 #include <wombat/strutils.h>
 #include <mama/integration/mama.h>
 #include "bridgefunctions.h"

diff --git a/mama/c_cpp/src/c/bridge/ompb/subscription.c b/mama/c_cpp/src/c/bridge/ompb/subscription.c
@@ -6,7 +6,7 @@
 #include "bridgefunctions.h"
 #include "transport.h"
 #include <mama/mama.h>
-#include <property.h>
+#include <wombat/property.h>
 #include <stdlib.h>
 #include <string.h>
 

diff --git a/mama/c_cpp/src/c/bridge/qpid/bridge.c b/mama/c_cpp/src/c/bridge/qpid/bridge.c
@@ -27,7 +27,7 @@
 #include <stdint.h>
 #include <mama/mama.h>
 #include <mama/version.h>
-#include <timers.h>
+#include <wombat/timers.h>
 #include <wombat/strutils.h>
 #include "qpidbridgefunctions.h"
 #include "qpiddefs.h"

diff --git a/mama/c_cpp/src/c/bridge/qpid/qpiddefs.h b/mama/c_cpp/src/c/bridge/qpid/qpiddefs.h
@@ -29,9 +29,9 @@
 
 #include <wombat/wSemaphore.h>
 #include <wombat/wtable.h>
-#include <list.h>
+#include <wombat/list.h>
 #include <wombat/mempool.h>
-#include <timers.h>
+#include <wombat/timers.h>
 
 /* Qpid include files */
 #include <proton/version.h>

diff --git a/mama/c_cpp/src/c/bridge/qpid/transport.c b/mama/c_cpp/src/c/bridge/qpid/transport.c
@@ -26,7 +26,7 @@
 
 #include <stdint.h>
 #include <wombat/port.h>
-#include <property.h>
+#include <wombat/property.h>
 #include <mama/mama.h>
 #include <queueimpl.h>
 #include <msgimpl.h>
@@ -35,7 +35,7 @@
 #include <msgimpl.h>
 #include <subscriptionimpl.h>
 #include <transportimpl.h>
-#include <timers.h>
+#include <wombat/timers.h>
 #include <stdio.h>
 #include <errno.h>
 #include <wombat/queue.h>

diff --git a/mama/c_cpp/src/c/clientmanageresponder.c b/mama/c_cpp/src/c/clientmanageresponder.c
@@ -23,7 +23,7 @@
 #include "mama/clientmanage.h"
 #include "subscriptionimpl.h"
 #include "clientmanageresponder.h"
-#include "list.h"
+#include "wombat/list.h"
 #include "syncresponder.h"
 #include "bridge.h"
 #include "transportimpl.h"

diff --git a/mama/c_cpp/src/c/endpointpool.c b/mama/c_cpp/src/c/endpointpool.c
@@ -29,7 +29,7 @@
 #include <wombat/wtable.h>
 #include <wombat/port.h>
 #include <mama/integration/endpointpool.h>
-#include <wlock.h>
+#include <wombat/wlock.h>
 
 
 /*=========================================================================

diff --git a/mama/c_cpp/src/c/fieldcache/fieldcacheimpl.h b/mama/c_cpp/src/c/fieldcache/fieldcacheimpl.h
@@ -25,7 +25,7 @@
 #include <mama/types.h>
 #include "fieldcachemap.h"
 #include "fieldcachelist.h"
-#include <wlock.h>
+#include <wombat/wlock.h>
 
 #if defined(__cplusplus)
 extern "C" {

diff --git a/mama/c_cpp/src/c/imagerequest.c b/mama/c_cpp/src/c/imagerequest.c
@@ -25,14 +25,14 @@
 #include <imagerequest.h>
 #include <throttle.h>
 #include <bridge.h>
-#include <list.h>
+#include <wombat/list.h>
 #include <mama/timer.h>
 #include <mama/subscription.h>
 #include <subscriptionimpl.h>
 #include <assert.h>
 #include "msgutils.h"
-#include "destroyHandle.h"
-#include "wlock.h"
+#include "wombat/destroyHandle.h"
+#include "wombat/wlock.h"
 #include "msgimpl.h"
 #include "inboximpl.h"
 #include "publisherimpl.h"

diff --git a/mama/c_cpp/src/c/log.c b/mama/c_cpp/src/c/log.c
@@ -31,7 +31,7 @@
 #include "mama/log.h"
 
 #include "wombat/MRSWLock.h"
-#include "property.h"
+#include "wombat/property.h"
 #include "mamainternal.h"
 
 /* ******************************************************************* */

diff --git a/mama/c_cpp/src/c/mama.c b/mama/c_cpp/src/c/mama.c
@@ -36,8 +36,8 @@
 #include <mama/version.h>
 #include <bridge.h>
 #include <payloadbridge.h>
-#include <property.h>
-#include <platform.h>
+#include <wombat/property.h>
+#include <wombat/platform.h>
 #include <plugin.h>
 #include <registerfunctions.h>
 

diff --git a/mama/c_cpp/src/c/mama/integration/mama.h b/mama/c_cpp/src/c/mama/integration/mama.h
@@ -14,7 +14,7 @@
 #define OPENMAMA_INTEGRATION_MAMA_H__
 
 #include <wombat/wtable.h>
-#include <property.h>
+#include <wombat/property.h>
 #include <mama/mama.h>
 #include <mama/version.h>