Rename submodule path to app-templates as the repo

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

diff --git a/.gitmodules b/.gitmodules
index 2a4297c..851c0bb 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "CAN-binder/conf.d/default"]
-       path = CAN-binder/conf.d/default
+       path = CAN-binder/conf.d/app-templates
        url = https://gerrit.automotivelinux.org/gerrit/apps/app-templates

diff --git a/CAN-binder/CMakeLists.txt b/CAN-binder/CMakeLists.txt
index 5fbeb19..2a97f85 100644 (file)
--- a/CAN-binder/CMakeLists.txt
+++ b/CAN-binder/CMakeLists.txt
@@ -19,7 +19,7 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 3.3)
 
 include(${CMAKE_CURRENT_SOURCE_DIR}/conf.d/config.cmake)
-include(${CMAKE_CURRENT_SOURCE_DIR}/conf.d/default/cmake/common.cmake)
+include(${CMAKE_CURRENT_SOURCE_DIR}/conf.d/app-templates/cmake/common.cmake)
 
 # Bindings to compile
 # --------------------

diff --git a/CAN-binder/build.mk b/CAN-binder/build.mk
index 24244cf..7c2c7fe 100755 (executable)
--- a/CAN-binder/build.mk
+++ b/CAN-binder/build.mk
@@ -15,7 +15,7 @@
 # limitations under the License.
 
 BUILD_DIR   := build
-PACKAGING_DIR := conf.d/default/wgt
+PACKAGING_DIR := conf.d/app-templates/wgt
 
 VPATH = etc:$(PACKAGING_DIR):$(PACKAGING_DIR)/etc:$(BUILD_DIR)
 
@@ -29,7 +29,7 @@ clean:
 mrproper:
        @rm -rf ${BUILD_DIR} package packaging
 
-build: conf.d/default/cmake config.xml.in icon-default.png ${BUILD_DIR}/Makefile
+build: conf.d/app-templates/cmake config.xml.in icon-default.png ${BUILD_DIR}/Makefile
        @cmake --build ${BUILD_DIR} --target all
 
 package: build | $(PKG_FILELIST)
@@ -47,9 +47,9 @@ ${BUILD_DIR}/Makefile:
        @[ -f ${BUILD_DIR}/Makefile ] || (cd ${BUILD_DIR} && cmake ${CMAKE_OPTS} ..)
 
 submodule:
-       @[ -d conf.d/default/cmake ] || git submodule init
-       @[ -d conf.d/default/cmake ] || git submodule update
+       @[ -d conf.d/app-templates/cmake ] || git submodule init
+       @[ -d conf.d/app-templates/cmake ] || git submodule update
 
-conf.d/default/cmake: submodule
+conf.d/app-templates/cmake: submodule
 config.xml.in: submodule
 icon-default.png: submodule

diff --git a/CAN-binder/conf.d/default b/CAN-binder/conf.d/app-templates
similarity index 100%
rename from CAN-binder/conf.d/default
rename to CAN-binder/conf.d/app-templates

diff --git a/CAN-binder/conf.d/config.cmake b/CAN-binder/conf.d/config.cmake
index 7916fa7..8340a26 100644 (file)
--- a/CAN-binder/conf.d/config.cmake
+++ b/CAN-binder/conf.d/config.cmake
@@ -31,7 +31,7 @@ set(PROJECT_LANGUAGES,"C")
 
 # Where are stored default templates files from submodule or subtree app-templates in your project tree
 # relative to the root project directory
-set(PROJECT_APP_TEMPLATES_DIR "conf.d/default")
+set(PROJECT_APP_TEMPLATES_DIR "conf.d/app-templates")
 
 # Where are stored your external libraries for your project. This is 3rd party library that you don't maintain
 # but used and must be built and linked.