flatpak: automatically add <release> tag to cli appdata

(cherry picked from commit 7f59018bc89b09b78980c6404954bb1f1b8dd883)

diff --git a/gtk/src/fr.handbrake.ghb.appdata.xml b/gtk/src/fr.handbrake.ghb.appdata.xml.template
similarity index 100%
rename from gtk/src/fr.handbrake.ghb.appdata.xml
rename to gtk/src/fr.handbrake.ghb.appdata.xml.template

diff --git a/test/fr.handbrake.HandBrakeCLI.appdata.xml b/test/fr.handbrake.HandBrakeCLI.appdata.xml.template
similarity index 98%
rename from test/fr.handbrake.HandBrakeCLI.appdata.xml
rename to test/fr.handbrake.HandBrakeCLI.appdata.xml.template
index 2095809ab2e1da8c3a9674727f611614408af205..c19756e86b97103a797e258c8ef17ff6371b8bdd 100644 (file)
--- a/test/fr.handbrake.HandBrakeCLI.appdata.xml
+++ b/test/fr.handbrake.HandBrakeCLI.appdata.xml.template
@@ -60,5 +60,9 @@
     <binary>HandBrakeCLI</binary>
   </provides>
 
+  <releases>
+    RELEASE_TAG
+  </releases>
+
 </component>
 

diff --git a/test/module.defs b/test/module.defs
index bda89ad554130643740c33dfd28570d8274958da..f88eea988a13531e64d2e336cab934023a468dd1 100644 (file)
--- a/test/module.defs
+++ b/test/module.defs
@@ -42,7 +42,8 @@ TEST.GCC.l += $(foreach m,$(MODULES.NAMES),$($m.OSL.libs))
 
 TEST.install.exe = $(DESTDIR)$(PREFIX/)bin/$(notdir $(TEST.exe))
 ifeq (1,$(FEATURE.flatpak))
-    TEST.appdata   = $(TEST.src/)fr.handbrake.HandBrakeCLI.appdata.xml
+    TEST.appdata.template = $(TEST.src/)fr.handbrake.HandBrakeCLI.appdata.xml.template
+    TEST.appdata = $(TEST.build/)fr.handbrake.HandBrakeCLI.appdata.xml
     TEST.install.appdata = $(DESTDIR)$(PREFIX/)share/metainfo/$(notdir $(TEST.appdata))
 endif
 
@@ -50,6 +51,9 @@ endif
 
 TEST.out += $(TEST.c.o)
 TEST.out += $(TEST.exe)
+ifeq (1,$(FEATURE.flatpak))
+    TEST.out += $(TEST.appdata)
+endif
 
 BUILD.out += $(TEST.out)
 BUILD.out += $(TEST.install.exe)

diff --git a/test/module.rules b/test/module.rules
index 8e29409119eada4addbcbaad4f7de25c6a1e71dc..6560bc476401c62e0f78a997db75903e091679c1 100644 (file)
--- a/test/module.rules
+++ b/test/module.rules
@@ -8,6 +8,9 @@ clean: test.clean
 xclean: test.xclean
 
 test.build: $(TEST.exe)
+ifeq (1,$(FEATURE.flatpak))
+test.build: $(TEST.appdata)
+endif
 
 ########################################
 # sync with ../macosx/module.rules     #
@@ -17,8 +20,13 @@ test.install-strip: | $(dir $(TEST.install.exe))
        $(STRIP.exe) $(TEST.install.exe)
 
 ifeq (1,$(FEATURE.flatpak))
+$(TEST.appdata): $(TEST.appdata.template)
+       sed -e 's^RELEASE_TAG^<release version="$(HB.version)" date="$(word 1,$(HB.repo.date))" />^' $< > $@
+
+$(TEST.install.appdata): $(TEST.appdata)
 test.install: | $(dir $(TEST.install.appdata))
 endif
+
 test.install: | $(dir $(TEST.install.exe))
        $(CP.exe) $(TEST.exe) $(TEST.install.exe)
 ifeq (1,$(FEATURE.flatpak))