From 8cdf8dec703d882b46ca50a769fabb95ffc48e2c Mon Sep 17 00:00:00 2001 From: manuel Date: Thu, 24 Nov 2016 21:27:41 +0100 Subject: sync with upstream --- project/cmake/installdata/addon-bindings.txt | 37 -------------------------- project/cmake/installdata/cmake-files.txt | 13 --------- project/cmake/installdata/common/addons.txt | 8 ++---- project/cmake/installdata/darwin/runtime.txt | 1 - project/cmake/installdata/ios/certificates.txt | 1 + project/cmake/installdata/ios/packaging.txt | 3 +++ project/cmake/installdata/ios/runtime.txt | 2 ++ project/cmake/installdata/osx/certificates.txt | 1 + project/cmake/installdata/osx/packaging.txt | 4 +++ project/cmake/installdata/osx/runtime.txt | 2 ++ project/cmake/installdata/rbpi/lirc.txt | 1 + project/cmake/installdata/windows/dlls.txt | 8 ++---- project/cmake/installdata/windows/python.txt | 1 + 13 files changed, 19 insertions(+), 63 deletions(-) delete mode 100644 project/cmake/installdata/addon-bindings.txt delete mode 100644 project/cmake/installdata/cmake-files.txt delete mode 100644 project/cmake/installdata/darwin/runtime.txt create mode 100644 project/cmake/installdata/ios/certificates.txt create mode 100644 project/cmake/installdata/ios/packaging.txt create mode 100644 project/cmake/installdata/ios/runtime.txt create mode 100644 project/cmake/installdata/osx/certificates.txt create mode 100644 project/cmake/installdata/osx/packaging.txt create mode 100644 project/cmake/installdata/osx/runtime.txt create mode 120000 project/cmake/installdata/rbpi/lirc.txt create mode 100644 project/cmake/installdata/windows/python.txt (limited to 'project/cmake/installdata') diff --git a/project/cmake/installdata/addon-bindings.txt b/project/cmake/installdata/addon-bindings.txt deleted file mode 100644 index 5655da5..0000000 --- a/project/cmake/installdata/addon-bindings.txt +++ /dev/null @@ -1,37 +0,0 @@ -xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_addon_cpp_dll.h -xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_addon_dll.h -xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_addon_types.h -xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_adsp_dll.h -xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_adsp_types.h -xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_audiodec_dll.h -xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_audiodec_types.h -xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_audioenc_dll.h -xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_audioenc_types.h -xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_audioengine_types.h -xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_codec_types.h -xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_epg_types.h -xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_inputstream_dll.h -xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_inputstream_types.h -xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_vfs_types.h -xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_vfs_utils.hpp -xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_peripheral_callbacks.h -xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_peripheral_dll.h -xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_peripheral_types.h -xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_peripheral_utils.hpp -xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_dll.h -xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_types.h -xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_scr_dll.h -xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_scr_types.h -xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_vis_dll.h -xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_vis_types.h -xbmc/addons/kodi-addon-dev-kit/include/kodi/libXBMC_addon.h -xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_audioengine.h -xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_adsp.h -xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_guilib.h -xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_inputstream.h -xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_peripheral.h -xbmc/addons/kodi-addon-dev-kit/include/kodi/libXBMC_pvr.h -xbmc/addons/kodi-addon-dev-kit/include/kodi/libXBMC_codec.h -xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxPacket.h -xbmc/cores/AudioEngine/Utils/AEChannelData.h -xbmc/filesystem/IFileTypes.h diff --git a/project/cmake/installdata/cmake-files.txt b/project/cmake/installdata/cmake-files.txt deleted file mode 100644 index 8dda8cd..0000000 --- a/project/cmake/installdata/cmake-files.txt +++ /dev/null @@ -1,13 +0,0 @@ -project/cmake/scripts/common/addon-helpers.cmake -project/cmake/scripts/common/addoptions.cmake -project/cmake/scripts/common/archsetup.cmake -project/cmake/scripts/common/checkcommits.cmake -project/cmake/scripts/common/check_target_platform.cmake -project/cmake/scripts/common/generateversionedfiles.cmake -project/cmake/scripts/common/generatorsetup.cmake -project/cmake/scripts/common/handle-depends.cmake -project/cmake/scripts/common/macros.cmake -project/cmake/scripts/common/managestring.cmake -project/cmake/scripts/common/pathsetup.cmake -project/cmake/scripts/common/prepare-env.cmake -project/cmake/scripts/common/projectmacros.cmake diff --git a/project/cmake/installdata/common/addons.txt b/project/cmake/installdata/common/addons.txt index 3f86c78..1cbe4d6 100644 --- a/project/cmake/installdata/common/addons.txt +++ b/project/cmake/installdata/common/addons.txt @@ -1,4 +1,5 @@ addons/audioencoder.xbmc.builtin.aac/* +addons/audioencoder.xbmc.builtin.wav/* addons/audioencoder.xbmc.builtin.wma/* addons/game.controller.default/* addons/kodi.adsp/* @@ -31,15 +32,10 @@ addons/screensaver.xbmc.builtin.dim/* addons/screensaver.xbmc.builtin.black/* addons/script.module.pil/* addons/script.module.pysqlite/* -addons/audioencoder.xbmc.builtin.aac/* -addons/audioencoder.xbmc.builtin.wav/* -addons/audioencoder.xbmc.builtin.wma/* addons/resource.language.en_gb/* -addons/resource.uisounds.confluence/* +addons/resource.uisounds.kodi/* addons/resource.images.weathericons.default/* addons/service.xbmc.versioncheck/* -addons/skin.estuary/* -addons/skin.estouchy/* addons/metadata.local/* addons/metadata.album.universal/* addons/metadata.artists.universal/* diff --git a/project/cmake/installdata/darwin/runtime.txt b/project/cmake/installdata/darwin/runtime.txt deleted file mode 100644 index e1bb711..0000000 --- a/project/cmake/installdata/darwin/runtime.txt +++ /dev/null @@ -1 +0,0 @@ -tools/darwin/runtime/preflight diff --git a/project/cmake/installdata/ios/certificates.txt b/project/cmake/installdata/ios/certificates.txt new file mode 100644 index 0000000..14e74a7 --- /dev/null +++ b/project/cmake/installdata/ios/certificates.txt @@ -0,0 +1 @@ +tools/depends/target/openssl/cacert.pem system/certs \ No newline at end of file diff --git a/project/cmake/installdata/ios/packaging.txt b/project/cmake/installdata/ios/packaging.txt new file mode 100644 index 0000000..ce990b5 --- /dev/null +++ b/project/cmake/installdata/ios/packaging.txt @@ -0,0 +1,3 @@ +LICENSE.gpl +privacy-policy.txt +xbmc/platform/darwin/Credits.html diff --git a/project/cmake/installdata/ios/runtime.txt b/project/cmake/installdata/ios/runtime.txt new file mode 100644 index 0000000..3bb5467 --- /dev/null +++ b/project/cmake/installdata/ios/runtime.txt @@ -0,0 +1,2 @@ +tools/darwin/runtime/preflight +tools/darwin/runtime/org.xbmc.helper.plist diff --git a/project/cmake/installdata/osx/certificates.txt b/project/cmake/installdata/osx/certificates.txt new file mode 100644 index 0000000..14e74a7 --- /dev/null +++ b/project/cmake/installdata/osx/certificates.txt @@ -0,0 +1 @@ +tools/depends/target/openssl/cacert.pem system/certs \ No newline at end of file diff --git a/project/cmake/installdata/osx/packaging.txt b/project/cmake/installdata/osx/packaging.txt new file mode 100644 index 0000000..f869e4c --- /dev/null +++ b/project/cmake/installdata/osx/packaging.txt @@ -0,0 +1,4 @@ +LICENSE.gpl +privacy-policy.txt +xbmc/platform/darwin/Credits.html +tools/darwin/packaging/media/osx/icon.iconset/* diff --git a/project/cmake/installdata/osx/runtime.txt b/project/cmake/installdata/osx/runtime.txt new file mode 100644 index 0000000..3bb5467 --- /dev/null +++ b/project/cmake/installdata/osx/runtime.txt @@ -0,0 +1,2 @@ +tools/darwin/runtime/preflight +tools/darwin/runtime/org.xbmc.helper.plist diff --git a/project/cmake/installdata/rbpi/lirc.txt b/project/cmake/installdata/rbpi/lirc.txt new file mode 120000 index 0000000..e89ae50 --- /dev/null +++ b/project/cmake/installdata/rbpi/lirc.txt @@ -0,0 +1 @@ +../linux/lirc.txt \ No newline at end of file diff --git a/project/cmake/installdata/windows/dlls.txt b/project/cmake/installdata/windows/dlls.txt index 72cca7d..64d9756 100644 --- a/project/cmake/installdata/windows/dlls.txt +++ b/project/cmake/installdata/windows/dlls.txt @@ -1,6 +1,2 @@ -system/*.dll -system/airplay/*.dll -system/cdrip/*.dll -system/players/dvdplayer/*.dll -system/players/paplayer/*.dll -system/players/VideoPlayer/*.dll +system/*.dll . +project/Win32BuildSetup/dependencies/python27.dll . \ No newline at end of file diff --git a/project/cmake/installdata/windows/python.txt b/project/cmake/installdata/windows/python.txt new file mode 100644 index 0000000..b805318 --- /dev/null +++ b/project/cmake/installdata/windows/python.txt @@ -0,0 +1 @@ +system/python/* \ No newline at end of file -- cgit v1.2.3