Fix: autobuild script errors when no DEST definied
authorRomain Forlot <romain.forlot@iot.bzh>
Tue, 11 Jul 2017 15:52:03 +0000 (17:52 +0200)
committerRomain Forlot <romain.forlot@iot.bzh>
Tue, 11 Jul 2017 15:53:34 +0000 (17:53 +0200)
Change-Id: I8b8113e6c8b36b8e9040a41e9a575856153f817f
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
conf.d/app-templates
conf.d/autobuild/agl/autobuild
conf.d/autobuild/linux/autobuild

index 70dc538..bac77a7 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 70dc53852b9d9c8687d33982ef798cba20efa595
+Subproject commit bac77a71ab848131dfc85670117af22483458702
index 31e29f7..759f6be 100755 (executable)
 
 THISFILE  := $(lastword $(MAKEFILE_LIST))
 BUILD_DIR := $(abspath $(dir $(THISFILE)/../../../../..)/build)
+DEST      := ${BUILD_DIR}/target
 
-.PHONY: all clean distclean configure build package
+.PHONY: all clean distclean configure build package help
 
-all: build
+all: help
+
+help:
+       @echo "List of targets available:"
+       @echo ""
+       @echo "- all"
+       @echo "- clean"
+       @echo "- distclean"
+       @echo "- configure"
+       @echo "- build"
+       @echo "- package"
+       @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"
 
 clean:
        @([ -d ${BUILD_DIR} ] && make -C ${BUILD_DIR} clean) || echo Nothing to clean
@@ -38,9 +52,8 @@ package: build
        @mkdir -p ${BUILD_DIR}/$@/lib
        @mkdir -p ${BUILD_DIR}/$@/htdocs
        @mkdir -p ${BUILD_DIR}/$@/data
-       @[ "${DEST}" ] && mkdir -p ${DEST}
        @cmake --build ${BUILD_DIR} --target widget
-       @[ "${DEST}" ] && cp ${BUILD_DIR}/*wgt ${DEST}
+       @mkdir -p ${DEST} && cp ${BUILD_DIR}/*wgt ${DEST}
 
 ${BUILD_DIR}/Makefile:
        @[ -d ${BUILD_DIR} ] || mkdir -p ${BUILD_DIR}
index 31e29f7..759f6be 100755 (executable)
 
 THISFILE  := $(lastword $(MAKEFILE_LIST))
 BUILD_DIR := $(abspath $(dir $(THISFILE)/../../../../..)/build)
+DEST      := ${BUILD_DIR}/target
 
-.PHONY: all clean distclean configure build package
+.PHONY: all clean distclean configure build package help
 
-all: build
+all: help
+
+help:
+       @echo "List of targets available:"
+       @echo ""
+       @echo "- all"
+       @echo "- clean"
+       @echo "- distclean"
+       @echo "- configure"
+       @echo "- build"
+       @echo "- package"
+       @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"
 
 clean:
        @([ -d ${BUILD_DIR} ] && make -C ${BUILD_DIR} clean) || echo Nothing to clean
@@ -38,9 +52,8 @@ package: build
        @mkdir -p ${BUILD_DIR}/$@/lib
        @mkdir -p ${BUILD_DIR}/$@/htdocs
        @mkdir -p ${BUILD_DIR}/$@/data
-       @[ "${DEST}" ] && mkdir -p ${DEST}
        @cmake --build ${BUILD_DIR} --target widget
-       @[ "${DEST}" ] && cp ${BUILD_DIR}/*wgt ${DEST}
+       @mkdir -p ${DEST} && cp ${BUILD_DIR}/*wgt ${DEST}
 
 ${BUILD_DIR}/Makefile:
        @[ -d ${BUILD_DIR} ] || mkdir -p ${BUILD_DIR}