summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog30
-rw-r--r--Makefile.am27
-rw-r--r--configure.in11
-rw-r--r--gtk/Makefile.am2
-rw-r--r--tests/Makefile.am31
-rw-r--r--tests/common.py9
-rw-r--r--tests/runtests.py2
7 files changed, 48 insertions, 64 deletions
diff --git a/ChangeLog b/ChangeLog
index 2cc7e234..0f8c267d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,33 @@
+2006-01-09 Johan Dahlin <jdahlin@async.com.br>
+
+ * Makefile.am:
+ * configure.in:
+ * dsextras.py:
+ * gtk/Makefile.am:
+ * pygobject-2.0.pc.in:
+ * pygtk.py:
+ * tests/Makefile.am:
+ * tests/common.py:
+ * tests/runtests.py:
+ * tests/test-thread.c:
+ * tests/test-thread.h:
+ * tests/test-unknown.c:
+ * tests/test-unknown.h:
+ * tests/test_gtype.py:
+ * tests/test_mainloop.py:
+ * tests/test_properties.py:
+ * tests/test_signal.py:
+ * tests/test_source.py:
+ * tests/test_subprocess.py:
+ * tests/test_subtype.py:
+ * tests/test_thread.py:
+ * tests/test_unknown.py:
+ * tests/testhelpermodule.c:
+ * tests/testmodule.py:
+
+ Remove gobject bindings and depend on pygobject 2.9.0.
+ Bump version to 2.9.0
+
2006-01-04 Cedric Gustin <cedric.gustin@gmail.com>
* dsextras.py (Template.generate): Pass GLOBAL_MACROS (in
diff --git a/Makefile.am b/Makefile.am
index a52c342d..92b0ee57 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,7 @@ if BUILD_GTK
GTK_SUBDIR = gtk
endif
-SUBDIRS = codegen gobject . $(GTK_SUBDIR) docs examples tests
+SUBDIRS = codegen . $(GTK_SUBDIR) docs examples tests
PLATFORM_VERSION = 2.0
@@ -13,7 +13,6 @@ EXTRA_DIST = \
ChangeLog.pre-2-0 \
ChangeLog.pre-2-6 \
config.h.win32 \
- dsextras.py \
MANIFEST.in \
MAPPING \
pygtk.spec \
@@ -24,11 +23,11 @@ EXTRA_DIST = \
PKG-INFO.in \
setup.py \
THREADS
-INCLUDES = $(PYTHON_INCLUDES) $(GLIB_CFLAGS) -I$(top_srcdir)/gobject
+INCLUDES = $(PYTHON_INCLUDES) $(GLIB_CFLAGS) $(PYGOBJECT_CFLAGS)
# pkg-config files
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = pygobject-$(PLATFORM_VERSION).pc
+pkgconfig_DATA =
if BUILD_GTK
pkgconfig_DATA += pygtk-$(PLATFORM_VERSION).pc
endif
@@ -38,17 +37,9 @@ defsdir = $(pkgdatadir)/$(PLATFORM_VERSION)/defs
defs_DATA =
# python
-pyexec_PYTHON = pygtk.py
pyexec_LTLIBRARIES =
-noinst_PYTHON = ltihooks.py
-
-# pygtk scripts
-pkgpythondir = $(pyexecdir)/gtk-2.0
-pkgpython_PYTHON = dsextras.py
-
-# pygtk extension modules
-pkgpyexecdir = $(pyexecdir)/gtk-2.0
pkgpyexec_LTLIBRARIES =
+noinst_PYTHON = ltihooks.py
# linker flags
common_ldflags = -module -avoid-version
@@ -112,15 +103,5 @@ endif
&& cp gen-$*.c $*.c \
&& rm -f gen-$*.c
-# install pth file.
-install-data-local:
- $(mkinstalldirs) $(DESTDIR)$(pythondir)
- echo "gtk-$(PLATFORM_VERSION)" > $(DESTDIR)$(pyexecdir)/pygtk.pth
-install-exec-local:
- $(mkinstalldirs) $(DESTDIR)$(pyexecdir)
- echo "gtk-$(PLATFORM_VERSION)" > $(DESTDIR)$(pyexecdir)/pygtk.pth
-uninstall-local:
- rm -f $(DESTDIR)$(pythondir)/pygtk.pth $(DESTDIR)$(pyexecdir)/pygtk.pth
-
snap:
$(MAKE) dist distdir=$(PACKAGE)-SNAP-`date +"%Y%m%d"`
diff --git a/configure.in b/configure.in
index cf14c78d..16658c00 100644
--- a/configure.in
+++ b/configure.in
@@ -3,11 +3,12 @@ AC_PREREQ(2.52)
dnl the pygtk version number
m4_define(pygtk_major_version, 2)
-m4_define(pygtk_minor_version, 8)
-m4_define(pygtk_micro_version, 3)
+m4_define(pygtk_minor_version, 9)
+m4_define(pygtk_micro_version, 0)
m4_define(pygtk_version, pygtk_major_version.pygtk_minor_version.pygtk_micro_version)
dnl versions of packages we require ...
+m4_define(pygobject_required_version, 2.9.0)
m4_define(glib_required_version, 2.8.0)
m4_define(pango_required_version, 1.10.0)
m4_define(atk_required_version, 1.8.0)
@@ -97,6 +98,9 @@ if test -n "$export_dynamic"; then
GLIB_LIBS=`echo $GLIB_LIBS | sed -e "s/$export_dynamic//"`
fi
+dnl pygobject
+PKG_CHECK_MODULES(PYGOBJECT, pygobject-2.0 >= pygobject_required_version)
+
dnl atk
PKG_CHECK_MODULES(ATK, atk >= atk_required_version,
build_atk=true, build_atk=false)
@@ -180,10 +184,8 @@ JH_ADD_CFLAG([-fno-strict-aliasing])
AC_CONFIG_FILES(
Makefile
- pygobject-2.0.pc
pygtk-2.0.pc
codegen/Makefile
- gobject/Makefile
gtk/Makefile
docs/Makefile
examples/Makefile
@@ -197,7 +199,6 @@ AC_OUTPUT
echo
echo "The following modules will be built:"
echo
-true && echo gobject
$build_atk && echo atk
$build_pango && echo pango
$build_pangocairo && echo pangocairo
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 95a7004e..80051319 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -4,7 +4,7 @@ PLATFORM_VERSION = 2.0
CLEANFILES =
EXTRA_DIST =
-INCLUDES = $(PYTHON_INCLUDES) -I$(top_srcdir)/gobject
+INCLUDES = $(PYTHON_INCLUDES) $(PYGOBJECT_CFLAGS)
# defs files
defsdir = $(pkgdatadir)/$(PLATFORM_VERSION)/defs
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 15ee4f04..194975b3 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,22 +1,11 @@
INCLUDES = \
$(PYTHON_INCLUDES) \
- $(GLIB_CFLAGS) \
+ $(PYGOBJECT_FLAGS) \
$(PANGO_CFLAGS) \
$(ATK_CFLAGS) \
- $(GTK_CFLAGS) \
- -I$(top_srcdir)/gobject
+ $(GTK_CFLAGS)
-EXTRA_DIST = $(tests) common.py runtests.py test-thread.h test-unknown.h testmodule.py leak.glade
-
-noinst_LTLIBRARIES = testhelper.la
-linked_LIBS = testhelper.la
-
-testhelper_la_LDFLAGS = -module -avoid-version
-testhelper_la_LIBADD = $(GLIB_LIBS)
-testhelper_la_SOURCES = \
- testhelpermodule.c \
- test-thread.c \
- test-unknown.c
+EXTRA_DIST = $(tests) common.py runtests.py leak.glade
tests = \
test_glade.py \
@@ -24,21 +13,9 @@ tests = \
test_dialog.py \
test_enum.py \
test_gdk.py \
- test_gtype.py \
- test_mainloop.py \
test_radiobutton.py \
- test_properties.py \
- test_signal.py \
- test_subprocess.py \
- test_subtype.py \
test_gdkevent.py \
- test_unknown.py \
- test_textview.py \
- test_source.py
-
-# This is a hack to make sure a shared library is built
-testhelper.la: $(testhelper_la_OBJECTS) $(testhelper_la_DEPENDENCIES)
- $(LINK) -rpath $(pkgpyexecdir) $(testhelper_la_LDFLAGS) $(testhelper_la_OBJECTS) $(testhelper_la_LIBADD) $(LIBS)
+ test_textview.py
check-local: $(top_srcdir)/gtk/__init__.py
@if test "$(top_builddir)" != "$(top_srcdir)"; then \
diff --git a/tests/common.py b/tests/common.py
index e9704611..af0f648c 100644
--- a/tests/common.py
+++ b/tests/common.py
@@ -1,6 +1,8 @@
import os
import sys
+import gobject
+
def importModules(buildDir, srcDir):
# Be very careful when you change this code, it's
# fragile and the order is really significant
@@ -9,16 +11,11 @@ def importModules(buildDir, srcDir):
sys.path.insert(0, srcDir)
# atk, pango
sys.path.insert(0, buildDir)
- # gobject
- sys.path.insert(0, os.path.join(buildDir, 'gobject'))
# _gtk, keysyms, glade
sys.path.insert(0, os.path.join(buildDir, 'gtk'))
- # testhelper
- sys.path.insert(0, os.path.join(buildDir, 'tests'))
sys.argv.append('--g-fatal-warnings')
import ltihooks
- gobject = importModule('gobject', buildDir, 'gobject/gobject.la')
atk = importModule('atk', buildDir)
pango = importModule('pango', buildDir)
gtk = importModule('gtk', buildDir, 'gtk')
@@ -28,8 +25,6 @@ def importModules(buildDir, srcDir):
except ImportError:
glade = None
- testhelper = importModule('testhelper', '.')
-
ltihooks.uninstall()
del ltihooks
diff --git a/tests/runtests.py b/tests/runtests.py
index 42f6a0c7..3ae71850 100644
--- a/tests/runtests.py
+++ b/tests/runtests.py
@@ -21,7 +21,7 @@ else:
common.importModules(buildDir=buildDir,
srcDir=srcDir)
-SKIP_FILES = ['common', 'runtests', 'testmodule']
+SKIP_FILES = ['common', 'runtests']
dir = os.path.split(os.path.abspath(__file__))[0]
os.chdir(dir)
View Lorry Controller Status