colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge: branch 'wip/jtojnar/pygobject-3.52-docs'

Browse Source 
meson: Fix docs generation with PyGObject 3.52

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/2164
This commit is contained in:
Beniamino Galvani
2025-03-31 12:08:38 +00:00
parent ecce8fa461 12eff9a7fd
commit 7f381c9d68
2 changed files with 0 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/libnm-client-impl/meson.build
View File

@@ -209,7 +209,6 @@ if enable_introspection
'LD_LIBRARY_PATH=' + ld_library_path, 'LD_LIBRARY_PATH=' + ld_library_path,
python_path, python_path,
gen_gir_cmd, gen_gir_cmd,
'--lib-path', meson.current_build_dir(),
'--gir', libnm_gir[0], '--gir', libnm_gir[0],
'--output', '@OUTPUT@', '--output', '@OUTPUT@',
'--target', name '--target', name

28
tools/generate-docs-nm-settings-docs-gir.py
View File

@@ -6,26 +6,9 @@
from __future__ import print_function, unicode_literals from __future__ import print_function, unicode_literals
import xml.etree.ElementTree as ET import xml.etree.ElementTree as ET
import argparse import argparse
import os
import gi import gi
import re import re
gi.require_version("GIRepository", "2.0")
from gi.repository import GIRepository
try:
libs = os.environ["LD_LIBRARY_PATH"].split(":")
libs.reverse()
for lib in libs:
GIRepository.Repository.prepend_library_path(lib)
except AttributeError:
# An old GI version, that has no prepend_library_path
# It's alright, it probably interprets LD_LIBRARY_PATH
# correctly.
pass
except KeyError:
pass
gi.require_version("NM", "1.0") gi.require_version("NM", "1.0")
from gi.repository import NM, GObject from gi.repository import NM, GObject
@@ -354,13 +337,6 @@ def main(gir_path_str, output_path_str, output_target):
if __name__ == "__main__": if __name__ == "__main__":
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
parser.add_argument(
"-l",
"--lib-path",
metavar="PATH",
action="append",
help="path to scan for shared libraries",
)
parser.add_argument( parser.add_argument(
"-g", "-g",
"--gir", "--gir",
@@ -384,8 +360,4 @@ if __name__ == "__main__":
args = parser.parse_args() args = parser.parse_args()
if args.lib_path:
for lib in args.lib_path:
GIRepository.Repository.prepend_library_path(lib)
main(args.gir, args.output, args.target) main(args.gir, args.output, args.target)