From d6a62d095cfa42c5ab4ac67017d995ce45ee158c Mon Sep 17 00:00:00 2001 From: Paul Pogonyshev Date: Sat, 18 Apr 2009 23:42:08 +0300 Subject: Remove 'ltihooks.py' as using deprecated Python module. Remove the script and all related imports. All relevant Makefile's now create symbolic links for '.so' files from '.libs' to the level up, so that C helper modules are still importable in built, but not installed source tree. --- tests/Makefile.am | 7 +++++++ tests/common.py | 5 ----- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'tests') diff --git a/tests/Makefile.am b/tests/Makefile.am index f9e9fed..493fe9f 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -56,3 +56,10 @@ check-local: $(top_srcdir)/glib/__init__.py $(top_srcdir)/gobject/__init__.py $( @rm -fr $(top_builddir)/glib/*.pyc @rm -fr $(top_builddir)/gobject/*.pyc @rm -fr $(top_builddir)/gio/*.pyc + + +all: $(LTLIBRARIES:.la=.so) +clean-local: + rm -f $(LTLIBRARIES:.la=.so) +.la.so: + $(LN_S) .libs/$@ $@ diff --git a/tests/common.py b/tests/common.py index d41b9f2..a6fa73d 100644 --- a/tests/common.py +++ b/tests/common.py @@ -5,13 +5,11 @@ def importModules(buildDir, srcDir): # Be very careful when you change this code, it's # fragile and the order is really significant - # ltihooks sys.path.insert(0, srcDir) sys.path.insert(0, buildDir) sys.path.insert(0, os.path.join(buildDir, 'glib')) sys.path.insert(0, os.path.join(buildDir, 'gobject')) sys.path.insert(0, os.path.join(buildDir, 'gio')) - import ltihooks # testhelper sys.path.insert(0, os.path.join(buildDir, 'tests')) @@ -22,9 +20,6 @@ def importModules(buildDir, srcDir): gobject = importModule('gobject', buildDir, 'gobject') gio = importModule('gio', buildDir, 'gio') - ltihooks.uninstall() - del ltihooks - globals().update(locals()) os.environ['PYGTK_USE_GIL_STATE_API'] = '' -- cgit