Merge {host,plugin}-iface into one common library.

2015-11-06 02:32:12 +03:00 · 2015-11-06 02:32:12 +03:00 · 66df0fd678
parent 7b89646055
commit 66df0fd678
16 changed files with 21 additions and 51 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -7,7 +7,7 @@ SET (PROJECT_DESCRIPTION "Host/Plugin Interfaces for GObject Based Applications/

 SET (MAJOR 0)
 SET (MINOR 1)
-SET (PATCH 8)
+SET (PATCH 10)

 LIST (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/backbone)

--- a/cmake/backbone
+++ b/cmake/backbone
@ -1 +1 @@
-Subproject commit 972b5e5d882bb590fb5eee248c92cdc13ff19c5f
+Subproject commit 4b74a70c2806e160ac2ae1cfe8a960cee8d490d4
--- a/pkg-config/CMakeLists.txt
+++ b/pkg-config/CMakeLists.txt
@ -3,11 +3,9 @@ INCLUDE (PkgConfigCommonRules)
 SET (PkgConfigLibs "-L\${libdir}")
 IF (WIN32)
  SET (PkgConfigLibs "${PkgConfigLibs} -l${PROJECT_LOWERCASE_NAME}-iface-${MAJOR}")
-  SET (PkgConfigLibs "${PkgConfigLibs} -l${PROJECT_LOWERCASE_NAME}-host-iface-${MAJOR}")
  SET (PkgConfigLibs "${PkgConfigLibs} -l${PROJECT_LOWERCASE_NAME}-loader-${MAJOR}")
 ELSE (WIN32)
  SET (PkgConfigLibs "${PkgConfigLibs} -l${PROJECT_LOWERCASE_NAME}-iface.so.${MAJOR}")
-  SET (PkgConfigLibs "${PkgConfigLibs} -l${PROJECT_LOWERCASE_NAME}-host-iface.so.${MAJOR}")
  SET (PkgConfigLibs "${PkgConfigLibs} -l${PROJECT_LOWERCASE_NAME}-loader.so.${MAJOR}")
 ENDIF (WIN32)

--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@ -1,3 +1,2 @@
-ADD_SUBDIRECTORY (host-iface)
-ADD_SUBDIRECTORY (plugin-iface)
+ADD_SUBDIRECTORY (iface)
 ADD_SUBDIRECTORY (loader)
--- a/src/host-iface/CMakeLists.txt
+++ b/src/host-iface/CMakeLists.txt
@ -1,5 +1,5 @@
-SET (LibName ${PROJECT_LOWERCASE_NAME}-host-iface)
-FILE (GLOB_RECURSE LibSources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} HostInterface.vala)
+SET (LibName ${PROJECT_LOWERCASE_NAME}-iface)
+FILE (GLOB_RECURSE LibSources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.vala)
 SET (LibPkgModules gee-0.8 gio-2.0)
 SET (LibExtraSources ${PROJECT_SOURCE_DIR}/src/library_constructor.c)
 SET (LibInstall ON)
--- a/src/host-iface/HostInterface.vala
+++ b/src/host-iface/HostInterface.vala
--- a/src/plugin-iface/PluginInterface.vala
+++ b/src/plugin-iface/PluginInterface.vala
--- a/src/loader/CMakeLists.txt
+++ b/src/loader/CMakeLists.txt
@ -1,13 +1,9 @@
 SET (LibName ${PROJECT_LOWERCASE_NAME}-loader)
 FILE (GLOB_RECURSE LibSources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} PluginLoader.vala)
 SET (LibPackages gee-0.8 gmodule-2.0 gio-2.0)
-SET (LibCustomVapis ${CMAKE_BINARY_DIR}/src/plugin-iface/${PROJECT_LOWERCASE_NAME}-iface-${MAJOR}.vapi
-     ${CMAKE_BINARY_DIR}/src/host-iface/${PROJECT_LOWERCASE_NAME}-host-iface-${MAJOR}.vapi
-)
+SET (LibCustomVapis ${CMAKE_BINARY_DIR}/src/iface/${PROJECT_LOWERCASE_NAME}-iface-${MAJOR}.vapi)
 SET (LibExtraSources ${PROJECT_SOURCE_DIR}/src/library_constructor.c)
 SET (LibInstall ON)
-SET (LibLinkLibs ${PROJECT_LOWERCASE_NAME}-iface ${PROJECT_LOWERCASE_NAME}-host-iface gmodule-2.0)
-INCLUDE_DIRECTORIES ("${CMAKE_BINARY_DIR}/src/plugin-iface"
-                     "${CMAKE_BINARY_DIR}/src/host-iface"
-)
+SET (LibLinkLibs ${PROJECT_LOWERCASE_NAME}-iface gmodule-2.0)
+INCLUDE_DIRECTORIES ("${CMAKE_BINARY_DIR}/src/iface")
 INCLUDE (ValaLibCommonRules)
