Rework the previous changes

This commit is contained in:
Thomas Nagy 2019-01-05 16:16:48 +01:00
parent ab24e0041e
commit 4bd0c72809
No known key found for this signature in database
GPG Key ID: 49B4C67C05277AAA
5 changed files with 16 additions and 16 deletions

View File

@ -607,13 +607,13 @@ class Context(ctx):
Logs.pprint(color, msg)
def load_special_tools(self, var, ban=[]):
r"""
"""
Loads third-party extensions modules for certain programming languages
by trying to list certain files in the extras/ directory. This method
is typically called once for a programming language group, see for
example :py:mod:`waflib.Tools.compiler_c`
:param var: glob expression, for example 'cxx\_\*.py'
:param var: glob expression, for example 'cxx\\_\\*.py'
:type var: string
:param ban: list of exact file names to exclude
:type ban: list of string

View File

@ -239,7 +239,7 @@ def validate_cfg(self, kw):
@conf
def exec_cfg(self, kw):
r"""
"""
Executes ``pkg-config`` or other ``-config`` applications to collect configuration flags:
* if atleast_pkgconfig_version is given, check that pkg-config has the version n and return
@ -250,9 +250,9 @@ def exec_cfg(self, kw):
:type atleast_pkgconfig_version: string
:param package: package name, for example *gtk+-2.0*
:type package: string
:param uselib_store: if the test is successful, define HAVE\_*name*. It is also used to define *conf.env.FLAGS_name* variables.
:param uselib_store: if the test is successful, define HAVE\\_*name*. It is also used to define *conf.env.FLAGS_name* variables.
:type uselib_store: string
:param modversion: if provided, return the version of the given module and define *name*\_VERSION
:param modversion: if provided, return the version of the given module and define *name*\\_VERSION
:type modversion: string
:param args: arguments to give to *package* when retrieving flags
:type args: list of string

View File

@ -305,7 +305,7 @@ def process_mocs(self):
@feature('qt5')
@after_method('apply_link')
def apply_qt5(self):
r"""
"""
Adds MOC_FLAGS which may be necessary for moc::
def build(bld):
@ -313,11 +313,11 @@ def apply_qt5(self):
The additional parameters are:
:param lang: list of translation files (\*.ts) to process
:param lang: list of translation files (\\*.ts) to process
:type lang: list of :py:class:`waflib.Node.Node` or string without the .ts extension
:param update: whether to process the C++ files to update the \*.ts files (use **waf --translate**)
:param update: whether to process the C++ files to update the \\*.ts files (use **waf --translate**)
:type update: bool
:param langname: if given, transform the \*.ts files into a .qrc files to include in the binary file
:param langname: if given, transform the \\*.ts files into a .qrc files to include in the binary file
:type langname: :py:class:`waflib.Node.Node` or string without the .qrc extension
"""
if getattr(self, 'lang', None):

View File

@ -108,12 +108,12 @@ def add_pylang(self, node):
@feature('pyqt5')
def apply_pyqt5(self):
r"""
"""
The additional parameters are:
:param lang: list of translation files (\*.ts) to process
:param lang: list of translation files (\\*.ts) to process
:type lang: list of :py:class:`waflib.Node.Node` or string without the .ts extension
:param langname: if given, transform the \*.ts files into a .qrc files to include in the binary file
:param langname: if given, transform the \\*.ts files into a .qrc files to include in the binary file
:type langname: :py:class:`waflib.Node.Node` or string without the .qrc extension
"""
if getattr(self, 'lang', None):

View File

@ -282,7 +282,7 @@ def add_lang(self, node):
@feature('qt4')
@after_method('apply_link')
def apply_qt4(self):
r"""
"""
Add MOC_FLAGS which may be necessary for moc::
def build(bld):
@ -290,11 +290,11 @@ def apply_qt4(self):
The additional parameters are:
:param lang: list of translation files (\*.ts) to process
:param lang: list of translation files (\\*.ts) to process
:type lang: list of :py:class:`waflib.Node.Node` or string without the .ts extension
:param update: whether to process the C++ files to update the \*.ts files (use **waf --translate**)
:param update: whether to process the C++ files to update the \\*.ts files (use **waf --translate**)
:type update: bool
:param langname: if given, transform the \*.ts files into a .qrc files to include in the binary file
:param langname: if given, transform the \\*.ts files into a .qrc files to include in the binary file
:type langname: :py:class:`waflib.Node.Node` or string without the .qrc extension
"""
if getattr(self, 'lang', None):