update .travis.yml

.travis.yml

@@ -7,28 +7,24 @@ language: cpp
 # Linux. We need Trusty in order to get up to date versions of
 # cmake and g++.
 #
+env:
+  global:
+    - app_id=pvr.octonet
+
 matrix:
   include:
     - os: linux
-      dist: trusty
+      dist: xenial
       sudo: required
       compiler: gcc
     - os: linux
-      dist: trusty
+      dist: xenial
       sudo: required
       compiler: clang
     - os: osx
-      osx_image: xcode7.3
+      osx_image: xcode9
     - os: osx
-      osx_image: xcode6.1
-
-#
-# Some of the OS X images don't have cmake, contrary to what people
-# on the Internet say
-#
-before_install:
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then which cmake || brew update        ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then which cmake || brew install cmake ; fi
+      osx_image: xcode9.4
 
 #
 # The addon source is automatically checked out in $TRAVIS_BUILD_DIR,
@@ -37,9 +33,9 @@ before_install:
 before_script:
   - cd $TRAVIS_BUILD_DIR/..
   - git clone --branch Leia --depth=1 https://github.com/xbmc/xbmc.git
-  - mkdir -p xbmc/cmake/addons/addons/pvr.octonet
-  - echo "pvr.octonet https://github.com/DigitalDevices/pvr.octonet master" > xbmc/cmake/addons/addons/pvr.octonet/pvr.octonet.txt
-  - cd $TRAVIS_BUILD_DIR && mkdir build && cd build
-  - cmake -DADDONS_TO_BUILD=pvr.octonet -DADDON_SRC_PREFIX=$TRAVIS_BUILD_DIR/.. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$TRAVIS_BUILD_DIR/../xbmc/addons -DPACKAGE_ZIP=1 $TRAVIS_BUILD_DIR/../xbmc/cmake/addons
+  - 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
 
 script: make