diff options
| author | John Stebbins <[email protected]> | 2018-06-07 14:49:45 -0700 |
|---|---|---|
| committer | John Stebbins <[email protected]> | 2018-06-07 15:01:33 -0700 |
| commit | 7f59018bc89b09b78980c6404954bb1f1b8dd883 (patch) | |
| tree | 9dabf553f2f863cb2e89c16069c1e474a90c6d87 | |
| parent | f95aa7aaaf7283aedee86422533bd1968b6c9a44 (diff) | |
flatpak: automatically add <release> tag to cli appdata
| -rw-r--r-- | gtk/src/fr.handbrake.ghb.appdata.xml.template (renamed from gtk/src/fr.handbrake.ghb.appdata.xml) | 0 | ||||
| -rw-r--r-- | test/fr.handbrake.HandBrakeCLI.appdata.xml.template (renamed from test/fr.handbrake.HandBrakeCLI.appdata.xml) | 4 | ||||
| -rw-r--r-- | test/module.defs | 6 | ||||
| -rw-r--r-- | test/module.rules | 8 |
4 files changed, 17 insertions, 1 deletions
diff --git a/gtk/src/fr.handbrake.ghb.appdata.xml b/gtk/src/fr.handbrake.ghb.appdata.xml.template index ab79a0494..ab79a0494 100644 --- a/gtk/src/fr.handbrake.ghb.appdata.xml +++ b/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 index 2095809ab..c19756e86 100644 --- 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 21bcaa157..459571067 100644 --- 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 679135074..87640c9de 100644 --- 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)) |