renamed TUHI_DEVEL to TUHI_DEVEL_BUILD_DIR

pull/296/head
Florian "sp1rit"​ 2022-11-21 15:44:33 +01:00
parent 9514ac6418
commit 66ed4400da
No known key found for this signature in database
GPG Key ID: 7D8C1CD573166D09
3 changed files with 8 additions and 8 deletions

View File

@ -178,6 +178,6 @@ configure_file(input: 'tools/tuhi-gui-flatpak.py',
copy: true)
tuhi_devenv = environment()
tuhi_devenv.set('TUHI_DEVEL', meson.current_build_dir())
tuhi_devenv.set('TUHI_DEVEL_BUILD_DIR', meson.current_build_dir())
tuhi_devenv.set('PYTHONPATH', meson.current_source_dir())
meson.add_devenv(tuhi_devenv)

View File

@ -17,8 +17,8 @@ from gi.repository import Gio
@devel@ # NOQA
if "TUHI_DEVEL" in os.environ:
resource_path = Path(os.environ["TUHI_DEVEL"], 'data', 'tuhi.gresource')
if "TUHI_DEVEL_BUILD_DIR" in os.environ:
resource_path = Path(os.environ["TUHI_DEVEL_BUILD_DIR"], 'data', 'tuhi.gresource')
else:
resource_path = Path('@pkgdatadir@', 'tuhi.gresource')
@ -30,9 +30,9 @@ if __name__ == "__main__":
import gettext
import locale
if "TUHI_DEVEL" in os.environ:
locale.bindtextdomain('tuhi', Path(os.environ["TUHI_DEVEL"], "po"))
gettext.bindtextdomain('tuhi', Path(os.environ["TUHI_DEVEL"], "po"))
if "TUHI_DEVEL_BUILD_DIR" in os.environ:
locale.bindtextdomain('tuhi', Path(os.environ["TUHI_DEVEL_BUILD_DIR"], "po"))
gettext.bindtextdomain('tuhi', Path(os.environ["TUHI_DEVEL_BUILD_DIR"], "po"))
else:
locale.bindtextdomain('tuhi', '@localedir@')
gettext.bindtextdomain('tuhi', '@localedir@')

View File

@ -17,8 +17,8 @@ import subprocess
from pathlib import Path
import argparse
tuhi_server = Path(os.environ.get("TUHI_DEVEL", "@libexecdir@"), 'tuhi-server')
tuhi_gui = Path(os.environ.get("TUHI_DEVEL", "@libexecdir@"), 'tuhi-gui')
tuhi_server = Path(os.environ.get("TUHI_DEVEL_BUILD_DIR", "@libexecdir@"), 'tuhi-server')
tuhi_gui = Path(os.environ.get("TUHI_DEVEL_BUILD_DIR", "@libexecdir@"), 'tuhi-gui')
@devel@ # NOQA