From 4cb663b037e39b8e8677bdc240b727db70ba8e4f Mon Sep 17 00:00:00 2001 From: Garrett Brown Date: Fri, 18 Feb 2022 09:33:05 -0800 Subject: Sort CMake installdata/treedata and system XML --- cmake/installdata/common/addons.txt | 48 +++++++++--------- cmake/installdata/common/common.txt | 12 ++--- cmake/installdata/darwin_embedded/runtime.txt | 2 +- cmake/installdata/osx/packaging.txt | 2 +- cmake/installdata/osx/runtime.txt | 2 +- cmake/installdata/test-reference-data.txt | 30 +++++------ cmake/installdata/windows/dlls.txt | 2 +- cmake/treedata/darwin_embedded/subdirs.txt | 2 +- cmake/treedata/darwin_embedded/tvos/tvos.txt | 0 system/addon-manifest.xml | 16 +++--- system/dialogcolors.xml | 72 +++++++++++++-------------- 11 files changed, 94 insertions(+), 94 deletions(-) mode change 100755 => 100644 cmake/treedata/darwin_embedded/tvos/tvos.txt diff --git a/cmake/installdata/common/addons.txt b/cmake/installdata/common/addons.txt index 18b747afbd..cad17de42e 100644 --- a/cmake/installdata/common/addons.txt +++ b/cmake/installdata/common/addons.txt @@ -8,27 +8,7 @@ addons/kodi.imagedecoder/* addons/kodi.inputstream/* addons/kodi.peripheral/* addons/kodi.resource/* -addons/xbmc.addon/metadata.xsd -addons/xbmc.addon/repository.xsd -addons/xbmc.audioencoder/* -addons/xbmc.codec/* -addons/xbmc.core/* -addons/xbmc.gui/* -addons/xbmc.metadata/* -addons/xbmc.pvr/* -addons/xbmc.python/* -addons/xbmc.webinterface/* -addons/repository.xbmc.org/* -addons/webinterface.default/* -addons/screensaver.xbmc.builtin.dim/* -addons/screensaver.xbmc.builtin.black/* -addons/script.module.pil/* -addons/script.module.pycryptodome/* -addons/resource.language.en_gb/* -addons/resource.uisounds.kodi/* -addons/resource.images.weathericons.default/* -addons/service.xbmc.versioncheck/* -addons/metadata.local/* +addons/kodi.vfs/* addons/metadata.album.universal/* addons/metadata.artists.universal/* addons/metadata.common.allmusic.com/* @@ -40,8 +20,28 @@ addons/metadata.common.theaudiodb.com/* addons/metadata.common.themoviedb.org/* addons/metadata.generic.albums/* addons/metadata.generic.artists/* -addons/metadata.themoviedb.org/* +addons/metadata.local/* addons/metadata.themoviedb.org.python/* -addons/metadata.tvshows.themoviedb.org/* +addons/metadata.themoviedb.org/* addons/metadata.tvshows.themoviedb.org.python/* -addons/kodi.vfs/* +addons/metadata.tvshows.themoviedb.org/* +addons/repository.xbmc.org/* +addons/resource.images.weathericons.default/* +addons/resource.language.en_gb/* +addons/resource.uisounds.kodi/* +addons/screensaver.xbmc.builtin.black/* +addons/screensaver.xbmc.builtin.dim/* +addons/script.module.pil/* +addons/script.module.pycryptodome/* +addons/service.xbmc.versioncheck/* +addons/webinterface.default/* +addons/xbmc.addon/metadata.xsd +addons/xbmc.addon/repository.xsd +addons/xbmc.audioencoder/* +addons/xbmc.codec/* +addons/xbmc.core/* +addons/xbmc.gui/* +addons/xbmc.metadata/* +addons/xbmc.pvr/* +addons/xbmc.python/* +addons/xbmc.webinterface/* diff --git a/cmake/installdata/common/common.txt b/cmake/installdata/common/common.txt index faf4bd944b..a3853b4e40 100644 --- a/cmake/installdata/common/common.txt +++ b/cmake/installdata/common/common.txt @@ -1,13 +1,13 @@ media/* sounds/* -system/keymaps/* -system/library/* -system/shaders/* -system/settings/* -userdata/* system/addon-manifest.xml system/colors.xml system/dialogcolors.xml +system/keyboardlayouts/* +system/keymaps/* +system/library/* system/peripherals.xml system/playercorefactory.xml -system/keyboardlayouts/* +system/settings/* +system/shaders/* +userdata/* diff --git a/cmake/installdata/darwin_embedded/runtime.txt b/cmake/installdata/darwin_embedded/runtime.txt index 3bb546754e..92595bd40f 100644 --- a/cmake/installdata/darwin_embedded/runtime.txt +++ b/cmake/installdata/darwin_embedded/runtime.txt @@ -1,2 +1,2 @@ -tools/darwin/runtime/preflight tools/darwin/runtime/org.xbmc.helper.plist +tools/darwin/runtime/preflight diff --git a/cmake/installdata/osx/packaging.txt b/cmake/installdata/osx/packaging.txt index f9ae368a18..d0ba0b7ab4 100644 --- a/cmake/installdata/osx/packaging.txt +++ b/cmake/installdata/osx/packaging.txt @@ -1,4 +1,4 @@ LICENSE.md privacy-policy.txt -xbmc/platform/darwin/Credits.html tools/darwin/packaging/media/osx/icon.iconset/* +xbmc/platform/darwin/Credits.html diff --git a/cmake/installdata/osx/runtime.txt b/cmake/installdata/osx/runtime.txt index 3bb546754e..92595bd40f 100644 --- a/cmake/installdata/osx/runtime.txt +++ b/cmake/installdata/osx/runtime.txt @@ -1,2 +1,2 @@ -tools/darwin/runtime/preflight tools/darwin/runtime/org.xbmc.helper.plist +tools/darwin/runtime/preflight diff --git a/cmake/installdata/test-reference-data.txt b/cmake/installdata/test-reference-data.txt index 25d29d23b8..ac6025ab89 100644 --- a/cmake/installdata/test-reference-data.txt +++ b/cmake/installdata/test-reference-data.txt @@ -1,29 +1,29 @@ +xbmc/cores/VideoPlayer/test/edl/testdata/comskipversion1.txt +xbmc/cores/VideoPlayer/test/edl/testdata/comskipversion2.txt +xbmc/cores/VideoPlayer/test/edl/testdata/edlautowindautowait.edl +xbmc/cores/VideoPlayer/test/edl/testdata/mplayerframebased.edl xbmc/cores/VideoPlayer/test/edl/testdata/mplayertimebased.edl xbmc/cores/VideoPlayer/test/edl/testdata/mplayertimebasedinterleavedcuts.edl -xbmc/cores/VideoPlayer/test/edl/testdata/mplayerframebased.edl xbmc/cores/VideoPlayer/test/edl/testdata/mplayertimebasedmixed.edl -xbmc/cores/VideoPlayer/test/edl/testdata/videoredo.Vprj xbmc/cores/VideoPlayer/test/edl/testdata/snapstream.mkv.chapters.xml -xbmc/cores/VideoPlayer/test/edl/testdata/comskipversion1.txt -xbmc/cores/VideoPlayer/test/edl/testdata/comskipversion2.txt -xbmc/cores/VideoPlayer/test/edl/testdata/edlautowindautowait.edl -xbmc/utils/test/CXBMCTinyXML-test.xml -xbmc/utils/test/data/language/Spanish/strings.po -xbmc/filesystem/test/extendedlocalheader.zip -xbmc/filesystem/test/reffile.txt -xbmc/filesystem/test/reffile.txt.rar -xbmc/filesystem/test/reffile.txt.zip -xbmc/filesystem/test/refRARnormal.rar -xbmc/filesystem/test/refRARstored.rar +xbmc/cores/VideoPlayer/test/edl/testdata/videoredo.Vprj xbmc/filesystem/test/data/httpdirectory/apache-default.html xbmc/filesystem/test/data/httpdirectory/apache-fancy.html xbmc/filesystem/test/data/httpdirectory/apache-html.html -xbmc/filesystem/test/data/httpdirectory/basic.html xbmc/filesystem/test/data/httpdirectory/basic-multiline.html +xbmc/filesystem/test/data/httpdirectory/basic.html xbmc/filesystem/test/data/httpdirectory/lighttp-default.html xbmc/filesystem/test/data/httpdirectory/nginx-default.html xbmc/filesystem/test/data/httpdirectory/nginx-fancyindex.html +xbmc/filesystem/test/extendedlocalheader.zip +xbmc/filesystem/test/reffile.txt +xbmc/filesystem/test/reffile.txt.rar +xbmc/filesystem/test/reffile.txt.zip +xbmc/filesystem/test/refRARnormal.rar +xbmc/filesystem/test/refRARstored.rar +xbmc/network/test/data/test-ranges.txt xbmc/network/test/data/test.html xbmc/network/test/data/test.png -xbmc/network/test/data/test-ranges.txt xbmc/playlists/test/test.xspf +xbmc/utils/test/CXBMCTinyXML-test.xml +xbmc/utils/test/data/language/Spanish/strings.po diff --git a/cmake/installdata/windows/dlls.txt b/cmake/installdata/windows/dlls.txt index a4bfb7949a..8cb5665c11 100644 --- a/cmake/installdata/windows/dlls.txt +++ b/cmake/installdata/windows/dlls.txt @@ -1,2 +1,2 @@ -project/BuildDependencies/${ARCH}/bin/libbluray*.jar . project/BuildDependencies/${ARCH}/bin/*.dll . +project/BuildDependencies/${ARCH}/bin/libbluray*.jar . diff --git a/cmake/treedata/darwin_embedded/subdirs.txt b/cmake/treedata/darwin_embedded/subdirs.txt index 20bfa02a70..a8d412271b 100644 --- a/cmake/treedata/darwin_embedded/subdirs.txt +++ b/cmake/treedata/darwin_embedded/subdirs.txt @@ -6,8 +6,8 @@ xbmc/platform/darwin platform/darwin xbmc/platform/darwin/ios-common platform/ios-common xbmc/platform/darwin/ios-common/network platform/ios-common/network xbmc/platform/darwin/ios-common/storage platform/ios-common/storage -xbmc/platform/darwin/peripherals platform/darwin/peripherals xbmc/platform/darwin/network platform/darwin/network +xbmc/platform/darwin/peripherals platform/darwin/peripherals xbmc/platform/darwin/utils platform/darwin/utils xbmc/platform/posix posix xbmc/platform/posix/filesystem platform/posix/filesystem diff --git a/cmake/treedata/darwin_embedded/tvos/tvos.txt b/cmake/treedata/darwin_embedded/tvos/tvos.txt old mode 100755 new mode 100644 diff --git a/system/addon-manifest.xml b/system/addon-manifest.xml index e6de83fb02..a1a6ac5117 100644 --- a/system/addon-manifest.xml +++ b/system/addon-manifest.xml @@ -4,11 +4,11 @@ game.controller.default game.controller.snes kodi.binary.global.audioengine - kodi.binary.global.main + kodi.binary.global.filesystem kodi.binary.global.general - kodi.binary.global.network kodi.binary.global.gui - kodi.binary.global.filesystem + kodi.binary.global.main + kodi.binary.global.network kodi.binary.global.tools kodi.binary.instance.audiodecoder kodi.binary.instance.audioencoder @@ -33,10 +33,10 @@ metadata.generic.albums metadata.generic.artists metadata.local - metadata.themoviedb.org metadata.themoviedb.org.python - metadata.tvshows.themoviedb.org + metadata.themoviedb.org metadata.tvshows.themoviedb.org.python + metadata.tvshows.themoviedb.org repository.xbmc.org resource.images.weathericons.default resource.language.en_gb @@ -45,9 +45,8 @@ screensaver.xbmc.builtin.dim script.module.pil script.module.pycryptodome - service.xbmc.versioncheck - skin.estuary skin.estouchy + skin.estuary webinterface.default xbmc.addon xbmc.core @@ -56,6 +55,7 @@ xbmc.metadata xbmc.python xbmc.webinterface - peripheral.joystick inputstream.adaptive + peripheral.joystick + service.xbmc.versioncheck diff --git a/system/dialogcolors.xml b/system/dialogcolors.xml index df9f26f862..12af216380 100644 --- a/system/dialogcolors.xml +++ b/system/dialogcolors.xml @@ -1,44 +1,42 @@ - fffafafa - fff5f5f5 - ffeeeeee - ffe0e0e0 - ffbdbdbd - ff9e9e9e - ff757575 - ff616161 - ff424242 - ff212121 FFEFDECD FFCD9575 + FFBF3F3F FFFDD9B5 FF78DBE2 FF87A96B FFFFA474 FFFAE7B5 FF9F8170 + FFA43482 FFFD7C6E FF000000 FFACE5EE - FF1F75FE FFA2A2D0 FF6699CC FF0D98BA FF7366BD + FF1F75FE FFDE5D83 FFCB4154 + ffeeeeee FFB4674D + FFDF9ACA FFFF7F49 FFEA7E5D + FFE74F00 FFB0B7C6 FFFFFF99 FF1CD3A2 + FF67CD95 FFFFAACC FFDD4492 FF1DACD6 FFBC5D58 + ffe0e0e0 + FF548CD0 FFDD9475 FF9ACEEB FFFFBCD9 @@ -53,73 +51,96 @@ FFCC6666 FFE7C697 FFFCD975 + ff616161 FFA8E4A0 - FF1CAC78 + ff424242 + fff5f5f5 + fffafafa + ffbdbdbd FF1164B4 FFF0E891 + FF1CAC78 + FF8F482F FFFF1DCE FFB2EC5D FF5D76CB + FF3C32CD FFCA3767 FF3BB08F FFFEFE22 + FF6B4D82 FFFCB4D5 + FF94DDCB FFFFF44F + FFFFD966 FFFFBD88 FFF664AF FFAAF0D1 FFCD4A4C FFEDD19C FF979AAA + FFFF6137 FFFF8243 FFC8385A FFEF98AA FFFDBCB4 FF1A4876 + FF4F2CD0 FF30BA8F FFC54B8C FF1974D2 FFFFA343 + FF62C9D3 FFBAB86C - FFFF7538 + FFFF8021 FFFF2B2B FFF8D568 + FFFF7538 FFE6A8D7 FF414A4C FFFF6E4A FF1CA9C9 FFFFCFAB FFC5D0E6 + FF5F7B4A FFFDDDE6 FF158078 FFFC74FD + FFFFB2E7 FFF78FA7 FF8E4585 FF7442C8 FF9D81BA FFFE4EDA FFFF496C + ff212121 FFD68A59 FF714B23 FFFF48D0 FFE3256B - FFEE204D FFFF5349 + FF9F3434 FFC0448F + FFEE204D FF1FCECB FF7851A9 FFFF9BAA FFFC2847 FF76FF7A + FFC4EA7F FF9FE2BF FFA5694F FF8A795D FF45CEA2 FFFB7EFD + FFFFFF65 FF80DAEB + ff757575 + ff9e9e9e FFECEABE FFFFCF48 FFFD5E53 + FFF79015 FFFAA76C FF18A7B5 FFEBC7DF @@ -139,28 +160,7 @@ FFFF43A4 FFFC6C85 FFCDA4DE - FFFCE883 FFC5E384 FFFFAE42 - FFBF3F3F - FFA43482 - FFDF9ACA - FFE74F00 - FF67CD95 - FF548CD0 - FF8F482F - FF3C32CD - FF6B4D82 - FF94DDCB - FFFFD966 - FFFF6137 - FF4F2CD0 - FF62C9D3 - FFFF8021 - FF5F7B4A - FFFFB2E7 - FF9F3434 - FFC4EA7F - FFFFFF65 - FFF79015 + FFFCE883 -- cgit v1.2.3