--- a/src/plugin-iface/CMakeLists.txt
+++ b/src/plugin-iface/CMakeLists.txt
@ -1,8 +0,0 @@
-SET (LibName ${PROJECT_LOWERCASE_NAME}-iface)
-FILE (GLOB_RECURSE LibSources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} PluginInterface.vala)
-SET (LibCustomVapis ${CMAKE_BINARY_DIR}/src/host-iface/${PROJECT_LOWERCASE_NAME}-host-iface-${MAJOR}.vapi)
-SET (LibExtraSources ${PROJECT_SOURCE_DIR}/src/library_constructor.c)
-SET (LibInstall ON)
-SET (LibLinkLibs ${PROJECT_LOWERCASE_NAME}-host-iface)
-INCLUDE_DIRECTORIES ("${CMAKE_BINARY_DIR}/src/host-iface")
-INCLUDE (ValaLibCommonRules)
--- a/test/loader_test-iface/CMakeLists.txt
+++ b/test/loader_test-iface/CMakeLists.txt
@ -1,10 +1,6 @@
 SET (LibName loader_test-iface)
 FILE (GLOB_RECURSE LibSources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} LoaderTestInterface.vala)
-SET (LibCustomVapis ${CMAKE_BINARY_DIR}/src/plugin-iface/${PROJECT_LOWERCASE_NAME}-iface-${MAJOR}.vapi
-                    ${CMAKE_BINARY_DIR}/src/host-iface/${PROJECT_LOWERCASE_NAME}-host-iface-${MAJOR}.vapi
-)
+SET (LibCustomVapis ${CMAKE_BINARY_DIR}/src/iface/${PROJECT_LOWERCASE_NAME}-iface-${MAJOR}.vapi)
 SET (LibLinkLibs gobject-plugin-iface)
-INCLUDE_DIRECTORIES ("${CMAKE_BINARY_DIR}/src/plugin-iface"
-                     "${CMAKE_BINARY_DIR}/src/host-iface"
-)
+INCLUDE_DIRECTORIES ("${CMAKE_BINARY_DIR}/src/iface")
 INCLUDE (ValaLibCommonRules)
--- a/test/loader_test/CMakeLists.txt
+++ b/test/loader_test/CMakeLists.txt
@ -2,19 +2,16 @@ SET (BinName loader_test)
 FILE (GLOB_RECURSE BinSources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} LoaderTest.vala)
 SET (BinPackages gee-0.8 gio-2.0)
 SET (BinCustomVapis ${CMAKE_BINARY_DIR}/src/loader/${PROJECT_LOWERCASE_NAME}-loader-${MAJOR}.vapi
-     ${CMAKE_BINARY_DIR}/src/plugin-iface/${PROJECT_LOWERCASE_NAME}-iface-${MAJOR}.vapi
+     ${CMAKE_BINARY_DIR}/src/iface/${PROJECT_LOWERCASE_NAME}-iface-${MAJOR}.vapi
     ${CMAKE_BINARY_DIR}/test/loader_test-iface/loader_test-iface-${MAJOR}.vapi
-     ${CMAKE_BINARY_DIR}/src/host-iface/${PROJECT_LOWERCASE_NAME}-host-iface-${MAJOR}.vapi
 )
 SET (BinLinkLibs ${PROJECT_LOWERCASE_NAME}-loader
                 ${PROJECT_LOWERCASE_NAME}-iface
-                 ${PROJECT_LOWERCASE_NAME}-host-iface
                 loader_test-iface
 )
 INCLUDE_DIRECTORIES ("${CMAKE_BINARY_DIR}/src/loader"
-                     "${CMAKE_BINARY_DIR}/src/plugin-iface"
+                     "${CMAKE_BINARY_DIR}/src/iface"
                     "${CMAKE_BINARY_DIR}/test/loader_test-iface"
-                     "${CMAKE_BINARY_DIR}/src/host-iface"
 )
 INCLUDE (ValaBinCommonRules)

--- a/test/plugins/typeA/typeA1/CMakeLists.txt
+++ b/test/plugins/typeA/typeA1/CMakeLists.txt
@ -1,13 +1,11 @@
 SET (PluginName type_a1)
 FILE (GLOB_RECURSE PluginSources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} TypeA1.vala)
 SET (PluginCustomVapis
-    ${CMAKE_BINARY_DIR}/src/plugin-iface/${PROJECT_LOWERCASE_NAME}-iface-${MAJOR}.vapi
+    ${CMAKE_BINARY_DIR}/src/iface/${PROJECT_LOWERCASE_NAME}-iface-${MAJOR}.vapi
    ${CMAKE_BINARY_DIR}/test/loader_test-iface/loader_test-iface-${MAJOR}.vapi
-    ${CMAKE_BINARY_DIR}/src/host-iface/${PROJECT_LOWERCASE_NAME}-host-iface-${MAJOR}.vapi
 )
 SET (PluginLinkLibs gobject-plugin-iface loader_test-iface)
