]> granicus.if.org Git - handbrake/commitdiff
flatpak: automatically add <release> tag to cli appdata
authorJohn Stebbins <jstebbins.hb@gmail.com>
Thu, 7 Jun 2018 21:49:45 +0000 (14:49 -0700)
committerJohn Stebbins <jstebbins.hb@gmail.com>
Thu, 7 Jun 2018 22:01:33 +0000 (15:01 -0700)
gtk/src/fr.handbrake.ghb.appdata.xml.template [moved from gtk/src/fr.handbrake.ghb.appdata.xml with 100% similarity]
test/fr.handbrake.HandBrakeCLI.appdata.xml.template [moved from test/fr.handbrake.HandBrakeCLI.appdata.xml with 98% similarity]
test/module.defs
test/module.rules

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)
@@ -60,5 +60,9 @@
     <binary>HandBrakeCLI</binary>
   </provides>
 
+  <releases>
+    RELEASE_TAG
+  </releases>
+
 </component>
 
index 21bcaa157910a93e50ccd3ef6b3e5366b4a3132d..459571067ed67de7a88dcfb8afcfed274af52d88 100644 (file)
@@ -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)
index 6791350746cca1c585bb62013f6af1376e4eafb8..87640c9de03b9f47b0658a5f53a8f5ccd6cb411f 100644 (file)
@@ -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))