update autobuild scripts

Modify autobuild scripts:
- to fix warnings on yocto build
- to add new standard targets

Signed-off-by: Raquel Medina <raquel.medina@konsulko.com>
Change-Id: Ideab6494c9c016116e1053d8c8e698dbe02d2bc8

2 files changed, 92 insertions, 9 deletions

diff --git a/autobuild/agl/autobuild b/autobuild/agl/autobuild
index e87a1c3..e659a2f 100755
--- a/autobuild/agl/autobuild
+++ b/autobuild/agl/autobuild
@@ -16,9 +16,12 @@
 
 THISFILE  := $(lastword $(MAKEFILE_LIST))
 BUILD_DIR := $(abspath $(dir $(THISFILE))/../../build)
+BUILD_DIR_TEST := $(abspath $(dir $(THISFILE))/../../build-test)
+BUILD_DIR_DEBUG := $(abspath $(dir $(THISFILE))/../../build-debug)
+BUILD_DIR_COVERAGE := $(abspath $(dir $(THISFILE))/../../build-coverage)
 DEST      := ${BUILD_DIR}
 
-.PHONY: all clean distclean configure build package help
+.PHONY: all clean distclean configure build package help configure-debug configure-coverage build-debug build-coverage package-test package-debug package-coverage package-debug package-all
 
 all: help
 
@@ -40,19 +43,58 @@ clean:
 	@([ -d ${BUILD_DIR} ] && make -C ${BUILD_DIR} ${CLEAN_ARGS} clean) || echo Nothing to clean
 
 distclean:
+	@[ -d ${DEST} ] && find ${DEST} -name "*.wgt" -delete
 	@([ -d ${BUILD_DIR} ] && make -C ${BUILD_DIR} distclean) || echo Nothing to distclean
 
 configure:
 	@[ -d ${BUILD_DIR} ] || mkdir -p ${BUILD_DIR}
 	@[ -f ${BUILD_DIR}/Makefile ] || (cd ${BUILD_DIR} && qmake ${CONFIGURE_ARGS} ..)
 
+configure-test:
+	@[ -d ${BUILD_DIR_TEST} ] || mkdir -p ${BUILD_DIR_TEST}
+	@[ -f ${BUILD_DIR_TEST}/Makefile ] || (cd ${BUILD_DIR_TEST} && qmake ${CONFIGURE_ARGS} ..)
+
+configure-debug:
+	@[ -d ${BUILD_DIR_DEBUG} ] || mkdir -p ${BUILD_DIR_DEBUG}
+	@[ -f ${BUILD_DIR_DEBUG}/Makefile ] || (cd ${BUILD_DIR_DEBUG} && qmake ${CONFIGURE_ARGS} ..)
+
+configure-coverage:
+	@[ -d ${BUILD_DIR_COVERAGE} ] || mkdir -p ${BUILD_DIR_COVERAGE}
+	@[ -f ${BUILD_DIR_COVERAGE}/Makefile ] || (cd ${BUILD_DIR_COVERAGE} && qmake ${CONFIGURE_ARGS} ..)
+
 build: configure
 	@make -C ${BUILD_DIR} ${BUILD_ARGS} all
 
