Move and update app-templates submodule

Change-Id: I91b3926c9c5ab7c95b5a6f9cec309d930792ba14
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>

diff --git a/.gitmodules b/.gitmodules
index 31e2140..3bf958b 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
-[submodule "CAN-binder/conf.d/app-templates"]
-       path = CAN-binder/conf.d/app-templates
+[submodule "CAN-binder/conf.d"]
+       path = CAN-binder/conf.d
        url = https://gerrit.automotivelinux.org/gerrit/p/apps/app-templates.git
        branch = reference

diff --git a/CAN-binder/conf.d b/CAN-binder/conf.d
new file mode 160000 (submodule)
index 0000000..d77fcda
--- /dev/null
+++ b/CAN-binder/conf.d
@@ -0,0 +1 @@
+Subproject commit d77fcdaeb249fb1b82703b3d033126cee2c3c3ec

diff --git a/CAN-binder/conf.d/app-templates b/CAN-binder/conf.d/app-templates
deleted file mode 160000 (submodule)
index c6315b8..0000000
--- a/CAN-binder/conf.d/app-templates
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c6315b89558170864a04e9b56bcde72f4902d4ca

diff --git a/CAN-binder/conf.d/config.cmake b/CAN-binder/conf.d/config.cmake
deleted file mode 100644 (file)
index 70732d4..0000000
--- a/CAN-binder/conf.d/config.cmake
+++ /dev/null
@@ -1,87 +0,0 @@
-###########################################################################
-# Copyright 2015, 2016, 2017 IoT.bzh
-#
-# author: Fulup Ar Foll <fulup@iot.bzh>
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-###########################################################################
-
-# Project Info
-# ------------------
-set(PROJECT_NAME low-can-project)
-set(VERSION "1.0")
-set(PROJECT_PRETTY_NAME "Low level CAN binding")
-set(PROJECT_DESCRIPTION "Expose CAN Low Level APIs through AGL Framework")
-set(PROJECT_URL "https://github.com/iotbzh/CAN_signaling")
-set(PROJECT_AUTHOR "Romain Forlot")
-set(PROJECT_AUTHOR_MAIL "romain.forlot@iot.bzh")
-set(PROJECT_ICON "icon.png")
-set(PROJECT_LANGUAGES,"C")
-
-# Compilation Mode (DEBUG, RELEASE)
-# ----------------------------------
-set(CMAKE_BUILD_TYPE "DEBUG")
-
-# Compiler selection if needed. Overload the detected compiler.
-# -----------------------------------------------
- set (gcc_minimal_version 4.9) 
-
-# PKG_CONFIG required packages
-# -----------------------------
-set (PKG_REQUIRED_LIST
-       json-c
-       libsystemd
-       afb-daemon
-)
-
-# Static constante definition
-# -----------------------------
-add_compile_options(-D_REENTRANT)
-add_compile_options(-DPB_FIELD_16BIT)
-
-# LANG Specific compile flags set for all build types
-set(CMAKE_C_FLAGS "")
-set(CMAKE_CXX_FLAGS "-std=c++11")
-
-# Print a helper message when every thing is finished
-# ----------------------------------------------------
-set(CLOSING_MESSAGE "Test with: afb-daemon --rootdir=\$\$(pwd)/package --ldpaths=\$\$(pwd)/package/lib --port=1234 --roothttp=\$\$(pwd)/package/htdocs --tracereq=common --token=\"1\" --verbose")
-set(WIDGET_MESSAGE "Install widget file using in the target : afm-util install ${PROJECT_NAME}.wgt")
-
-# (BUG!!!) as PKG_CONFIG_PATH does not work [should be an env variable]
-# ---------------------------------------------------------------------
-set(CMAKE_INSTALL_PREFIX $ENV{HOME}/opt)
-set(CMAKE_PREFIX_PATH ${CMAKE_INSTALL_PREFIX}/lib64/pkgconfig ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
-set(LD_LIBRARY_PATH ${CMAKE_INSTALL_PREFIX}/lib64 ${CMAKE_INSTALL_PREFIX}/lib)
-
-# Optional dependencies order
-# ---------------------------
-#set(EXTRA_DEPENDENCIES_ORDER)
-
-# Optional Extra global include path
-# -----------------------------------
-#set(EXTRA_INCLUDE_DIRS)
-
-# Optional extra libraries
-# -------------------------
-#set(EXTRA_LINK_LIBRARIES)
-
-# Optional force binding installation
-# ------------------------------------
-set(BINDINGS_INSTALL_PREFIX /opt )
-# set(WIDGET_PREFIX DestinationPath)
-
-# Optional force binding Linking flag
-# ------------------------------------
-# set(BINDINGS_LINK_FLAG LinkOptions )
-