diff options
| author | Bastien Nocera <hadess@hadess.net> | 2020-02-20 18:20:05 +0100 |
|---|---|---|
| committer | Bastien Nocera <hadess@hadess.net> | 2020-02-20 18:21:38 +0100 |
| commit | 1ed2557d5eb5dfe8dfbd15ea705e9f480b446e29 (patch) | |
| tree | e2256d4e852414d0df716b107e82ed96b85e1237 | |
| parent | a2086e27201d4123e374f5e2d09ad7a10067dd59 (diff) | |
| download | shared-mime-info-1ed2557d5eb5dfe8dfbd15ea705e9f480b446e29.tar.gz | |
build: Remove autotools support from freedesktop_generate.sh
| -rwxr-xr-x | data/freedesktop_generate.sh | 18 | ||||
| -rw-r--r-- | data/meson.build | 1 |
2 files changed, 3 insertions, 16 deletions
diff --git a/data/freedesktop_generate.sh b/data/freedesktop_generate.sh index a078ec96..90381030 100755 --- a/data/freedesktop_generate.sh +++ b/data/freedesktop_generate.sh @@ -1,24 +1,12 @@ #!/bin/bash -e -if [ "$1" == "--meson" ] ; then - shift - MESON=enabled -fi src_root="$1" build_root="$2" -if test "x$MESON" = "x" ; then - make -C "${build_root}/po" update-gmo - OUT="${build_root}/freedesktop.org.xml" - GMODIR="${src_root}/po/" -else - ninja -C "${build_root}" shared-mime-info-gmo - OUT="${build_root}/data/freedesktop.org.xml" - GMODIR="${build_root}/po/" -fi +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 "${OUT}" \ - "${GMODIR}"*".gmo" + -o "${build_root}/data/freedesktop.org.xml" \ + "${build_root}/po/"*".gmo" diff --git a/data/meson.build b/data/meson.build index 35bd8a59..48ca20ca 100644 --- a/data/meson.build +++ b/data/meson.build @@ -10,7 +10,6 @@ freedesktop_org_xml = custom_target('freedesktop.org.xml', output: 'freedesktop.org.xml', command: [ find_program('freedesktop_generate.sh'), - '--meson', meson.source_root(), meson.build_root() ], |