luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-19 23:28:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Introduce the UNINSTALLED_GLIB_BUILDDIR environment variable

Browse Source 
This makes it possible to also use relative imports for
gdbus-codegen's config module.

https://bugzilla.gnome.org/show_bug.cgi?id=650763
This commit is contained in:
Dieter Verfaillie
2011-08-23 17:37:35 +02:00
committed by Colin Walters
parent 5dc3c2efc8
commit 5391aae009
6 changed files with 58 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
gio/gdbus-2.0/codegen/__init__.py
View File

@@ -0,0 +1,29 @@
# -*- Mode: Python -*-
# GDBus - GLib D-Bus Library
#
# Copyright (C) 2008-2011 Red Hat, Inc.
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation; either
# version 2 of the License, or (at your option) any later version.
#
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General
# Public License along with this library; if not, write to the
# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
# Boston, MA 02111-1307, USA.
#
# Author: David Zeuthen <davidz@redhat.com>
import os
builddir = os.environ.get('UNINSTALLED_GLIB_BUILDDIR')
if builddir is not None:
__path__.append(os.path.abspath(os.path.join(builddir, 'gio', 'gdbus-2.0', 'codegen')))

2
gio/gdbus-2.0/codegen/codegen.py
View File

@@ -23,7 +23,7 @@
import sys import sys
import config from . import config
from . import utils from . import utils
from . import dbustypes from . import dbustypes

2
gio/gdbus-2.0/codegen/codegen_docbook.py
View File

@@ -24,7 +24,7 @@
import sys import sys
import re import re
import config from . import config
from . import utils from . import utils
from . import dbustypes from . import dbustypes
from . import parser from . import parser

2
gio/gdbus-2.0/codegen/codegen_main.py
View File

@@ -24,7 +24,7 @@
import sys import sys
import optparse import optparse
import config from . import config
from . import utils from . import utils
from . import dbustypes from . import dbustypes
from . import parser from . import parser

32
gio/tests/Makefile.am
View File

@@ -260,21 +260,23 @@ gdbus_bz627724_LDADD = $(progs_ldadd)
if OS_UNIX if OS_UNIX
gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c : test-codegen.xml gdbus-test-codegen-generated.h gdbus-test-codegen-generated.c : test-codegen.xml
$(AM_V_GEN) PYTHONPATH=$(top_srcdir)/gio/gdbus-codegen:$(top_builddir)/gio/gdbus-codegen:$$PYTHONPATH $(PYTHON) $(top_srcdir)/gio/gdbus-codegen/codegen_main.py \ $(AM_V_GEN) UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
--interface-prefix org.project. \ PYTHONPATH=$(top_srcdir)/gio/gdbus-2.0 \
--generate-c-code gdbus-test-codegen-generated \ $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
--c-generate-object-manager \ --interface-prefix org.project. \
--c-namespace Foo \ --generate-c-code gdbus-test-codegen-generated \
--generate-docbook gdbus-test-codegen-generated-doc \ --c-generate-object-manager \
--annotate "org.project.Bar" Key1 Value1 \ --c-namespace Foo \
--annotate "org.project.Bar" org.gtk.GDBus.Internal Value2 \ --generate-docbook gdbus-test-codegen-generated-doc \
--annotate "org.project.Bar.HelloWorld()" Key3 Value3 \ --annotate "org.project.Bar" Key1 Value1 \
--annotate "org.project.Bar::TestSignal" Key4 Value4 \ --annotate "org.project.Bar" org.gtk.GDBus.Internal Value2 \
--annotate "org.project.Bar:ay" Key5 Value5 \ --annotate "org.project.Bar.HelloWorld()" Key3 Value3 \
--annotate "org.project.Bar.TestPrimitiveTypes()[val_int32]" Key6 Value6 \ --annotate "org.project.Bar::TestSignal" Key4 Value4 \
--annotate "org.project.Bar.TestPrimitiveTypes()[ret_uint32]" Key7 Value7 \ --annotate "org.project.Bar:ay" Key5 Value5 \
--annotate "org.project.Bar::TestSignal[array_of_strings]" Key8 Value8 \ --annotate "org.project.Bar.TestPrimitiveTypes()[val_int32]" Key6 Value6 \
$(srcdir)/test-codegen.xml \ --annotate "org.project.Bar.TestPrimitiveTypes()[ret_uint32]" Key7 Value7 \
--annotate "org.project.Bar::TestSignal[array_of_strings]" Key8 Value8 \
$(srcdir)/test-codegen.xml \
$(NULL) $(NULL)
BUILT_SOURCES += gdbus-test-codegen-generated.c gdbus-test-codegen-generated.h BUILT_SOURCES += gdbus-test-codegen-generated.c gdbus-test-codegen-generated.h

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

@@ -22,13 +22,15 @@ GDBUS_GENERATED = \
$(NULL) $(NULL)
$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml $(GDBUS_GENERATED) : gdbus-example-objectmanager.xml
$(AM_V_GEN) PYTHONPATH=$(top_srcdir)/gio/gdbus-codegen:$(top_builddir)/gio/gdbus-codegen:$$PYTHONPATH $(PYTHON) $(top_srcdir)/gio/gdbus-codegen/codegen_main.py \ $(AM_V_GEN) UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \
--interface-prefix org.gtk.GDBus.Example.ObjectManager. \ PYTHONPATH=$(top_srcdir)/gio/gdbus-2.0 \
--c-namespace Example \ $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \
--c-generate-object-manager \ --interface-prefix org.gtk.GDBus.Example.ObjectManager. \
--generate-c-code gdbus-example-objectmanager-generated \ --c-namespace Example \
--generate-docbook gdbus-example-objectmanager-generated \ --c-generate-object-manager \
$< \ --generate-c-code gdbus-example-objectmanager-generated \
--generate-docbook gdbus-example-objectmanager-generated \
$< \
$(NULL) $(NULL)
BUILT_SOURCES += $(GDBUS_GENERATED) BUILT_SOURCES += $(GDBUS_GENERATED)