From e18f66f3318c8b073f68fe6f00aaec7d2c882ad7 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Tue, 9 Jun 2020 22:05:31 -0400 Subject: Update autobuild scripts Update autobuild scripts with reworked version that fixes building outside of the source tree. As well, the project files have been tweaked to strip the release build binaries and add "-debug" in the name of the debug widget file. Bug-AGL: SPEC-2049, SPEC-3300 Signed-off-by: Scott Murray Change-Id: If2071acc4bc5414d860740c6f5d7f96315504c8f --- app/app.pro | 4 ++ autobuild/agl/autobuild | 118 +++++++++++++++++++++++-------------------- autobuild/linux/autobuild | 125 +++++++++++++++++++++++++--------------------- package/package.pro | 7 ++- 4 files changed, 142 insertions(+), 112 deletions(-) diff --git a/app/app.pro b/app/app.pro index 39b0048..b0fea14 100644 --- a/app/app.pro +++ b/app/app.pro @@ -6,6 +6,10 @@ SOURCES = main.cpp CONFIG += link_pkgconfig PKGCONFIG += libhomescreen qlibwindowmanager qtappfw-mediaplayer +CONFIG(release, debug|release) { + QMAKE_POST_LINK = $(STRIP) --strip-unneeded $(TARGET) +} + RESOURCES += \ mediaplayer.qrc \ images/images.qrc diff --git a/autobuild/agl/autobuild b/autobuild/agl/autobuild index 154645d..bbbc13e 100755 --- a/autobuild/agl/autobuild +++ b/autobuild/agl/autobuild @@ -1,5 +1,6 @@ #!/usr/bin/make -f # Copyright (C) 2015 - 2018 "IoT.bzh" +# Copyright (C) 2020 Konsulko Group # Author "Romain Forlot" # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,84 +16,95 @@ # limitations under the License. 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 configure-debug configure-coverage build-debug build-coverage package-test package-debug package-coverage package-debug package-all - -all: help +ROOT_DIR := $(abspath $(dir $(THISFILE))/../..) + +# Build directories +# Note that the debug directory is defined in relation to the release +# directory (BUILD_DIR), this needs to be kept in mind if over-riding +# it and building that widget types, the specific widget type variable +# (e.g. BUILD_DIR_DEBUG) may also need to be specified to yield the +# desired output hierarchy. +BUILD_DIR = $(ROOT_DIR)/build +BUILD_DIR_DEBUG = $(abspath $(BUILD_DIR)/../build-debug) + +# Output directory variable for use in pattern rules. +# This is intended for internal use only, hence the explicit override +# definition. +override OUTPUT_DIR = $(BUILD_DIR) + +# Final install directory for widgets +DEST = $(OUTPUT_DIR) + +# Default build type for release builds +BUILD_TYPE = release + +.PHONY: all help update install distclean +.PHONY: clean clean-release clean-debug clean-all +.PHONY: configure configure-release configure-debug +.PHONY: build build-release build-debug build-all +.PHONY: package package-release package-debug package-all help: @echo "List of targets available:" @echo "" @echo "- all" + @echo "- help" @echo "- clean" @echo "- distclean" @echo "- configure" @echo "- build: compilation, link and prepare files for package into a widget" @echo "- package: output a widget file '*.wgt'" - @echo "- install: install in your INSTALL_ROOT directory" + @echo "- install: install in $(DEST) directory" @echo "" @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: - @([ -d ${BUILD_DIR} ] && make -C ${BUILD_DIR} ${CLEAN_ARGS} clean) || echo Nothing to clean +all: package-all -distclean: - @[ -d ${DEST} ] && find ${DEST} -name "*.wgt" -delete - @([ -d ${BUILD_DIR} ] && make -C ${BUILD_DIR} distclean) || echo Nothing to distclean +# Target specific variable over-rides so static pattern rules can be +# used for the various type-specific targets. -configure: - @[ -d ${BUILD_DIR} ] || mkdir -p ${BUILD_DIR} - @[ -f ${BUILD_DIR}/Makefile ] || (cd ${BUILD_DIR} && qmake ${CONFIGURE_ARGS} ..) +configure-debug build-debug package-debug clean-debug: OUTPUT_DIR = $(BUILD_DIR_DEBUG) +configure-debug build-debug package-debug: BUILD_TYPE = debug -configure-test: - @[ -d ${BUILD_DIR_TEST} ] || mkdir -p ${BUILD_DIR_TEST} - @[ -f ${BUILD_DIR_TEST}/Makefile ] || (cd ${BUILD_DIR_TEST} && qmake ${CONFIGURE_ARGS} ..) +clean-release clean-debug: + @if [ -d $(OUTPUT_DIR) ]; then \ + $(MAKE) -C $(OUTPUT_DIR) $(CLEAN_ARGS) clean; \ + else \ + echo Nothing to clean; \ + fi -configure-debug: - @[ -d ${BUILD_DIR_DEBUG} ] || mkdir -p ${BUILD_DIR_DEBUG} - @[ -f ${BUILD_DIR_DEBUG}/Makefile ] || (cd ${BUILD_DIR_DEBUG} && qmake ${CONFIGURE_ARGS} ..) +clean: clean-release -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 +clean-all: clean-release clean-debug -build-debug: configure-debug - @make -C ${BUILD_DIR_DEBUG} ${BUILD_ARGS} all +distclean: clean-all -build-coverage: configure-coverage - @make -C ${BUILD_DIR_COVERAGE} ${BUILD_ARGS} all +configure-release configure-debug: + @mkdir -p $(OUTPUT_DIR) + @if [ ! -f $(OUTPUT_DIR)/Makefile ]; then \ + (cd $(OUTPUT_DIR) && qmake CONFIG+=$(BUILD_TYPE) $(CONFIGURE_ARGS) $(ROOT_DIR)); \ + fi -install: build - @make -C ${BUILD_DIR} ${INSTALL_ARGS} install +configure: configure-release -package: build - @if [ "${DEST}" != "${BUILD_DIR}/$@" ]; then \ - mkdir -p ${DEST} && cp ${BUILD_DIR}/$@/*.wgt ${DEST}; \ - fi +build-release build-debug: build-%: configure-% + @$(MAKE) -C $(OUTPUT_DIR) $(BUILD_ARGS) all -package-test: build-test - @if [ "${DEST}" != "${BUILD_DIR_TEST}" ]; then \ - mkdir -p ${DEST} && cp ${BUILD_DIR_TEST}/package/*.wgt ${DEST}; \ - fi +build: build-release -package-debug: build-debug - @if [ "${DEST}" != "${BUILD_DIR_DEBUG}" ]; then \ - mkdir -p ${DEST} && cp ${BUILD_DIR_DEBUG}/package/*.wgt ${DEST}; \ - fi +build-all: build-release build-debug -package-coverage: build-coverage - @if [ "${DEST}" != "${BUILD_DIR_COVERAGE}" ]; then \ - mkdir -p ${DEST} && cp ${BUILD_DIR_COVERAGE}/package/*.wgt ${DEST}; \ +package-release package-debug: package-%: build-% + @cp $(OUTPUT_DIR)/package/*.wgt $(OUTPUT_DIR)/ + @if [ "$(abspath $(DEST))" != "$(abspath $(OUTPUT_DIR))" ]; then \ + mkdir -p $(DEST) && cp $(OUTPUT_DIR)/*.wgt $(DEST); \ fi -package-all: package package-test package-coverage package-debug + +package: package-release + +package-all: package-release package-debug + +install: build + @$(MAKE) -C $(BUILD_DIR) $(INSTALL_ARGS) install diff --git a/autobuild/linux/autobuild b/autobuild/linux/autobuild index 9fc326f..bbbc13e 100755 --- a/autobuild/linux/autobuild +++ b/autobuild/linux/autobuild @@ -1,12 +1,13 @@ #!/usr/bin/make -f # Copyright (C) 2015 - 2018 "IoT.bzh" +# Copyright (C) 2020 Konsulko Group # Author "Romain Forlot" # # Licensed under the Apache License, Version 2.0 (the "License"); # 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, @@ -15,87 +16,95 @@ # limitations under the License. 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 configure-debug configure-coverage build-debug build-coverage package-test package-debug package-coverage package-debug package-all - -all: help +ROOT_DIR := $(abspath $(dir $(THISFILE))/../..) + +# Build directories +# Note that the debug directory is defined in relation to the release +# directory (BUILD_DIR), this needs to be kept in mind if over-riding +# it and building that widget types, the specific widget type variable +# (e.g. BUILD_DIR_DEBUG) may also need to be specified to yield the +# desired output hierarchy. +BUILD_DIR = $(ROOT_DIR)/build +BUILD_DIR_DEBUG = $(abspath $(BUILD_DIR)/../build-debug) + +# Output directory variable for use in pattern rules. +# This is intended for internal use only, hence the explicit override +# definition. +override OUTPUT_DIR = $(BUILD_DIR) + +# Final install directory for widgets +DEST = $(OUTPUT_DIR) + +# Default build type for release builds +BUILD_TYPE = release + +.PHONY: all help update install distclean +.PHONY: clean clean-release clean-debug clean-all +.PHONY: configure configure-release configure-debug +.PHONY: build build-release build-debug build-all +.PHONY: package package-release package-debug package-all help: @echo "List of targets available:" @echo "" @echo "- all" + @echo "- help" @echo "- clean" @echo "- distclean" @echo "- configure" - @echo "- build: compilation, link and prepare files for package into a widget" + @echo "- build: compilation, link and prepare files for package into a widget" @echo "- package: output a widget file '*.wgt'" - @echo "- install: install in your defined DEST directory" + @echo "- install: install in $(DEST) directory" @echo "" @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: - @([ -d ${BUILD_DIR} ] && make -C ${BUILD_DIR} ${CLEAN_ARGS} clean) || echo Nothing to clean + @echo "Don't use your build dir as DEST as wgt file is generated at this location" -distclean: - @[ -d ${DEST} ] && find ${DEST} -name "*.wgt" -delete - @([ -d ${BUILD_DIR} ] && make -C ${BUILD_DIR} distclean) || echo Nothing to distclean +all: package-all -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} ..) +# Target specific variable over-rides so static pattern rules can be +# used for the various type-specific targets. -configure-debug: - @[ -d ${BUILD_DIR_DEBUG} ] || mkdir -p ${BUILD_DIR_DEBUG} - @[ -f ${BUILD_DIR_DEBUG}/Makefile ] || (cd ${BUILD_DIR_DEBUG} && qmake ${CONFIGURE_ARGS} ..) +configure-debug build-debug package-debug clean-debug: OUTPUT_DIR = $(BUILD_DIR_DEBUG) +configure-debug build-debug package-debug: BUILD_TYPE = debug -configure-coverage: - @[ -d ${BUILD_DIR_COVERAGE} ] || mkdir -p ${BUILD_DIR_COVERAGE} - @[ -f ${BUILD_DIR_COVERAGE}/Makefile ] || (cd ${BUILD_DIR_COVERAGE} && qmake ${CONFIGURE_ARGS} ..) +clean-release clean-debug: + @if [ -d $(OUTPUT_DIR) ]; then \ + $(MAKE) -C $(OUTPUT_DIR) $(CLEAN_ARGS) clean; \ + else \ + echo Nothing to clean; \ + fi -build: configure - @make -C ${BUILD_DIR} ${BUILD_ARGS} all -build-test: configure-test - @make -C ${BUILD_DIR_TEST} ${BUILD_ARGS} all +clean: clean-release -build-debug: configure-debug - @make -C ${BUILD_DIR_DEBUG} ${BUILD_ARGS} all +clean-all: clean-release clean-debug -build-coverage: configure-coverage - @make -C ${BUILD_DIR_COVERAGE} ${BUILD_ARGS} all +distclean: clean-all -install: build - @if [ "${DEST}" != "${BUILD_DIR}" ]; then \ - mkdir -p ${DEST} && cp -rf ${BUILD_DIR}/package/root/* ${DEST}; \ +configure-release configure-debug: + @mkdir -p $(OUTPUT_DIR) + @if [ ! -f $(OUTPUT_DIR)/Makefile ]; then \ + (cd $(OUTPUT_DIR) && qmake CONFIG+=$(BUILD_TYPE) $(CONFIGURE_ARGS) $(ROOT_DIR)); \ fi -package: build - @if [ "${DEST}" != "${BUILD_DIR}/$@" ]; then \ - mkdir -p ${DEST} && cp ${BUILD_DIR}/$@/*.wgt ${DEST}; \ - fi +configure: configure-release -package-test: build-test - @if [ "${DEST}" != "${BUILD_DIR_TEST}/$@" ]; then \ - mkdir -p ${DEST} && cp ${BUILD_DIR_TEST}/package/*.wgt ${DEST}; \ - fi +build-release build-debug: build-%: configure-% + @$(MAKE) -C $(OUTPUT_DIR) $(BUILD_ARGS) all -package-debug: build-debug - @if [ "${DEST}" != "${BUILD_DIR_DEBUG}/package" ]; then \ - mkdir -p ${DEST} && cp ${BUILD_DIR_DEBUG}/package/*.wgt ${DEST}; \ - fi +build: build-release + +build-all: build-release build-debug -package-coverage: build-coverage - @if [ "${DEST}" != "${BUILD_DIR_COVERAGE}/package" ]; then \ - mkdir -p ${DEST} && cp ${BUILD_DIR_COVERAGE}/package/*.wgt ${DEST}; \ +package-release package-debug: package-%: build-% + @cp $(OUTPUT_DIR)/package/*.wgt $(OUTPUT_DIR)/ + @if [ "$(abspath $(DEST))" != "$(abspath $(OUTPUT_DIR))" ]; then \ + mkdir -p $(DEST) && cp $(OUTPUT_DIR)/*.wgt $(DEST); \ fi -package-all: package package-test package-coverage package-debug +package: package-release + +package-all: package-release package-debug + +install: build + @$(MAKE) -C $(BUILD_DIR) $(INSTALL_ARGS) install diff --git a/package/package.pro b/package/package.pro index 47996f5..614096f 100644 --- a/package/package.pro +++ b/package/package.pro @@ -13,7 +13,12 @@ copy_config.commands = $(COPY_FILE) \"$$replace(copy_config.depends, /, $$QMAKE_ QMAKE_EXTRA_TARGETS += copy_config PRE_TARGETDEPS += $$copy_config.target +WGT_TYPE = +CONFIG(debug, debug|release) { + WGT_TYPE = -debug +} + wgt.target = package -wgt.commands = wgtpkg-pack -f -o mediaplayer.wgt root +wgt.commands = wgtpkg-pack -f -o mediaplayer$${WGT_TYPE}.wgt root QMAKE_EXTRA_TARGETS += wgt -- cgit 1.2.3-korg