Merge pull request #12029 from AlwinEsch/change_addon_xml_way-2

[cmake][addons] automate addon.xml version set

27 files changed, 95 insertions, 79 deletions

diff --git a/addons/audioencoder.xbmc.builtin.aac/addon.xml b/addons/audioencoder.xbmc.builtin.aac/addon.xml
index eb484a95c6..5ea5c45135 100644
--- a/addons/audioencoder.xbmc.builtin.aac/addon.xml
+++ b/addons/audioencoder.xbmc.builtin.aac/addon.xml
@@ -4,9 +4,6 @@
   version="1.0.0"
   name="AAC encoder"
   provider-name="spiff">
-  <requires>
-    <import addon="xbmc.audioencoder" version="1.0.0"/>
-  </requires>
   <extension
     point="xbmc.audioencoder"
     extension=".m4a"
diff --git a/addons/audioencoder.xbmc.builtin.wma/addon.xml b/addons/audioencoder.xbmc.builtin.wma/addon.xml
index 6b02df3a4e..93477df74b 100644
--- a/addons/audioencoder.xbmc.builtin.wma/addon.xml
+++ b/addons/audioencoder.xbmc.builtin.wma/addon.xml
@@ -4,9 +4,6 @@
   version="1.0.0"
   name="WMA encoder"
   provider-name="spiff">
-  <requires>
-    <import addon="xbmc.audioencoder" version="1.0.0"/>
-  </requires>
   <extension
     point="xbmc.audioencoder"
     extension=".wma"
diff --git a/addons/kodi.adsp/addon.xml b/addons/kodi.adsp/addon.xml
deleted file mode 100644
index 16b246e973..0000000000
--- a/addons/kodi.adsp/addon.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<addon id="kodi.adsp" version="0.1.8" provider-name="Team KODI">
-  <backwards-compatibility abi="0.1.8"/>
-  <requires>
-    <import addon="xbmc.core" version="0.1.0"/>
-  </requires>
-</addon>
diff --git a/addons/kodi.audiodecoder/addon.xml b/addons/kodi.audiodecoder/addon.xml
deleted file mode 100644
index c786cd8509..0000000000
--- a/addons/kodi.audiodecoder/addon.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<addon id="kodi.audiodecoder" version="1.0.0" provider-name="Team Kodi">
-  <backwards-compatibility abi="1.0.0"/>
-  <requires>
-    <import addon="xbmc.core" version="0.1.0"/>
-  </requires>
-</addon>
diff --git a/addons/kodi.binary.global.gui/addon.xml.in b/addons/kodi.binary.global.gui/addon.xml.in
new file mode 100644
index 0000000000..d3f453f744
--- /dev/null
+++ b/addons/kodi.binary.global.gui/addon.xml.in
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<addon id="kodi.binary.global.gui" version="@ADDON_GLOBAL_VERSION_GUI@" provider-name="Team Kodi">
+  <backwards-compatibility abi="@ADDON_GLOBAL_VERSION_GUI_MIN@"/>
+  <requires>
+    <import addon="xbmc.core" version="0.1.0"/>
+  </requires>
+</addon>
diff --git a/addons/kodi.binary.global.main/addon.xml.in b/addons/kodi.binary.global.main/addon.xml.in
new file mode 100644
index 0000000000..f60bbb5562
--- /dev/null
+++ b/addons/kodi.binary.global.main/addon.xml.in
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<addon id="kodi.binary.global.main" version="@ADDON_GLOBAL_VERSION_MAIN@" provider-name="Team Kodi">
+  <backwards-compatibility abi="@ADDON_GLOBAL_VERSION_MAIN_MIN@"/>
+  <requires>
+    <import addon="xbmc.core" version="0.1.0"/>
+  </requires>
+</addon>
diff --git a/addons/kodi.binary.instance.adsp/addon.xml.in b/addons/kodi.binary.instance.adsp/addon.xml.in
new file mode 100644
index 0000000000..8a443ff2cb
--- /dev/null
+++ b/addons/kodi.binary.instance.adsp/addon.xml.in
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<addon id="kodi.binary.instance.adsp" version="@ADDON_INSTANCE_VERSION_ADSP@" provider-name="Team Kodi">
+  <backwards-compatibility abi="@ADDON_INSTANCE_VERSION_ADSP_MIN@"/>
+  <requires>
+    <import addon="xbmc.core" version="0.1.0"/>
+  </requires>
+</addon>
diff --git a/addons/kodi.binary.instance.audiodecoder/addon.xml.in b/addons/kodi.binary.instance.audiodecoder/addon.xml.in
new file mode 100644
index 0000000000..50ce7e4264
--- /dev/null
+++ b/addons/kodi.binary.instance.audiodecoder/addon.xml.in
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<addon id="kodi.binary.instance.audiodecoder" version="@ADDON_INSTANCE_VERSION_AUDIODECODER@" provider-name="Team Kodi">
+  <backwards-compatibility abi="@ADDON_INSTANCE_VERSION_AUDIODECODER_MIN@"/>
+  <requires>
+    <import addon="xbmc.core" version="0.1.0"/>
+  </requires>
+</addon>
diff --git a/addons/kodi.binary.instance.audioencoder/addon.xml.in b/addons/kodi.binary.instance.audioencoder/addon.xml.in
new file mode 100644
index 0000000000..31d5cf61d6
--- /dev/null
+++ b/addons/kodi.binary.instance.audioencoder/addon.xml.in
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<addon id="kodi.binary.instance.audioencoder" version="@ADDON_INSTANCE_VERSION_AUDIOENCODER@" provider-name="Team Kodi">
+  <backwards-compatibility abi="@ADDON_INSTANCE_VERSION_AUDIOENCODER_MIN@"/>
+  <requires>
+    <import addon="xbmc.core" version="0.1.0"/>
+  </requires>
+</addon>
diff --git a/addons/kodi.game/addon.xml b/addons/kodi.binary.instance.game/addon.xml.in
index aa9940ae8a..b8b379d2de 100644
--- a/addons/kodi.game/addon.xml
+++ b/addons/kodi.binary.instance.game/addon.xml.in
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<addon id="kodi.game" version="1.0.30" provider-name="Team-Kodi">
-	<backwards-compatibility abi="1.0.30"/>
+<addon id="kodi.binary.instance.game" version="@ADDON_INSTANCE_VERSION_GAME@" provider-name="Team Kodi">
+	<backwards-compatibility abi="@ADDON_INSTANCE_VERSION_GAME_MIN@"/>
 	<requires>
 		<import addon="xbmc.core" version="0.1.0"/>
 	</requires>
