autobuild: fix generating all widget targeticefish_8.99.5icefish/8.99.58.99.5

This lets to build all widget type once for all.

Bug-AGL: SPEC-2049

Change-Id: I6640cf2a6e45f3cbbc3983ff7aca0abe6303f8f7
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>

2 files changed, 40 insertions, 18 deletions

diff --git a/src/template.d/autobuild/agl/autobuild.in b/src/template.d/autobuild/agl/autobuild.in
index cf6d9f1..403b967 100755
--- a/src/template.d/autobuild/agl/autobuild.in
+++ b/src/template.d/autobuild/agl/autobuild.in
@@ -47,7 +47,11 @@ distclean:
 
 configure:
 	@[ -d ${BUILD_DIR} ] || mkdir -p ${BUILD_DIR}
-	@[ -f ${BUILD_DIR}/Makefile ] || (cd ${BUILD_DIR} && cmake ${CONFIGURE_ARGS} ..)
+	@[ -f ${BUILD_DIR}/Makefile ] || (cd ${BUILD_DIR} && cmake -DCMAKE_BUILD_TYPE=RELEASE ${CONFIGURE_ARGS} ..)
+
+configure-test:
+	@[ -d ${BUILD_DIR} ] || mkdir -p ${BUILD_DIR}
+	@[ -f ${BUILD_DIR}/Makefile ] || (cd ${BUILD_DIR} && cmake -DCMAKE_BUILD_TYPE=RELEASE ${CONFIGURE_ARGS} ..)
 
 configure-debug:
 	@[ -d ${BUILD_DIR} ] || mkdir -p ${BUILD_DIR}
@@ -60,6 +64,9 @@ configure-coverage:
 build: configure
 	@cmake --build ${BUILD_DIR} ${BUILD_ARGS} --target all
 
+build-test: configure-test
+	@cmake --build ${BUILD_DIR} ${BUILD_ARGS} --target all
+
 build-debug: configure-debug
 	@cmake --build ${BUILD_DIR} ${BUILD_ARGS} --target all
 
