From 6223944619904766598ad7c84358d308ff02c6db Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Sat, 29 Aug 2020 02:41:18 +0200 Subject: [PATCH 1/3] update Travis CI to make also debian build test --- .travis.yml | 40 ++++++++++++++++++++++++++-------------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index a2a62d3..b7b5a03 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,16 +1,12 @@ language: cpp -# -# Define the build matrix -# -# Travis defaults to building on Ubuntu Trusty when building on -# Linux. We need Xenial in order to get up to date versions of -# cmake and g++. -# env: global: - app_id=screensaver.asteroids +# +# Define the build matrix +# matrix: include: - os: linux @@ -21,10 +17,22 @@ matrix: dist: xenial sudo: required compiler: clang + - os: linux + dist: bionic + sudo: required + compiler: gcc + env: DEBIAN_BUILD=true + - os: linux + dist: focal + sudo: required + compiler: gcc + env: DEBIAN_BUILD=true - os: osx osx_image: xcode10.2 before_install: + - if [[ $DEBIAN_BUILD == true ]]; then sudo add-apt-repository -y ppa:team-xbmc/xbmc-nightly; fi + - if [[ $DEBIAN_BUILD == true ]]; then sudo apt-get install fakeroot; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get update -qq; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install -y libgl1-mesa-dev; fi @@ -33,11 +41,15 @@ before_install: # we'll put the Kodi source on the same level # before_script: - - cd $TRAVIS_BUILD_DIR/.. - - git clone --branch master --depth=1 https://github.com/xbmc/xbmc.git - - cd ${app_id} && mkdir build && cd build - - mkdir -p definition/${app_id} - - echo ${app_id} $TRAVIS_BUILD_DIR $TRAVIS_COMMIT > definition/${app_id}/${app_id}.txt - - cmake -DADDONS_TO_BUILD=${app_id} -DADDON_SRC_PREFIX=$TRAVIS_BUILD_DIR/.. -DADDONS_DEFINITION_DIR=$TRAVIS_BUILD_DIR/build/definition -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$TRAVIS_BUILD_DIR/../xbmc/addons -DPACKAGE_ZIP=1 $TRAVIS_BUILD_DIR/../xbmc/cmake/addons + - if [[ $DEBIAN_BUILD != true ]]; then cd $TRAVIS_BUILD_DIR/..; fi + - if [[ $DEBIAN_BUILD != true ]]; then git clone --branch master --depth=1 https://github.com/xbmc/xbmc.git; fi + - if [[ $DEBIAN_BUILD != true ]]; then cd ${app_id} && mkdir build && cd build; fi + - if [[ $DEBIAN_BUILD != true ]]; then mkdir -p definition/${app_id}; fi + - if [[ $DEBIAN_BUILD != true ]]; then echo ${app_id} $TRAVIS_BUILD_DIR $TRAVIS_COMMIT > definition/${app_id}/${app_id}.txt; fi + - if [[ $DEBIAN_BUILD != true ]]; then cmake -DADDONS_TO_BUILD=${app_id} -DADDON_SRC_PREFIX=$TRAVIS_BUILD_DIR/.. -DADDONS_DEFINITION_DIR=$TRAVIS_BUILD_DIR/build/definition -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$TRAVIS_BUILD_DIR/../xbmc/addons -DPACKAGE_ZIP=1 $TRAVIS_BUILD_DIR/../xbmc/cmake/addons; fi + - if [[ $DEBIAN_BUILD == true ]]; then wget https://raw.githubusercontent.com/xbmc/xbmc/master/xbmc/addons/kodi-dev-kit/tools/debian-addon-package-test.sh && chmod +x ./debian-addon-package-test.sh; fi + - if [[ $DEBIAN_BUILD == true ]]; then sudo apt-get build-dep $TRAVIS_BUILD_DIR; fi -script: make +script: + - if [[ $DEBIAN_BUILD != true ]]; then make; fi + - if [[ $DEBIAN_BUILD == true ]]; then ./debian-addon-package-test.sh $TRAVIS_BUILD_DIR; fi From 90d33f89244c3b13e4da069a743a1133f6de791e Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Sat, 29 Aug 2020 02:42:59 +0200 Subject: [PATCH 2/3] update/cleanup debian build code --- debian/control | 2 +- debian/copyright | 2 +- debian/rules | 8 +------- debian/source/format | 2 +- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/debian/control b/debian/control index c836f1c..821d5ee 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Build-Depends: debhelper (>= 9.0.0), cmake, kodi-addon-dev, libgles2-mesa-dev [arm64 armhf], libgl1-mesa-dev [i386 amd64], libglm-dev Standards-Version: 4.1.2 Section: libs -Homepage: http://kodi.tv +Homepage: https://kodi.tv Package: kodi-screensaver-asteroids Section: libs diff --git a/debian/copyright b/debian/copyright index 37867e2..90cd59a 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,7 +3,7 @@ Upstream-Name: screensaver.asteroids Source: https://github.com/xbmc/screensaver.asteroids Files: * -Copyright: 2005-2019 Team Kodi +Copyright: 2005-2020 Team Kodi 2013 Arne Morten Kvarving 2013 wsnipex License: GPL-2+ diff --git a/debian/rules b/debian/rules index 602d24a..7af5e57 100755 --- a/debian/rules +++ b/debian/rules @@ -13,13 +13,7 @@ dh $@ override_dh_auto_configure: - dh_auto_configure -- \ - -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_SHARED_LIBS=1 \ - -DUSE_LTO=1 - -override_dh_strip: - dh_strip -pkodi-screensaver-asteroids --dbg-package=kodi-screensaver-asteroids-dbg + dh_auto_configure -- -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_SHARED_LIBS=1 -DUSE_LTO=1 override_dh_installdocs: dh_installdocs --link-doc=kodi-screensaver-asteroids diff --git a/debian/source/format b/debian/source/format index 163aaf8..89ae9db 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -3.0 (quilt) +3.0 (native) From fe69be1092f1c98af3adb8696ffe2bf76426e9fd Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Sat, 29 Aug 2020 02:44:17 +0200 Subject: [PATCH 3/3] increase version to 2.5.0 (API related) --- screensaver.asteroids/addon.xml.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/screensaver.asteroids/addon.xml.in b/screensaver.asteroids/addon.xml.in index 3735ba6..8b6d3ff 100644 --- a/screensaver.asteroids/addon.xml.in +++ b/screensaver.asteroids/addon.xml.in @@ -1,7 +1,7 @@  @ADDON_DEPENDS@