diff --git a/addons/kodi.game/controller.xsd b/addons/kodi.binary.instance.game/controller.xsd
index a5383f826b..a5383f826b 100644
--- a/addons/kodi.game/controller.xsd
+++ b/addons/kodi.binary.instance.game/controller.xsd
diff --git a/addons/kodi.binary.instance.imagedecoder/addon.xml.in b/addons/kodi.binary.instance.imagedecoder/addon.xml.in
new file mode 100644
index 0000000000..b6eae4e900
--- /dev/null
+++ b/addons/kodi.binary.instance.imagedecoder/addon.xml.in
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<addon id="kodi.binary.instance.imagedecoder" version="@ADDON_INSTANCE_VERSION_IMAGEDECODER@" provider-name="Team Kodi">
+  <backwards-compatibility abi="@ADDON_INSTANCE_VERSION_IMAGEDECODER_MIN@"/>
+  <requires>
+    <import addon="xbmc.core" version="0.1.0"/>
+  </requires>
+</addon>
diff --git a/addons/kodi.binary.instance.inputstream/addon.xml.in b/addons/kodi.binary.instance.inputstream/addon.xml.in
new file mode 100644
index 0000000000..21f604212d
--- /dev/null
+++ b/addons/kodi.binary.instance.inputstream/addon.xml.in
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<addon id="kodi.binary.instance.inputstream" version="@ADDON_INSTANCE_VERSION_INPUTSTREAM@" provider-name="Team Kodi">
+  <backwards-compatibility abi="@ADDON_INSTANCE_VERSION_INPUTSTREAM_MIN@"/>
+  <requires>
+    <import addon="xbmc.core" version="0.1.0"/>
+  </requires>
+</addon>
diff --git a/addons/kodi.binary.instance.peripheral/addon.xml.in b/addons/kodi.binary.instance.peripheral/addon.xml.in
new file mode 100644
index 0000000000..99165f1830
--- /dev/null
+++ b/addons/kodi.binary.instance.peripheral/addon.xml.in
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<addon id="kodi.binary.instance.peripheral" version="@ADDON_INSTANCE_VERSION_PERIPHERAL@" provider-name="Team Kodi">
+  <backwards-compatibility abi="@ADDON_INSTANCE_VERSION_PERIPHERAL_MIN@"/>
+	<requires>
+		<import addon="xbmc.core" version="0.1.0"/>
+	</requires>
+</addon>
diff --git a/addons/kodi.binary.instance.pvr/addon.xml.in b/addons/kodi.binary.instance.pvr/addon.xml.in
new file mode 100644
index 0000000000..fce51e6ce8
--- /dev/null
+++ b/addons/kodi.binary.instance.pvr/addon.xml.in
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<addon id="kodi.binary.instance.pvr" version="@ADDON_INSTANCE_VERSION_PVR@" provider-name="Team Kodi">
+  <backwards-compatibility abi="@ADDON_INSTANCE_VERSION_PVR_MIN@"/>
+  <requires>
+    <import addon="xbmc.core" version="0.1.0"/>
+  </requires>
+</addon>
diff --git a/addons/xbmc.pvr/icon.png b/addons/kodi.binary.instance.pvr/icon.png
index 6f25f4dcff..6f25f4dcff 100644
--- a/addons/xbmc.pvr/icon.png
+++ b/addons/kodi.binary.instance.pvr/icon.png
diff --git a/addons/kodi.binary.instance.screensaver/addon.xml.in b/addons/kodi.binary.instance.screensaver/addon.xml.in
new file mode 100644
index 0000000000..b11831d252
--- /dev/null
+++ b/addons/kodi.binary.instance.screensaver/addon.xml.in
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<addon id="kodi.binary.instance.screensaver" version="@ADDON_INSTANCE_VERSION_SCREENSAVER@" provider-name="Team Kodi">
+  <backwards-compatibility abi="@ADDON_INSTANCE_VERSION_SCREENSAVER_MIN@"/>
+  <requires>
+    <import addon="xbmc.core" version="0.1.0"/>
+  </requires>
+</addon>
diff --git a/addons/kodi.binary.instance.vfs/addon.xml.in b/addons/kodi.binary.instance.vfs/addon.xml.in
new file mode 100644
index 0000000000..248bcccd36
--- /dev/null
+++ b/addons/kodi.binary.instance.vfs/addon.xml.in
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<addon id="kodi.binary.instance.vfs" version="@ADDON_INSTANCE_VERSION_VFS@" provider-name="Team Kodi">
+  <backwards-compatibility abi="@ADDON_INSTANCE_VERSION_VFS_MIN@"/>
+  <requires>
+    <import addon="xbmc.core" version="0.1.0"/>
+  </requires>
+</addon>
diff --git a/addons/kodi.binary.instance.visualization/addon.xml.in b/addons/kodi.binary.instance.visualization/addon.xml.in
new file mode 100644
index 0000000000..ab82869572
--- /dev/null
+++ b/addons/kodi.binary.instance.visualization/addon.xml.in
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<addon id="kodi.binary.instance.visualization" version="@ADDON_INSTANCE_VERSION_VISUALIZATION@" provider-name="Team Kodi">
+  <backwards-compatibility abi="@ADDON_INSTANCE_VERSION_VISUALIZATION_MIN@"/>
+  <requires>
+    <import addon="xbmc.core" version="0.1.0"/>
+  </requires>
+</addon>
diff --git a/addons/kodi.guilib/addon.xml.in b/addons/kodi.guilib/addon.xml.in
deleted file mode 100644
index 936a9e3222..0000000000
--- a/addons/kodi.guilib/addon.xml.in
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<addon id="kodi.guilib" version="@guilib_version@" provider-name="Team-Kodi">
-  <backwards-compatibility abi="@guilib_version_min@"/>
-  <requires>
-    <import addon="xbmc.core" version="0.1.0"/>
-  </requires>
-</addon>
diff --git a/addons/kodi.imagedecoder/addon.xml b/addons/kodi.imagedecoder/addon.xml
deleted file mode 100644
index aa0af75ad1..0000000000
--- a/addons/kodi.imagedecoder/addon.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<addon id="kodi.imagedecoder" version="1.0.0" provider-name="Team Kodi">
-  <backwards-compatibility abi="1.0.0"/>
-  <requires>
-    <import addon="xbmc.core" version="0.1.0"/>
-  </requires>
-</addon>
diff --git a/addons/kodi.inputstream/addon.xml b/addons/kodi.inputstream/addon.xml
deleted file mode 100644
index 45f5dc4ea9..0000000000
--- a/addons/kodi.inputstream/addon.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<addon id="kodi.inputstream" version="1.0.6" provider-name="Team Kodi">
-  <backwards-compatibility abi="1.0.6"/>
-  <requires>
-    <import addon="xbmc.core" version="0.1.0"/>
-  </requires>
-</addon>
diff --git a/addons/kodi.peripheral/addon.xml b/addons/kodi.peripheral/addon.xml
deleted file mode 100644
index 9b78391baa..0000000000
--- a/addons/kodi.peripheral/addon.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<addon id="kodi.peripheral" version="1.3.1" provider-name="Team-Kodi">
-	<backwards-compatibility abi="1.3.1"/>
-	<requires>
-		<import addon="xbmc.core" version="0.1.0"/>
-	</requires>
-</addon>
diff --git a/addons/kodi.vfs/addon.xml b/addons/kodi.vfs/addon.xml
deleted file mode 100644
index 4535e332e9..0000000000
--- a/addons/kodi.vfs/addon.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<addon id="kodi.vfs" version="1.0.0" provider-name="Team-Kodi">
-  <backwards-compatibility abi="1.0.0"/>
-  <requires>
-    <import addon="xbmc.core" version="0.1.0"/>
-  </requires>
-</addon>
diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po
index 0d850b4188..d56ce2ae39 100644
--- a/addons/resource.language.en_gb/resources/strings.po
+++ b/addons/resource.language.en_gb/resources/strings.po
@@ -15093,7 +15093,14 @@ msgctxt "#24151"
 msgid "Add-on migration in progress - please wait"
 msgstr ""
 