@@ -76,8 +83,10 @@ package: build
 	@if [ "${DEST}" != "${BUILD_DIR}" ]; then \
 		mkdir -p ${DEST} && cp ${BUILD_DIR}/*.wgt ${DEST}; \
 	fi
+	@rm ${BUILD_DIR}/Makefile
+	@rm ${BUILD_DIR}/CMakeCache.txt
 
-package-test: build
+package-test: build-test
 	@mkdir -p ${BUILD_DIR}/$@/bin
 	@mkdir -p ${BUILD_DIR}/$@/etc
 	@mkdir -p ${BUILD_DIR}/$@/lib
@@ -88,6 +97,8 @@ package-test: build
 	@if [ "${DEST}" != "${BUILD_DIR}" ]; then \
 		mkdir -p ${DEST} && cp ${BUILD_DIR}/*.wgt ${DEST}; \
 	fi
+	@rm ${BUILD_DIR}/Makefile
+	@rm ${BUILD_DIR}/CMakeCache.txt
 
 package-debug: build-debug
 	@mkdir -p ${BUILD_DIR}/$@/bin
@@ -99,6 +110,8 @@ package-debug: build-debug
 	@if [ "${DEST}" != "${BUILD_DIR}" ]; then \
 		mkdir -p ${DEST} && cp ${BUILD_DIR}/*.wgt ${DEST}; \
 	fi
+	@rm ${BUILD_DIR}/Makefile
+	@rm ${BUILD_DIR}/CMakeCache.txt
 
 package-coverage: build-coverage
 	@mkdir -p ${BUILD_DIR}/$@/bin
@@ -110,6 +123,8 @@ package-coverage: build-coverage
 	@if [ "${DEST}" != "${BUILD_DIR}" ]; then \
 		mkdir -p ${DEST} && cp ${BUILD_DIR}/*.wgt ${DEST}; \
 	fi
+	@rm ${BUILD_DIR}/Makefile
+	@rm ${BUILD_DIR}/CMakeCache.txt
 
 package-coverage-test: build-coverage
 	@mkdir -p ${BUILD_DIR}/$@/bin
@@ -122,6 +137,8 @@ package-coverage-test: build-coverage
 	@if [ "${DEST}" != "${BUILD_DIR}" ]; then \
 		mkdir -p ${DEST} && cp ${BUILD_DIR}/*.wgt ${DEST}; \
 	fi
+	@rm ${BUILD_DIR}/Makefile
+	@rm ${BUILD_DIR}/CMakeCache.txt
 
 
 package-debug-test: build-debug
@@ -135,16 +152,10 @@ package-debug-test: build-debug
 	@if [ "${DEST}" != "${BUILD_DIR}" ]; then \
 		mkdir -p ${DEST} && cp ${BUILD_DIR}/*.wgt ${DEST}; \
 	fi
-
-package-all-1: package package-test
-	@rm ${BUILD_DIR}/Makefile
-	@rm ${BUILD_DIR}/CMakeCache.txt
-
-package-all-2: package-all-1 package-coverage
 	@rm ${BUILD_DIR}/Makefile
 	@rm ${BUILD_DIR}/CMakeCache.txt
 
-package-all: package-all-2 package-debug
+package-all: package package-test package-coverage package-debug
 
 install: build
 	@cmake --build ${BUILD_DIR} ${INSTALL_ARGS} --target install
diff --git a/src/template.d/autobuild/linux/autobuild.in b/src/template.d/autobuild/linux/autobuild.in
index 4d3f432..9d6bc88 100755
--- a/src/template.d/autobuild/linux/autobuild.in
+++ b/src/template.d/autobuild/linux/autobuild.in
@@ -47,7 +47,11 @@ distclean:
 
 configure:
 	@[ -d ${BUILD_DIR} ] || mkdir -p ${BUILD_DIR}
-	@[ -f ${BUILD_DIR}/Makefile ] || (cd ${BUILD_DIR} && cmake ${CONFIGURE_ARGS} ..)
+	@[ -f ${BUILD_DIR}/Makefile ] || (cd ${BUILD_DIR} && cmake -DCMAKE_BUILD_TYPE=RELEASE ${CONFIGURE_ARGS} ..)
+
+configure-test:
+	@[ -d ${BUILD_DIR} ] || mkdir -p ${BUILD_DIR}
+	@[ -f ${BUILD_DIR}/Makefile ] || (cd ${BUILD_DIR} && cmake -DCMAKE_BUILD_TYPE=RELEASE ${CONFIGURE_ARGS} ..)
 
 configure-debug:
 	@[ -d ${BUILD_DIR} ] || mkdir -p ${BUILD_DIR}
@@ -60,6 +64,9 @@ configure-coverage:
 build: configure
 	@cmake --build ${BUILD_DIR} ${BUILD_ARGS} --target all
 
+build-test: configure-test
+	@cmake --build ${BUILD_DIR} ${BUILD_ARGS} --target all
+
 build-debug: configure-debug
 	@cmake --build ${BUILD_DIR} ${BUILD_ARGS} --target all
 
@@ -76,8 +83,10 @@ package: build
 	@if [ "${DEST}" != "${BUILD_DIR}" ]; then \
 		mkdir -p ${DEST} && cp ${BUILD_DIR}/*.wgt ${DEST}; \
 	fi
+	@rm ${BUILD_DIR}/Makefile
+	@rm ${BUILD_DIR}/CMakeCache.txt
 
-package-test: build
+package-test: build-test
 	@mkdir -p ${BUILD_DIR}/$@/bin
 	@mkdir -p ${BUILD_DIR}/$@/etc
 	@mkdir -p ${BUILD_DIR}/$@/lib
@@ -88,6 +97,8 @@ package-test: build
 	@if [ "${DEST}" != "${BUILD_DIR}" ]; then \
 		mkdir -p ${DEST} && cp ${BUILD_DIR}/*.wgt ${DEST}; \
 	fi
+	@rm ${BUILD_DIR}/Makefile
+	@rm ${BUILD_DIR}/CMakeCache.txt
 
 package-debug: build-debug
 	@mkdir -p ${BUILD_DIR}/$@/bin
@@ -99,6 +110,8 @@ package-debug: build-debug
 	@if [ "${DEST}" != "${BUILD_DIR}" ]; then \
 		mkdir -p ${DEST} && cp ${BUILD_DIR}/*.wgt ${DEST}; \
 	fi
+	@rm ${BUILD_DIR}/Makefile
+	@rm ${BUILD_DIR}/CMakeCache.txt
 
 package-coverage: build-coverage
 	@mkdir -p ${BUILD_DIR}/$@/bin
@@ -110,6 +123,8 @@ package-coverage: build-coverage
 	@if [ "${DEST}" != "${BUILD_DIR}" ]; then \
 		mkdir -p ${DEST} && cp ${BUILD_DIR}/*.wgt ${DEST}; \
 	fi
+	@rm ${BUILD_DIR}/Makefile
+	@rm ${BUILD_DIR}/CMakeCache.txt
 
 package-coverage-test: build-coverage
 	@mkdir -p ${BUILD_DIR}/$@/bin
@@ -122,6 +137,8 @@ package-coverage-test: build-coverage
 	@if [ "${DEST}" != "${BUILD_DIR}" ]; then \
 		mkdir -p ${DEST} && cp ${BUILD_DIR}/*.wgt ${DEST}; \
 	fi
+	@rm ${BUILD_DIR}/Makefile
+	@rm ${BUILD_DIR}/CMakeCache.txt
 
 package-debug-test: build-debug
 	@mkdir -p ${BUILD_DIR}/$@/bin
@@ -134,16 +151,10 @@ package-debug-test: build-debug
 	@if [ "${DEST}" != "${BUILD_DIR}" ]; then \
 		mkdir -p ${DEST} && cp ${BUILD_DIR}/*.wgt ${DEST}; \
 	fi
-
-package-all-1: package package-test
-	@rm ${BUILD_DIR}/Makefile
-	@rm ${BUILD_DIR}/CMakeCache.txt
-
-package-all-2: package-all-1 package-coverage
 	@rm ${BUILD_DIR}/Makefile
 	@rm ${BUILD_DIR}/CMakeCache.txt
 
-package-all: package-all-2 package-debug
+package-all: package package-test package-coverage package-debug
 
 install: build
 	@cmake --build ${BUILD_DIR} ${INSTALL_ARGS} --target install