Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #2216 from ebassi/yelp-linguas 

Support LINGUAS for gnome.yelp() languages
This commit is contained in:
Jussi Pakkanen 2017-09-14 21:35:50 +03:00 committed by GitHub
parent 6fd2fab02c 6f1d7e3d0a
commit 19e22ac88a
5 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mesonbuild/modules/gnome.py
View File

@ -680,6 +680,11 @@ class GnomeModule(ExtensionModule):
source_str = '@@'.join(sources) source_str = '@@'.join(sources)
langs = mesonlib.stringlistify(kwargs.pop('languages', [])) langs = mesonlib.stringlistify(kwargs.pop('languages', []))
if langs:
mlog.log(mlog.red('DEPRECATION:'), '''The "languages" argument of gnome.yelp() is deprecated.
Use a LINGUAS file in the sources directory instead.
This will become a hard error in the future.''')
media = mesonlib.stringlistify(kwargs.pop('media', [])) media = mesonlib.stringlistify(kwargs.pop('media', []))
symlinks = kwargs.pop('symlink_media', True) symlinks = kwargs.pop('symlink_media', True)

4
mesonbuild/scripts/yelphelper.py
View File

@ -18,6 +18,7 @@ import shutil
import argparse import argparse
from .. import mlog from .. import mlog
from . import destdir_join from . import destdir_join
from .gettext import read_linguas
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
parser.add_argument('command') parser.add_argument('command')
@ -108,6 +109,9 @@ def run(args):
build_subdir = os.path.join(os.environ['MESON_BUILD_ROOT'], options.subdir) build_subdir = os.path.join(os.environ['MESON_BUILD_ROOT'], options.subdir)
abs_sources = [os.path.join(src_subdir, 'C', source) for source in sources] abs_sources = [os.path.join(src_subdir, 'C', source) for source in sources]
if not langs:
langs = read_linguas(src_subdir)
if options.command == 'pot': if options.command == 'pot':
build_pot(src_subdir, options.project_id, sources) build_pot(src_subdir, options.project_id, sources)
elif options.command == 'update-po': elif options.command == 'update-po':

2
test cases/frameworks/13 yelp/help/LINGUAS Normal file
View File

@ -0,0 +1,2 @@
de
es

6
test cases/frameworks/13 yelp/help/meson.build
View File

@ -13,3 +13,9 @@ gnome.yelp('meson-symlink',
symlink_media: true, symlink_media: true,
languages: ['de', 'es'], languages: ['de', 'es'],
) )
gnome.yelp('meson-linguas',
sources: 'index.page',
media: 'media/test.txt',
symlink_media: false,
)

6
test cases/frameworks/13 yelp/installed_files.txt
View File

@ -10,3 +10,9 @@ usr/share/help/es/meson-symlink/media/test.txt
usr/share/help/es/meson-symlink/index.page usr/share/help/es/meson-symlink/index.page
usr/share/help/de/meson-symlink/index.page usr/share/help/de/meson-symlink/index.page
usr/share/help/de/meson-symlink/media/test.txt usr/share/help/de/meson-symlink/media/test.txt
usr/share/help/C/meson-linguas/index.page
usr/share/help/C/meson-linguas/media/test.txt
usr/share/help/es/meson-linguas/media/test.txt
usr/share/help/es/meson-linguas/index.page
usr/share/help/de/meson-linguas/index.page
usr/share/help/de/meson-linguas/media/test.txt