Use LFSH named, rename data to var

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

diff --git a/cmake/cmake.d/02-variables.cmake b/cmake/cmake.d/02-variables.cmake
index 0fc55a3..b4940f2 100644 (file)
--- a/cmake/cmake.d/02-variables.cmake
+++ b/cmake/cmake.d/02-variables.cmake
@@ -176,7 +176,7 @@ set(BINDIR bin CACHE PATH "User executables")
 set(ETCDIR etc CACHE PATH "Read only system configuration data")
 set(LIBDIR lib CACHE PATH "System library directory")
 set(HTTPDIR htdocs CACHE PATH "HTML5 data directory")
-set(DATADIR data CACHE PATH "External data resources files")
+set(DATADIR var CACHE PATH "External data resources files")
 
 # Normally CMake uses the build tree for the RPATH when building executables
 # etc on systems that use RPATH. When the software is installed the executables

diff --git a/samples.d/config.cmake.sample b/samples.d/config.cmake.sample
index 1b6302e..3a7ef8f 100644 (file)
--- a/samples.d/config.cmake.sample
+++ b/samples.d/config.cmake.sample
@@ -36,9 +36,6 @@ set(PROJECT_APP_TEMPLATES_DIR "conf.d/app-templates")
 # but used and must be built and linked.
 # set(PROJECT_LIBDIR "libs")
 
-# Where are stored data for your application. Pictures, static resources must be placed in that folder.
-# set(PROJECT_RESOURCES "data")
-
 # Which directories inspect to find CMakeLists.txt target files
 # set(PROJECT_SRC_DIR_PATTERN "*")
 

diff --git a/template.d/autobuild/agl/autobuild.in b/template.d/autobuild/agl/autobuild.in
index 3a1ba5f..83097ab 100755 (executable)
--- a/template.d/autobuild/agl/autobuild.in
+++ b/template.d/autobuild/agl/autobuild.in
@@ -55,7 +55,7 @@ package: build
        @mkdir -p ${BUILD_DIR}/$@/etc
        @mkdir -p ${BUILD_DIR}/$@/lib
        @mkdir -p ${BUILD_DIR}/$@/htdocs
-       @mkdir -p ${BUILD_DIR}/$@/data
+       @mkdir -p ${BUILD_DIR}/$@/var
        @cmake --build ${BUILD_DIR} --target widget
        @mkdir -p ${DEST} && cp ${BUILD_DIR}/*wgt ${DEST}
 

diff --git a/template.d/autobuild/linux/autobuild.in b/template.d/autobuild/linux/autobuild.in
index 3a1ba5f..83097ab 100755 (executable)
--- a/template.d/autobuild/linux/autobuild.in
+++ b/template.d/autobuild/linux/autobuild.in
@@ -55,7 +55,7 @@ package: build
        @mkdir -p ${BUILD_DIR}/$@/etc
        @mkdir -p ${BUILD_DIR}/$@/lib
        @mkdir -p ${BUILD_DIR}/$@/htdocs
-       @mkdir -p ${BUILD_DIR}/$@/data
+       @mkdir -p ${BUILD_DIR}/$@/var
        @cmake --build ${BUILD_DIR} --target widget
        @mkdir -p ${DEST} && cp ${BUILD_DIR}/*wgt ${DEST}