From 727d5cc0e72837fdf1c2fb053ad5bee4d42f92a4 Mon Sep 17 00:00:00 2001
From: Romain Forlot <romain.forlot@iot.bzh>
Date: Fri, 18 Jan 2019 17:21:01 +0100
Subject: Git submodules migration to separated libraries

Migrate submodule to use the afb-helpers and controller libraries.
Find them as packages not only link against them like before.

- Remove the submodules
- Remote the target link on target
- Add dependencies to afb-helpers and appcontroller packages.

Bug-AGL: SPEC-2139

Change-Id: I79da3a84bc1ee020924bb51f0eaed85a99ba7288
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
---
 .gitmodules               |  6 ------
 afb-helpers               |  1 -
 app-controller-submodule  |  1 -
 conf.d/cmake/config.cmake |  4 +++-
 src/CMakeLists.txt        | 13 +------------
 src/aft.h                 |  1 +
 6 files changed, 5 insertions(+), 21 deletions(-)
 delete mode 100644 .gitmodules
 delete mode 160000 afb-helpers
 delete mode 160000 app-controller-submodule

diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 502cd9c..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,6 +0,0 @@
-[submodule "afb-helpers"]
-	path = afb-helpers
-	url = https://gerrit.automotivelinux.org/gerrit/p/apps/app-afb-helpers-submodule.git
-[submodule "app-controller-submodule"]
-	path = app-controller-submodule
-	url = https://gerrit.automotivelinux.org/gerrit/p/apps/app-controller-submodule.git
diff --git a/afb-helpers b/afb-helpers
deleted file mode 160000
index f0ce5b6..0000000
--- a/afb-helpers
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit f0ce5b665dd33b285d723720c16ac0542cde4e6e
diff --git a/app-controller-submodule b/app-controller-submodule
deleted file mode 160000
index 0e395a6..0000000
--- a/app-controller-submodule
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0e395a67ff376a8586ac75144bd71c2944acd622
diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake
index 3fe3534..2f0f763 100644
--- a/conf.d/cmake/config.cmake
+++ b/conf.d/cmake/config.cmake
@@ -71,6 +71,8 @@ set (PKG_REQUIRED_LIST
 	json-c
 	libsystemd>=222
 	afb-daemon>=4.0
+	appcontroller
+	afb-helpers
 )
 
 # Prefix path where will be installed the files
@@ -124,7 +126,7 @@ set(INSTALL_PREFIX /opt/AGL CACHE PATH "INSTALL PREFIX PATH")
 # -O2
 # CACHE STRING "Compilation flags for RELEASE build type.")
 
-set(CONTROL_SUPPORT_LUA 1)
+add_definitions(-DCONTROL_SUPPORT_LUA=1)
 add_definitions(-DLUA_GLOB_PATTERN="/var/?.lua\\\;")
 add_definitions(-DCONTROL_PLUGIN_PATH="./var:${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/lib/plugins:${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/var:${INSTALL_PREFIX}/${PROJECT_NAME}/lib/plugins:${INSTALL_PREFIX}/${PROJECT_NAME}/var:${CMAKE_BINARY_DIR}/package/lib/plugins:${CMAKE_BINARY_DIR}/package/var")
 add_definitions(-DCONTROL_CONFIG_PATH="./etc:${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/etc:${INSTALL_PREFIX}/${PROJECT_NAME}/etc:${CMAKE_BINARY_DIR}/package/etc")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e6351fb..7b528a6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -24,22 +24,11 @@ PROJECT_TARGET_ADD(aft)
     ADD_LIBRARY(${TARGET_NAME} MODULE ${TARGET_NAME}.c mapis.c)
 
     SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES
-	PREFIX ""
+        PREFIX ""
         LABELS "BINDING"
         OUTPUT_NAME ${TARGET_NAME}
     )
 
-    TARGET_LINK_LIBRARIES(${TARGET_NAME}
-	    afb-helpers
-        ctl-utilities
-	    ${link_libraries}
-    )
-
-    # Define target includes for this target client
-    TARGET_INCLUDE_DIRECTORIES(${TARGET_NAME}
-        PUBLIC  ${CMAKE_CURRENT_SOURCE_DIR}
-    )
-
     # Define target includes for this target client
     TARGET_INCLUDE_DIRECTORIES(${TARGET_NAME}
         PUBLIC  ${CMAKE_CURRENT_SOURCE_DIR}
diff --git a/src/aft.h b/src/aft.h
index 7ac00a0..6778e02 100644
--- a/src/aft.h
+++ b/src/aft.h
@@ -24,6 +24,7 @@
 #include <ctl-config.h>
 #include <filescan-utils.h>
 #include <wrap-json.h>
+#include <afb/afb-binding.h>
 
 #ifndef ERROR
   #define ERROR -1
-- 
cgit 1.2.3-korg