luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-12 15:36:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Introduce the UNINSTALLED_GLIB_SRCDIR environment variable

Browse Source 
This makes it possible to avoid setting PYTHONPATH in
Makefile.am files.

https://bugzilla.gnome.org/show_bug.cgi?id=650763
This commit is contained in:
Dieter Verfaillie 2011-08-23 16:38:36 +01:00 committed by Colin Walters
parent 5391aae009
commit cd0cd95078
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gio/gdbus-2.0/codegen/gdbus-codegen.in Executable file → Normal file
View File

@ -25,9 +25,14 @@
import os
import sys
path = os.path.join('@libdir@', 'gdbus-2.0', 'codegen')
sys.path.insert(0, path)
srcdir = os.getenv('UNINSTALLED_GLIB_SRCDIR', None)
from codegen_main import codegen_main
if srcdir is not None:
path = os.path.join(srcdir, 'gio', 'gdbus-2.0')
else:
path = os.path.join('@libdir@', 'gdbus-2.0')
sys.exit(codegen_main())
sys.path.insert(0, os.path.abspath(path))
from codegen import codegen_main
sys.exit(codegen_main.codegen_main())

4
gio/tests/Makefile.am
View File

@ -260,8 +260,8 @@ gdbus_bz627724_LDADD = $(progs_ldadd)
if OS_UNIX
gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c : test-codegen.xml
$(AM_V_GEN) UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
PYTHONPATH=$(top_srcdir)/gio/gdbus-2.0 \
$(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
$(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
--interface-prefix org.project. \
--generate-c-code gdbus-test-codegen-generated \

4
gio/tests/gdbus-object-manager-example/Makefile.am
View File

@ -22,8 +22,8 @@ GDBUS_GENERATED = \
$(NULL)
$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml
$(AM_V_GEN) UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
PYTHONPATH=$(top_srcdir)/gio/gdbus-2.0 \
$(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \
UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
$(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
--interface-prefix org.gtk.GDBus.Example.ObjectManager. \
--c-namespace Example \