-#empty strings from id 24152 to 24990
+#. Inform about not supported addon if tried to enable
+#: xbmc/addons/AddonManager.cpp
+#: xbmc/addons/AddonDll.cpp
+msgctxt "#24152"
+msgid "The add-on is not compatible with this version of Kodi."
+msgstr ""
+
+#empty strings from id 24153 to 24990
 
 #. Used as error message in add-on browser when add-on repository data could not be downloaded
 #: xbmc/filesystem/AddonsDirectory.cpp
@@ -15230,13 +15237,7 @@ msgctxt "#29802"
 msgid "Passthrough audio in use"
 msgstr ""
 
-#. The label in the add-ons dll class to report about outdated add-on api version
-#: xbmc/addons/AddonDll.cpp
-msgctxt "#29803"
-msgid "Incompatible API version for type '%s'. Kodi: '%s', add-on: '%s'."
-msgstr ""
-
-#empty strings from id 29804 to 29899
+#empty strings from id 29803 to 29899
 
 #. Header string on RDS Radiotext+ Info dialog
 msgctxt "#29900"
diff --git a/addons/xbmc.audioencoder/addon.xml b/addons/xbmc.audioencoder/addon.xml
deleted file mode 100644
index 0440695c74..0000000000
--- a/addons/xbmc.audioencoder/addon.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<addon id="xbmc.audioencoder" version="1.0.0" provider-name="Team Kodi">
-  <backwards-compatibility abi="1.0.0"/>
-  <requires>
-    <import addon="xbmc.core" version="0.1.0"/>
-  </requires>
-</addon>
diff --git a/addons/xbmc.pvr/addon.xml b/addons/xbmc.pvr/addon.xml
deleted file mode 100644
index a7cc34ce71..0000000000
--- a/addons/xbmc.pvr/addon.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<addon id="xbmc.pvr" version="5.2.2" provider-name="Team-Kodi">
-  <backwards-compatibility abi="5.2.2"/>
-  <requires>
-    <import addon="xbmc.core" version="0.1.0"/>
-  </requires>
-</addon>