summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2017-06-09 18:11:24 +0200
committerRomain Forlot <romain.forlot@iot.bzh>2017-06-09 18:11:24 +0200
commit20eaa9b48b43407a9a4f023655cb940c59b8917a (patch)
tree8138a8441ca9fcba17cd9a724b860850b51754a6
parent24c4af5f03b233331782400b780bd5cbca0133a3 (diff)
Rename submodule path to app-templates as the repo
Change-Id: Ic4c2c5e50a19199614b7f1aaa8e1d2f9992fb3af Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
-rw-r--r--.gitmodules2
-rw-r--r--CAN-binder/CMakeLists.txt2
-rwxr-xr-xCAN-binder/build.mk10
m---------CAN-binder/conf.d/app-templates (renamed from CAN-binder/conf.d/default)0
-rw-r--r--CAN-binder/conf.d/config.cmake2
5 files changed, 8 insertions, 8 deletions
diff --git a/.gitmodules b/.gitmodules
index 2a4297cf..851c0bb3 100644
--- 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 5fbeb193..2a97f85d 100644
--- 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 24244cf5..7c2c7fe7 100755
--- 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
-Subproject cc640c4cfed7d4a35cbbdbb23e09b9e76c88902
+Subproject cc640c4cfed7d4a35cbbdbb23e09b9e76c88902
diff --git a/CAN-binder/conf.d/config.cmake b/CAN-binder/conf.d/config.cmake
index 7916fa78..8340a26a 100644
--- 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.