diff options
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | README.md | 2 | ||||
| -rwxr-xr-x | data/freedesktop_generate.sh | 12 | ||||
| -rw-r--r-- | data/meson.build | 16 | ||||
| -rw-r--r-- | meson.build | 1 |
5 files changed, 6 insertions, 27 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 985dfe96..345e1ce1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,7 +9,6 @@ variables: glib2-devel gettext git - itstool xmlto findutils gettext-devel @@ -34,4 +33,3 @@ build:meson: paths: - _build/meson-logs/*.txt - _build/meson-dist/*.* - @@ -19,7 +19,7 @@ $ ninja -v -C _build install ``` It requires the glib development package to be installed as well as -gettext and itstool. +gettext. This database is translated at Transifex. diff --git a/data/freedesktop_generate.sh b/data/freedesktop_generate.sh deleted file mode 100755 index 62ccffa7..00000000 --- a/data/freedesktop_generate.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -e - -src_root="$1" -build_root="$2" - -${NINJA:-ninja} -C "${build_root}" shared-mime-info-gmo - -itstool \ - --its "${src_root}/data/its/shared-mime-info.its" \ - --join "${src_root}/data/freedesktop.org.xml.in" \ - -o "${build_root}/data/freedesktop.org.xml" \ - "${build_root}/po/"*".gmo" diff --git a/data/meson.build b/data/meson.build index 24361c97..09ed7a98 100644 --- a/data/meson.build +++ b/data/meson.build @@ -1,18 +1,12 @@ install_man('update-mime-database.1') -freedesktop_org_xml = custom_target('freedesktop.org.xml', - input : files( - 'freedesktop.org.xml.in', - 'its/shared-mime-info.its', - 'its/shared-mime-info.loc', - ), +freedesktop_org_xml = i18n.merge_file( + input: 'freedesktop.org.xml.in', output: 'freedesktop.org.xml', - command: [ - find_program('freedesktop_generate.sh'), - meson.source_root(), - meson.build_root() - ], + data_dirs: '.', + po_dir: '../po', + type: 'xml', install: true, install_dir: get_option('datadir') / 'mime' / 'packages', ) diff --git a/meson.build b/meson.build index 0d08c8a0..60f17ae7 100644 --- a/meson.build +++ b/meson.build @@ -20,7 +20,6 @@ config.set_quoted('VERSION', meson.project_version()) ############################################################################### # Find tools -itstool = find_program('itstool') xmllint = find_program('xmllint') xmlto = find_program('xmlto', required: false) |