[planner: 2/4] build: Port MIME type handling from intltool to gettext
- From: Mart Raudsepp <mraudsepp src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [planner: 2/4] build: Port MIME type handling from intltool to gettext
- Date: Sat, 26 Jun 2021 12:57:45 +0000 (UTC)
commit 1aaf3c373924fb55aad70a1115d84e48e7d8af29
Author: Mart Raudsepp <leio gentoo org>
Date: Sat Jun 26 15:53:23 2021 +0300
build: Port MIME type handling from intltool to gettext
data/meson.build | 8 +-------
data/mime/its/mime.its | 6 ++++++
data/mime/its/mime.loc | 6 ++++++
data/mime/meson.build | 7 ++++---
data/mime/{planner.xml.in => org.gnome.Planner.xml.in} | 2 +-
5 files changed, 18 insertions(+), 11 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index 85aff4de..7a89dd67 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -21,7 +21,7 @@ subdir('images')
subdir('ui')
subdir('dtd')
subdir('stylesheets')
-#subdir('mime')
+subdir('mime')
subdir('sql')
install_man('planner.1')
i18n.merge_file(
@@ -33,10 +33,6 @@ i18n.merge_file(
install_dir: planner_datadir / 'applications',
)
-intltool_merge = find_program('intltool-merge')
-intltool_cache = po_dir / '.intltool-merge-cache'
-intltool_xml_cmd = [intltool_merge, '-x', '-u', '-c', intltool_cache, po_dir, '@INPUT@', '@OUTPUT@']
-
schema_file = 'org.gnome.Planner.gschema.xml'
install_data(
schema_file,
@@ -47,5 +43,3 @@ install_data(
'planner.convert',
install_dir: planner_datadir / 'GConf' / 'gsettings',
)
-
-subdir('mime') # relies on intltool variables from above
diff --git a/data/mime/its/mime.its b/data/mime/its/mime.its
new file mode 100644
index 00000000..dec8d136
--- /dev/null
+++ b/data/mime/its/mime.its
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<its:rules xmlns:its="http://www.w3.org/2005/11/its"
+ version="2.0">
+ <its:translateRule selector="/mime-info" translate="no"/>
+ <its:translateRule selector="//comment" translate="yes"/>
+</its:rules>
diff --git a/data/mime/its/mime.loc b/data/mime/its/mime.loc
new file mode 100644
index 00000000..a34fe8dc
--- /dev/null
+++ b/data/mime/its/mime.loc
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<locatingRules>
+ <locatingRule name="mime" pattern="*.xml">
+ <documentRule localName="mime-info" target="mime.its"/>
+ </locatingRule>
+</locatingRules>
diff --git a/data/mime/meson.build b/data/mime/meson.build
index 01982efd..3a204244 100644
--- a/data/mime/meson.build
+++ b/data/mime/meson.build
@@ -1,12 +1,13 @@
-mime_xml_file = 'planner.xml'
+mime_xml_file = 'org.gnome.Planner.xml'
planner_mimedir = planner_datadir / 'mime' / 'packages'
-custom_target(
+i18n.merge_file(
mime_xml_file,
input: mime_xml_file + '.in',
output: mime_xml_file,
- command: intltool_xml_cmd,
+ po_dir: po_dir,
+ data_dirs: meson.current_source_dir(),
install: true,
install_dir: planner_mimedir,
)
diff --git a/data/mime/planner.xml.in b/data/mime/org.gnome.Planner.xml.in
similarity index 89%
rename from data/mime/planner.xml.in
rename to data/mime/org.gnome.Planner.xml.in
index 1699edca..58bb26f5 100644
--- a/data/mime/planner.xml.in
+++ b/data/mime/org.gnome.Planner.xml.in
@@ -2,7 +2,7 @@
<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
<mime-type type="application/x-planner">
<sub-class-of type="application/xml"/>
- <_comment>Planner project plan</_comment>
+ <comment>Planner project plan</comment>
<magic priority="60">
<match type="string" value="mrproject-version" offset="20:140"/>
</magic>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]