-INCLUDE_DIRECTORIES ("${CMAKE_BINARY_DIR}/src/plugin-iface"
+INCLUDE_DIRECTORIES ("${CMAKE_BINARY_DIR}/src/iface"
                     "${CMAKE_BINARY_DIR}/test/loader_test-iface"
-                     "${CMAKE_BINARY_DIR}/src/host-iface"
 )
 INCLUDE (ValaPluginCommonRules)
--- a/test/plugins/typeA/typeA2/CMakeLists.txt
+++ b/test/plugins/typeA/typeA2/CMakeLists.txt
@ -1,13 +1,11 @@
 SET (PluginName type_a2)
 FILE (GLOB_RECURSE PluginSources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} TypeA2.vala)
 SET (PluginCustomVapis
-    ${CMAKE_BINARY_DIR}/src/plugin-iface/${PROJECT_LOWERCASE_NAME}-iface-${MAJOR}.vapi
+    ${CMAKE_BINARY_DIR}/src/iface/${PROJECT_LOWERCASE_NAME}-iface-${MAJOR}.vapi
    ${CMAKE_BINARY_DIR}/test/loader_test-iface/loader_test-iface-${MAJOR}.vapi
-    ${CMAKE_BINARY_DIR}/src/host-iface/${PROJECT_LOWERCASE_NAME}-host-iface-${MAJOR}.vapi
 )
 SET (PluginLinkLibs gobject-plugin-iface loader_test-iface)
-INCLUDE_DIRECTORIES ("${CMAKE_BINARY_DIR}/src/plugin-iface"
+INCLUDE_DIRECTORIES ("${CMAKE_BINARY_DIR}/src/iface"
                     "${CMAKE_BINARY_DIR}/test/loader_test-iface"
-                     "${CMAKE_BINARY_DIR}/src/host-iface"
 )
 INCLUDE (ValaPluginCommonRules)
--- a/test/plugins/typeB/typeB1/CMakeLists.txt
+++ b/test/plugins/typeB/typeB1/CMakeLists.txt
@ -1,13 +1,11 @@
 SET (PluginName type_b1)
 FILE (GLOB_RECURSE PluginSources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} TypeB1.vala)
 SET (PluginCustomVapis
-    ${CMAKE_BINARY_DIR}/src/plugin-iface/${PROJECT_LOWERCASE_NAME}-iface-${MAJOR}.vapi
+    ${CMAKE_BINARY_DIR}/src/iface/${PROJECT_LOWERCASE_NAME}-iface-${MAJOR}.vapi
    ${CMAKE_BINARY_DIR}/test/loader_test-iface/loader_test-iface-${MAJOR}.vapi
-    ${CMAKE_BINARY_DIR}/src/host-iface/${PROJECT_LOWERCASE_NAME}-host-iface-${MAJOR}.vapi
 )
 SET (PluginLinkLibs gobject-plugin-iface loader_test-iface)
-INCLUDE_DIRECTORIES ("${CMAKE_BINARY_DIR}/src/plugin-iface"
+INCLUDE_DIRECTORIES ("${CMAKE_BINARY_DIR}/src/iface"
                     "${CMAKE_BINARY_DIR}/test/loader_test-iface"
-                     "${CMAKE_BINARY_DIR}/src/host-iface"
 )
 INCLUDE (ValaPluginCommonRules)
--- a/test/plugins/typeB/typeB2/CMakeLists.txt
+++ b/test/plugins/typeB/typeB2/CMakeLists.txt
@ -1,13 +1,11 @@
 SET (PluginName type_b2)
 FILE (GLOB_RECURSE PluginSources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} TypeB2.vala)
 SET (PluginCustomVapis
-    ${CMAKE_BINARY_DIR}/src/plugin-iface/${PROJECT_LOWERCASE_NAME}-iface-${MAJOR}.vapi
+    ${CMAKE_BINARY_DIR}/src/iface/${PROJECT_LOWERCASE_NAME}-iface-${MAJOR}.vapi
    ${CMAKE_BINARY_DIR}/test/loader_test-iface/loader_test-iface-${MAJOR}.vapi
-    ${CMAKE_BINARY_DIR}/src/host-iface/${PROJECT_LOWERCASE_NAME}-host-iface-${MAJOR}.vapi
 )
 SET (PluginLinkLibs gobject-plugin-iface loader_test-iface)
-INCLUDE_DIRECTORIES ("${CMAKE_BINARY_DIR}/src/plugin-iface"
+INCLUDE_DIRECTORIES ("${CMAKE_BINARY_DIR}/src/iface"
                     "${CMAKE_BINARY_DIR}/test/loader_test-iface"
-                     "${CMAKE_BINARY_DIR}/src/host-iface"
 )
 INCLUDE (ValaPluginCommonRules)
--- a/util/backbone
+++ b/util/backbone
@ -1 +1 @@
-Subproject commit e0eb6706bf76ae7d4048c6f535fd72d4943c570b
+Subproject commit bc270b7a0fdbbaec24dbd4af307bda242bed5c2b