agl-service-unicens: use shared lib of afb-helpers

Change the usage of afb-helpers from git submodule to
shared library. Removed also unused app-templates submodule.

Bug-AGL: SPEC-2562

Signed-off-by: Tobias Jahnke <tobias.jahnke@microchip.com>
Change-Id: Iade8686aded8912d4dd203d1f74e171c13302a3e

diff --git a/.gitmodules b/.gitmodules
index 54be31c..e885a93 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,3 @@
-[submodule "conf.d/templates"]
-       path = conf.d/app-templates
-       url = https://gerrit.automotivelinux.org/gerrit/p/apps/app-templates.git
 [submodule "ucs2-lib/unicens"]
        path = ucs2-lib/unicens
        url = https://github.com/MicrochipTech/unicens.git
-[submodule "afb-helpers"]
-       path = afb-helpers
-       url = https://gerrit.automotivelinux.org/gerrit/apps/app-afb-helpers-submodule

diff --git a/afb-helpers b/afb-helpers
deleted file mode 160000 (submodule)
index f0ce5b6..0000000
--- a/afb-helpers
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit f0ce5b665dd33b285d723720c16ac0542cde4e6e

diff --git a/conf.d/project/config.cmake b/conf.d/project/config.cmake
index fae52f3..4c9b1d6 100644 (file)
--- a/conf.d/project/config.cmake
+++ b/conf.d/project/config.cmake
@@ -22,7 +22,7 @@ set(PROJECT_NAME agl-service-unicens)
 set(PROJECT_VERSION "0.1")
 set(PROJECT_PRETTY_NAME "UNICENS Service")
 set(PROJECT_DESCRIPTION "UNICENS V2 - Infotainment network setup and access")
-set(PROJECT_URL "https://gerrit.automotivelinux.org/gerrit/p/apps/agl-service-unicens.git")
+set(PROJECT_URL "https://git.automotivelinux.org/apps/agl-service-unicens/")
 set(PROJECT_ICON "icon.png")
 set(PROJECT_AUTHOR "Thorsten Kummermehr")
 set(PROJECT_AUTHOR_MAIL "thorsten.kummermehr@microchip.com")
@@ -73,6 +73,7 @@ set (PKG_REQUIRED_LIST
        json-c
        libsystemd>=222
        afb-daemon
+       afb-helpers
        libxml-2.0
 )
 
@@ -199,7 +200,7 @@ set(AFB_REMPORT "1234" CACHE PATH "Default binder listening port")
 
 # Print a helper message when every thing is finished
 # ----------------------------------------------------
-set(CLOSING_MESSAGE "Test with: afb-daemon --ldpaths=./package --port=1234 --workdir=. --roothttp=../htdocs --tracereq=common --token= --verbose")
+set(CLOSING_MESSAGE "Test with: afb-daemon --ldpaths=./package --port=1234 --workdir=. --roothttp=./package/htdocs --tracereq=common --token= --verbose")
 set(PACKAGE_MESSAGE "Install widget file using in the target : afm-util install ${PROJECT_NAME}.wgt")
 
 # Optional schema validator about now only XML, LUA and JSON

diff --git a/ucs2-afb/CMakeLists.txt b/ucs2-afb/CMakeLists.txt
index 2f99b58..cdaf2be 100644 (file)
--- a/ucs2-afb/CMakeLists.txt
+++ b/ucs2-afb/CMakeLists.txt
@@ -34,6 +34,5 @@ PROJECT_TARGET_ADD(ucs2-afb)
     # Library dependencies (include updates automatically)
     TARGET_LINK_LIBRARIES(${TARGET_NAME}
         ucs2-inter
-        afb-helpers
         ${link_libraries}
     )

diff --git a/ucs2-afb/ucs_apidef.h b/ucs2-afb/ucs_apidef.h
index 0b40094..379966b 100644 (file)
--- a/ucs2-afb/ucs_apidef.h
+++ b/ucs2-afb/ucs_apidef.h
@@ -64,12 +64,12 @@ static const struct afb_auth _afb_auths_UNICENS[] = {
        { .type = afb_auth_Permission, .text = "urn:AGL:permission:UNICENS:public:controller" }
 };
 
- void ucs2_listconfig(afb_req req);
- void ucs2_initialise(afb_req req);
- void ucs2_subscribe(afb_req req);
- void ucs2_subscriberx(afb_req req);
- void ucs2_writei2c(afb_req req);
- void ucs2_sendmessage(afb_req req);
+void ucs2_listconfig(afb_req_t req);
+void ucs2_initialise(afb_req_t req);
+void ucs2_subscribe(afb_req_t req);
+void ucs2_subscriberx(afb_req_t req);
+void ucs2_writei2c(afb_req_t req);
+void ucs2_sendmessage(afb_req_t req);
 
 static const struct afb_verb_v2 _afb_verbs_UNICENS[] = {
     {
@@ -123,6 +123,8 @@ static const struct afb_verb_v2 _afb_verbs_UNICENS[] = {
        }
 };
 
+int ucs2_initbinding();
+
 const struct afb_binding_v2 afbBindingV2 = {
     .api = "UNICENS",
     .specification = _afb_description_UNICENS,

diff --git a/ucs2-afb/ucs_binding.c b/ucs2-afb/ucs_binding.c
index 4b21934..bf0fd8e 100644 (file)
--- a/ucs2-afb/ucs_binding.c
+++ b/ucs2-afb/ucs_binding.c
@@ -41,7 +41,7 @@
 
 #include "ucs_binding.h"
 #include "ucs_interface.h"
-#include "wrap-json.h"
+#include <wrap-json.h>
 
 #define MAX_FILENAME_LEN (100)
 #define RX_BUFFER (64)