summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastien Douheret <sebastien.douheret@iot.bzh>2019-07-04 22:44:49 +0200
committerSebastien Douheret <sebastien.douheret@iot.bzh>2019-08-01 17:45:11 +0200
commit4bcea9804e13134d2e0f45ae158c17825cff1b76 (patch)
tree8bb24667539a1716f51b6d99f79a49ab9f9ef151
parentff3e5e63af44dc08eac1d7808e32edb01ae920df (diff)
Backport improvements in autobuild scripts
Change-Id: I2091262c34ca1961cef0c2f25996bf5c34fe609c Signed-off-by: Sebastien Douheret <sebastien.douheret@iot.bzh>
-rwxr-xr-xautobuild/agl/autobuild8
-rwxr-xr-xautobuild/linux/autobuild8
2 files changed, 12 insertions, 4 deletions
diff --git a/autobuild/agl/autobuild b/autobuild/agl/autobuild
index a832db4..db00c1a 100755
--- a/autobuild/agl/autobuild
+++ b/autobuild/agl/autobuild
@@ -59,7 +59,9 @@ package: build
@mkdir -p ${BUILD_DIR}/$@/htdocs
@mkdir -p ${BUILD_DIR}/$@/var
@cmake --build ${BUILD_DIR} ${PACKAGE_ARGS} --target widget
- @mkdir -p ${DEST} && cp ${BUILD_DIR}/*.wgt ${DEST}
+ @if [ "${DEST}" != "${BUILD_DIR}" ]; then \
+ mkdir -p ${DEST} && cp ${BUILD_DIR}/*.wgt ${DEST}; \
+ fi
package-test: build
@mkdir -p ${BUILD_DIR}/$@/bin
@@ -69,7 +71,9 @@ package-test: build
@mkdir -p ${BUILD_DIR}/$@/var
@cmake --build ${BUILD_DIR} ${PACKAGE_ARGS} --target widget
@cmake --build ${BUILD_DIR} ${PACKAGE_ARGS} --target test_widget
- @mkdir -p ${DEST} && cp ${BUILD_DIR}/*.wgt ${DEST}
+ @if [ "${DEST}" != "${BUILD_DIR}" ]; then \
+ mkdir -p ${DEST} && cp ${BUILD_DIR}/*.wgt ${DEST}; \
+ fi
install: build
@cmake --build ${BUILD_DIR} ${INSTALL_ARGS} --target install
diff --git a/autobuild/linux/autobuild b/autobuild/linux/autobuild
index a832db4..db00c1a 100755
--- a/autobuild/linux/autobuild
+++ b/autobuild/linux/autobuild
@@ -59,7 +59,9 @@ package: build
@mkdir -p ${BUILD_DIR}/$@/htdocs
@mkdir -p ${BUILD_DIR}/$@/var
@cmake --build ${BUILD_DIR} ${PACKAGE_ARGS} --target widget
- @mkdir -p ${DEST} && cp ${BUILD_DIR}/*.wgt ${DEST}
+ @if [ "${DEST}" != "${BUILD_DIR}" ]; then \
+ mkdir -p ${DEST} && cp ${BUILD_DIR}/*.wgt ${DEST}; \
+ fi
package-test: build
@mkdir -p ${BUILD_DIR}/$@/bin
@@ -69,7 +71,9 @@ package-test: build
@mkdir -p ${BUILD_DIR}/$@/var
@cmake --build ${BUILD_DIR} ${PACKAGE_ARGS} --target widget
@cmake --build ${BUILD_DIR} ${PACKAGE_ARGS} --target test_widget
- @mkdir -p ${DEST} && cp ${BUILD_DIR}/*.wgt ${DEST}
+ @if [ "${DEST}" != "${BUILD_DIR}" ]; then \
+ mkdir -p ${DEST} && cp ${BUILD_DIR}/*.wgt ${DEST}; \
+ fi
install: build
@cmake --build ${BUILD_DIR} ${INSTALL_ARGS} --target install