+build-test: configure-test
+	@make -C ${BUILD_DIR_TEST} ${BUILD_ARGS} all
+
+build-debug: configure-debug
+	@make -C ${BUILD_DIR_DEBUG} ${BUILD_ARGS} all
+
+build-coverage: configure-coverage
+	@make -C ${BUILD_DIR_COVERAGE} ${BUILD_ARGS} all
+
+install: build
+	@make -C ${BUILD_DIR} ${INSTALL_ARGS} install
+
 package: build
 	@if [ "${DEST}" != "${BUILD_DIR}/$@" ]; then \
 		mkdir -p ${DEST} && cp ${BUILD_DIR}/$@/*.wgt ${DEST}; \
 	fi
 
-install: build
-	@make -C ${BUILD_DIR} ${INSTALL_ARGS} install
+package-test: build-test
+	@if [ "${DEST}" != "${BUILD_DIR_TEST}" ]; then \
+		mkdir -p ${DEST} && cp ${BUILD_DIR_TEST}/package/*.wgt ${DEST}; \
+	fi
+
+package-debug: build-debug
+	@if [ "${DEST}" != "${BUILD_DIR_DEBUG}" ]; then \
+		mkdir -p ${DEST} && cp ${BUILD_DIR_DEBUG}/package/*.wgt ${DEST}; \
+	fi
+
+package-coverage: build-coverage
+	@if [ "${DEST}" != "${BUILD_DIR_COVERAGE}" ]; then \
+		mkdir -p ${DEST} && cp ${BUILD_DIR_COVERAGE}/package/*.wgt ${DEST}; \
+	fi
+
+package-all: package package-test package-coverage package-debug
diff --git a/autobuild/linux/autobuild b/autobuild/linux/autobuild
index 9ec2f6e..9c03d99 100755
--- a/autobuild/linux/autobuild
+++ b/autobuild/linux/autobuild
@@ -6,7 +6,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#      http://www.apache.org/licenses/LICENSE-2.0
+#        http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,9 +16,12 @@
 
 THISFILE  := $(lastword $(MAKEFILE_LIST))
 BUILD_DIR := $(abspath $(dir $(THISFILE))/../../build)
+BUILD_DIR_TEST := $(abspath $(dir $(THISFILE))/../../build-test)
+BUILD_DIR_DEBUG := $(abspath $(dir $(THISFILE))/../../build-debug)
+BUILD_DIR_COVERAGE := $(abspath $(dir $(THISFILE))/../../build-coverage)
 DEST      := ${BUILD_DIR}
 
-.PHONY: all clean distclean configure build package help
+.PHONY: all clean distclean configure build package help configure-debug configure-coverage build-debug build-coverage package-test package-debug package-coverage package-debug package-all
 
 all: help
 
@@ -36,7 +39,7 @@ help:
 	@echo "Usage: ./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:
+ clean:
 	@([ -d ${BUILD_DIR} ] && make -C ${BUILD_DIR} ${CLEAN_ARGS} clean) || echo Nothing to clean
 
 distclean:
@@ -47,16 +50,54 @@ configure:
 	@[ -d ${BUILD_DIR} ] || mkdir -p ${BUILD_DIR}
 	@[ -f ${BUILD_DIR}/Makefile ] || (cd ${BUILD_DIR} && qmake ${CONFIGURE_ARGS} ..)
 
+configure-test:
+	@[ -d ${BUILD_DIR_TEST} ] || mkdir -p ${BUILD_DIR_TEST}
+	@[ -f ${BUILD_DIR_TEST}/Makefile ] || (cd ${BUILD_DIR_TEST} && qmake ${CONFIGURE_ARGS} ..)
+
+configure-debug:
+	@[ -d ${BUILD_DIR_DEBUG} ] || mkdir -p ${BUILD_DIR_DEBUG}
+	@[ -f ${BUILD_DIR_DEBUG}/Makefile ] || (cd ${BUILD_DIR_DEBUG} && qmake ${CONFIGURE_ARGS} ..)
+
+configure-coverage:
+	@[ -d ${BUILD_DIR_COVERAGE} ] || mkdir -p ${BUILD_DIR_COVERAGE}
+	@[ -f ${BUILD_DIR_COVERAGE}/Makefile ] || (cd ${BUILD_DIR_COVERAGE} && qmake ${CONFIGURE_ARGS} ..)
+
 build: configure
 	@make -C ${BUILD_DIR} ${BUILD_ARGS} all
 
+build-test: configure-test
+	@make -C ${BUILD_DIR_TEST} ${BUILD_ARGS} all
+
+build-debug: configure-debug
+	@make -C ${BUILD_DIR_DEBUG} ${BUILD_ARGS} all
+
+build-coverage: configure-coverage
+	@make -C ${BUILD_DIR_COVERAGE} ${BUILD_ARGS} all
+
+install: build
+	@if [ "${DEST}" != "${BUILD_DIR}" ]; then \
+		mkdir -p ${DEST} && cp -rf ${BUILD_DIR}/package/root/* ${DEST}; \
+	fi
+
 package: build
 	@if [ "${DEST}" != "${BUILD_DIR}/$@" ]; then \
 		mkdir -p ${DEST} && cp ${BUILD_DIR}/$@/*.wgt ${DEST}; \
 	fi
 
-install: build
-	@if [ "${DEST}" != "${BUILD_DIR}" ]; then \
-		mkdir -p ${DEST} && cp -rf ${BUILD_DIR}/package/root/* ${DEST}; \
+package-test: build-test
+	@if [ "${DEST}" != "${BUILD_DIR_TEST}/$@" ]; then \
+		mkdir -p ${DEST} && cp ${BUILD_DIR_TEST}/package/*.wgt ${DEST}; \
 	fi
 
+package-debug: build-debug
+	@if [ "${DEST}" != "${BUILD_DIR_DEBUG}/package" ]; then \
+		mkdir -p ${DEST} && cp ${BUILD_DIR_DEBUG}/package/*.wgt ${DEST}; \
+	fi
+
+package-coverage: build-coverage
+	@if [ "${DEST}" != "${BUILD_DIR_COVERAGE}/package" ]; then \
+		mkdir -p ${DEST} && cp ${BUILD_DIR_COVERAGE}/package/*.wgt ${DEST}; \
+	fi
+
+package-all: package package-test package-coverage package-debug
+