Merge pull request #97 from AlwinEsch/Matrix-change

[Matrix] build system cleanup / increase version to 4.1.1

.travis.yml

@@ -22,9 +22,7 @@ matrix:
       sudo: required
       compiler: clang
     - os: osx
-      osx_image: xcode9
-    - os: osx
-      osx_image: xcode9.4
+      osx_image: xcode10.2
 
 #
 # The addon source is automatically checked out in $TRAVIS_BUILD_DIR,

CMakeLists.txt

@@ -1,18 +1,15 @@
+cmake_minimum_required(VERSION 3.5)
 project(pvr.nextpvr)
 
-cmake_minimum_required(VERSION 2.6)
-
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR})
 
-enable_language(CXX)
-
 find_package(Kodi REQUIRED)
 find_package(p8-platform REQUIRED)
 find_package(TinyXML REQUIRED)
 
 include_directories(${p8-platform_INCLUDE_DIRS}
                     ${TINYXML_INCLUDE_DIR}
-                    ${KODI_INCLUDE_DIR})
+                    ${KODI_INCLUDE_DIR}/..) # Hack way with "/..", need bigger Kodi cmake rework to match right include ways
 
 set(NEXTPVR_SOURCES src/client.cpp
                     src/md5.cpp

FindTinyXML.cmake

@@ -6,22 +6,19 @@
 #   TINYXML_LIBRARIES    - List of libraries when using TinyXML.
 #
 
+find_package(PkgConfig)
 if(PKG_CONFIG_FOUND)
-  pkg_check_modules (TINYXML tinyxml)
-  list(APPEND TINYXML_INCLUDE_DIRS ${TINYXML_INCLUDEDIR})
+  pkg_check_modules(PC_TINYXML tinyxml QUIET)
 endif()
-if(NOT TINYXML_FOUND)
-  find_path( TINYXML_INCLUDE_DIRS "tinyxml.h"
-             PATH_SUFFIXES "tinyxml" )
 
-  find_library( TINYXML_LIBRARIES
-                NAMES "tinyxml"
-                PATH_SUFFIXES "tinyxml" )
-endif()
+find_path(TINYXML_INCLUDE_DIRS NAMES tinyxml.h
+                               PATHS ${PC_TINYXML_INCLUDEDIR}
+                               PATH_SUFFIXES tinyxml)
+find_library(TINYXML_LIBRARIES NAMES tinyxml
+                               PATHS ${PC_TINYXML_LIBDIR}
+                               PATH_SUFFIXES tinyxml)
 
-# handle the QUIETLY and REQUIRED arguments and set TINYXML_FOUND to TRUE if
-# all listed variables are TRUE
-include( "FindPackageHandleStandardArgs" )
-find_package_handle_standard_args(TinyXML DEFAULT_MSG TINYXML_INCLUDE_DIRS TINYXML_LIBRARIES )
+include("FindPackageHandleStandardArgs")
+find_package_handle_standard_args(TinyXML REQUIRED_VARS TINYXML_INCLUDE_DIRS TINYXML_LIBRARIES)
 
 mark_as_advanced(TINYXML_INCLUDE_DIRS TINYXML_LIBRARIES)

README.md

@@ -1,8 +1,9 @@
-[![Build Status](https://travis-ci.org/kodi-pvr/pvr.nextpvr.svg?branch=master)](https://travis-ci.org/kodi-pvr/pvr.nextpvr)
+[![Build Status](https://travis-ci.org/kodi-pvr/pvr.nextpvr.svg?branch=Matrix)](https://travis-ci.org/kodi-pvr/pvr.nextpvr/branches)
+[![Build Status](https://ci.appveyor.com/api/projects/status/github/kodi-pvr/pvr.nextpvr?branch=Matrix&svg=true)](https://ci.appveyor.com/project/kodi-pvr/pvr-nextpvr?branch=Matrix)
 [![Coverity Scan Build Status](https://scan.coverity.com/projects/5120/badge.svg)](https://scan.coverity.com/projects/5120)
 
 # NextPVR PVR
-NextPVR PVR client addon for [Kodi] (http://kodi.tv)
+NextPVR PVR client addon for [Kodi] (https://kodi.tv)
 
 ## Build instructions
 
@@ -16,5 +17,5 @@ NextPVR PVR client addon for [Kodi] (http://kodi.tv)
 
 ##### Useful links
 
-* [Kodi's PVR user support] (http://forum.kodi.tv/forumdisplay.php?fid=167)
-* [Kodi's PVR development support] (http://forum.kodi.tv/forumdisplay.php?fid=136)
+* [Kodi's PVR user support] (https://forum.kodi.tv/forumdisplay.php?fid=167)
+* [Kodi's PVR development support] (https://forum.kodi.tv/forumdisplay.php?fid=136)

appveyor.yml

@@ -0,0 +1,33 @@
+version: BuildNr.{build}
+
+image: Visual Studio 2017
+
+shallow_clone: true
+
+clone_folder: c:\projects\pvr.nextpvr
+
+environment:
+  app_id: pvr.nextpvr
+
+  matrix:
+    - GENERATOR: "Visual Studio 15"
+      CONFIG: Release
+    - GENERATOR: "Visual Studio 15 Win64"
+      CONFIG: Release
+    - GENERATOR: "Visual Studio 15 Win64"
+      CONFIG: Release
+      WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.17763.0"
+    - GENERATOR: "Visual Studio 15 ARM"
+      CONFIG: Release
+      WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.17763.0"
+
+build_script:
+  - cd ..
+  - 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% %APPVEYOR_BUILD_FOLDER% %APPVEYOR_REPO_COMMIT% > definition\%app_id%\%app_id%.txt
+  - cmake -T host=x64 -G "%GENERATOR%" %WINSTORE% -DADDONS_TO_BUILD=%app_id% -DCMAKE_BUILD_TYPE=%CONFIG% -DADDONS_DEFINITION_DIR=%APPVEYOR_BUILD_FOLDER%/build/definition -DADDON_SRC_PREFIX=../.. -DCMAKE_INSTALL_PREFIX=../../xbmc/addons -DPACKAGE_ZIP=1 ../../xbmc/cmake/addons
+  - cmake --build . --config %CONFIG% --target %app_id%

pvr.nextpvr/changelog.txt

@@ -1,3 +1,8 @@
+v4.1.1
+- Update build system version and cleanup
+- Fix package check for JsonCpp
+- Added AppVeyor for Windows related build tests
+
 v4.1.0
 - Update to GUI addon API v5.14.0
 

src/BackendRequest.cpp

@@ -20,7 +20,7 @@
 
 
 #include  "BackendRequest.h"
-#include "Filesystem.h"
+#include "kodi/Filesystem.h"
 
 #define HTTP_OK 200
 #define HTTP_NOTFOUND 404

src/Socket.cpp

@@ -16,7 +16,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-#include "libXBMC_addon.h"
+#include "kodi/libXBMC_addon.h"
 #include <string>
 #include "p8-platform/os.h"
 #include "p8-platform/util/timeutils.h"

src/buffers/Buffer.cpp

@@ -20,7 +20,7 @@
 */
 
 #include "Buffer.h"
-#include "Filesystem.h"
+#include "kodi/Filesystem.h"
 #include <sstream>
 
 using namespace timeshift;

src/buffers/RollingFile.cpp

@@ -20,7 +20,7 @@
 
 #include "RollingFile.h"
 #include  "../BackendRequest.h"
-#include "Filesystem.h"
+#include "kodi/Filesystem.h"
 #include <regex>
 #include <mutex>
 #include "tinyxml.h"

src/client.cpp

@@ -18,7 +18,7 @@
  */
 
 #include "client.h"
-#include "xbmc_pvr_dll.h"
+#include "kodi/xbmc_pvr_dll.h"
 #include "pvrclient-nextpvr.h"
 #include "uri.h"
 

src/client.h

@@ -23,9 +23,9 @@
 #ifndef CLIENT_H
 #define CLIENT_H
 
-#include "libXBMC_addon.h"
-#include "libXBMC_pvr.h"
-#include "libKODI_guilib.h"
+#include "kodi/libXBMC_addon.h"
+#include "kodi/libXBMC_pvr.h"
+#include "kodi/libKODI_guilib.h"
 
 enum eStreamingMethod
 {

src/pvrclient-nextpvr.h

@@ -21,7 +21,7 @@
 #include <vector>
 
 /* Master defines for client control */
-#include "xbmc_pvr_types.h"
+#include "kodi/xbmc_pvr_types.h"
 
 /* Local includes */
 #include "Socket.h"