Siklos/blueprint-compiler
1
0
Fork 0
mirror of https://gitlab.gnome.org/jwestman/blueprint-compiler.git synced 2025-05-04 15:59:08 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

typelib: Use GIRepository to find typelib path

Browse source
This commit is contained in:
James Westman 2022-06-28 23:43:01 -05:00
parent cfae48a65a
commit 68610a7dba
No known key found for this signature in database
GPG key ID: CE2DBA0ADB654EA6
2 changed files with 7 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

32
blueprintcompiler/gir.py
View file

@ -21,6 +21,10 @@ from functools import cached_property
import typing as T
import os, sys
import gi # type: ignore
gi.require_version("GIRepository", "2.0")
from gi.repository import GIRepository # type: ignore
from .errors import CompileError, CompilerBugError
from . import typelib, xml_reader
@ -29,25 +33,7 @@ _xml_cache = {}
def get_namespace(namespace, version):
from .main import LIBDIR, VERSION
search_paths = []
if LIBDIR is not None:
search_paths.append(os.path.join(LIBDIR, "girepository-1.0"))
# This is a fragile hack to make blueprint-compiler work uninstalled on
# most systems.
if VERSION == "uninstalled":
search_paths += [
"/usr/lib/girepository-1.0",
"/usr/local/lib/girepository-1.0",
"/app/lib/girepository-1.0",
"/usr/lib64/girepository-1.0",
"/usr/local/lib64/girepository-1.0",
"/app/lib64/girepository-1.0",
]
if typelib_path := os.environ.get("GI_TYPELIB_PATH"):
search_paths.append(typelib_path)
search_paths = GIRepository.Repository.get_search_path()
filename = f"{namespace}-{version}.typelib"
@ -76,14 +62,6 @@ def get_xml(namespace, version):
from xml.etree import ElementTree
search_paths = []
# Same fragile hack as before
if VERSION == "uninstalled":
search_paths += [
"/usr/share/gir-1.0",
"/usr/local/share/gir-1.0",
"/app/share/gir-1.0",
]
if data_paths := os.environ.get("XDG_DATA_DIRS"):
search_paths += [os.path.join(path, "gir-1.0") for path in data_paths.split(os.pathsep)]