aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Ranostay <matt.ranostay@konsulko.com>2019-05-20 23:51:43 -0700
committerMatt Ranostay <matt.ranostay@konsulko.com>2019-05-20 23:52:40 -0700
commit3caa0589a467a836cc99cd22978d5b7178de2b63 (patch)
treed91446a4a8a54abe8926af52642bb240bcc26a83
parent26cd32a8edb0a867431e14c4dd19c9e17ed8f885 (diff)
Avoid copying over the same file with the wgt output, and prevent the following error: cp: 'build/vshl-capabilities.wgt' and 'build/vshl-capabilities.wgt' are the same file make: *** [autobuild/agl/autobuild:62: package] Error 1 Bug-AGL: SPEC-2430 Change-Id: I596fa8d6bf4b31ad10ca55b475d91ed89ce783e0 Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com>
-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