Merge pull request #21010 from garbear/more-sorting

Sort CMake installdata/treedata, add-on manifest and colors

9 files changed, 50 insertions, 50 deletions

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 169fb3727d..52892f47c2 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
index 1335e6694f..1335e6694f 100755..100644
--- a/cmake/treedata/darwin_embedded/tvos/tvos.txt
+++ b/cmake/treedata/darwin_embedded/tvos/tvos.txt