Update app-templates and autobuild script
authorRomain Forlot <romain.forlot@iot.bzh>
Wed, 8 Nov 2017 08:10:57 +0000 (09:10 +0100)
committerRomain Forlot <romain.forlot@iot.bzh>
Wed, 8 Nov 2017 08:10:57 +0000 (09:10 +0100)
Change-Id: I9ab84291aa785b87091cec4f775fb7e4cd31809c
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
conf.d/app-templates
conf.d/autobuild/agl/autobuild
conf.d/autobuild/linux/autobuild

index 42e5f14..c881d86 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 42e5f14ffa00542385d0d60ee8b00494f590ab8c
+Subproject commit c881d86fc8852a2b2215856d3503aba192c0f4ee
index 4811441..3a1ba5f 100755 (executable)
@@ -29,8 +29,9 @@ help:
        @echo "- clean"
        @echo "- distclean"
        @echo "- configure"
-       @echo "- build"
-       @echo "- package"
+       @echo "- build: compilation, link and prepare files for package into a widget"
+       @echo "- package: output a widget file '*.wgt'"
+       @echo "- install: install in your ${CMAKE_INSTALL_DIR} directory"
        @echo ""
        @echo "Usage: ./conf.d/autobuild/agl/autobuild package DEST=${HOME}/opt"
        @echo "Don't use your build dir as DEST as wgt file is generated at this location"
@@ -58,6 +59,9 @@ package: build
        @cmake --build ${BUILD_DIR} --target widget
        @mkdir -p ${DEST} && cp ${BUILD_DIR}/*wgt ${DEST}
 
+install: build
+       @cmake --build ${BUILD_DIR} --target install
+
 ${BUILD_DIR}/Makefile:
        @[ -d ${BUILD_DIR} ] || mkdir -p ${BUILD_DIR}
        @[ -f ${BUILD_DIR}/Makefile ] || (cd ${BUILD_DIR} && cmake ${CONFIGURE_ARGS} ..)
index 4811441..3a1ba5f 100755 (executable)
@@ -29,8 +29,9 @@ help:
        @echo "- clean"
        @echo "- distclean"
        @echo "- configure"
-       @echo "- build"
-       @echo "- package"
+       @echo "- build: compilation, link and prepare files for package into a widget"
+       @echo "- package: output a widget file '*.wgt'"
+       @echo "- install: install in your ${CMAKE_INSTALL_DIR} directory"
        @echo ""
        @echo "Usage: ./conf.d/autobuild/agl/autobuild package DEST=${HOME}/opt"
        @echo "Don't use your build dir as DEST as wgt file is generated at this location"
@@ -58,6 +59,9 @@ package: build
        @cmake --build ${BUILD_DIR} --target widget
        @mkdir -p ${DEST} && cp ${BUILD_DIR}/*wgt ${DEST}
 
+install: build
+       @cmake --build ${BUILD_DIR} --target install
+
 ${BUILD_DIR}/Makefile:
        @[ -d ${BUILD_DIR} ] || mkdir -p ${BUILD_DIR}
        @[ -f ${BUILD_DIR}/Makefile ] || (cd ${BUILD_DIR} && cmake ${CONFIGURE_ARGS} ..)