From 411dd4c88a27b2ec048d6de80ec44419c22d75be Mon Sep 17 00:00:00 2001 From: Raquel Medina Date: Thu, 28 Mar 2019 15:44:15 +0200 Subject: fix warnings by relocating autobuild scripts - move autobuild scripts to top dir - remove submodules and update app/CMakeLists.txt to use libafb-helpers-qt instead. Bug-AGL: SPEC-2164 Change-Id: I9bf25a158d4eeba16ffb5555c8ca257cd81259f4 Signed-off-by: Raquel Medina --- .gitmodules | 6 ---- afb-helpers | 1 - app/CMakeLists.txt | 2 +- autobuild/agl/autobuild | 22 +++++++++++++ autobuild/linux/autobuild | 67 ++++++++++++++++++++++++++++++++++++++++ conf.d/autobuild/agl/autobuild | 22 ------------- conf.d/autobuild/linux/autobuild | 67 ---------------------------------------- 7 files changed, 90 insertions(+), 97 deletions(-) delete mode 100644 .gitmodules delete mode 160000 afb-helpers create mode 100755 autobuild/agl/autobuild create mode 100755 autobuild/linux/autobuild delete mode 100755 conf.d/autobuild/agl/autobuild delete mode 100755 conf.d/autobuild/linux/autobuild diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index af9d4e3..0000000 --- a/.gitmodules +++ /dev/null @@ -1,6 +0,0 @@ -[submodule "conf.d/app-templates"] - path = conf.d/app-templates - url = https://gerrit.automotivelinux.org/gerrit/p/apps/app-templates.git -[submodule "afb-helpers"] - path = afb-helpers - url = https://gerrit.automotivelinux.org/gerrit/apps/app-afb-helpers-submodule diff --git a/afb-helpers b/afb-helpers deleted file mode 160000 index 52f0478..0000000 --- a/afb-helpers +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 52f04783535948f2782780992710276f3419e56e diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index 5317224..e08a102 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -52,7 +52,7 @@ target_link_libraries(mixer Qt5::AGLExtras Qt5::WebSockets json-c - afb-helpers + libafb-helpers-qt.a ) if(NOT NATIVE_BUILD) diff --git a/autobuild/agl/autobuild b/autobuild/agl/autobuild new file mode 100755 index 0000000..883293d --- /dev/null +++ b/autobuild/agl/autobuild @@ -0,0 +1,22 @@ +#!/bin/bash + +SOURCE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/../../../" +BUILD_DIR=$( echo "$2" | cut -d'=' -f2 ) + +# HACK: alias should be expanded in script for cmake to work properly +shopt -s expand_aliases +# HACK: source again the SDK because of the alias +source $SDKTARGETSYSROOT/../../environment-setup-* + +pushd $BUILD_DIR + + cmake $SOURCE_DIR + make + + if [ "$1" == "package" ]; then + make widget + cp *.wgt package/ + fi + +popd + diff --git a/autobuild/linux/autobuild b/autobuild/linux/autobuild new file mode 100755 index 0000000..035db15 --- /dev/null +++ b/autobuild/linux/autobuild @@ -0,0 +1,67 @@ +#!/usr/bin/make -f +# Copyright (C) 2015, 2016 "IoT.bzh" +# 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 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +THISFILE := $(lastword $(MAKEFILE_LIST)) +BUILD_DIR := $(abspath $(dir $(THISFILE))/../../build) +DEST := ${BUILD_DIR}/target + +.PHONY: all clean distclean configure build package help update + +all: help + +help: + @echo "List of targets available:" + @echo "" + @echo "- all" + @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 ${CMAKE_INSTALL_DIR} directory" + @echo "" + @echo "Usage: ./conf.d/autobuild/agl/autobuild package DEST=${HOME}/opt" + @echo "Don't use your build dir as DEST as wgt file is generated at this location" + +update: configure + @cmake --build ${BUILD_DIR} --target autobuild + +clean: + @([ -d ${BUILD_DIR} ] && make -C ${BUILD_DIR} clean) || echo Nothing to clean + +distclean: + @rm -rf ${BUILD_DIR} + +configure: ${BUILD_DIR}/Makefile + +build: configure + @cmake --build ${BUILD_DIR} ${BUILD_ARGS} --target all + +package: build + @mkdir -p ${BUILD_DIR}/$@/bin + @mkdir -p ${BUILD_DIR}/$@/etc + @mkdir -p ${BUILD_DIR}/$@/lib + @mkdir -p ${BUILD_DIR}/$@/htdocs + @mkdir -p ${BUILD_DIR}/$@/data + @cmake --build ${BUILD_DIR} --target widget + @mkdir -p ${DEST} && cp ${BUILD_DIR}/*wgt ${DEST} + +install: build + @cmake --build ${BUILD_DIR} --target install + +${BUILD_DIR}/Makefile: + @[ -d ${BUILD_DIR} ] || mkdir -p ${BUILD_DIR} + @[ -f ${BUILD_DIR}/Makefile ] || (cd ${BUILD_DIR} && cmake ${CONFIGURE_ARGS} ..) diff --git a/conf.d/autobuild/agl/autobuild b/conf.d/autobuild/agl/autobuild deleted file mode 100755 index 883293d..0000000 --- a/conf.d/autobuild/agl/autobuild +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -SOURCE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/../../../" -BUILD_DIR=$( echo "$2" | cut -d'=' -f2 ) - -# HACK: alias should be expanded in script for cmake to work properly -shopt -s expand_aliases -# HACK: source again the SDK because of the alias -source $SDKTARGETSYSROOT/../../environment-setup-* - -pushd $BUILD_DIR - - cmake $SOURCE_DIR - make - - if [ "$1" == "package" ]; then - make widget - cp *.wgt package/ - fi - -popd - diff --git a/conf.d/autobuild/linux/autobuild b/conf.d/autobuild/linux/autobuild deleted file mode 100755 index 3a1ba5f..0000000 --- a/conf.d/autobuild/linux/autobuild +++ /dev/null @@ -1,67 +0,0 @@ -#!/usr/bin/make -f -# Copyright (C) 2015, 2016 "IoT.bzh" -# 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 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -THISFILE := $(lastword $(MAKEFILE_LIST)) -BUILD_DIR := $(abspath $(dir $(THISFILE)/../../../../..)/build) -DEST := ${BUILD_DIR}/target - -.PHONY: all clean distclean configure build package help update - -all: help - -help: - @echo "List of targets available:" - @echo "" - @echo "- all" - @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 ${CMAKE_INSTALL_DIR} directory" - @echo "" - @echo "Usage: ./conf.d/autobuild/agl/autobuild package DEST=${HOME}/opt" - @echo "Don't use your build dir as DEST as wgt file is generated at this location" - -update: configure - @cmake --build ${BUILD_DIR} --target autobuild - -clean: - @([ -d ${BUILD_DIR} ] && make -C ${BUILD_DIR} clean) || echo Nothing to clean - -distclean: - @rm -rf ${BUILD_DIR} - -configure: ${BUILD_DIR}/Makefile - -build: configure - @cmake --build ${BUILD_DIR} ${BUILD_ARGS} --target all - -package: build - @mkdir -p ${BUILD_DIR}/$@/bin - @mkdir -p ${BUILD_DIR}/$@/etc - @mkdir -p ${BUILD_DIR}/$@/lib - @mkdir -p ${BUILD_DIR}/$@/htdocs - @mkdir -p ${BUILD_DIR}/$@/data - @cmake --build ${BUILD_DIR} --target widget - @mkdir -p ${DEST} && cp ${BUILD_DIR}/*wgt ${DEST} - -install: build - @cmake --build ${BUILD_DIR} --target install - -${BUILD_DIR}/Makefile: - @[ -d ${BUILD_DIR} ] || mkdir -p ${BUILD_DIR} - @[ -f ${BUILD_DIR}/Makefile ] || (cd ${BUILD_DIR} && cmake ${CONFIGURE_ARGS} ..) -- cgit 1.2.3-korg