From acd1a4731ee2dfd6bc09e0449094bc738ac6f939 Mon Sep 17 00:00:00 2001 From: DongHun Kwak Date: Wed, 12 Jul 2017 08:45:08 +0900 Subject: [PATCH] Imported Upstream version 3.2.1 Change-Id: I4de394b259e3dd06791eb9dfe3684a30dfeef7aa Signed-off-by: DongHun Kwak --- ChangeLog | 4572 ++++++++++++++++++++++++--------------------- Makefile.am | 6 +- Makefile.in | 9 +- NEWS | 13 + PKG-INFO | 4 +- aclocal.m4 | 1519 ++++++++------- config.guess | 16 +- config.sub | 19 +- configure | 3424 +++++++++++++-------------------- configure.ac | 2 +- examples/Makefile.in | 3 +- gi/Makefile.am | 13 +- gi/Makefile.in | 16 +- gi/_glib/Makefile.am | 12 +- gi/_glib/Makefile.in | 15 +- gi/_gobject/Makefile.am | 12 +- gi/_gobject/Makefile.in | 15 +- gi/_gobject/constants.py | 1 + gi/overrides/Gio.py | 4 +- gi/overrides/Gtk.py | 40 +- gi/overrides/Makefile.am | 10 + gi/overrides/Makefile.in | 33 +- gi/pygi-cache.c | 4 +- gi/pygi-marshal-cleanup.c | 4 +- gi/pygtkcompat.py | 21 +- gi/repository/Makefile.am | 11 + gi/repository/Makefile.in | 33 +- ltmain.sh | 4051 ++++++++++++++------------------------- m4/libtool.m4 | 2268 ++++++++-------------- m4/ltoptions.m4 | 32 +- m4/ltversion.m4 | 12 +- m4/lt~obsolete.m4 | 12 +- tests/Makefile.in | 3 +- tests/compathelper.py | 2 +- tests/runtests.py | 19 +- tests/test_everything.py | 24 +- tests/test_gdbus.py | 13 +- tests/test_gi.py | 38 +- tests/test_gobject.py | 2 +- tests/test_interface.py | 1 - tests/test_option.py | 1 - tests/test_overrides.py | 90 +- tests/test_properties.py | 2 +- tests/test_pygtkcompat.py | 26 + tests/test_source.py | 2 +- tests/test_uris.py | 1 - 46 files changed, 7036 insertions(+), 9394 deletions(-) mode change 100644 => 100755 ltmain.sh diff --git a/ChangeLog b/ChangeLog index 098e2da..3ff51f4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,36 +1,238 @@ +commit 803313a03b241e9ad933c2b4f23752763d1b66e4 +Author: Sebastian Pölsterl +Date: Thu May 10 20:58:04 2012 +0200 + + Bump version to 3.2.1 + + configure.ac | 2 +- + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) + +commit ebdb1cb6f865ddb28ac79d15172b9ce28e07d07d +Author: Sebastian Pölsterl +Date: Thu May 10 20:56:59 2012 +0200 + + Prepare 3.2.1 release + + NEWS | 13 +++++++++++++ + 1 Datei geändert, 13 Zeilen hinzugefügt(+) + +commit a890cf021a414a16361f0d1a9ecf6c86b10507ff +Author: Sebastian Pölsterl +Date: Thu May 10 20:47:52 2012 +0200 + + Reindent files in tests to use 4-space indentation + + Previously, running make check with python3 resulted in a TabError + because tabs and spaces for indentation where mixed + + tests/compathelper.py | 2 +- + tests/runtests.py | 17 +++++----- + tests/test_everything.py | 24 +++++++------- + tests/test_gdbus.py | 11 +++---- + tests/test_gi.py | 38 +++++++++++----------- + tests/test_gobject.py | 2 +- + tests/test_interface.py | 1 - + tests/test_option.py | 1 - + tests/test_overrides.py | 80 + +++++++++++++++++++++++----------------------- + tests/test_properties.py | 2 +- + tests/test_source.py | 2 +- + tests/test_uris.py | 1 - + 12 Dateien geändert, 88 Zeilen hinzugefügt(+), 93 Zeilen entfernt(-) + +commit 0ed74e4c4da4ed3313d83807b998f4f096aeefcd +Author: Martin Pitt +Date: Mon Apr 23 15:24:04 2012 +0200 + + Add missing override for TreeModel.iter_previous() + + This should behave like the override for TreeModel.iter_next(). + + https://bugzilla.gnome.org/show_bug.cgi?id=660018 + + gi/overrides/Gtk.py | 6 ++++++ + tests/test_overrides.py | 4 ++++ + 2 Dateien geändert, 10 Zeilen hinzugefügt(+) + +commit 76fdcf201745dc56c6773a8546da53ad562038a7 +Author: Giovanni Campagna +Date: Sun Apr 29 23:55:15 2012 +0200 + + GSettings: allow extra keyword arguments + + All GObject constructors are expected to accept any construct + property as keyword argument, and overrides should respect that. + In particular, not doing this for GSettings prevents using a custom + GSettingsSchema. + + https://bugzilla.gnome.org/show_bug.cgi?id=675105 + + Signed-off-by: Martin Pitt + + gi/overrides/Gio.py | 4 ++-- + 1 Datei geändert, 2 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) + +commit 3f4ca905e482aad221f355586bc00b29c2547ddd +Author: Jose Rostagno +Date: Sun Apr 29 12:56:50 2012 -0300 + + pygtkcompat: Correct Userlist module use + + https://bugzilla.gnome.org/show_bug.cgi?id=675084 + + Signed-off-by: Martin Pitt + + gi/pygtkcompat.py | 2 +- + tests/test_pygtkcompat.py | 4 ++++ + 2 Dateien geändert, 5 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) + +commit 926f08a94b38a4b3102e72b3fe19e886fa59f436 +Author: Martin Pitt +Date: Mon Apr 23 20:09:43 2012 +0200 + + test_gdbus: Call GetConnectionUnixProcessID() with correct signature + + https://bugzilla.gnome.org/show_bug.cgi?id=667954 + + tests/test_gdbus.py | 2 +- + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) + +commit 223b3c67634b4a2b066b38718498c89108371373 +Author: Martin Pitt +Date: Mon Apr 23 17:40:23 2012 +0200 + + GTK overrides: Add missing keyword arguments + + Add missing **kwargs to overridden __init__() constructors, to + allow specifying + arbitrary widget properties. + + https://bugzilla.gnome.org/show_bug.cgi?id=660018 + + gi/overrides/Gtk.py | 34 ++++++++++++++++++---------------- + tests/test_overrides.py | 6 ++++++ + 2 Dateien geändert, 24 Zeilen hinzugefügt(+), 16 Zeilen entfernt(-) + +commit f440e8fea00092c46d1f2136a89f28b288206928 +Author: Martin Pitt +Date: Sun Apr 22 16:45:06 2012 +0200 + + pygi-convert.py: Drop obsolete drag method conversions + + Drop conversion of drag_source_unset() and drag_dest_{,un}set(). These + were + fixed a while ago to be proper Widget methods again. + + https://bugzilla.gnome.org/show_bug.cgi?id=652860 + + pygi-convert.sh | 3 --- + 1 Datei geändert, 3 Zeilen entfernt(-) + +commit 99e0f7008671284bf1c176e5f7ef7ee9e37a5a93 +Author: Bastian Winkler +Date: Thu Apr 12 20:30:05 2012 +0200 + + Fix len_arg_index for array arguments + + Don't set len_arg_index for arrays without the length annotation + given. + This fixes methods like Clutter.Texture.set_from_rgb_data() and + Clutter.Image.set_data() + + Skip the test case in the cherrypick, as gobject-introspection do + not yet ship + the test API in GNOME 3.4. + + https://bugzilla.gnome.org/show_bug.cgi?id=674271 + + Signed-off-by: Martin Pitt + + gi/pygi-cache.c | 4 +++- + gi/pygi-marshal-cleanup.c | 4 ++-- + 2 Dateien geändert, 5 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-) + +commit 27205e78dc9b729e0c0ca82c125ded5842ca8069 +Author: Martin Pitt +Date: Thu Apr 19 07:27:10 2012 +0200 + + Add missing GObject.TYPE_GTYPE + + gi/_gobject/constants.py | 1 + + 1 Datei geändert, 1 Zeile hinzugefügt(+) + +commit c52881fbfef26f460e4ead8c72bc1d245b0e0e9b +Author: Martin Pitt +Date: Mon Mar 26 17:45:08 2012 +0200 + + Fix "distcheck" and tests with out-of-tree builds + + - Symlink *.py files from srcdir into builddir during build, as + Python does not + accept the extensions and modules in different paths. + - "make clean" should remove *.pyc files + - tests/runtests.py: Look for tests in srcdir, not in builddir + + Conflicts: + + tests/runtests.py + + Makefile.am | 6 ++++-- + gi/Makefile.am | 13 +++++++++++-- + gi/_glib/Makefile.am | 12 ++++++++++-- + gi/_gobject/Makefile.am | 12 ++++++++++-- + gi/overrides/Makefile.am | 10 ++++++++++ + gi/repository/Makefile.am | 11 +++++++++++ + tests/runtests.py | 6 ++++-- + 7 Dateien geändert, 60 Zeilen hinzugefügt(+), 10 Zeilen entfernt(-) + +commit 216c88a80ed762b69a175f8771492ee53738d461 +Author: Paolo Borelli +Date: Wed Mar 21 21:09:24 2012 +0100 + + Add GtkComboBoxEntry compatibility + + This widget has been removed in Gtk+ 3, add a small wrapper to the + compat module to make at least basic pygtk programs that use it work. + + https://bugzilla.gnome.org/show_bug.cgi?id=672589 + + gi/pygtkcompat.py | 19 +++++++++++++++++++ + tests/test_pygtkcompat.py | 22 ++++++++++++++++++++++ + 2 Dateien geändert, 41 Zeilen hinzugefügt(+) + commit c643ff16758dd286b59ab040c1f4422c9401f691 Author: Martin Pitt -Date: Mon Mar 26 13:20:27 2012 +0200 +Date: Mon Mar 26 13:20:27 2012 +0200 Release 3.2.0 - NEWS | 3 +++ + NEWS | 3 +++ configure.ac | 4 ++-- - 2 files changed, 5 insertions(+), 2 deletions(-) + 2 Dateien geändert, 5 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit a60734edf794ed2758cdc16c5cee675f39815084 Author: Martin Pitt -Date: Thu Mar 22 11:05:47 2012 +0100 +Date: Thu Mar 22 11:05:47 2012 +0100 post-release bump Use 3.1.94 for now, this will most likely become 3.2.0 as it is. configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit ab0ee3c606b89a0db03f34256efbebae3c1886a0 Author: Martin Pitt -Date: Thu Mar 22 10:58:04 2012 +0100 +Date: Thu Mar 22 10:58:04 2012 +0100 Release 3.1.93 NEWS | 8 ++++++++ - 1 files changed, 8 insertions(+), 0 deletions(-) + 1 Datei geändert, 8 Zeilen hinzugefügt(+) commit a43992fc3ecdcdd28024980bd9e98e5d21ede37f Author: Martin Pitt -Date: Wed Mar 21 15:21:02 2012 +0100 +Date: Wed Mar 21 15:21:02 2012 +0100 pygtkcompat test: Properly clean up PixbufLoader @@ -43,12 +245,12 @@ Date: Wed Mar 21 15:21:02 2012 +0100 Fix this by calling close(). - tests/test_pygtkcompat.py | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) + tests/test_pygtkcompat.py | 3 ++- + 1 Datei geändert, 2 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit df44fdd3f8bcb285dc6abfe7b32ee816077f95eb Author: Martin Pitt -Date: Thu Mar 22 09:58:21 2012 +0100 +Date: Thu Mar 22 09:58:21 2012 +0100 test_overrides: Find local gsettings schema with current glib @@ -59,11 +261,11 @@ Date: Thu Mar 22 09:58:21 2012 +0100 which makes this work again. tests/test_overrides.py | 9 +++++---- - 1 files changed, 5 insertions(+), 4 deletions(-) + 1 Datei geändert, 5 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-) commit d931b26ac1ee8a36c5daef933720982a3f31c116 Author: Alberto Mardegan -Date: Tue Mar 20 14:55:07 2012 +0400 +Date: Tue Mar 20 14:55:07 2012 +0400 Support marshalling GI_TYPE_TAG_INTERFACE @@ -76,13 +278,13 @@ Date: Tue Mar 20 14:55:07 2012 +0400 https://bugzilla.gnome.org/show_bug.cgi?id=668903 - gi/pygi-marshal-from-py.c | 3 ++- - gi/pygi-marshal-to-py.c | 3 ++- - 2 files changed, 4 insertions(+), 2 deletions(-) + gi/pygi-marshal-from-py.c | 3 ++- + gi/pygi-marshal-to-py.c | 3 ++- + 2 Dateien geändert, 4 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit 1b3f8b1fde2ba25592eb038341eabf6157f12c25 Author: Martin Pitt -Date: Wed Mar 21 14:34:36 2012 +0100 +Date: Wed Mar 21 14:34:36 2012 +0100 Fix warnings on None values in added tree/list store rows @@ -107,72 +309,72 @@ Date: Wed Mar 21 14:34:36 2012 +0100 https://bugzilla.gnome.org/show_bug.cgi?id=672463 - gi/overrides/Gtk.py | 26 ++++++++++++++------------ + gi/overrides/Gtk.py | 26 ++++++++++++++------------ tests/test_overrides.py | 5 +++++ - 2 files changed, 19 insertions(+), 12 deletions(-) + 2 Dateien geändert, 19 Zeilen hinzugefügt(+), 12 Zeilen entfernt(-) commit 5e0e5e72a4436badd09f0aa07f62960afcdca8c6 Author: Martin Pitt -Date: Mon Mar 19 16:58:22 2012 +0100 +Date: Mon Mar 19 16:58:22 2012 +0100 post-release bump Use 3.1.93 for now, this will most likely become 3.2.0 as it is. configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 88924e399d7ccf7af2e9a78720e0c508cd6080d8 Author: Martin Pitt -Date: Mon Mar 19 16:41:17 2012 +0100 +Date: Mon Mar 19 16:41:17 2012 +0100 Release 3.1.92 NEWS | 46 ++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 46 insertions(+), 0 deletions(-) + 1 Datei geändert, 46 Zeilen hinzugefügt(+) commit b41e6139befb984c0b78bcefe2630ab1393b4b40 Author: Martin Pitt -Date: Mon Mar 19 16:14:54 2012 +0100 +Date: Mon Mar 19 16:14:54 2012 +0100 README: Update current maintainers Also update Martin's email address. - README | 10 ++++++---- + README | 10 ++++++---- pygobject.doap | 2 +- - 2 files changed, 7 insertions(+), 5 deletions(-) + 2 Dateien geändert, 7 Zeilen hinzugefügt(+), 5 Zeilen entfernt(-) commit 45e27ba7e447552057a2950fc768c63ff2e6612e Author: Martin Pitt -Date: Mon Mar 19 16:11:22 2012 +0100 +Date: Mon Mar 19 16:11:22 2012 +0100 Bump version to 3.1.92, in sync with GNOME configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 77d358f8c5f524259249ea686899e3a4da05562e Author: Johan Dahlin -Date: Mon Mar 19 11:54:07 2012 -0300 +Date: Mon Mar 19 11:54:07 2012 -0300 Correct Gtk.TreePath.__iter__ to work with Python 3 - gi/overrides/Gtk.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + gi/overrides/Gtk.py | 2 +- + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 1f18bcb37bdc42368ad9a07c7f348f736c2f665d Author: Martin Pitt -Date: Mon Mar 19 15:54:13 2012 +0100 +Date: Mon Mar 19 15:54:13 2012 +0100 Fix pygtkcompat.py to work with Python 3 gi/pygtkcompat.py | 20 +++++++++++++++----- - 1 files changed, 15 insertions(+), 5 deletions(-) + 1 Datei geändert, 15 Zeilen hinzugefügt(+), 5 Zeilen entfernt(-) commit 96a9f92da801989464fbcedf6d849819f6dbea64 Author: Martin Pitt -Date: Mon Mar 19 15:32:22 2012 +0100 +Date: Mon Mar 19 15:32:22 2012 +0100 Fix test_everything.TestSignals.test_object_param_signal test case @@ -183,108 +385,108 @@ Date: Mon Mar 19 15:32:22 2012 +0100 exactly two at the moment. tests/test_everything.py | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit ba00afb1e50759b2b321f16e05a15946053cdafa Author: Johan Dahlin -Date: Mon Mar 19 10:58:09 2012 -0300 +Date: Mon Mar 19 10:58:09 2012 -0300 pygtkcompat: Remove first argument for get_origin() - gi/pygtkcompat.py | 5 +++++ - tests/test_pygtkcompat.py | 5 +++++ - 2 files changed, 10 insertions(+), 0 deletions(-) + gi/pygtkcompat.py | 5 +++++ + tests/test_pygtkcompat.py | 5 +++++ + 2 Dateien geändert, 10 Zeilen hinzugefügt(+) commit 65499246a862ce6a82bc3b0cc74fe8ff82dde687 Author: Johan Dahlin -Date: Fri Mar 16 16:08:44 2012 -0300 +Date: Fri Mar 16 16:08:44 2012 -0300 GtkViewport: Add a default values for the adjustment constructor parameters https://bugzilla.gnome.org/show_bug.cgi?id=672260 - gi/overrides/Gtk.py | 10 ++++++++++ + gi/overrides/Gtk.py | 10 ++++++++++ tests/test_overrides.py | 11 +++++++++++ - 2 files changed, 21 insertions(+), 0 deletions(-) + 2 Dateien geändert, 21 Zeilen hinzugefügt(+) commit 43c761d9f35252dcb58b9cf2278016d841eea4ec Author: Johan Dahlin -Date: Fri Mar 16 16:08:23 2012 -0300 +Date: Fri Mar 16 16:08:23 2012 -0300 GtkIconSet: Add a default value for the pixbuf constructor parameter https://bugzilla.gnome.org/show_bug.cgi?id=672260 - gi/overrides/Gtk.py | 11 +++++++++++ + gi/overrides/Gtk.py | 11 +++++++++++ tests/test_overrides.py | 6 ++++++ - 2 files changed, 17 insertions(+), 0 deletions(-) + 2 Dateien geändert, 17 Zeilen hinzugefügt(+) commit 116d3712251b1b8aa2d4f4a9e40e22f5b9fcbe4f Author: Johan Dahlin -Date: Fri Mar 16 16:07:30 2012 -0300 +Date: Fri Mar 16 16:07:30 2012 -0300 PangoLayout: Add a default value for set_markup() https://bugzilla.gnome.org/show_bug.cgi?id=672260 - gi/overrides/Pango.py | 3 +++ + gi/overrides/Pango.py | 3 +++ tests/test_overrides.py | 4 ++++ - 2 files changed, 7 insertions(+), 0 deletions(-) + 2 Dateien geändert, 7 Zeilen hinzugefügt(+) commit a3ca47b086b7fcf084282be788c5d737dde847ac Author: Johan Dahlin -Date: Fri Mar 16 16:06:37 2012 -0300 +Date: Fri Mar 16 16:06:37 2012 -0300 Gtk[HV]Scrollbar: Add a default value for the adjustment constructor parameter https://bugzilla.gnome.org/show_bug.cgi?id=672260 - gi/overrides/Gtk.py | 15 +++++++++++++++ + gi/overrides/Gtk.py | 15 +++++++++++++++ tests/test_overrides.py | 14 ++++++++++++++ - 2 files changed, 29 insertions(+), 0 deletions(-) + 2 Dateien geändert, 29 Zeilen hinzugefügt(+) commit 458dab08c78cb730dd95bcd67af20a0d73a3af2f Author: Johan Dahlin -Date: Fri Mar 16 16:06:12 2012 -0300 +Date: Fri Mar 16 16:06:12 2012 -0300 GtkToolButton: Add a default value for the stock_id constructor parameter https://bugzilla.gnome.org/show_bug.cgi?id=672260 - gi/overrides/Gtk.py | 10 ++++++++++ + gi/overrides/Gtk.py | 10 ++++++++++ tests/test_overrides.py | 9 ++++++++- - 2 files changed, 18 insertions(+), 1 deletions(-) + 2 Dateien geändert, 18 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit 2f7789a5a1f55ec38c5ff0f96bc5c9023679a333 Author: Johan Dahlin -Date: Fri Mar 16 16:05:55 2012 -0300 +Date: Fri Mar 16 16:05:55 2012 -0300 GtkIconView: Add a default value for the model constructor parameter https://bugzilla.gnome.org/show_bug.cgi?id=672260 - gi/overrides/Gtk.py | 3 +++ + gi/overrides/Gtk.py | 3 +++ tests/test_overrides.py | 11 +++++++++++ - 2 files changed, 14 insertions(+), 0 deletions(-) + 2 Dateien geändert, 14 Zeilen hinzugefügt(+) commit 2dd9dadd1bd92c3324e9de209ba8205a9d4106d6 Author: Johan Dahlin -Date: Thu Mar 15 15:22:46 2012 -0300 +Date: Thu Mar 15 15:22:46 2012 -0300 Add a default value for column in Gtk.TreeView.get_cell_area() https://bugzilla.gnome.org/show_bug.cgi?id=672260 - gi/overrides/Gtk.py | 5 +++++ + gi/overrides/Gtk.py | 5 +++++ tests/test_overrides.py | 3 +++ - 2 files changed, 8 insertions(+), 0 deletions(-) + 2 Dateien geändert, 8 Zeilen hinzugefügt(+) commit bf8c95836e1cc1e1629937cbc69ea3027fb82746 Author: Martin Pitt -Date: Thu Mar 15 09:48:10 2012 +0100 +Date: Thu Mar 15 09:48:10 2012 +0100 Atomic inserts in Gtk.{List,Tree}Store overrides @@ -309,14 +511,15 @@ Date: Thu Mar 15 09:48:10 2012 +0100 https://bugzilla.gnome.org/show_bug.cgi?id=671610 - gi/overrides/Gtk.py | 81 + gi/overrides/Gtk.py | 81 +++++++++++++++++++++++++++++------------------ - tests/test_overrides.py | 74 ++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 124 insertions(+), 31 deletions(-) + tests/test_overrides.py | 74 + +++++++++++++++++++++++++++++++++++++++++++ + 2 Dateien geändert, 124 Zeilen hinzugefügt(+), 31 Zeilen entfernt(-) commit f7db4eaf8148f2dd8bf1718152a1dcae509470c7 Author: Martin Pitt -Date: Sun Mar 18 16:07:26 2012 +0100 +Date: Sun Mar 18 16:07:26 2012 +0100 Fix Gtk.Button constructor to accept use_stock parameter @@ -326,22 +529,22 @@ Date: Sun Mar 18 16:07:26 2012 +0100 Signed-off-by: Martin Pitt - gi/overrides/Gtk.py | 4 +--- + gi/overrides/Gtk.py | 4 +--- tests/test_overrides.py | 6 ++++++ - 2 files changed, 7 insertions(+), 3 deletions(-) + 2 Dateien geändert, 7 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-) commit 466337cf2fd091738eeab12c10d250a9d0827284 Author: Johan Dahlin -Date: Fri Mar 16 16:55:47 2012 -0300 +Date: Fri Mar 16 16:55:47 2012 -0300 Correct bad rebase, remove duplicate Window - gi/overrides/Gtk.py | 7 ------- - 1 files changed, 0 insertions(+), 7 deletions(-) + gi/overrides/Gtk.py | 7 ------- + 1 Datei geändert, 7 Zeilen entfernt(-) commit c60d5ee3c88bd8e1c68ea97f079947cf79d5bb7d Author: Johan Dahlin -Date: Thu Mar 15 15:42:28 2012 -0300 +Date: Thu Mar 15 15:42:28 2012 -0300 Add a PyGTK compatibility layer @@ -350,16 +553,16 @@ Date: Thu Mar 15 15:42:28 2012 -0300 https://bugzilla.gnome.org/show_bug.cgi?id=653462 - gi/Makefile.am | 3 +- - gi/pygtkcompat.py | 421 + gi/Makefile.am | 3 +- + gi/pygtkcompat.py | 421 +++++++++++++++++++++++++++++++++++++++++++++ - tests/Makefile.am | 3 +- - tests/test_pygtkcompat.py | 77 ++++++++ - 4 files changed, 502 insertions(+), 2 deletions(-) + tests/Makefile.am | 3 +- + tests/test_pygtkcompat.py | 77 +++++++++ + 4 Dateien geändert, 502 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit 680a2e04ac4f80ad16e820d3f753519477c988aa Author: Johan Dahlin -Date: Wed Mar 14 15:20:53 2012 -0300 +Date: Wed Mar 14 15:20:53 2012 -0300 Add bw-compatible arguments to Gtk.Adjustment @@ -369,35 +572,35 @@ Date: Wed Mar 14 15:20:53 2012 -0300 https://bugzilla.gnome.org/show_bug.cgi?id=672087 - gi/overrides/Gtk.py | 8 +++++++- - 1 files changed, 7 insertions(+), 1 deletions(-) + gi/overrides/Gtk.py | 8 +++++++- + 1 Datei geändert, 7 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit fbd21ee7176bc1b70547ea464b512c8ffd674187 Author: Johan Dahlin -Date: Wed Mar 14 17:13:04 2012 -0300 +Date: Wed Mar 14 17:13:04 2012 -0300 GtkTreePath: make it iterable https://bugzilla.gnome.org/show_bug.cgi?id=672093 - gi/overrides/Gtk.py | 3 +++ + gi/overrides/Gtk.py | 3 +++ tests/test_overrides.py | 2 ++ - 2 files changed, 5 insertions(+), 0 deletions(-) + 2 Dateien geändert, 5 Zeilen hinzugefügt(+) commit a7b08cb75541612c78d123b1d968be7874e3c481 Author: Johan Dahlin -Date: Wed Mar 14 13:32:31 2012 -0300 +Date: Wed Mar 14 13:32:31 2012 -0300 Add a default argument to TreeModelFilter.set_visible_func() https://bugzilla.gnome.org/show_bug.cgi?id=672081 - gi/overrides/Gtk.py | 14 ++++++++++++++ - 1 files changed, 14 insertions(+), 0 deletions(-) + gi/overrides/Gtk.py | 14 ++++++++++++++ + 1 Datei geändert, 14 Zeilen hinzugefügt(+) commit 02950cabb38b1b3c9378c42c069eefdbccbce17d Author: Johan Dahlin -Date: Wed Mar 14 13:31:41 2012 -0300 +Date: Wed Mar 14 13:31:41 2012 -0300 Add a default argument to Gtk.TreeView.set_cursor @@ -405,24 +608,24 @@ Date: Wed Mar 14 13:31:41 2012 -0300 https://bugzilla.gnome.org/show_bug.cgi?id=672081 - gi/overrides/Gtk.py | 4 ++++ + gi/overrides/Gtk.py | 4 ++++ tests/test_overrides.py | 10 ++++++++++ - 2 files changed, 14 insertions(+), 0 deletions(-) + 2 Dateien geändert, 14 Zeilen hinzugefügt(+) commit 7245bd0ae3f6243c79fa8543a0ed1e50e5015844 Author: Johan Dahlin -Date: Wed Mar 14 13:31:06 2012 -0300 +Date: Wed Mar 14 13:31:06 2012 -0300 Add a default argument to Pango.Context.get_metrics() https://bugzilla.gnome.org/show_bug.cgi?id=672081 gi/overrides/Pango.py | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) + 1 Datei geändert, 9 Zeilen hinzugefügt(+) commit bc1fd8814df6c1e85b586d0fb943c89f7e2b78b5 Author: Martin Pitt -Date: Fri Mar 16 13:27:56 2012 +0100 +Date: Fri Mar 16 13:27:56 2012 +0100 Fix double-freeing GValues in arrays @@ -437,12 +640,12 @@ Date: Fri Mar 16 13:27:56 2012 +0100 https://bugzilla.gnome.org/show_bug.cgi?id=672224 - gi/pygi-marshal-from-py.c | 7 ++++++- - 1 files changed, 6 insertions(+), 1 deletions(-) + gi/pygi-marshal-from-py.c | 7 ++++++- + 1 Datei geändert, 6 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit a906b7d1947ba905f959d3f738eb6c29b02f96e7 Author: Simon Feltman -Date: Fri Mar 16 00:29:31 2012 -0700 +Date: Fri Mar 16 00:29:31 2012 -0700 Renamed "property" class to "Property" @@ -456,17 +659,17 @@ Date: Fri Mar 16 00:29:31 2012 -0700 Signed-off-by: Martin Pitt - examples/properties.py | 6 +- - gi/_gobject/__init__.py | 7 ++- + examples/properties.py | 6 +-- + gi/_gobject/__init__.py | 7 +-- gi/_gobject/propertyhelper.py | 12 +++--- tests/test_interface.py | 4 +- tests/test_properties.py | 94 - ++++++++++++++++++++-------------------- - 5 files changed, 62 insertions(+), 61 deletions(-) + ++++++++++++++++++++--------------------- + 5 Dateien geändert, 62 Zeilen hinzugefügt(+), 61 Zeilen entfernt(-) commit d7d28d717e38c0546529b09b8b571a5cc631c5b5 Author: Martin Pitt -Date: Wed Mar 14 22:52:47 2012 +0100 +Date: Wed Mar 14 22:52:47 2012 +0100 Fix Python to C marshalling of GValue arrays @@ -496,12 +699,12 @@ Date: Wed Mar 14 22:52:47 2012 +0100 gi/pygi-marshal-cleanup.c | 19 ++++++++++++++----- gi/pygi-marshal-from-py.c | 13 ++++++++++++- - tests/test_gi.py | 8 ++++++++ - 3 files changed, 34 insertions(+), 6 deletions(-) + tests/test_gi.py | 8 ++++++++ + 3 Dateien geändert, 34 Zeilen hinzugefügt(+), 6 Zeilen entfernt(-) commit 27ac9c1de6487035b18ef4511c155d251cb6d39d Author: Johan Dahlin -Date: Fri Mar 16 09:59:57 2012 +0100 +Date: Fri Mar 16 09:59:57 2012 +0100 Correct the Gtk.Window hierarchy @@ -521,14 +724,14 @@ Date: Fri Mar 16 09:59:57 2012 +0100 Signed-off-by: Martin Pitt - gi/overrides/Gtk.py | 56 - +++++++++++++++++++++++----------------------- - tests/test_overrides.py | 35 +++++++++++++++++++++++++++- - 2 files changed, 61 insertions(+), 30 deletions(-) + gi/overrides/Gtk.py | 56 + +++++++++++++++++++++++------------------------ + tests/test_overrides.py | 35 +++++++++++++++++++++++++++-- + 2 Dateien geändert, 61 Zeilen hinzugefügt(+), 30 Zeilen entfernt(-) commit 77ab27ab8a580d98f76730f075e083e1e870f55e Author: simon -Date: Tue Mar 13 01:41:53 2012 -0700 +Date: Tue Mar 13 01:41:53 2012 -0700 Renamed getter/setter instance attributes to fget/fset respectively. @@ -544,27 +747,27 @@ Date: Tue Mar 13 01:41:53 2012 -0700 args to also decorate a method: class C(GObject.GObject): - _value = 0 - @GObject.property(type=int, default=0) - def propInt(self): - return self._value - @propInt.setter - def propInt(self, value): - self._value = value + _value = 0 + @GObject.property(type=int, default=0) + def propInt(self): + return self._value + @propInt.setter + def propInt(self, value): + self._value = value https://bugzilla.gnome.org/show_bug.cgi?id=586181 Signed-off-by: Martin Pitt - gi/_gobject/__init__.py | 10 +++--- + gi/_gobject/__init__.py | 10 +++---- gi/_gobject/propertyhelper.py | 59 - +++++++++++++++++++++++++++++----------- + ++++++++++++++++++++++++++++++----------- tests/test_properties.py | 41 ++++++++++++++++++++++++++++ - 3 files changed, 89 insertions(+), 21 deletions(-) + 3 Dateien geändert, 89 Zeilen hinzugefügt(+), 21 Zeilen entfernt(-) commit 174a61fb3149c07dab5cc35e64825922cdefcb95 Author: Johan Dahlin -Date: Tue Mar 13 17:10:13 2012 -0300 +Date: Tue Mar 13 17:10:13 2012 -0300 Add Gtk.Arrow/Gtk.Window constructor override @@ -572,12 +775,12 @@ Date: Tue Mar 13 17:10:13 2012 -0300 https://bugzilla.gnome.org/show_bug.cgi?id=672045 - gi/overrides/Gtk.py | 17 +++++++++++++++++ - 1 files changed, 17 insertions(+), 0 deletions(-) + gi/overrides/Gtk.py | 17 +++++++++++++++++ + 1 Datei geändert, 17 Zeilen hinzugefügt(+) commit 7746d2188ac4933c2c9011d84525d1e62fc18953 Author: Michel Dänzer -Date: Fri Mar 9 12:26:53 2012 +0100 +Date: Fri Mar 9 12:26:53 2012 +0100 Fix marshalling to/from Python to work on big endian machines. @@ -585,14 +788,14 @@ Date: Fri Mar 9 12:26:53 2012 +0100 Signed-off-by: Martin Pitt - gi/pygi-argument.c | 25 ++++++++++++++++--------- + gi/pygi-argument.c | 25 ++++++++++++++++--------- gi/pygi-marshal-from-py.c | 32 +++++++++++++++++++++++++------- gi/pygi-marshal-to-py.c | 19 +++++++++++++++++++ - 3 files changed, 60 insertions(+), 16 deletions(-) + 3 Dateien geändert, 60 Zeilen hinzugefügt(+), 16 Zeilen entfernt(-) commit 0591cc6f160ae6e9d8c3970934ae105ef340d7d3 Author: Michel Dänzer -Date: Thu Mar 8 12:21:28 2012 +0100 +Date: Thu Mar 8 12:21:28 2012 +0100 Use gi_cclosure_marshal_generic instead of duplicating it. @@ -605,17 +808,17 @@ Date: Thu Mar 8 12:21:28 2012 +0100 Signed-off-by: Michel Dänzer Signed-off-by: Martin Pitt - configure.ac | 3 +- - gi/_gobject/Makefile.am | 7 +-- + configure.ac | 3 +- + gi/_gobject/Makefile.am | 7 +- gi/_gobject/ffi-marshaller.c | 194 ------------------------------------------ gi/_gobject/ffi-marshaller.h | 31 ------- gi/_gobject/gobjectmodule.c | 12 +-- - 5 files changed, 4 insertions(+), 243 deletions(-) + 5 Dateien geändert, 4 Zeilen hinzugefügt(+), 243 Zeilen entfernt(-) commit 8ca828825a2c47080055c5f986979aac8da9a93f Author: René Stadler -Date: Mon Mar 5 21:10:55 2012 +0100 +Date: Mon Mar 5 21:10:55 2012 +0100 Override Gtk.TreeView.get_visible_range to fix return @@ -623,60 +826,60 @@ Date: Mon Mar 5 21:10:55 2012 +0100 https://bugzilla.gnome.org/show_bug.cgi?id=671409 - gi/overrides/Gtk.py | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) + gi/overrides/Gtk.py | 5 +++++ + 1 Datei geändert, 5 Zeilen hinzugefügt(+) commit 4824ceaa77b59788325a2c1ee0f994d4e74d7a1c Author: Paolo Borelli -Date: Sun Mar 4 16:41:18 2012 +0100 +Date: Sun Mar 4 16:41:18 2012 +0100 Plug memory leak in _is_union_member When we found the member, unref the objects before breaking out of the loop. - gi/pygi-marshal-from-py.c | 9 +++------ - 1 files changed, 3 insertions(+), 6 deletions(-) + gi/pygi-marshal-from-py.c | 9 +++------ + 1 Datei geändert, 3 Zeilen hinzugefügt(+), 6 Zeilen entfernt(-) commit c6ae29ac157978a61b11cc2de9e8485d8a175105 Author: Sebastian Pölsterl -Date: Tue Feb 21 15:37:18 2012 +0100 +Date: Tue Feb 21 15:37:18 2012 +0100 tests: Split TestInterfaces into separate tests tests/test_gi.py | 36 +++++++++++++++++++----------------- - 1 files changed, 19 insertions(+), 17 deletions(-) + 1 Datei geändert, 19 Zeilen hinzugefügt(+), 17 Zeilen entfernt(-) commit de3299818ae5fdf1c7abbe05a36bfd5cdface7b8 Author: Sebastian Pölsterl -Date: Mon Feb 20 19:37:32 2012 +0100 +Date: Mon Feb 20 19:37:32 2012 +0100 Post release version bump to 3.1.2 configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit fd020e783c0dacea3320225b4ddd57d6a0fce7ea Author: Sebastian Pölsterl -Date: Mon Feb 20 19:33:56 2012 +0100 +Date: Mon Feb 20 19:33:56 2012 +0100 Prepare 3.1.1 release NEWS | 18 ++++++++++++++++++ - 1 files changed, 18 insertions(+), 0 deletions(-) + 1 Datei geändert, 18 Zeilen hinzugefügt(+) commit 99485d96811667ef7a7a393b68b7361733157d61 Author: Sebastian Pölsterl -Date: Sat Feb 18 00:38:05 2012 +0100 +Date: Sat Feb 18 00:38:05 2012 +0100 Don't use C99 style gi/pygi-cache.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit 0739c39f6282d95fc17ee406fa1151d074b0450d Author: Martin Pitt -Date: Thu Feb 16 16:42:53 2012 +0100 +Date: Thu Feb 16 16:42:53 2012 +0100 Add test for GPtrArray with transfer full @@ -688,22 +891,22 @@ Date: Thu Feb 16 16:42:53 2012 +0100 double-free. tests/test_everything.py | 10 +++++++++- - 1 files changed, 9 insertions(+), 1 deletions(-) + 1 Datei geändert, 9 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit 087a104f66793a981a0c02f1c7ab9cc1cf659da3 Author: Martin Pitt -Date: Wed Feb 15 13:36:39 2012 +0100 +Date: Wed Feb 15 13:36:39 2012 +0100 Drop obsolete g_thread_init() Not necessary any more since glib 2.24, and we depend on 2.31. - gi/_glib/pyglib.c | 3 --- - 1 files changed, 0 insertions(+), 3 deletions(-) + gi/_glib/pyglib.c | 3 --- + 1 Datei geändert, 3 Zeilen entfernt(-) commit 66fb610e45912a7def29e5848577d280ef55643a Author: Martin Pitt -Date: Wed Feb 15 13:35:33 2012 +0100 +Date: Wed Feb 15 13:35:33 2012 +0100 Fix deprecated g_source_get_current_time() @@ -712,24 +915,24 @@ Date: Wed Feb 15 13:35:33 2012 +0100 simplifies the code. gi/_glib/pygsource.c | 4 +--- - 1 files changed, 1 insertions(+), 3 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 3 Zeilen entfernt(-) commit 18342edded05d3d9cccf648ed92bc1cac95c51eb Author: Martin Pitt -Date: Wed Feb 15 13:31:23 2012 +0100 +Date: Wed Feb 15 13:31:23 2012 +0100 Fix deprecated g_value_[gs]et_char() Replace with _schar(). We depend on glib >= 2.31 already. gi/_gobject/ffi-marshaller.c | 2 +- - gi/_gobject/pygtype.c | 6 +++--- - gi/pygi-argument.c | 2 +- - 3 files changed, 5 insertions(+), 5 deletions(-) + gi/_gobject/pygtype.c | 6 +++--- + gi/pygi-argument.c | 2 +- + 3 Dateien geändert, 5 Zeilen hinzugefügt(+), 5 Zeilen entfernt(-) commit 3dfb8dcbe7cf09dc170433fc48d3273c6ea9448e Author: Simon Schampijer -Date: Thu Feb 2 19:06:01 2012 +0100 +Date: Thu Feb 2 19:06:01 2012 +0100 Make pygiconvert.sh correctly convert gtk.gdk.x11_* @@ -737,33 +940,33 @@ Date: Thu Feb 2 19:06:01 2012 +0100 GdkX11.x11_*. Fixing pygiconvert.sh to do so. pygi-convert.sh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 3af5016978df598d5fd1c225cc49bb2c04dc4e35 Author: Sebastian Pölsterl -Date: Fri Feb 10 13:29:41 2012 +0100 +Date: Fri Feb 10 13:29:41 2012 +0100 Raise required glib version to 2.31 because of g_value_(get|set)_schar Commit ee62df4d2fc0cc63c2f29d3ad9b47b875dbd5f89 introduced both calls configure.ac | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + 1 Datei geändert, 3 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-) commit 50c3b1bad3ea79750649f4b48fce0adbfaba5268 Author: Dieter Verfaillie -Date: Fri Feb 10 09:28:36 2012 +0100 +Date: Fri Feb 10 09:28:36 2012 +0100 Fix cset_first typo https://bugzilla.gnome.org/show_bug.cgi?id=649267 - gi/_gobject/pygparamspec.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + gi/_gobject/pygparamspec.c | 2 +- + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 6ab542fb3ec1031922ba65664d77bbaac0df453e Author: Bastian Winkler -Date: Mon Nov 14 14:41:08 2011 +0100 +Date: Mon Nov 14 14:41:08 2011 +0100 pygi-convert: Handle Clutter and Cogl @@ -771,11 +974,11 @@ Date: Mon Nov 14 14:41:08 2011 +0100 pygi-convert.sh | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 76 insertions(+), 0 deletions(-) + 1 Datei geändert, 76 Zeilen hinzugefügt(+) commit 4aeb27efc43e131de5d0bc0f60dca7c1d34c3d45 Author: Cédric Krier -Date: Fri Feb 10 09:04:18 2012 +0100 +Date: Fri Feb 10 09:04:18 2012 +0100 Provide access to gpointer struct values @@ -783,45 +986,45 @@ Date: Fri Feb 10 09:04:18 2012 +0100 Signed-off-by: Martin Pitt - gi/pygi-argument.c | 3 ++- - gi/pygi-info.c | 13 +++++++++++++ + gi/pygi-argument.c | 3 ++- + gi/pygi-info.c | 13 +++++++++++++ tests/test_everything.py | 21 +++++++++++++++++++++ - 3 files changed, 36 insertions(+), 1 deletions(-) + 3 Dateien geändert, 36 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit 5c0b20cc1a261cb7430a5251dffe60da698033b5 Author: Paolo Borelli -Date: Thu Feb 9 18:15:42 2012 +0100 +Date: Thu Feb 9 18:15:42 2012 +0100 Add some GType tests Use what was recently added in g-i tests/test_gi.py | 17 +++++++++++++++-- - 1 files changed, 15 insertions(+), 2 deletions(-) + 1 Datei geändert, 15 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit ea7778f6f37a6fc38f88d89d4b6cae8be0ed9753 Author: Paolo Borelli -Date: Thu Feb 9 18:14:52 2012 +0100 +Date: Thu Feb 9 18:14:52 2012 +0100 Split GStrv and array variant tests in their own classes Also tidy up the spacing a bit tests/test_gi.py | 29 +++++++++++++++++++++++------ - 1 files changed, 23 insertions(+), 6 deletions(-) + 1 Datei geändert, 23 Zeilen hinzugefügt(+), 6 Zeilen entfernt(-) commit db7f9be319d3cf52aef300fbac60cabb7ff57276 Author: Paolo Borelli -Date: Wed Feb 8 22:23:30 2012 +0100 +Date: Wed Feb 8 22:23:30 2012 +0100 Add unit test for builder's connect_after tests/test_overrides.py | 8 ++++++++ - 1 files changed, 8 insertions(+), 0 deletions(-) + 1 Datei geändert, 8 Zeilen hinzugefügt(+) commit 671f9b0dd73ac41a84caf9d1f04cec351bc01b47 Author: Ryan Lortie -Date: Wed Feb 8 16:06:22 2012 -0500 +Date: Wed Feb 8 16:06:22 2012 -0500 fix GtkBuilder signal connection 'after' logic @@ -831,23 +1034,23 @@ Date: Wed Feb 8 16:06:22 2012 -0500 https://bugzilla.gnome.org/show_bug.cgi?id=669705 - gi/overrides/Gtk.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + gi/overrides/Gtk.py | 2 +- + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 1d23d8006be98b77a0134fddd23b76df05e489fa Author: Patrick Welche -Date: Tue Feb 7 11:49:58 2012 +0000 +Date: Tue Feb 7 11:49:58 2012 +0000 test(1) uses '=' to test if strings are identical https://bugzilla.gnome.org/show_bug.cgi?id=669598 m4/python.m4 | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + 1 Datei geändert, 3 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-) commit 945fd18e531c2131440af93dcd89f6c63abbfd7c Author: Ryan Lortie -Date: Tue Feb 7 13:42:19 2012 -0500 +Date: Tue Feb 7 13:42:19 2012 -0500 pygspawn: improve error checking @@ -865,43 +1068,43 @@ Date: Tue Feb 7 13:42:19 2012 -0500 https://bugzilla.gnome.org/show_bug.cgi?id=669594 - gi/_glib/pygspawn.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + gi/_glib/pygspawn.c | 4 ++-- + 1 Datei geändert, 2 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit 8fc969c45d6d720400dc6c9ef391d0ca93f14b5a Author: Sebastian Pölsterl -Date: Mon Feb 6 19:15:53 2012 +0100 +Date: Mon Feb 6 19:15:53 2012 +0100 Post release version bump to 3.1.1 configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit f76b2fe6d37be76bf129ee2adee90b2cc0eee56e Author: Sebastian Pölsterl -Date: Mon Feb 6 19:11:52 2012 +0100 +Date: Mon Feb 6 19:11:52 2012 +0100 Prepare 3.1.0 release NEWS | 34 ++++++++++++++++++++++++++++++++++ - 1 files changed, 34 insertions(+), 0 deletions(-) + 1 Datei geändert, 34 Zeilen hinzugefügt(+) commit c09d0dffc5a570d5ae4df1ae07b2e5594c3ca1bf Author: Sebastian Pölsterl -Date: Mon Feb 6 19:04:41 2012 +0100 +Date: Mon Feb 6 19:04:41 2012 +0100 Updated DOAP file to only include people currently actively working on the project Removed obsolete MAINTAINERS file - MAINTAINERS | 19 ------------------- + MAINTAINERS | 19 ------------------- pygobject.doap | 44 +++++++++++++++----------------------------- - 2 files changed, 15 insertions(+), 48 deletions(-) + 2 Dateien geändert, 15 Zeilen hinzugefügt(+), 48 Zeilen entfernt(-) commit 0285e107be581c4d594127dc06cd05df1f02fb3f Author: Sebastian Pölsterl -Date: Mon Feb 6 18:57:01 2012 +0100 +Date: Mon Feb 6 18:57:01 2012 +0100 Revert "Convert all strings to utf-8 encoding when retrieving from TreeModel" @@ -911,36 +1114,36 @@ Date: Mon Feb 6 18:57:01 2012 +0100 Due to this commit breaking backwards compatability, we decided to revert this change - gi/overrides/Gtk.py | 15 --------------- - tests/compathelper.py | 2 -- + gi/overrides/Gtk.py | 15 --------------- + tests/compathelper.py | 2 -- tests/test_overrides.py | 31 +------------------------------ - 3 files changed, 1 insertions(+), 47 deletions(-) + 3 Dateien geändert, 1 Zeile hinzugefügt(+), 47 Zeilen entfernt(-) commit 0e921cd26ed5a6e3bc6ef5f553e8b22b862d72a6 Author: Sebastian Pölsterl -Date: Sun Feb 5 13:47:10 2012 +0100 +Date: Sun Feb 5 13:47:10 2012 +0100 tests: Fixed issues with python3 tests/test_gi.py | 9 ++++++--- - 1 files changed, 6 insertions(+), 3 deletions(-) + 1 Datei geändert, 6 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-) commit ee62df4d2fc0cc63c2f29d3ad9b47b875dbd5f89 Author: Sebastian Pölsterl -Date: Sun Feb 5 11:59:51 2012 +0100 +Date: Sun Feb 5 11:59:51 2012 +0100 Properly distinguish between different integer types for properties https://bugzilla.gnome.org/show_bug.cgi?id=664150 - gi/pygi-property.c | 48 ++++++++++++++++++++++++++++++++++++--- - tests/test_gi.py | 62 + gi/pygi-property.c | 48 ++++++++++++++++++++++++++++++++++++---- + tests/test_gi.py | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 106 insertions(+), 4 deletions(-) + 2 Dateien geändert, 106 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-) commit c329bf2aee8d75ce452638db75e09197ff2b9b65 Author: Sebastian Pölsterl -Date: Sun Feb 5 11:46:21 2012 +0100 +Date: Sun Feb 5 11:46:21 2012 +0100 Distinguish between GArray and GPtrArray when cleaning up @@ -950,11 +1153,11 @@ Date: Sun Feb 5 11:46:21 2012 +0100 https://bugzilla.gnome.org/show_bug.cgi?id=669393 gi/pygi-marshal-cleanup.c | 32 +++++++++++++++++++++++--------- - 1 files changed, 23 insertions(+), 9 deletions(-) + 1 Datei geändert, 23 Zeilen hinzugefügt(+), 9 Zeilen entfernt(-) commit 4ea37c606f67df843788261b2c8acd6bac4c1e0c Author: Paolo Borelli -Date: Sun Feb 5 18:51:53 2012 +0100 +Date: Sun Feb 5 18:51:53 2012 +0100 Add null_gerror_callback unit test @@ -964,11 +1167,11 @@ Date: Sun Feb 5 18:51:53 2012 +0100 https://bugzilla.gnome.org/show_bug.cgi?id=669415 tests/test_everything.py | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) + 1 Datei geändert, 9 Zeilen hinzugefügt(+) commit a41984780ee49dcf02c718ca1be87bba747472e5 Author: Martin Pitt -Date: Mon Feb 6 09:34:28 2012 +0100 +Date: Mon Feb 6 09:34:28 2012 +0100 pyglib_error_check: Re-add missing NULL check @@ -982,35 +1185,35 @@ Date: Mon Feb 6 09:34:28 2012 +0100 https://bugzilla.gnome.org/show_bug.cgi?id=669415 - gi/_glib/pyglib.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + gi/_glib/pyglib.c | 2 ++ + 1 Datei geändert, 2 Zeilen hinzugefügt(+) commit 2c797c17913999379e277788d5e4cce8d68cebb0 Author: Michael Culbertson -Date: Sat Feb 4 16:11:34 2012 +0100 +Date: Sat Feb 4 16:11:34 2012 +0100 Add tests/runtests-windows.py to source tarball https://bugzilla.gnome.org/show_bug.cgi?id=663288 - tests/Makefile.am | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + tests/Makefile.am | 1 + + 1 Datei geändert, 1 Zeile hinzugefügt(+) commit d6a899cdf70e978534326155e3fad75a705f4b20 Author: Sebastian Pölsterl -Date: Sat Feb 4 15:55:55 2012 +0100 +Date: Sat Feb 4 15:55:55 2012 +0100 Don't issue a depreciation warning for GtkDialog's NO_SEPARATOR flag, even when unused https://bugzilla.gnome.org/show_bug.cgi?id=665553 - gi/overrides/Gtk.py | 6 ++---- - 1 files changed, 2 insertions(+), 4 deletions(-) + gi/overrides/Gtk.py | 6 ++---- + 1 Datei geändert, 2 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-) commit 534ec71c575a279ff1c05da20a8858bb1145b4d0 Author: Nirbheek Chauhan -Date: Sat Feb 4 15:42:36 2012 +0100 +Date: Sat Feb 4 15:42:36 2012 +0100 Fix bool() operations on GLib.Variant objects @@ -1020,14 +1223,14 @@ Date: Sat Feb 4 15:42:36 2012 +0100 https://bugzilla.gnome.org/show_bug.cgi?id=647723 - gi/overrides/GLib.py | 18 ++++++++++++++++++ + gi/overrides/GLib.py | 18 ++++++++++++++++++ tests/test_overrides.py | 45 +++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 63 insertions(+), 0 deletions(-) + 2 Dateien geändert, 63 Zeilen hinzugefügt(+) commit 8d6a127df5dd1e5f26faeba8f977074b4496b24f Author: Nirbheek Chauhan -Date: Sat Feb 4 15:41:08 2012 +0100 +Date: Sat Feb 4 15:41:08 2012 +0100 Fix hash() and __eq__() for GLib.Variant objects @@ -1038,14 +1241,14 @@ Date: Sat Feb 4 15:41:08 2012 +0100 https://bugzilla.gnome.org/show_bug.cgi?id=647725 - gi/overrides/GLib.py | 23 +++++++++++++++++++ + gi/overrides/GLib.py | 23 +++++++++++++++++++ tests/test_overrides.py | 56 +++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 79 insertions(+), 0 deletions(-) + 2 Dateien geändert, 79 Zeilen hinzugefügt(+) commit f82404034be042bf2026bbb7f1e33b11d6e17a6f Author: Martin Pitt -Date: Wed Jan 25 07:01:06 2012 +0100 +Date: Wed Jan 25 07:01:06 2012 +0100 Fix method names of callback tests @@ -1056,11 +1259,11 @@ Date: Wed Jan 25 07:01:06 2012 +0100 case names. tests/test_everything.py | 30 +++++++++++++++--------------- - 1 files changed, 15 insertions(+), 15 deletions(-) + 1 Datei geändert, 15 Zeilen hinzugefügt(+), 15 Zeilen entfernt(-) commit e37ee78fbf0aa72159a40da4165a26bea065faf1 Author: Will Thompson -Date: Mon Jan 23 13:10:30 2012 +0000 +Date: Mon Jan 23 13:10:30 2012 +0000 Cairo: add missing braces around array-of-struct definition @@ -1069,11 +1272,11 @@ Date: Mon Jan 23 13:10:30 2012 +0000 https://bugzilla.gnome.org/show_bug.cgi?id=668497 gi/pygi-foreign-cairo.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit db24865d6b60351d72f5b8f47103d6d0a6c63b2e Author: Will Thompson -Date: Mon Jan 23 13:06:41 2012 +0000 +Date: Mon Jan 23 13:06:41 2012 +0000 g_instance_init: cast to PyGObject * as needed @@ -1081,12 +1284,12 @@ Date: Mon Jan 23 13:06:41 2012 +0000 https://bugzilla.gnome.org/show_bug.cgi?id=668497 - gi/_gobject/gobjectmodule.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + gi/_gobject/gobjectmodule.c | 2 +- + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit a8408cfd68cd5e7cdb0b8a83e107d9a0d828e4bd Author: Will Thompson -Date: Mon Jan 23 13:01:27 2012 +0000 +Date: Mon Jan 23 13:01:27 2012 +0000 Fix a few set-but-not-used warnings. @@ -1101,30 +1304,30 @@ Date: Mon Jan 23 13:01:27 2012 +0000 https://bugzilla.gnome.org/show_bug.cgi?id=668497 - gi/_glib/pygiochannel.c | 2 +- - gi/_glib/pygmainloop.c | 3 +-- - gi/_gobject/pygobject.c | 2 +- - gi/pygi-marshal-cleanup.c | 2 -- - 4 files changed, 3 insertions(+), 6 deletions(-) + gi/_glib/pygiochannel.c | 2 +- + gi/_glib/pygmainloop.c | 3 +-- + gi/_gobject/pygobject.c | 2 +- + gi/pygi-marshal-cleanup.c | 2 -- + 4 Dateien geändert, 3 Zeilen hinzugefügt(+), 6 Zeilen entfernt(-) commit 29a30490ed51e347e8f57d2bf9af69400734eee8 Author: Stefano Facchini -Date: Thu Jan 19 18:09:07 2012 +0100 +Date: Thu Jan 19 18:09:07 2012 +0100 pygmainloop: allow for extra arguments in 'quit' method To allow for the common syntax: - object.connect('signal-name', main_loop.quit) + object.connect('signal-name', main_loop.quit) https://bugzilla.gnome.org/show_bug.cgi?id=668288 gi/_glib/pygmainloop.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit 557a61c12c01137a0d7c679c4b053973df09d445 Author: Alexandre Rostovtsev -Date: Mon Dec 26 00:44:56 2011 -0500 +Date: Mon Dec 26 00:44:56 2011 -0500 Fix bytearray test compatibility with python3 @@ -1133,11 +1336,11 @@ Date: Mon Dec 26 00:44:56 2011 -0500 https://bugzilla.gnome.org/show_bug.cgi?id=666852 tests/test_gi.py | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit d69e5b3c7bdb9113382fd125c256b12bff4c24d2 Author: Alberto Mardegan -Date: Mon Jan 23 12:37:26 2012 +0200 +Date: Mon Jan 23 12:37:26 2012 +0200 Respect transfer-type when demarshalling GErrors @@ -1149,12 +1352,12 @@ Date: Mon Jan 23 12:37:26 2012 +0200 https://bugzilla.gnome.org/show_bug.cgi?id=666270 - gi/pygi-argument.c | 12 +++++++++++- - 1 files changed, 11 insertions(+), 1 deletions(-) + gi/pygi-argument.c | 12 +++++++++++- + 1 Datei geändert, 11 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit 77f32d9110bfeb6dad8457f565b4c70b5998fef6 Author: Alberto Mardegan -Date: Thu Dec 15 16:12:01 2011 +0200 +Date: Thu Dec 15 16:12:01 2011 +0200 Support GHashTable and GError as callback/closure arguments @@ -1168,13 +1371,13 @@ Date: Thu Dec 15 16:12:01 2011 +0200 Signed-off-by: Martin Pitt - gi/pygi-closure.c | 2 ++ + gi/pygi-closure.c | 2 ++ tests/test_everything.py | 35 +++++++++++++++++++++++++++++++++++ - 2 files changed, 37 insertions(+), 0 deletions(-) + 2 Dateien geändert, 37 Zeilen hinzugefügt(+) commit 4b9dc03d0e49e9a1f4bf0f2df503bdff00d13a2b Author: Will Thompson -Date: Mon Jan 23 13:56:02 2012 +0000 +Date: Mon Jan 23 13:56:02 2012 +0000 Don't leak when marshalling GErrors to C @@ -1187,21 +1390,21 @@ Date: Mon Jan 23 13:56:02 2012 +0000 https://bugzilla.gnome.org/show_bug.cgi?id=666098 - gi/_glib/pyglib.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) + gi/_glib/pyglib.c | 3 +++ + 1 Datei geändert, 3 Zeilen hinzugefügt(+) commit adcfe96d49b09bcc550653d73de196610fd5144d Author: Will Thompson -Date: Fri Jan 20 16:20:10 2012 +0000 +Date: Fri Jan 20 16:20:10 2012 +0000 Support functions which return GError GStreamer has the following method: void gst_message_parse_error ( - GstMessage *message, - GError **error, - gchar **debug_message); + GstMessage *message, + GError **error, + gchar **debug_message); With this patch, we marshal the GError out parameter as a GObject.GError @@ -1212,16 +1415,16 @@ Date: Fri Jan 20 16:20:10 2012 +0000 https://bugzilla.gnome.org/show_bug.cgi?id=666098 - gi/_glib/pyglib.c | 46 + gi/_glib/pyglib.c | 46 +++++++++++++++++++++++++++++++++++----------- - gi/_glib/pyglib.h | 1 + + gi/_glib/pyglib.h | 1 + gi/pygi-marshal-to-py.c | 16 +++++++++++++--- - tests/test_gi.py | 32 ++++++++++++++++++++++++++++++++ - 4 files changed, 81 insertions(+), 14 deletions(-) + tests/test_gi.py | 32 ++++++++++++++++++++++++++++++++ + 4 Dateien geändert, 81 Zeilen hinzugefügt(+), 14 Zeilen entfernt(-) commit 09f003729eac9d553a208c343c2a14d253b77d9a Author: Alberto Mardegan -Date: Mon Jan 23 12:42:21 2012 +0200 +Date: Mon Jan 23 12:42:21 2012 +0200 Fix indentation of _pygi_argument_to_object() @@ -1229,39 +1432,39 @@ Date: Mon Jan 23 12:42:21 2012 +0200 Signed-off-by: Martin Pitt - gi/pygi-argument.c | 26 +++++++++++++------------- - 1 files changed, 13 insertions(+), 13 deletions(-) + gi/pygi-argument.c | 26 +++++++++++++------------- + 1 Datei geändert, 13 Zeilen hinzugefügt(+), 13 Zeilen entfernt(-) commit c71c010be01d706f90bc200194325fd82f4071b2 Author: Paolo Borelli -Date: Sat Jan 14 14:24:23 2012 +0100 +Date: Sat Jan 14 14:24:23 2012 +0100 Avoid C99 syntax. gi/gimodule.c | 10 ++++++---- - 1 files changed, 6 insertions(+), 4 deletions(-) + 1 Datei geändert, 6 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-) commit c299d058c22385ececaec64c872d1dd1bc1ae17a Author: Paolo Borelli -Date: Fri Jan 6 13:39:31 2012 +0100 +Date: Fri Jan 6 13:39:31 2012 +0100 Connect to first action of a radio group. - gi/overrides/Gtk.py | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + gi/overrides/Gtk.py | 4 ++-- + 1 Datei geändert, 2 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit dee2f179037902a3883bd0e61ff1c350e1fd8a4f Author: Paolo Borelli -Date: Wed Jan 4 16:40:51 2012 +0100 +Date: Wed Jan 4 16:40:51 2012 +0100 Use g_slist_free_full in pygi-closure. - gi/pygi-closure.c | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) + gi/pygi-closure.c | 3 +-- + 1 Datei geändert, 1 Zeile hinzugefügt(+), 2 Zeilen entfernt(-) commit 2bee4207ab6f07dc9c0952affe72f0e304cfb624 Author: Paolo Borelli -Date: Wed Jan 4 15:24:13 2012 +0100 +Date: Wed Jan 4 15:24:13 2012 +0100 Avoid O(n^2) behavior when marshalling lists @@ -1271,42 +1474,42 @@ Date: Wed Jan 4 15:24:13 2012 +0100 https://bugzilla.gnome.org/show_bug.cgi?id=667261 - gi/pygi-marshal-from-py.c | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) + gi/pygi-marshal-from-py.c | 8 ++++---- + 1 Datei geändert, 4 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-) commit d68455e99b1a9ebba31209b17a11317b1958678b Author: Paolo Borelli -Date: Tue Jan 3 16:57:40 2012 +0100 +Date: Tue Jan 3 16:57:40 2012 +0100 Handle NULL as a valid case of a char** array Treat NULL as an empty array and add the corresponding testcase gi/pygi-marshal-to-py.c | 9 +++++---- - tests/test_gi.py | 3 +++ - 2 files changed, 8 insertions(+), 4 deletions(-) + tests/test_gi.py | 3 +++ + 2 Dateien geändert, 8 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-) commit e3451b8e6018bb76e9992fb6af24a71725de5cfd Author: Tomeu Vizoso -Date: Fri Dec 23 12:01:43 2011 +0100 +Date: Fri Dec 23 12:01:43 2011 +0100 Branching, bump version to 3.1.0 configure.ac | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit 8d1a36cc73f5f4df091ecb289c8a7b38ec2ab605 Author: Tomeu Vizoso -Date: Mon Dec 12 18:35:30 2011 +0100 +Date: Mon Dec 12 18:35:30 2011 +0100 Add notes about branching to HACKING HACKING | 10 ++++++++++ - 1 files changed, 10 insertions(+), 0 deletions(-) + 1 Datei geändert, 10 Zeilen hinzugefügt(+) commit 00030bc6f0fb961c716ed692144cd8e4bb9be7d0 Author: Sebastian Pölsterl -Date: Sat Dec 10 12:51:45 2011 +0100 +Date: Sat Dec 10 12:51:45 2011 +0100 Fixed bug where GObject.property did not respect minimum and maximum values @@ -1315,101 +1518,101 @@ Date: Sat Dec 10 12:51:45 2011 +0100 gi/_gobject/propertyhelper.py | 2 +- tests/test_properties.py | 31 +++++++++++++++++++++++++++++++ - 2 files changed, 32 insertions(+), 1 deletions(-) + 2 Dateien geändert, 32 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit 7b78abc6c399abd0daa4c11c644d107e1bb7b452 Author: Tomeu Vizoso -Date: Mon Dec 12 17:00:24 2011 +0100 +Date: Mon Dec 12 17:00:24 2011 +0100 Remove mention of removed option --enable-docs HACKING | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 4cba52f5b5e79b7b6212cb0795e8976a9da9f21d Author: Tomeu Vizoso -Date: Mon Dec 12 17:00:03 2011 +0100 +Date: Mon Dec 12 17:00:03 2011 +0100 Fix sebp's name in NEWS NEWS | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 8c95981d0ba224a577f87998030c384b3dae3d80 Author: Tomeu Vizoso -Date: Mon Dec 12 16:20:09 2011 +0100 +Date: Mon Dec 12 16:20:09 2011 +0100 Release 3.0.3 NEWS | 15 +++++++++++++++ - 1 files changed, 15 insertions(+), 0 deletions(-) + 1 Datei geändert, 15 Zeilen hinzugefügt(+) commit 58e47fd28c5d75bb78042c8f9eb5aae84de9c64d Author: Tomeu Vizoso -Date: Mon Dec 12 16:16:44 2011 +0100 +Date: Mon Dec 12 16:16:44 2011 +0100 Pre-release version bump configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 884468d4816fc976c0c0c72651e7f81d13f3f78b Author: Manuel Quiñones -Date: Thu Dec 1 11:50:38 2011 -0300 +Date: Thu Dec 1 11:50:38 2011 -0300 Convert all modifier constants to Gdk.ModifierType Signed-off-by: Manuel Quiñones pygi-convert.sh | 14 ++++++++++++++ - 1 files changed, 14 insertions(+), 0 deletions(-) + 1 Datei geändert, 14 Zeilen hinzugefügt(+) commit 654711d0f940d7480d0f1cdb25a3dc9996f7a706 Author: Sebastian Pölsterl -Date: Tue Nov 8 12:38:12 2011 +0100 +Date: Tue Nov 8 12:38:12 2011 +0100 Convert all strings to utf-8 encoding when retrieving from TreeModel https://bugzilla.gnome.org/show_bug.cgi?id=663610 - gi/overrides/Gtk.py | 15 +++++++++++++++ - tests/compathelper.py | 2 ++ + gi/overrides/Gtk.py | 15 +++++++++++++++ + tests/compathelper.py | 2 ++ tests/test_overrides.py | 31 ++++++++++++++++++++++++++++++- - 3 files changed, 47 insertions(+), 1 deletions(-) + 3 Dateien geändert, 47 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit 4f637212f13b197a95c824967a58496b9e3b877c Author: John (J5) Palmieri -Date: Wed Nov 2 14:51:24 2011 -0400 +Date: Wed Nov 2 14:51:24 2011 -0400 add test for bytearray variants tests/test_gi.py | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) + 1 Datei geändert, 4 Zeilen hinzugefügt(+) commit 20ca3f129d6cc662285cce8c732b55596016aefa Author: John (J5) Palmieri -Date: Wed Nov 2 14:50:42 2011 -0400 +Date: Wed Nov 2 14:50:42 2011 -0400 handle NULL arrays correctly for each array type gi/pygi-marshal-to-py.c | 11 ++++++----- - 1 files changed, 6 insertions(+), 5 deletions(-) + 1 Datei geändert, 6 Zeilen hinzugefügt(+), 5 Zeilen entfernt(-) commit ce2f780bffe44b1d4de617dcbce4b90c58b03c18 Author: John (J5) Palmieri -Date: Wed Nov 2 14:17:21 2011 -0400 +Date: Wed Nov 2 14:17:21 2011 -0400 Revert "Revert "Fix array termination and size calculation"" This reverts commit cfda820e8d9604c5ef2ad1161c22b20080d5daf4. - gi/pygi-marshal-from-py.c | 6 +++++- - gi/pygi-marshal-to-py.c | 8 +++++++- - 2 files changed, 12 insertions(+), 2 deletions(-) + gi/pygi-marshal-from-py.c | 6 +++++- + gi/pygi-marshal-to-py.c | 8 +++++++- + 2 Dateien geändert, 12 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit 832f16f96815adc22cc3acbeb3fa969631795a29 Author: Owen W. Taylor -Date: Sun Oct 30 18:08:57 2011 -0400 +Date: Sun Oct 30 18:08:57 2011 -0400 pygmainloop: avoid lockups if multiple glib.MainLoop exist @@ -1421,35 +1624,35 @@ Date: Sun Oct 30 18:08:57 2011 -0400 https://bugzilla.gnome.org/show_bug.cgi?id=663068 gi/_glib/pygmainloop.c | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) + 1 Datei geändert, 4 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit 2fd3aa9d4ca0906a5e609845ee500ba72e358f94 Author: Tomeu Vizoso -Date: Sat Oct 29 15:08:03 2011 +0200 +Date: Sat Oct 29 15:08:03 2011 +0200 Properly chain up to the class that implements a given vfunc. https://bugzilla.gnome.org/show_bug.cgi?id=662994 - gi/types.py | 22 +++++++++++++--------- + gi/types.py | 22 +++++++++++++--------- tests/test_gi.py | 20 ++++++++++---------- - 2 files changed, 23 insertions(+), 19 deletions(-) + 2 Dateien geändert, 23 Zeilen hinzugefügt(+), 19 Zeilen entfernt(-) commit cfda820e8d9604c5ef2ad1161c22b20080d5daf4 Author: Tomeu Vizoso -Date: Wed Nov 2 14:54:21 2011 +0100 +Date: Wed Nov 2 14:54:21 2011 +0100 Revert "Fix array termination and size calculation" This reverts commit eef35b2df8023ffff2d195ee16c084f5cfcb6ba3. - gi/pygi-marshal-from-py.c | 6 +----- - gi/pygi-marshal-to-py.c | 8 +------- - 2 files changed, 2 insertions(+), 12 deletions(-) + gi/pygi-marshal-from-py.c | 6 +----- + gi/pygi-marshal-to-py.c | 8 +------- + 2 Dateien geändert, 2 Zeilen hinzugefügt(+), 12 Zeilen entfernt(-) commit eef35b2df8023ffff2d195ee16c084f5cfcb6ba3 Author: Holger Berndt -Date: Sun Oct 30 16:36:32 2011 +0100 +Date: Sun Oct 30 16:36:32 2011 +0100 Fix array termination and size calculation @@ -1462,31 +1665,31 @@ Date: Sun Oct 30 16:36:32 2011 +0100 https://bugzilla.gnome.org/show_bug.cgi?id=662550 - gi/pygi-marshal-from-py.c | 6 +++++- - gi/pygi-marshal-to-py.c | 8 +++++++- - 2 files changed, 12 insertions(+), 2 deletions(-) + gi/pygi-marshal-from-py.c | 6 +++++- + gi/pygi-marshal-to-py.c | 8 +++++++- + 2 Dateien geändert, 12 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit 4c1d9f01b8fa6702f73b290180f934250e179caa Author: Daniel Drake -Date: Sun Oct 30 09:20:45 2011 +0000 +Date: Sun Oct 30 09:20:45 2011 +0000 pygi-convert: fix for Pango.Alignment pygi-convert.sh | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+) commit e3abd76096cc9f335681c7225f452c286b9c59e2 Author: Daniel Drake -Date: Sun Oct 30 07:06:57 2011 +0000 +Date: Sun Oct 30 07:06:57 2011 +0000 pygi-convert: fix for Gtk.Orientation pygi-convert.sh | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+) commit 52b82c5f78ef3755388457fa9440c36ccd2dfbbf Author: Martin Pitt -Date: Thu Oct 27 07:16:24 2011 +0200 +Date: Thu Oct 27 07:16:24 2011 +0200 Add tests for calling closures @@ -1498,11 +1701,11 @@ Date: Thu Oct 27 07:16:24 2011 +0200 for now. (See https://bugzilla.gnome.org/show_bug.cgi?id=656554) tests/test_everything.py | 24 ++++++++++++++++++++++++ - 1 files changed, 24 insertions(+), 0 deletions(-) + 1 Datei geändert, 24 Zeilen hinzugefügt(+) commit c7aa0e79dfb4c1092c51ae1464b8414083b4f3fc Author: Mikkel Kamstrup Erlandsen -Date: Tue Oct 4 12:28:26 2011 +0200 +Date: Tue Oct 4 12:28:26 2011 +0200 fix marshaling of arrays of GVariants @@ -1520,26 +1723,26 @@ Date: Tue Oct 4 12:28:26 2011 +0200 Signed-off-by: Martin Pitt - gi/pygi-cache.c | 2 +- + gi/pygi-cache.c | 2 +- gi/pygi-marshal-cleanup.c | 81 +++++++++++++++++++++++++++++---------------- - gi/pygi-marshal-from-py.c | 10 ++++- - gi/pygi-marshal-to-py.c | 13 ++++++- - tests/test_gi.py | 14 +++++++- - 5 files changed, 85 insertions(+), 35 deletions(-) + gi/pygi-marshal-from-py.c | 10 ++++-- + gi/pygi-marshal-to-py.c | 13 ++++++-- + tests/test_gi.py | 14 +++++++- + 5 Dateien geändert, 85 Zeilen hinzugefügt(+), 35 Zeilen entfernt(-) commit c2ec4d8eb46ae2e6ee4372b2a4f9d5df0e5d82f3 Author: Ignacio Casal Quinteiro -Date: Sat Oct 22 00:20:57 2011 +0200 +Date: Sat Oct 22 00:20:57 2011 +0200 Release 3.0.2 NEWS | 8 ++++++++ - 1 files changed, 8 insertions(+), 0 deletions(-) + 1 Datei geändert, 8 Zeilen hinzugefügt(+) commit 5c24760b797e985721f7fe51d52252e4dd54a417 Author: Martin Pitt -Date: Fri Oct 21 17:31:41 2011 +0200 +Date: Fri Oct 21 17:31:41 2011 +0200 Fix "Returns: (skip)" method calls without (out) arguments @@ -1551,13 +1754,13 @@ Date: Fri Oct 21 17:31:41 2011 +0200 https://bugzilla.gnome.org/show_bug.cgi?id=662383 - gi/pygi-invoke.c | 10 ++++++++++ + gi/pygi-invoke.c | 10 ++++++++++ tests/test_everything.py | 8 ++++++++ - 2 files changed, 18 insertions(+), 0 deletions(-) + 2 Dateien geändert, 18 Zeilen hinzugefügt(+) commit 585222915dc98b0e375de3db4771466278a32e81 Author: John (J5) Palmieri -Date: Tue Oct 18 00:39:16 2011 -0400 +Date: Tue Oct 18 00:39:16 2011 -0400 Do union member checks for unions that are parameters @@ -1567,11 +1770,11 @@ Date: Tue Oct 18 00:39:16 2011 -0400 gi/pygi-marshal-from-py.c | 121 +++++++++++++++++++++++++-------------------- - 1 files changed, 68 insertions(+), 53 deletions(-) + 1 Datei geändert, 68 Zeilen hinzugefügt(+), 53 Zeilen entfernt(-) commit 8deaec6b9abd87f02060c9feec773d4693e89028 Author: Martin Pitt -Date: Wed Oct 19 14:35:11 2011 +0200 +Date: Wed Oct 19 14:35:11 2011 +0200 Gdk overrides: Unbreak for Gdk-2.0 @@ -1581,36 +1784,36 @@ Date: Wed Oct 19 14:35:11 2011 +0200 https://launchpad.net/bugs/875399 - gi/overrides/Gdk.py | 95 + gi/overrides/Gdk.py | 95 ++++++++++++++++++++++++++------------------------- - 1 files changed, 48 insertions(+), 47 deletions(-) + 1 Datei geändert, 48 Zeilen hinzugefügt(+), 47 Zeilen entfernt(-) commit f395fb131caf7ca550acd17138d8061926ef4f92 Author: John (J5) Palmieri -Date: Fri Oct 14 17:19:45 2011 -0400 +Date: Fri Oct 14 17:19:45 2011 -0400 unit test for checking ref count of object param in signals https://bugzilla.gnome.org/show_bug.cgi?id=661359 tests/test_everything.py | 11 +++++++++++ - 1 files changed, 11 insertions(+), 0 deletions(-) + 1 Datei geändert, 11 Zeilen hinzugefügt(+) commit 611f58b99851328653af4930f188c33eccaa9f6f Author: John (J5) Palmieri -Date: Fri Oct 14 16:42:32 2011 -0400 +Date: Fri Oct 14 16:42:32 2011 -0400 when converting an object with transfer none, make sure the wrapper owns a ref https://bugzilla.gnome.org/show_bug.cgi?id=661359 - gi/pygi-argument.c | 10 ++++++++++ - 1 files changed, 10 insertions(+), 0 deletions(-) + gi/pygi-argument.c | 10 ++++++++++ + 1 Datei geändert, 10 Zeilen hinzugefügt(+) commit 0f1eb9fa0e7aa5e7c22dabc709c0dfb469e404f1 Author: Timo Vanwynsberghe -Date: Tue Oct 4 11:13:43 2011 +0200 +Date: Tue Oct 4 11:13:43 2011 +0200 Allow GBoxed types as property @@ -1618,39 +1821,39 @@ Date: Tue Oct 4 11:13:43 2011 +0200 https://bugzilla.gnome.org/show_bug.cgi?id=660798 gi/_gobject/propertyhelper.py | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) + 1 Datei geändert, 3 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit bef8d385117dd0295c9ba7567710d76fc2bb729a Author: Ignacio Casal Quinteiro -Date: Mon Oct 10 11:24:42 2011 +0200 +Date: Mon Oct 10 11:24:42 2011 +0200 Add tests for boxed properties. tests/test_properties.py | 20 ++++++++++++++++++-- - 1 files changed, 18 insertions(+), 2 deletions(-) + 1 Datei geändert, 18 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit 77123ffeb1585837033848f4d5a90cfa63fdaee0 Author: Ignacio Casal Quinteiro -Date: Fri Sep 30 20:21:07 2011 +0200 +Date: Fri Sep 30 20:21:07 2011 +0200 Post release bump version configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit f5ccfec0a1bc4c999bfa49d75383ea06d3a068c4 Author: Ignacio Casal Quinteiro -Date: Fri Sep 30 20:19:46 2011 +0200 +Date: Fri Sep 30 20:19:46 2011 +0200 Release 3.0.1 - NEWS | 5 +++++ + NEWS | 5 +++++ configure.ac | 2 +- - 2 files changed, 6 insertions(+), 1 deletions(-) + 2 Dateien geändert, 6 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit 56ac9339eb1d6950623dc4d8c3b9972874e7fa86 Author: John (J5) Palmieri -Date: Thu Sep 22 19:03:20 2011 -0400 +Date: Thu Sep 22 19:03:20 2011 -0400 when checking instances union members are same type as parent @@ -1663,11 +1866,11 @@ Date: Thu Sep 22 19:03:20 2011 -0400 gi/pygi-marshal-from-py.c | 60 ++++++++++++++++++++++++++++++++++++++++++--- - 1 files changed, 56 insertions(+), 4 deletions(-) + 1 Datei geändert, 56 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-) commit 311a4f8035a95b41bc3c0a836c32b7a5bf2d9959 Author: John (J5) Palmieri -Date: Wed Sep 21 21:50:48 2011 -0400 +Date: Wed Sep 21 21:50:48 2011 -0400 add a floating flag to pygobjects @@ -1675,54 +1878,54 @@ Date: Wed Sep 21 21:50:48 2011 -0400 instantiated via g_object_new - gi/_gobject/gobjectmodule.c | 5 +++++ + gi/_gobject/gobjectmodule.c | 5 +++++ gi/_gobject/pygobject-private.h | 3 +++ - gi/_gobject/pygobject.c | 27 ++++++++++++++++++++++++++- - gi/_gobject/pygobject.h | 3 ++- - 4 files changed, 36 insertions(+), 2 deletions(-) + gi/_gobject/pygobject.c | 27 ++++++++++++++++++++++++++- + gi/_gobject/pygobject.h | 3 ++- + 4 Dateien geändert, 36 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit d2d29ae5845217254b9336fd8629f369cb119b25 Author: John (J5) Palmieri -Date: Wed Sep 21 21:13:22 2011 -0400 +Date: Wed Sep 21 21:13:22 2011 -0400 Revert "Fix refcount bug by not creating python wrapper during gobject init stage" This reverts commit f6fa5dd8f39af1b8a52d7600d257400b0983e8c5. - gi/_gobject/gobjectmodule.c | 32 +++++++++++++++++--------------- - 1 files changed, 17 insertions(+), 15 deletions(-) + gi/_gobject/gobjectmodule.c | 32 +++++++++++++++++--------------- + 1 Datei geändert, 17 Zeilen hinzugefügt(+), 15 Zeilen entfernt(-) commit a24c10b779f2a1b0425d56d03d59c393389cad98 Author: John (J5) Palmieri -Date: Wed Sep 21 21:10:00 2011 -0400 +Date: Wed Sep 21 21:10:00 2011 -0400 make sure to commit the NEWS file NEWS | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) + 1 Datei geändert, 4 Zeilen hinzugefügt(+) commit 2eed2940c9be099fb6305288d895265e6b35d3d2 Author: John (J5) Palmieri -Date: Mon Sep 19 13:19:57 2011 -0400 +Date: Mon Sep 19 13:19:57 2011 -0400 prep for 3.0 release configure.ac | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + 1 Datei geändert, 3 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-) commit fbd58b70c2c3c1128f95a87eb4cc8313b6a401b8 Author: John (J5) Palmieri -Date: Fri Sep 16 14:19:15 2011 -0400 +Date: Fri Sep 16 14:19:15 2011 -0400 up version required of gobject-introspection to 1.29.0 configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 225f21117b6b3546989abe22538c784291e86b2a Author: John (J5) Palmieri -Date: Fri Sep 16 12:26:10 2011 -0400 +Date: Fri Sep 16 12:26:10 2011 -0400 fix most warnings @@ -1731,62 +1934,62 @@ Date: Fri Sep 16 12:26:10 2011 -0400 * handle deprecated enums in switch statments by using default: * unused wanrings still remain in some places - gi/pygi-argument.c | 2 +- - gi/pygi-cache.c | 7 ++----- - gi/pygi-info.c | 6 ++++++ - gi/pygi-invoke.c | 2 +- + gi/pygi-argument.c | 2 +- + gi/pygi-cache.c | 7 ++----- + gi/pygi-info.c | 6 ++++++ + gi/pygi-invoke.c | 2 +- gi/pygi-marshal-from-py.c | 17 +++++++++-------- - gi/pygi-marshal-to-py.c | 3 +-- - 6 files changed, 20 insertions(+), 17 deletions(-) + gi/pygi-marshal-to-py.c | 3 +-- + 6 Dateien geändert, 20 Zeilen hinzugefügt(+), 17 Zeilen entfernt(-) commit 9a70f01288e1b049206d25d67938907f1b38a490 Author: John (J5) Palmieri -Date: Fri Sep 16 12:24:38 2011 -0400 +Date: Fri Sep 16 12:24:38 2011 -0400 post release bump configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 3ec4020205e909ee4400650434f9ae7b89c2bde8 Author: John (J5) Palmieri -Date: Thu Sep 15 18:12:01 2011 -0400 +Date: Thu Sep 15 18:12:01 2011 -0400 edit HACKING file to show correct tag format HACKING | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 2e864fd05bc0adf48df9f65ab72785ebb1d0d3f0 Author: John (J5) Palmieri -Date: Thu Sep 15 18:10:33 2011 -0400 +Date: Thu Sep 15 18:10:33 2011 -0400 update NEWS file to prep for release NEWS | 35 +++++++++++++++++++++++++++++++++++ - 1 files changed, 35 insertions(+), 0 deletions(-) + 1 Datei geändert, 35 Zeilen hinzugefügt(+) commit 0da687fa699aba4f42c42a924d6754e2bd47df50 Author: John (J5) Palmieri -Date: Thu Sep 15 17:59:31 2011 -0400 +Date: Thu Sep 15 17:59:31 2011 -0400 fix typo s/lenth/length - gi/overrides/Gtk.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + gi/overrides/Gtk.py | 2 +- + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 0e4861abaff64d8e7e8d1aeedf9dd1e80de8aab2 Author: John (J5) Palmieri -Date: Thu Sep 15 17:48:58 2011 -0400 +Date: Thu Sep 15 17:48:58 2011 -0400 fix typo in docstring gi/_gobject/propertyhelper.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit e7fcc326d64def610e5a1003cf6c7ca97023814d Author: John (J5) Palmieri -Date: Thu Sep 15 17:46:46 2011 -0400 +Date: Thu Sep 15 17:46:46 2011 -0400 do not pass in len(str) to the length argument of gtk_test_buffer_insert* apis @@ -1799,12 +2002,12 @@ Date: Thu Sep 15 17:46:46 2011 -0400 just set length to that. - gi/overrides/Gtk.py | 6 ++---- - 1 files changed, 2 insertions(+), 4 deletions(-) + gi/overrides/Gtk.py | 6 ++---- + 1 Datei geändert, 2 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-) commit 6f380153afb3390f7da9f4b8befb1c4ee224da17 Author: Dieter Verfaillie -Date: Mon Sep 12 21:07:20 2011 +0200 +Date: Mon Sep 12 21:07:20 2011 +0200 Switch tarball compression format to tar.xz only. @@ -1815,11 +2018,11 @@ Date: Mon Sep 12 21:07:20 2011 +0200 https://bugzilla.gnome.org/show_bug.cgi?id=659140 configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 11c45ac6dcb6ffad766d03bfc77f45a6d703a90d Author: Dieter Verfaillie -Date: Thu Sep 15 14:18:57 2011 +0200 +Date: Thu Sep 15 14:18:57 2011 +0200 Remove pygtk_version attribute from internal gi._gobject module. @@ -1829,13 +2032,13 @@ Date: Thu Sep 15 14:18:57 2011 +0200 https://bugzilla.gnome.org/show_bug.cgi?id=659142 - gi/_gobject/gobjectmodule.c | 4 ---- - gi/_gobject/pygobject.h | 2 -- - 2 files changed, 0 insertions(+), 6 deletions(-) + gi/_gobject/gobjectmodule.c | 4 ---- + gi/_gobject/pygobject.h | 2 -- + 2 Dateien geändert, 6 Zeilen entfernt(-) commit 7e48fd6dfd86b7082c3fd35d25d9693c56c9665a Author: John (J5) Palmieri -Date: Thu Sep 15 15:52:18 2011 -0400 +Date: Thu Sep 15 15:52:18 2011 -0400 remove overridesdir from the .pc file and add it to the gi module @@ -1845,16 +2048,16 @@ Date: Thu Sep 15 15:52:18 2011 -0400 * putting it into the module allows us to give the correct directory based on which version of python you run the script from * access the var as such: - import gi - installdir = gi._overridesdir + import gi + installdir = gi._overridesdir - gi/__init__.py | 2 ++ - pygobject-3.0.pc.in | 10 +++++++++- - 2 files changed, 11 insertions(+), 1 deletions(-) + gi/__init__.py | 2 ++ + pygobject-3.0.pc.in | 10 +++++++++- + 2 Dateien geändert, 11 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit beea7072a5a989be47a755ac46647380d4dbd6b4 Author: John (J5) Palmieri -Date: Thu Sep 15 00:11:09 2011 -0400 +Date: Thu Sep 15 00:11:09 2011 -0400 fix tests to correctly construct a dummy Gtk.TargetEntry @@ -1873,11 +2076,11 @@ Date: Thu Sep 15 00:11:09 2011 -0400 https://bugzilla.gnome.org/show_bug.cgi?id=627236 tests/test_overrides.py | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit 46ba7f04ef3df08e07ddda5c10f0c98bec5fa183 Author: John (J5) Palmieri -Date: Thu Sep 15 00:08:31 2011 -0400 +Date: Thu Sep 15 00:08:31 2011 -0400 we now assume that C arrays of structs are flat so memcpy them when marshalling @@ -1893,12 +2096,12 @@ Date: Thu Sep 15 00:08:31 2011 -0400 https://bugzilla.gnome.org/show_bug.cgi?id=627236 gi/pygi-marshal-from-py.c | 35 ++++++++++++++++++++++++++++++++--- - tests/test_gi.py | 29 +++++++++++++++++++++++++++++ - 2 files changed, 61 insertions(+), 3 deletions(-) + tests/test_gi.py | 29 +++++++++++++++++++++++++++++ + 2 Dateien geändert, 61 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-) commit e30a41592baa942188574e5c9f99572963e2e387 Author: John (J5) Palmieri -Date: Thu Sep 15 00:02:34 2011 -0400 +Date: Thu Sep 15 00:02:34 2011 -0400 only update the arg counts once if child arg comes before parent arg @@ -1920,11 +2123,11 @@ Date: Thu Sep 15 00:02:34 2011 -0400 gi/pygi-cache.c | 30 ++++++++++++++++++++---------- gi/pygi-cache.h | 9 +++++++-- - 2 files changed, 27 insertions(+), 12 deletions(-) + 2 Dateien geändert, 27 Zeilen hinzugefügt(+), 12 Zeilen entfernt(-) commit f6fa5dd8f39af1b8a52d7600d257400b0983e8c5 Author: John (J5) Palmieri -Date: Wed Sep 14 20:26:15 2011 -0400 +Date: Wed Sep 14 20:26:15 2011 -0400 Fix refcount bug by not creating python wrapper during gobject init stage @@ -1947,46 +2150,46 @@ Date: Wed Sep 14 20:26:15 2011 -0400 https://bugzilla.gnome.org/show_bug.cgi?id=657403 - gi/_gobject/gobjectmodule.c | 32 +++++++++++++++----------------- - 1 files changed, 15 insertions(+), 17 deletions(-) + gi/_gobject/gobjectmodule.c | 32 +++++++++++++++----------------- + 1 Datei geändert, 15 Zeilen hinzugefügt(+), 17 Zeilen entfernt(-) commit 61b64a65beee9011f8e4ed20f0a83e6630ba154f Author: John (J5) Palmieri -Date: Tue Sep 13 18:08:04 2011 -0400 +Date: Tue Sep 13 18:08:04 2011 -0400 don't destroy just created wrapper when object is created via g_object_new https://bugzilla.gnome.org/show_bug.cgi?id=657403 - gi/_gobject/gobjectmodule.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + gi/_gobject/gobjectmodule.c | 2 +- + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 93e12cc2eb7e7f2c18971da86e9c9452d3f566b7 Author: Steve Frécinaux -Date: Fri Aug 26 11:22:09 2011 +0200 +Date: Fri Aug 26 11:22:09 2011 +0200 Remove deprecated API from pygobject.h https://bugzilla.gnome.org/show_bug.cgi?id=657416 gi/_gobject/pygobject.h | 19 +------------------ - 1 files changed, 1 insertions(+), 18 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 18 Zeilen entfernt(-) commit e1c71092af6e2cffa36248519adfceac1874051d Author: Marcin Owsiany -Date: Wed Aug 31 09:43:28 2011 +0100 +Date: Wed Aug 31 09:43:28 2011 +0100 Convert gtk.TRUE/FALSE to Python True/False. https://bugzilla.gnome.org/show_bug.cgi?id=657785 pygi-convert.sh | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+) commit 3ace5c2e2268285a5dcb39889fcb2a71bc1063bd Author: Steve Frécinaux -Date: Fri Sep 2 08:37:15 2011 +0200 +Date: Fri Sep 2 08:37:15 2011 +0200 Drop legacy __gobject_init__ method of GObject.Object. @@ -1996,13 +2199,13 @@ Date: Fri Sep 2 08:37:15 2011 +0200 https://bugzilla.gnome.org/show_bug.cgi?id=658032 - examples/signal.py | 2 -- + examples/signal.py | 2 -- gi/_gobject/pygobject.c | 11 ----------- - 2 files changed, 0 insertions(+), 13 deletions(-) + 2 Dateien geändert, 13 Zeilen entfernt(-) commit fcd457d1d1d8a813acb2ebfe5ee0e9aab2c9c88c Author: Dieter Verfaillie -Date: Tue Sep 13 12:05:30 2011 +0200 +Date: Tue Sep 13 12:05:30 2011 +0200 AM_CHECK_PYTHON_LIBS does not work for lib64 @@ -2011,35 +2214,35 @@ Date: Tue Sep 13 12:05:30 2011 +0200 https://bugzilla.gnome.org/show_bug.cgi?id=658856 - configure.ac | 4 +++- - gi/Makefile.am | 9 ++++++--- - gi/_glib/Makefile.am | 10 ++++++++-- + configure.ac | 4 +++- + gi/Makefile.am | 9 ++++++--- + gi/_glib/Makefile.am | 10 ++++++++-- gi/_gobject/Makefile.am | 8 +++++++- - 4 files changed, 24 insertions(+), 7 deletions(-) + 4 Dateien geändert, 24 Zeilen hinzugefügt(+), 7 Zeilen entfernt(-) commit 863c087911203a8f3ebaa8e77622a3437a7cd320 Author: Dieter Verfaillie -Date: Mon Sep 12 23:03:05 2011 +0200 +Date: Mon Sep 12 23:03:05 2011 +0200 Remove common_ldflags from Makefile.am as it is no longer used. https://bugzilla.gnome.org/show_bug.cgi?id=658856 - Makefile.am | 6 ------ - 1 files changed, 0 insertions(+), 6 deletions(-) + Makefile.am | 6 ------ + 1 Datei geändert, 6 Zeilen entfernt(-) commit 24b920f9922e367bdb8b3e56c2f61e0c8f5cdb66 Author: John (J5) Palmieri -Date: Tue Sep 13 16:20:48 2011 -0400 +Date: Tue Sep 13 16:20:48 2011 -0400 cast params for PyObject_IsInstance to suppress warnings gi/_gobject/pygobject-private.h | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit 861369ec59b17f67151813dc2e87c6e86126b954 Author: John (J5) Palmieri -Date: Tue Sep 13 16:04:31 2011 -0400 +Date: Tue Sep 13 16:04:31 2011 -0400 check if object is actually a PyGFlag before trying to access g_type @@ -2052,21 +2255,21 @@ Date: Tue Sep 13 16:04:31 2011 -0400 memory beyond the bounds of the actual structure passed in gi/_gobject/pygobject-private.h | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit eea93e89fb064253bd8903c8b453daf4b3c87c2c Author: John (J5) Palmieri -Date: Tue Sep 13 16:03:02 2011 -0400 +Date: Tue Sep 13 16:03:02 2011 -0400 fix regression - add instance type checks since Py3 no longer does this for us gi/pygi-marshal-from-py.c | 21 +++++++++++++++++++-- - 1 files changed, 19 insertions(+), 2 deletions(-) + 1 Datei geändert, 19 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit a4e4318b50a24a688e32579273fbcfa51d1b422a Author: John (J5) Palmieri -Date: Fri Sep 2 18:39:51 2011 -0400 +Date: Fri Sep 2 18:39:51 2011 -0400 refactor in/out marshalling to be to_py/from_py @@ -2082,36 +2285,37 @@ Date: Fri Sep 2 18:39:51 2011 -0400 https://bugzilla.gnome.org/show_bug.cgi?id=658362 - gi/Makefile.am | 8 +- - gi/pygi-cache.c | 673 +++++++++++----------- - gi/pygi-cache.h | 62 ++- - gi/pygi-invoke.c | 144 +++--- + gi/Makefile.am | 8 +- + gi/pygi-cache.c | 673 ++++++++++----------- + gi/pygi-cache.h | 62 +- + gi/pygi-invoke.c | 144 ++--- gi/pygi-marshal-cleanup.c | 168 +++--- gi/pygi-marshal-cleanup.h | 128 ++-- gi/pygi-marshal-from-py.c | 1412 +++++++++++++++++++++++++++++++++++++++++++++ gi/pygi-marshal-from-py.h | 186 ++++++ - gi/pygi-marshal-in.c | 1412 + gi/pygi-marshal-in.c | 1412 --------------------------------------------- - gi/pygi-marshal-in.h | 186 ------ - gi/pygi-marshal-out.c | 768 ------------------------ - gi/pygi-marshal-out.h | 144 ----- + gi/pygi-marshal-in.h | 186 ------ + gi/pygi-marshal-out.c | 768 ------------------------ + gi/pygi-marshal-out.h | 144 ----- gi/pygi-marshal-to-py.c | 768 ++++++++++++++++++++++++ gi/pygi-marshal-to-py.h | 144 +++++ - 14 files changed, 3122 insertions(+), 3081 deletions(-) + 14 Dateien geändert, 3122 Zeilen hinzugefügt(+), 3081 Zeilen + entfernt(-) commit 45b0fcff9e948c65a3903c32a3957802034c5e47 Author: Dieter Verfaillie -Date: Fri Sep 9 16:50:25 2011 +0200 +Date: Fri Sep 9 16:50:25 2011 +0200 Examples: fix cairo-demo.py imports examples/cairo-demo.py | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + 1 Datei geändert, 3 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-) commit 3ca19fc13e6024fd04851e6f269020a92b09fa17 Author: Dieter Verfaillie -Date: Fri Sep 9 15:08:27 2011 +0200 +Date: Fri Sep 9 15:08:27 2011 +0200 Fix paths and add missing overridesdir variable used in uninstalled pkgconfig file @@ -2119,65 +2323,65 @@ Date: Fri Sep 9 15:08:27 2011 +0200 https://bugzilla.gnome.org/show_bug.cgi?id=658654 pygobject-3.0-uninstalled.pc.in | 14 +++++++------- - 1 files changed, 7 insertions(+), 7 deletions(-) + 1 Datei geändert, 7 Zeilen hinzugefügt(+), 7 Zeilen entfernt(-) commit 6e773175b9d2f46b3df5075ec952a8c5aff3c607 Author: Dieter Verfaillie -Date: Fri Sep 9 15:08:04 2011 +0200 +Date: Fri Sep 9 15:08:04 2011 +0200 Remove no longer used variables from pkgconfig files https://bugzilla.gnome.org/show_bug.cgi?id=658654 pygobject-3.0-uninstalled.pc.in | 6 ------ - pygobject-3.0.pc.in | 5 +---- - 2 files changed, 1 insertions(+), 10 deletions(-) + pygobject-3.0.pc.in | 5 +---- + 2 Dateien geändert, 1 Zeile hinzugefügt(+), 10 Zeilen entfernt(-) commit 81d388780311311d8dc4a027a59d114edf9a00fc Author: Dieter Verfaillie -Date: Fri Sep 9 14:57:58 2011 +0200 +Date: Fri Sep 9 14:57:58 2011 +0200 docs/Makefile.am and m4/python.m4: Python3 portability fixes https://bugzilla.gnome.org/show_bug.cgi?id=658652 docs/Makefile.am | 2 +- - m4/python.m4 | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) + m4/python.m4 | 2 +- + 2 Dateien geändert, 2 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit 7e692ee061406e48e4862b98a0829650b1d6d585 Author: Dieter Verfaillie -Date: Fri Sep 9 14:57:46 2011 +0200 +Date: Fri Sep 9 14:57:46 2011 +0200 Refactor and clean Makefile.am files https://bugzilla.gnome.org/show_bug.cgi?id=658652 - Makefile.am | 2 - - gi/Makefile.am | 81 ++++++++++++++++++++++-------------- - gi/_glib/Makefile.am | 100 + Makefile.am | 2 - + gi/Makefile.am | 81 ++++++++++++++++++++++-------------- + gi/_glib/Makefile.am | 100 +++++++++++++++++++++++++++++---------------- gi/_gobject/Makefile.am | 85 ++++++++++++++++++++------------------ - gi/overrides/Makefile.am | 4 +- - gi/repository/Makefile.am | 4 +- - 6 files changed, 162 insertions(+), 114 deletions(-) + gi/overrides/Makefile.am | 4 +- + gi/repository/Makefile.am | 4 +- + 6 Dateien geändert, 162 Zeilen hinzugefügt(+), 114 Zeilen entfernt(-) commit 3dd59b07d1f4a93ee1f65d6a64e1afb6f5e84232 Author: Dieter Verfaillie -Date: Fri Sep 9 14:57:36 2011 +0200 +Date: Fri Sep 9 14:57:36 2011 +0200 Remove all PLATFORM_VERSION = 2.0 traces https://bugzilla.gnome.org/show_bug.cgi?id=658652 - gi/Makefile.am | 2 -- - gi/overrides/Makefile.am | 1 - - gi/repository/Makefile.am | 1 - - 3 files changed, 0 insertions(+), 4 deletions(-) + gi/Makefile.am | 2 -- + gi/overrides/Makefile.am | 1 - + gi/repository/Makefile.am | 1 - + 3 Dateien geändert, 4 Zeilen entfernt(-) commit db1e484bfa157967de55ee2e0e18a82b8e388b61 Author: Dieter Verfaillie -Date: Fri Sep 9 14:57:25 2011 +0200 +Date: Fri Sep 9 14:57:25 2011 +0200 Remove gi/tests/ directory as all the tests now live in tests/ @@ -2185,25 +2389,25 @@ Date: Fri Sep 9 14:57:25 2011 +0200 gi/tests/Makefile.am | 24 ------------------------ gi/tests/runtests.py | 21 --------------------- - 2 files changed, 0 insertions(+), 45 deletions(-) + 2 Dateien geändert, 45 Zeilen entfernt(-) commit b0ecbf00138ef1147e478ebf3c66f0e9b3f85dfc Author: Dieter Verfaillie -Date: Fri Sep 9 14:55:25 2011 +0200 +Date: Fri Sep 9 14:55:25 2011 +0200 autogen.sh: Use autoreconf instead of a custom script and honor ACLOCAL_FLAGS https://bugzilla.gnome.org/show_bug.cgi?id=658652 - Makefile.am | 2 +- - autogen.sh | 95 + Makefile.am | 2 +- + autogen.sh | 95 +++++++---------------------------------------------------- - 2 files changed, 12 insertions(+), 85 deletions(-) + 2 Dateien geändert, 12 Zeilen hinzugefügt(+), 85 Zeilen entfernt(-) commit 4671f5397003f376f00830e3fd1c214de594619f Author: Dieter Verfaillie -Date: Fri Sep 9 14:55:01 2011 +0200 +Date: Fri Sep 9 14:55:01 2011 +0200 use improved python.m4 macros to search for Python headers and libs @@ -2211,11 +2415,11 @@ Date: Fri Sep 9 14:55:01 2011 +0200 configure.ac | 3 ++- m4/python.m4 | 47 +++++++++++++++++++++++++++++++++++++---------- - 2 files changed, 39 insertions(+), 11 deletions(-) + 2 Dateien geändert, 39 Zeilen hinzugefügt(+), 11 Zeilen entfernt(-) commit 2c9fd09da196d35db968bff4ae63fcce2d891e69 Author: Javier Jardón -Date: Fri Sep 9 15:38:22 2011 +0100 +Date: Fri Sep 9 15:38:22 2011 +0100 Make maintiner mode enabled by default @@ -2223,11 +2427,11 @@ Date: Fri Sep 9 15:38:22 2011 +0100 http://blogs.gnome.org/desrt/2011/09/08/am_maintainer_mode-is-not-cool/ configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit b24dcb415406668931e02a1f669ef9861bb3a660 Author: Dieter Verfaillie -Date: Wed Aug 24 09:58:10 2011 +0200 +Date: Wed Aug 24 09:58:10 2011 +0200 Disable documentation for now since they are completely wrong for GI. @@ -2235,22 +2439,22 @@ Date: Wed Aug 24 09:58:10 2011 +0200 Makefile.am | 2 +- configure.ac | 25 ------------------------- - 2 files changed, 1 insertions(+), 26 deletions(-) + 2 Dateien geändert, 1 Zeile hinzugefügt(+), 26 Zeilen entfernt(-) commit ecea2358a379c8ff44dff2f8f9c30a9092af1681 Author: Dieter Verfaillie -Date: Wed Sep 7 10:38:28 2011 +0200 +Date: Wed Sep 7 10:38:28 2011 +0200 Fix documentation installation directory https://bugzilla.gnome.org/show_bug.cgi?id=657054 docs/Makefile.am | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) + 1 Datei geändert, 3 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit 8d3125c8ce9890c70400dd8a3ac273b590fe6a31 Author: Dieter Verfaillie -Date: Tue Sep 6 22:22:11 2011 +0200 +Date: Tue Sep 6 22:22:11 2011 +0200 Remove distutils based build system. @@ -2261,18 +2465,18 @@ Date: Tue Sep 6 22:22:11 2011 +0200 https://bugzilla.gnome.org/show_bug.cgi?id=657054 - MANIFEST.in | 7 - - Makefile.am | 25 +-- - README.win32 | 21 -- - dsextras.py | 509 + MANIFEST.in | 7 - + Makefile.am | 25 +-- + README.win32 | 21 -- + dsextras.py | 509 ---------------------------------------------- pygobject_postinstall.py | 9 - - setup.py | 351 -------------------------------- - 6 files changed, 7 insertions(+), 915 deletions(-) + setup.py | 351 -------------------------------- + 6 Dateien geändert, 7 Zeilen hinzugefügt(+), 915 Zeilen entfernt(-) commit b82d916635aa0b732840548088a3fcfcb2e41bc4 Author: Dieter Verfaillie -Date: Wed Sep 7 10:40:36 2011 +0200 +Date: Wed Sep 7 10:40:36 2011 +0200 [gtk-demo] Fix syntax highlighter encoding issue @@ -2287,22 +2491,22 @@ Date: Wed Sep 7 10:40:36 2011 +0200 selecting the rotated text demo in the treeview. - demos/gtk-demo/gtk-demo.py | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) + demos/gtk-demo/gtk-demo.py | 3 +++ + 1 Datei geändert, 3 Zeilen hinzugefügt(+) commit 31db3ed3d233bd495c3a2f99b3fa51031bfa30c6 Author: Ignacio Casal Quinteiro -Date: Tue Sep 6 22:13:54 2011 +0200 +Date: Tue Sep 6 22:13:54 2011 +0200 overrides: add constants for atoms - gi/overrides/Gdk.py | 49 + gi/overrides/Gdk.py | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 49 insertions(+), 0 deletions(-) + 1 Datei geändert, 49 Zeilen hinzugefügt(+) commit 81861bc2d664eb38d46e5c38ff755d436f040f63 Author: Steve Frécinaux -Date: Wed Aug 31 14:18:56 2011 +0200 +Date: Wed Aug 31 14:18:56 2011 +0200 Drop pygobject_construct() from public API. @@ -2319,33 +2523,33 @@ Date: Wed Aug 31 14:18:56 2011 +0200 https://bugzilla.gnome.org/show_bug.cgi?id=657814 - gi/_gobject/gobjectmodule.c | 118 + gi/_gobject/gobjectmodule.c | 118 +++++++++------------------------------ gi/_gobject/pygobject-private.h | 3 - - gi/_gobject/pygobject.h | 8 --- - 3 files changed, 26 insertions(+), 103 deletions(-) + gi/_gobject/pygobject.h | 8 --- + 3 Dateien geändert, 26 Zeilen hinzugefügt(+), 103 Zeilen entfernt(-) commit c4c55a98ccf9e39ed0d10ed49b66a76dc7d7c509 Author: Ignacio Casal Quinteiro -Date: Wed Aug 31 18:00:44 2011 +0200 +Date: Wed Aug 31 18:00:44 2011 +0200 post release version bump configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit ac5a0f46242abdd3cd98ec5f9f2bf8e5b05f3845 Author: Ignacio Casal Quinteiro -Date: Wed Aug 31 17:58:37 2011 +0200 +Date: Wed Aug 31 17:58:37 2011 +0200 Release 2.90.3 NEWS | 12 ++++++++++++ - 1 files changed, 12 insertions(+), 0 deletions(-) + 1 Datei geändert, 12 Zeilen hinzugefügt(+) commit 429569abddada5a3bad554de707ddf35b349936e Author: John (J5) Palmieri -Date: Thu Aug 25 13:57:53 2011 -0400 +Date: Thu Aug 25 13:57:53 2011 -0400 support skip annotation for return values @@ -2356,25 +2560,25 @@ Date: Thu Aug 25 13:57:53 2011 -0400 full https://bugzilla.gnome.org/show_bug.cgi?id=650135 - gi/pygi-cache.c | 1 + - gi/pygi-cache.h | 1 + - gi/pygi-invoke.c | 48 - ++++++++++++++++++++++++++++----------------- - tests/test_everything.py | 8 +++++++ - 4 files changed, 40 insertions(+), 18 deletions(-) + gi/pygi-cache.c | 1 + + gi/pygi-cache.h | 1 + + gi/pygi-invoke.c | 48 + +++++++++++++++++++++++++++++----------------- + tests/test_everything.py | 8 ++++++++ + 4 Dateien geändert, 40 Zeilen hinzugefügt(+), 18 Zeilen entfernt(-) commit 7a234b185b131f3eb6a6e8a8c717ddf4d508b15e Author: Xavier Claessens -Date: Tue Aug 2 12:05:12 2011 +0200 +Date: Tue Aug 2 12:05:12 2011 +0200 Test GPtrArray regression tests/test_everything.py | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) + 1 Datei geändert, 3 Zeilen hinzugefügt(+) commit 42fc9fa437102c882844a0e70a081ab08de92658 Author: Steve Frécinaux -Date: Fri Aug 26 10:53:43 2011 +0200 +Date: Fri Aug 26 10:53:43 2011 +0200 Drop support for old constructor style. @@ -2384,18 +2588,18 @@ Date: Fri Aug 26 10:53:43 2011 +0200 https://bugzilla.gnome.org/show_bug.cgi?id=657413 - gi/_gobject/gobjectmodule.c | 20 -------------------- + gi/_gobject/gobjectmodule.c | 20 -------------------- gi/_gobject/pygobject-private.h | 1 - - gi/_gobject/pygobject.c | 1 - - gi/_gobject/pygobject.h | 2 -- - gi/gimodule.c | 28 ---------------------------- - gi/types.py | 2 -- - tests/testhelpermodule.c | 5 ----- - 7 files changed, 0 insertions(+), 59 deletions(-) + gi/_gobject/pygobject.c | 1 - + gi/_gobject/pygobject.h | 2 -- + gi/gimodule.c | 28 ---------------------------- + gi/types.py | 2 -- + tests/testhelpermodule.c | 5 ----- + 7 Dateien geändert, 59 Zeilen entfernt(-) commit 3961a405e1bddef22e1a5a0c7aa3ae55e4ec09ad Author: Steve Frécinaux -Date: Fri Aug 26 10:45:59 2011 +0200 +Date: Fri Aug 26 10:45:59 2011 +0200 Drop support for sink functions. @@ -2404,19 +2608,19 @@ Date: Fri Aug 26 10:45:59 2011 +0200 https://bugzilla.gnome.org/show_bug.cgi?id=642233 - gi/_gobject/gobjectmodule.c | 1 - - gi/_gobject/pygobject.c | 53 -------------------------------------- - gi/_gobject/pygobject.h | 4 --- - tests/test-floating.c | 59 - ++++++------------------------------------ - tests/test-floating.h | 42 ++++++++---------------------- - tests/test_gobject.py | 13 ++------- - tests/testhelpermodule.c | 32 ++++++---------------- - 7 files changed, 32 insertions(+), 172 deletions(-) + gi/_gobject/gobjectmodule.c | 1 - + gi/_gobject/pygobject.c | 53 -------------------------------------- + gi/_gobject/pygobject.h | 4 --- + tests/test-floating.c | 59 + +++++++------------------------------------ + tests/test-floating.h | 42 ++++++++---------------------- + tests/test_gobject.py | 13 +++------- + tests/testhelpermodule.c | 32 +++++++---------------- + 7 Dateien geändert, 32 Zeilen hinzugefügt(+), 172 Zeilen entfernt(-) commit 631d8ef879a13492945a3e30b3df9863a4ba2f44 Author: Mike Gorse -Date: Wed Aug 24 17:30:09 2011 -0500 +Date: Wed Aug 24 17:30:09 2011 -0500 Reinstate copying of in-line structs in arrays @@ -2428,11 +2632,11 @@ Date: Wed Aug 24 17:30:09 2011 -0500 https://bugzilla.gnome.org/show_bug.cgi?id=657120 gi/pygi-marshal-out.c | 8 +++++++- - 1 files changed, 7 insertions(+), 1 deletions(-) + 1 Datei geändert, 7 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit f38511f251602e18551c04617cc2e2d42e812e1e Author: John (J5) Palmieri -Date: Tue Aug 23 14:18:43 2011 -0400 +Date: Tue Aug 23 14:18:43 2011 -0400 fix inline struct array handling @@ -2446,49 +2650,49 @@ Date: Tue Aug 23 14:18:43 2011 -0400 gi/pygi-marshal-out.c | 23 +++++++++-------------- tests/test_gi.py | 8 ++++++++ - 2 files changed, 17 insertions(+), 14 deletions(-) + 2 Dateien geändert, 17 Zeilen hinzugefügt(+), 14 Zeilen entfernt(-) commit d92846a5446b0dd2e69c813f56224a1966ab1a33 Author: Dieter Verfaillie -Date: Tue Aug 23 11:30:41 2011 +0200 +Date: Tue Aug 23 11:30:41 2011 +0200 [gtk-demo] printing.py: set print and error dialog transient parent demos/gtk-demo/demos/printing.py | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) + 1 Datei geändert, 4 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-) commit 1aebc1565752840075027b9452fe2a67217bf53b Author: Dieter Verfaillie -Date: Tue Aug 23 11:28:05 2011 +0200 +Date: Tue Aug 23 11:28:05 2011 +0200 [gtk-demo] printing.py: exit Gtk mainloop when done and correctly handle printing errors demos/gtk-demo/demos/printing.py | 14 ++++++++++---- - 1 files changed, 10 insertions(+), 4 deletions(-) + 1 Datei geändert, 10 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-) commit 1f9e4486c5b84209ce0038887738fc16a4ef7da3 Author: Dieter Verfaillie -Date: Tue Aug 23 08:05:43 2011 +0200 +Date: Tue Aug 23 08:05:43 2011 +0200 [gtk-demo] show "activated" demo's in italic font in the TreeView - demos/gtk-demo/gtk-demo.py | 7 +++++-- - 1 files changed, 5 insertions(+), 2 deletions(-) + demos/gtk-demo/gtk-demo.py | 7 +++++-- + 1 Datei geändert, 5 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit 971d063f7a36e13ef6621db7002b00af52f6292a Author: Dieter Verfaillie -Date: Mon Aug 22 14:52:28 2011 +0200 +Date: Mon Aug 22 14:52:28 2011 +0200 [gtk-demo] source colorizer: Python3 does not have the BACKQUOTE token, so simply remove it - demos/gtk-demo/gtk-demo.py | 5 +---- - 1 files changed, 1 insertions(+), 4 deletions(-) + demos/gtk-demo/gtk-demo.py | 5 +---- + 1 Datei geändert, 1 Zeile hinzugefügt(+), 4 Zeilen entfernt(-) commit c2979a37d6d505095b6e55789150a6498d95819d Author: Dieter Verfaillie -Date: Mon Aug 22 14:22:18 2011 +0200 +Date: Mon Aug 22 14:22:18 2011 +0200 [gtk-demo] In Python3, GLib.file_get_contents returns a bytes object but Gtk.TextBuffer.insert expects a string. @@ -2498,183 +2702,183 @@ Date: Mon Aug 22 14:22:18 2011 +0200 section "If pre-2.6 compatibility is needed" (because configure.ac is still happy with Python 2.5.2). - demos/gtk-demo/gtk-demo.py | 6 +++++- - 1 files changed, 5 insertions(+), 1 deletions(-) + demos/gtk-demo/gtk-demo.py | 6 +++++- + 1 Datei geändert, 5 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit 9ea56535f35abbea4cd977dea4c89247e4b01694 Author: Dieter Verfaillie -Date: Mon Aug 22 12:30:24 2011 +0200 +Date: Mon Aug 22 12:30:24 2011 +0200 [gtk-demo] images.py: fix 'Insensitive 'button mnenomic demos/gtk-demo/demos/images.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 7829dae1cdb8697a19c2b5e158ef0e08f6c2558b Author: Dieter Verfaillie -Date: Mon Aug 22 10:38:04 2011 +0200 +Date: Mon Aug 22 10:38:04 2011 +0200 [gtk-demo] printing.py: fix Pango.EllipsizeType > Pango.EllipsizeMode & get_pixel_size demos/gtk-demo/demos/printing.py | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit 07f0274301d77d9bf62b49a14b059d9a52afb445 Author: Dieter Verfaillie -Date: Mon Aug 22 10:37:08 2011 +0200 +Date: Mon Aug 22 10:37:08 2011 +0200 [gtk-demo] printing.py: fix text file loading demos/gtk-demo/demos/printing.py | 32 ++++++++++++++++---------------- - 1 files changed, 16 insertions(+), 16 deletions(-) + 1 Datei geändert, 16 Zeilen hinzugefügt(+), 16 Zeilen entfernt(-) commit 135148a4c35aac1d132b0b8fa3adbf1fdcdb3a24 Author: Dieter Verfaillie -Date: Mon Aug 22 10:20:35 2011 +0200 +Date: Mon Aug 22 10:20:35 2011 +0200 [gtk-demo] pixbuf.py: fix image loading demos/gtk-demo/demos/pixbuf.py | 25 +++++++++++-------------- - 1 files changed, 11 insertions(+), 14 deletions(-) + 1 Datei geändert, 11 Zeilen hinzugefügt(+), 14 Zeilen entfernt(-) commit a93cae2c80e30a408f86e7e6c4d15a538011a189 Author: Dieter Verfaillie -Date: Mon Aug 22 10:10:02 2011 +0200 +Date: Mon Aug 22 10:10:02 2011 +0200 [gtk-demo] images.py: fix logo loading demos/gtk-demo/demos/images.py | 70 - ++++++++++++++++----------------------- - 1 files changed, 29 insertions(+), 41 deletions(-) + +++++++++++++++++----------------------- + 1 Datei geändert, 29 Zeilen hinzugefügt(+), 41 Zeilen entfernt(-) commit eddc0824e0e4c156fca5de05bdeb600c534d4b24 Author: Dieter Verfaillie -Date: Wed Aug 24 12:19:21 2011 +0200 +Date: Wed Aug 24 12:19:21 2011 +0200 [gtk-demo] appwindow.py: set AboutDialog parent - demos/gtk-demo/demos/appwindow.py | 7 +++---- - 1 files changed, 3 insertions(+), 4 deletions(-) + demos/gtk-demo/demos/appwindow.py | 7 +++---- + 1 Datei geändert, 3 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-) commit 7fe10a5b33148b1f029f3d34f76b7f880c1c2e7a Author: Dieter Verfaillie -Date: Mon Aug 22 07:58:25 2011 +0200 +Date: Mon Aug 22 07:58:25 2011 +0200 [gtk-demo] appwindow.py: fix logo loading demos/gtk-demo/demos/appwindow.py | 10 +++------- - 1 files changed, 3 insertions(+), 7 deletions(-) + 1 Datei geändert, 3 Zeilen hinzugefügt(+), 7 Zeilen entfernt(-) commit 62fda288c1c37167c589e8e9d49ed625f770a98a Author: Dieter Verfaillie -Date: Mon Aug 22 07:57:31 2011 +0200 +Date: Mon Aug 22 07:57:31 2011 +0200 [gtk-demo] appwindow.py: fix callback signatures - demos/gtk-demo/demos/appwindow.py | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + demos/gtk-demo/demos/appwindow.py | 6 +++--- + 1 Datei geändert, 3 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-) commit 87e9ab4d3a0aac4f4710aa0f8af0a1736f781ad9 Author: Dieter Verfaillie -Date: Mon Aug 22 07:48:28 2011 +0200 +Date: Mon Aug 22 07:48:28 2011 +0200 [gtk-demo] fix glib vs GLib usage demos/gtk-demo/demos/Icon View/iconviewbasics.py | 2 +- - demos/gtk-demo/demos/appwindow.py | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) + demos/gtk-demo/demos/appwindow.py | 2 +- + 2 Dateien geändert, 2 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit d29cad6976a80862e1fc590d3e7d190e8a234866 Author: Dieter Verfaillie -Date: Wed Aug 24 12:19:02 2011 +0200 +Date: Wed Aug 24 12:19:02 2011 +0200 [gtk-demo] iconviewedit.py: fix for Gdk.color_parse API breakage caused by improved GDK overrides demos/gtk-demo/demos/Icon View/iconviewedit.py | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + 1 Datei geändert, 3 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-) commit f29d3a85a275a39e8481484779264b0dea1160ab Author: Dieter Verfaillie -Date: Mon Aug 22 07:25:32 2011 +0200 +Date: Mon Aug 22 07:25:32 2011 +0200 [gtk-demo] optimize source colorizer by only preparing iters for known colorized tokens - demos/gtk-demo/gtk-demo.py | 20 +++++++++++++++----- - 1 files changed, 15 insertions(+), 5 deletions(-) + demos/gtk-demo/gtk-demo.py | 20 +++++++++++++++----- + 1 Datei geändert, 15 Zeilen hinzugefügt(+), 5 Zeilen entfernt(-) commit ecd1eb00b19733da3f2e3d7935792378f34cab19 Author: Dieter Verfaillie -Date: Fri Aug 19 18:31:20 2011 +0200 +Date: Fri Aug 19 18:31:20 2011 +0200 [gtk-demo] small formatting fixes - demos/gtk-demo/demos/Entry/entry_buffer.py | 1 + + demos/gtk-demo/demos/Entry/entry_buffer.py | 1 + demos/gtk-demo/demos/Entry/entry_completion.py | 1 + demos/gtk-demo/demos/Icon View/iconviewbasics.py | 8 ++++---- - demos/gtk-demo/demos/assistant.py | 1 + - demos/gtk-demo/demos/builder.py | 4 +++- - demos/gtk-demo/demos/button_box.py | 1 + - demos/gtk-demo/demos/clipboard.py | 1 + - demos/gtk-demo/demos/colorselector.py | 1 + - demos/gtk-demo/demos/combobox.py | 1 + - demos/gtk-demo/demos/drawingarea.py | 4 +++- - demos/gtk-demo/demos/test.py | 2 ++ - 11 files changed, 19 insertions(+), 6 deletions(-) + demos/gtk-demo/demos/assistant.py | 1 + + demos/gtk-demo/demos/builder.py | 4 +++- + demos/gtk-demo/demos/button_box.py | 1 + + demos/gtk-demo/demos/clipboard.py | 1 + + demos/gtk-demo/demos/colorselector.py | 1 + + demos/gtk-demo/demos/combobox.py | 1 + + demos/gtk-demo/demos/drawingarea.py | 4 +++- + demos/gtk-demo/demos/test.py | 2 ++ + 11 Dateien geändert, 19 Zeilen hinzugefügt(+), 6 Zeilen entfernt(-) commit c42cb4da399ff5732f4ca732b85134de796a60fa Author: Dieter Verfaillie -Date: Fri Aug 19 18:30:50 2011 +0200 +Date: Fri Aug 19 18:30:50 2011 +0200 [gtk-demo] remove "is_fully_bound" from demos - demos/gtk-demo/demos/Entry/entry_buffer.py | 2 -- + demos/gtk-demo/demos/Entry/entry_buffer.py | 2 -- demos/gtk-demo/demos/Entry/entry_completion.py | 2 -- - demos/gtk-demo/demos/appwindow.py | 3 --- - demos/gtk-demo/demos/assistant.py | 2 -- - demos/gtk-demo/demos/builder.py | 2 -- - demos/gtk-demo/demos/button_box.py | 2 -- - demos/gtk-demo/demos/clipboard.py | 2 -- - demos/gtk-demo/demos/colorselector.py | 2 -- - demos/gtk-demo/demos/combobox.py | 2 -- - demos/gtk-demo/demos/drawingarea.py | 2 -- - demos/gtk-demo/demos/test.py | 1 - - 11 files changed, 0 insertions(+), 22 deletions(-) + demos/gtk-demo/demos/appwindow.py | 3 --- + demos/gtk-demo/demos/assistant.py | 2 -- + demos/gtk-demo/demos/builder.py | 2 -- + demos/gtk-demo/demos/button_box.py | 2 -- + demos/gtk-demo/demos/clipboard.py | 2 -- + demos/gtk-demo/demos/colorselector.py | 2 -- + demos/gtk-demo/demos/combobox.py | 2 -- + demos/gtk-demo/demos/drawingarea.py | 2 -- + demos/gtk-demo/demos/test.py | 1 - + 11 Dateien geändert, 22 Zeilen entfernt(-) commit cad6a62c63f455f0b1315465a9cd71c0f02b12a5 Author: Dieter Verfaillie -Date: Fri Aug 19 18:26:31 2011 +0200 +Date: Fri Aug 19 18:26:31 2011 +0200 [gtk-demo] add source colorizer loosely based on PyGTK's pygtk-demo and GTK+'s gtk-demo code demos/gtk-demo/gtk-demo.py | 116 ++++++++++++++++++++++++++++++++++++++------ - 1 files changed, 101 insertions(+), 15 deletions(-) + 1 Datei geändert, 101 Zeilen hinzugefügt(+), 15 Zeilen entfernt(-) commit 250c36f4a8352ff1b31c1c85b156d3e803d4b8ef Author: Dieter Verfaillie -Date: Fri Aug 19 15:08:15 2011 +0200 +Date: Fri Aug 19 15:08:15 2011 +0200 [gtk-demo] remove C-isms - demos/gtk-demo/gtk-demo.py | 28 ++++++++++++++-------------- - 1 files changed, 14 insertions(+), 14 deletions(-) + demos/gtk-demo/gtk-demo.py | 28 ++++++++++++++-------------- + 1 Datei geändert, 14 Zeilen hinzugefügt(+), 14 Zeilen entfernt(-) commit cf35fe8e259e786d0fa21b08b1f5c64c9bb0a84e Author: Dieter Verfaillie -Date: Fri Aug 19 14:54:39 2011 +0200 +Date: Fri Aug 19 14:54:39 2011 +0200 [gtk-demo] fix text on info tab to be more like GTK+'s gtk-demo - demos/gtk-demo/gtk-demo.py | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + demos/gtk-demo/gtk-demo.py | 4 ++-- + 1 Datei geändert, 2 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit 241827208e25c72a990d8edd95a3b879470d6409 Author: Dieter Verfaillie -Date: Fri Aug 19 14:40:56 2011 +0200 +Date: Fri Aug 19 14:40:56 2011 +0200 [gtk-demo] remove duplicate storage of demos by only storing them in a TreeStore subclass @@ -2683,120 +2887,120 @@ Date: Fri Aug 19 14:40:56 2011 +0200 demo loading code into the Demo class demos/gtk-demo/gtk-demo.py | 151 - ++++++++++++++++++++----------------------- - 1 files changed, 70 insertions(+), 81 deletions(-) + ++++++++++++++++++++------------------------ + 1 Datei geändert, 70 Zeilen hinzugefügt(+), 81 Zeilen entfernt(-) commit 58797c355a08a35375988881a17958bb42ad54bb Author: Dieter Verfaillie -Date: Fri Aug 19 14:40:00 2011 +0200 +Date: Fri Aug 19 14:40:00 2011 +0200 [gtk-demo] make GtkDemoApp a Gtk.Window subclass and adapt main() to demonstrate the GLib.MainLoop - demos/gtk-demo/gtk-demo.py | 43 + demos/gtk-demo/gtk-demo.py | 43 ++++++++++++++++++++++++++----------------- - 1 files changed, 26 insertions(+), 17 deletions(-) + 1 Datei geändert, 26 Zeilen hinzugefügt(+), 17 Zeilen entfernt(-) commit 1e4fc1ea54527cff78f6c633db39e9a0bd3c64d2 Author: Dieter Verfaillie -Date: Fri Aug 19 11:46:17 2011 +0200 +Date: Fri Aug 19 11:46:17 2011 +0200 [gtk-demo] correctly load demo code when cwd != demos/gtk-demo/ - demos/gtk-demo/gtk-demo.py | 39 +++++++++++++++++++++++---------------- - 1 files changed, 23 insertions(+), 16 deletions(-) + demos/gtk-demo/gtk-demo.py | 39 +++++++++++++++++++++++---------------- + 1 Datei geändert, 23 Zeilen hinzugefügt(+), 16 Zeilen entfernt(-) commit 6ffc999fbd4c9990fb5bde53ddd46d139b53245e Author: Dieter Verfaillie -Date: Fri Aug 19 11:02:35 2011 +0200 +Date: Fri Aug 19 11:02:35 2011 +0200 [gtk-demo] drawingarea: fix labels - demos/gtk-demo/demos/drawingarea.py | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + demos/gtk-demo/demos/drawingarea.py | 4 ++-- + 1 Datei geändert, 2 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit 9fd3986affe11cbc5a816adcccdc56d0592f3618 Author: Dieter Verfaillie -Date: Fri Aug 19 09:57:31 2011 +0200 +Date: Fri Aug 19 09:57:31 2011 +0200 [gtk-demo] fix imports demos/gtk-demo/demos/Icon View/iconviewbasics.py | 6 ++++-- - demos/gtk-demo/demos/appwindow.py | 9 ++++++--- - demos/gtk-demo/gtk-demo.py | 8 ++++---- - 3 files changed, 14 insertions(+), 9 deletions(-) + demos/gtk-demo/demos/appwindow.py | 9 ++++++--- + demos/gtk-demo/gtk-demo.py | 8 ++++---- + 3 Dateien geändert, 14 Zeilen hinzugefügt(+), 9 Zeilen entfernt(-) commit 9f314babfdee3b82799e00ea003972b0bbe6a8d5 Author: Dieter Verfaillie -Date: Fri Aug 19 10:07:14 2011 +0200 +Date: Fri Aug 19 10:07:14 2011 +0200 [gtk-demo] fix shebang - demos/gtk-demo/gtk-demo.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + demos/gtk-demo/gtk-demo.py | 2 +- + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 01142060ae7d71a8a1f7d3e9bbc6f52e65f01c8d Author: Sebastian Pölsterl -Date: Fri Aug 19 12:27:04 2011 +0200 +Date: Fri Aug 19 12:27:04 2011 +0200 Added support for __setitem__ to TreeModel and support for slices to TreeModelRow https://bugzilla.gnome.org/show_bug.cgi?id=656891 - gi/overrides/Gtk.py | 26 +++++++++++++++++++- + gi/overrides/Gtk.py | 26 +++++++++++++++++++-- tests/test_overrides.py | 57 +++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 81 insertions(+), 2 deletions(-) + 2 Dateien geändert, 81 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit d6da96c65b2ed3cda238886990a624fbc31f6987 Author: Olav Vitters -Date: Wed Aug 24 16:31:12 2011 +0200 +Date: Wed Aug 24 16:31:12 2011 +0200 Convert ACCEL_* constants into Gtk.AccelFlags. pygi-convert.sh | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+) commit 0841d41698302abb5d987849a5874252564ed428 Author: Olav Vitters -Date: Wed Aug 24 16:22:17 2011 +0200 +Date: Wed Aug 24 16:22:17 2011 +0200 Convert TREE_VIEW_DROP_* constants into Gtk.TreeViewDropPosition pygi-convert.sh | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+) commit 37b0d0f9dc3d485829cae6e50da369fdea91a2d1 Author: John (J5) Palmieri -Date: Thu Aug 18 14:06:32 2011 -0400 +Date: Thu Aug 18 14:06:32 2011 -0400 post commit version bump configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit e51efc50835a14e0418cc27cc928c52d1aa6a3cf Author: John (J5) Palmieri -Date: Thu Aug 18 14:02:30 2011 -0400 +Date: Thu Aug 18 14:02:30 2011 -0400 release 2.90.2 NEWS | 10 ++++++++++ - 1 files changed, 10 insertions(+), 0 deletions(-) + 1 Datei geändert, 10 Zeilen hinzugefügt(+) commit 74c727b53fcf64f465ee77b5a1ea04a69ca90968 Author: John (J5) Palmieri -Date: Thu Aug 18 13:50:51 2011 -0400 +Date: Thu Aug 18 13:50:51 2011 -0400 remove tests that were removed from gi tests/test_gi.py | 11 ----------- - 1 files changed, 0 insertions(+), 11 deletions(-) + 1 Datei geändert, 11 Zeilen entfernt(-) commit 11ea24dd30d8eeca11c8433c6bd75b06e52ae1ef Author: John (J5) Palmieri -Date: Thu Aug 18 13:48:57 2011 -0400 +Date: Thu Aug 18 13:48:57 2011 -0400 don't calculate item_size using is_pointer @@ -2805,33 +3009,33 @@ Date: Thu Aug 18 13:48:57 2011 -0400 * disregaurd is_pointer when cacluating item sizes gi/pygi-info.c | 8 ++------ - 1 files changed, 2 insertions(+), 6 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+), 6 Zeilen entfernt(-) commit 493b4a21dd162d78cf572b548b58ba6a9ff22971 Author: Timo Vanwynsberghe -Date: Wed Jul 6 01:50:31 2011 +0200 +Date: Wed Jul 6 01:50:31 2011 +0200 Updated signal example to use GObject introspection https://bugzilla.gnome.org/show_bug.cgi?id=654162 - examples/signal.py | 9 ++++----- - 1 files changed, 4 insertions(+), 5 deletions(-) + examples/signal.py | 9 ++++----- + 1 Datei geändert, 4 Zeilen hinzugefügt(+), 5 Zeilen entfernt(-) commit 0332010e704e253380e993874eab9dd122e59a7e Author: Timo Vanwynsberghe -Date: Wed Jul 6 01:54:50 2011 +0200 +Date: Wed Jul 6 01:54:50 2011 +0200 Updated properties example to use GObject introspection https://bugzilla.gnome.org/show_bug.cgi?id=654162 examples/properties.py | 14 +++++++------- - 1 files changed, 7 insertions(+), 7 deletions(-) + 1 Datei geändert, 7 Zeilen hinzugefügt(+), 7 Zeilen entfernt(-) commit c39f4555ebd703651eca6f978ed9870655b737f0 Author: Martin Pitt -Date: Fri Aug 12 22:55:02 2011 +0200 +Date: Fri Aug 12 22:55:02 2011 +0200 Add override for GLib.Variant.split_signature() @@ -2841,95 +3045,95 @@ Date: Fri Aug 12 22:55:02 2011 +0200 generating introspection XML for exported DBus server objects. - gi/overrides/GLib.py | 50 + gi/overrides/GLib.py | 50 +++++++++++++++++++++++++++++++++++++++++++++++ - tests/test_overrides.py | 22 ++++++++++++++++++++ - 2 files changed, 72 insertions(+), 0 deletions(-) + tests/test_overrides.py | 22 +++++++++++++++++++++ + 2 Dateien geändert, 72 Zeilen hinzugefügt(+) commit 735f98d83c1c19df7457aa32a378e8c80cf2831f Author: Timo Vanwynsberghe -Date: Mon Aug 15 18:58:31 2011 +0200 +Date: Mon Aug 15 18:58:31 2011 +0200 [pygi-convert.sh] Handle the import of pygtk and require Gtk 3.0 https://bugzilla.gnome.org/show_bug.cgi?id=654001 pygi-convert.sh | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+) commit d0a96a0a75f2bc969522abce2d326ef440cf143a Author: Ignacio Casal Quinteiro -Date: Mon Aug 15 13:12:49 2011 +0200 +Date: Mon Aug 15 13:12:49 2011 +0200 Install pygobject.h again. This is needed by libpeas. - gi/_gobject/Makefile.am | 5 ++++- + gi/_gobject/Makefile.am | 5 ++++- pygobject-3.0-uninstalled.pc.in | 4 ++-- - pygobject-3.0.pc.in | 6 +++--- - 3 files changed, 9 insertions(+), 6 deletions(-) + pygobject-3.0.pc.in | 6 +++--- + 3 Dateien geändert, 9 Zeilen hinzugefügt(+), 6 Zeilen entfernt(-) commit 081dc2eb03b677eac9f08d3ad05deecc7c51554c Author: John (J5) Palmieri -Date: Sun Aug 14 11:20:15 2011 -0400 +Date: Sun Aug 14 11:20:15 2011 -0400 update the doap file pygobject.doap | 26 ++++++++++++++------------ - 1 files changed, 14 insertions(+), 12 deletions(-) + 1 Datei geändert, 14 Zeilen hinzugefügt(+), 12 Zeilen entfernt(-) commit 762a36d2343bc39a502507d600fd1b9db9649dae Author: John (J5) Palmieri -Date: Sun Aug 14 11:13:25 2011 -0400 +Date: Sun Aug 14 11:13:25 2011 -0400 prerelease bump configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit d3f85a61ec4b1a1d04838f73dc8d862258150048 Author: John (J5) Palmieri -Date: Sun Aug 14 10:13:37 2011 -0400 +Date: Sun Aug 14 10:13:37 2011 -0400 get things ready for release NEWS | 194 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 194 insertions(+), 0 deletions(-) + 1 Datei geändert, 194 Zeilen hinzugefügt(+) commit ffd057649380d4249c1c52e1225e3646f3994bc6 Author: John (J5) Palmieri -Date: Sun Aug 14 05:26:18 2011 -0400 +Date: Sun Aug 14 05:26:18 2011 -0400 pass exta keywords to the Box constructor - gi/overrides/Gtk.py | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + gi/overrides/Gtk.py | 4 ++-- + 1 Datei geändert, 2 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit cadbd4142bd0045368b5123d4b0a1876bdd5d798 Author: John (J5) Palmieri -Date: Sat Aug 13 11:03:07 2011 -0400 +Date: Sat Aug 13 11:03:07 2011 -0400 add (Tree|List)Store set method override - gi/overrides/Gtk.py | 50 +++++++++++++++++++++++ + gi/overrides/Gtk.py | 50 +++++++++++++++++++++++ tests/test_overrides.py | 102 - +++++++++++++++++++++++++++++++++++++++++++++- - 2 files changed, 149 insertions(+), 3 deletions(-) + +++++++++++++++++++++++++++++++++++++++++++++-- + 2 Dateien geändert, 149 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-) commit 9ee9b22bd95e44bd2eca26e7bf3b0a9a988700c5 Author: John (J5) Palmieri -Date: Sat Aug 13 09:19:29 2011 -0400 +Date: Sat Aug 13 09:19:29 2011 -0400 add test for object arrays tests/test_everything.py | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) + 1 Datei geändert, 6 Zeilen hinzugefügt(+) commit c9d9ffd0380878792cbdb13dec4e53be897e5fbc Author: John (J5) Palmieri -Date: Sat Aug 13 08:46:18 2011 -0400 +Date: Sat Aug 13 08:46:18 2011 -0400 only support C pointer arrays for structs and objects @@ -2941,40 +3145,40 @@ Date: Sat Aug 13 08:46:18 2011 -0400 gi/pygi-marshal-out.c | 2 +- tests/test_gi.py | 8 -------- - 2 files changed, 1 insertions(+), 9 deletions(-) + 2 Dateien geändert, 1 Zeile hinzugefügt(+), 9 Zeilen entfernt(-) commit b12379de1790b72d51883bf7b63c892639a892e7 Author: John (J5) Palmieri -Date: Sat Aug 13 06:31:52 2011 -0400 +Date: Sat Aug 13 06:31:52 2011 -0400 revert Gtk.Window override because it causes issues with subclasses - gi/overrides/Gtk.py | 9 --------- - 1 files changed, 0 insertions(+), 9 deletions(-) + gi/overrides/Gtk.py | 9 --------- + 1 Datei geändert, 9 Zeilen entfernt(-) commit 3e64a62d6d7f9e9d2820aad54187ef9c34710a1f Author: Jonathan Matthew -Date: Thu Apr 7 21:05:32 2011 +1000 +Date: Thu Apr 7 21:05:32 2011 +1000 take GIL in _pygi_invoke_closure_free (bug #647016) - gi/pygi-closure.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) + gi/pygi-closure.c | 3 +++ + 1 Datei geändert, 3 Zeilen hinzugefügt(+) commit f8de9b8615f5dc30f492781d792aef5fc1e9ab73 Author: Johan Dahlin -Date: Mon Jun 27 00:41:24 2011 -0300 +Date: Mon Jun 27 00:41:24 2011 -0300 Add a default parameter to GtkTreeModel.filter_new https://bugzilla.gnome.org/show_bug.cgi?id=653462 - gi/overrides/Gtk.py | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) + gi/overrides/Gtk.py | 3 +++ + 1 Datei geändert, 3 Zeilen hinzugefügt(+) commit 583d0b3c6b53712128d7c2d5f075000a2a76ae5f Author: Johan Dahlin -Date: Mon Jun 27 00:40:12 2011 -0300 +Date: Mon Jun 27 00:40:12 2011 -0300 Add vbox/action_area properties @@ -2984,12 +3188,12 @@ Date: Mon Jun 27 00:40:12 2011 -0300 https://bugzilla.gnome.org/show_bug.cgi?id=653462 - gi/overrides/Gtk.py | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) + gi/overrides/Gtk.py | 3 +++ + 1 Datei geändert, 3 Zeilen hinzugefügt(+) commit 017fdfc1dd06259006719e02ffa48883cee01ffd Author: Johan Dahlin -Date: Mon Jun 27 00:39:41 2011 -0300 +Date: Mon Jun 27 00:39:41 2011 -0300 Add a couple of constructors @@ -2998,12 +3202,12 @@ Date: Mon Jun 27 00:39:41 2011 -0300 https://bugzilla.gnome.org/show_bug.cgi?id=653462 - gi/overrides/Gtk.py | 40 ++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 40 insertions(+), 0 deletions(-) + gi/overrides/Gtk.py | 40 ++++++++++++++++++++++++++++++++++++++++ + 1 Datei geändert, 40 Zeilen hinzugefügt(+) commit af8bc9d5cdba48a7ee728ccb7ea9039df3ecceba Author: Johan Dahlin -Date: Mon Jun 27 00:38:30 2011 -0300 +Date: Mon Jun 27 00:38:30 2011 -0300 Do not always pass in user_data to callbacks. @@ -3012,23 +3216,23 @@ Date: Mon Jun 27 00:38:30 2011 -0300 https://bugzilla.gnome.org/show_bug.cgi?id=653462 - gi/overrides/Gtk.py | 15 ++++++++++++--- - 1 files changed, 12 insertions(+), 3 deletions(-) + gi/overrides/Gtk.py | 15 ++++++++++++--- + 1 Datei geändert, 12 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-) commit 7914d814350af1a18bdeda64f049c8e9a68d1d18 Author: Johan Dahlin -Date: Mon Jun 27 00:38:20 2011 -0300 +Date: Mon Jun 27 00:38:20 2011 -0300 Add a default detail value for Widget.render_icon https://bugzilla.gnome.org/show_bug.cgi?id=653462 - gi/overrides/Gtk.py | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) + gi/overrides/Gtk.py | 3 +++ + 1 Datei geändert, 3 Zeilen hinzugefügt(+) commit 5b1c875269b7979caae97e84919a690a34d92f29 Author: Johan Dahlin -Date: Mon Jun 27 00:36:20 2011 -0300 +Date: Mon Jun 27 00:36:20 2011 -0300 Add an override for Gdk.color_parse() @@ -3040,38 +3244,38 @@ Date: Mon Jun 27 00:36:20 2011 -0300 https://bugzilla.gnome.org/show_bug.cgi?id=653462 - gi/overrides/Gdk.py | 8 ++++++++ - 1 files changed, 8 insertions(+), 0 deletions(-) + gi/overrides/Gdk.py | 8 ++++++++ + 1 Datei geändert, 8 Zeilen hinzugefügt(+) commit 187a2932bbf1e724f759ff3ed3392fc7341c6aa8 Author: Laszlo Pandy -Date: Mon Aug 8 12:06:18 2011 +0200 +Date: Mon Aug 8 12:06:18 2011 +0200 Support function calling with keyword arguments in invoke. https://bugzilla.gnome.org/show_bug.cgi?id=625596 - gi/pygi-cache.c | 39 +++++++++++ - gi/pygi-cache.h | 4 + - gi/pygi-invoke.c | 162 + gi/pygi-cache.c | 39 +++++++++++ + gi/pygi-cache.h | 4 ++ + gi/pygi-invoke.c | 162 ++++++++++++++++++++++++++++++++++++++++++++-- - gi/types.py | 12 ++-- + gi/types.py | 12 ++-- tests/test_everything.py | 2 +- - tests/test_gi.py | 58 ++++++++++++++++ - 6 files changed, 265 insertions(+), 12 deletions(-) + tests/test_gi.py | 58 +++++++++++++++++ + 6 Dateien geändert, 265 Zeilen hinzugefügt(+), 12 Zeilen entfernt(-) commit e5df32ffbf37481dbb6a70c4d4e7b7b9778c5549 Author: John (J5) Palmieri -Date: Sat Aug 13 04:13:28 2011 -0400 +Date: Sat Aug 13 04:13:28 2011 -0400 remove references to deprecated GI_INFO_TYPE_ERROR_DOMAIN gi/pygi-info.c | 5 ----- - 1 files changed, 0 insertions(+), 5 deletions(-) + 1 Datei geändert, 5 Zeilen entfernt(-) commit 745001178fc72be5626c7211366d694f41162987 Author: Martin Pitt -Date: Thu Aug 11 15:11:42 2011 +0200 +Date: Thu Aug 11 15:11:42 2011 +0200 Fix gobject vs. gi.repository warning @@ -3080,11 +3284,11 @@ Date: Thu Aug 11 15:11:42 2011 +0200 update the warning to explain how to fix the problem. gi/_gobject/__init__.py | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) + 1 Datei geändert, 4 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-) commit 25d2d05cba05414cd4551e0e06f6286a9b97a509 Author: John (J5) Palmieri -Date: Fri Jul 22 15:46:31 2011 -0400 +Date: Fri Jul 22 15:46:31 2011 -0400 make GObject and GLib able to take overrides @@ -3092,83 +3296,83 @@ Date: Fri Jul 22 15:46:31 2011 -0400 https://bugzilla.gnome.org/show_bug.cgi?id=642048 - gi/importer.py | 11 ++--- - gi/module.py | 118 + gi/importer.py | 11 +++--- + gi/module.py | 118 ++++++++++++++++++++++++++++---------------------------- - 2 files changed, 64 insertions(+), 65 deletions(-) + 2 Dateien geändert, 64 Zeilen hinzugefügt(+), 65 Zeilen entfernt(-) commit 698b2284e29c0f699198cf6a22eeb0e399daba6e Author: John (J5) Palmieri -Date: Fri Jul 22 15:45:09 2011 -0400 +Date: Fri Jul 22 15:45:09 2011 -0400 avoid dependency issue by importing the internal gobject https://bugzilla.gnome.org/show_bug.cgi?id=642048 gi/__init__.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 7b068ebe59884ebd9aeb4425dc80cdff73a66fb1 Author: John (J5) Palmieri -Date: Fri Jul 22 14:13:02 2011 -0400 +Date: Fri Jul 22 14:13:02 2011 -0400 fix tests to use the new GLib module https://bugzilla.gnome.org/show_bug.cgi?id=642048 tests/test_mainloop.py | 7 +++---- - tests/test_option.py | 3 ++- - tests/test_source.py | 24 +++++++++++------------- + tests/test_option.py | 3 ++- + tests/test_source.py | 24 +++++++++++------------- tests/test_subprocess.py | 12 +++++------- - tests/test_thread.py | 10 ++++------ - tests/test_uris.py | 4 ++-- - 6 files changed, 27 insertions(+), 33 deletions(-) + tests/test_thread.py | 10 ++++------ + tests/test_uris.py | 4 ++-- + 6 Dateien geändert, 27 Zeilen hinzugefügt(+), 33 Zeilen entfernt(-) commit 191ef79315f8a5641699536fde58da18e23ef904 Author: John (J5) Palmieri -Date: Fri Jul 22 14:11:53 2011 -0400 +Date: Fri Jul 22 14:11:53 2011 -0400 add DynamicGLibModule which works like DynamicGObjectModule https://bugzilla.gnome.org/show_bug.cgi?id=642048 gi/importer.py | 7 +++++-- - gi/module.py | 32 +++++++++++++++++++++++++++++--- - 2 files changed, 34 insertions(+), 5 deletions(-) + gi/module.py | 32 +++++++++++++++++++++++++++++--- + 2 Dateien geändert, 34 Zeilen hinzugefügt(+), 5 Zeilen entfernt(-) commit fbd4a8263260c187211799454c08b1e55e2cb998 Author: John (J5) Palmieri -Date: Fri Jul 22 12:27:41 2011 -0400 +Date: Fri Jul 22 12:27:41 2011 -0400 refactor, add objects and types to the correct internal module https://bugzilla.gnome.org/show_bug.cgi?id=642048 - gi/_glib/pygiochannel.c | 38 +++++++++++++++++++------------------- - gi/_glib/pygmaincontext.c | 2 +- - gi/_glib/pygmainloop.c | 4 ++-- - gi/_glib/pygoptioncontext.c | 4 ++-- - gi/_glib/pygoptiongroup.c | 4 ++-- - gi/_glib/pygsource.c | 14 +++++++------- - gi/_glib/pygspawn.c | 14 +++++++------- - 7 files changed, 40 insertions(+), 40 deletions(-) + gi/_glib/pygiochannel.c | 38 +++++++++++++++++++------------------- + gi/_glib/pygmaincontext.c | 2 +- + gi/_glib/pygmainloop.c | 4 ++-- + gi/_glib/pygoptioncontext.c | 4 ++-- + gi/_glib/pygoptiongroup.c | 4 ++-- + gi/_glib/pygsource.c | 14 +++++++------- + gi/_glib/pygspawn.c | 14 +++++++------- + 7 Dateien geändert, 40 Zeilen hinzugefügt(+), 40 Zeilen entfernt(-) commit 7431b49a161df9178c55b814d3adff992ac2d722 Author: John (J5) Palmieri -Date: Fri Jul 22 12:26:32 2011 -0400 +Date: Fri Jul 22 12:26:32 2011 -0400 rename the pyglib shared library so we don't load the old one https://bugzilla.gnome.org/show_bug.cgi?id=642048 - gi/Makefile.am | 2 +- - gi/_glib/Makefile.am | 10 +++++----- + gi/Makefile.am | 2 +- + gi/_glib/Makefile.am | 10 +++++----- gi/_gobject/Makefile.am | 2 +- - 3 files changed, 7 insertions(+), 7 deletions(-) + 3 Dateien geändert, 7 Zeilen hinzugefügt(+), 7 Zeilen entfernt(-) commit b8700451acd4a19b59b64fc8641fca748d2189e2 Author: John (J5) Palmieri -Date: Fri Jul 22 11:20:09 2011 -0400 +Date: Fri Jul 22 11:20:09 2011 -0400 refactor tests to only use PyGObject 3 syntax @@ -3181,27 +3385,27 @@ Date: Fri Jul 22 11:20:09 2011 -0400 https://bugzilla.gnome.org/show_bug.cgi?id=642048 - tests/runtests-windows.py | 4 +- - tests/test_gdbus.py | 12 ++-- - tests/test_gi.py | 4 +- - tests/test_gobject.py | 31 ++++++------ + tests/runtests-windows.py | 4 +- + tests/test_gdbus.py | 12 ++--- + tests/test_gi.py | 4 +- + tests/test_gobject.py | 31 ++++++------ tests/test_interface.py | 16 +++--- - tests/test_mainloop.py | 3 +- - tests/test_overrides.py | 8 ++-- + tests/test_mainloop.py | 3 +- + tests/test_overrides.py | 8 +-- tests/test_properties.py | 124 - ++++++++++++++++++++++---------------------- - tests/test_signal.py | 98 ++++++++++++++++++------------------ - tests/test_source.py | 5 +- - tests/test_subprocess.py | 3 +- - tests/test_thread.py | 5 +- - tests/test_unknown.py | 8 ++-- - tests/testhelpermodule.c | 2 +- - tests/testmodule.py | 10 ++-- - 15 files changed, 169 insertions(+), 164 deletions(-) + ++++++++++++++++++++++----------------------- + tests/test_signal.py | 98 +++++++++++++++++------------------ + tests/test_source.py | 5 +- + tests/test_subprocess.py | 3 +- + tests/test_thread.py | 5 +- + tests/test_unknown.py | 8 +-- + tests/testhelpermodule.c | 2 +- + tests/testmodule.py | 10 ++-- + 15 Dateien geändert, 169 Zeilen hinzugefügt(+), 164 Zeilen entfernt(-) commit c980dae21468fe073cc8782608148c346bb90ad7 Author: John (J5) Palmieri -Date: Fri Jul 22 11:16:00 2011 -0400 +Date: Fri Jul 22 11:16:00 2011 -0400 refactor the internal _glib module to import correct modules @@ -3211,11 +3415,11 @@ Date: Fri Jul 22 11:16:00 2011 -0400 gi/_glib/glibmodule.c | 10 +++++----- gi/_glib/option.py | 4 ++-- gi/_glib/pyglib.c | 18 +++++++++--------- - 4 files changed, 18 insertions(+), 17 deletions(-) + 4 Dateien geändert, 18 Zeilen hinzugefügt(+), 17 Zeilen entfernt(-) commit 65ac35cca8d24f4c133991e1c6ac02f49416a9a4 Author: John (J5) Palmieri -Date: Fri Jul 22 11:10:46 2011 -0400 +Date: Fri Jul 22 11:10:46 2011 -0400 refactor to use the new internal _glib and _gobject modules @@ -3232,27 +3436,27 @@ Date: Fri Jul 22 11:10:46 2011 -0400 gi/_gobject/propertyhelper.py | 11 +++++------ gi/_gobject/pygobject.c | 16 ++++++++-------- gi/_gobject/pygobject.h | 2 +- - 6 files changed, 29 insertions(+), 25 deletions(-) + 6 Dateien geändert, 29 Zeilen hinzugefügt(+), 25 Zeilen entfernt(-) commit 59ed1289f76bc287443b3974710ea0da3e2cc8cc Author: John (J5) Palmieri -Date: Fri Jul 22 11:07:10 2011 -0400 +Date: Fri Jul 22 11:07:10 2011 -0400 refactor gi module to import and use internal _gobject module https://bugzilla.gnome.org/show_bug.cgi?id=642048 - gi/importer.py | 2 -- - gi/module.py | 31 ++++++++++++++++--------------- - gi/overrides/Gtk.py | 2 +- + gi/importer.py | 2 -- + gi/module.py | 31 ++++++++++++++++--------------- + gi/overrides/Gtk.py | 2 +- gi/overrides/__init__.py | 6 +++--- gi/pygobject-external.h | 2 +- - gi/types.py | 12 ++++++------ - 6 files changed, 27 insertions(+), 28 deletions(-) + gi/types.py | 12 ++++++------ + 6 Dateien geändert, 27 Zeilen hinzugefügt(+), 28 Zeilen entfernt(-) commit 6b9d738d78c6ac45d49f00402c89356887555069 Author: John (J5) Palmieri -Date: Fri Jul 22 11:02:49 2011 -0400 +Date: Fri Jul 22 11:02:49 2011 -0400 move the static bits internal to gi and refactor build files @@ -3262,167 +3466,168 @@ Date: Fri Jul 22 11:02:49 2011 -0400 https://bugzilla.gnome.org/show_bug.cgi?id=642048 - Makefile.am | 2 +- - configure.ac | 6 +- - gi/Makefile.am | 8 +- - gi/_glib/Makefile.am | 58 + - gi/_glib/__init__.py | 25 + - gi/_glib/glibmodule.c | 969 ++++++++++++++ - gi/_glib/option.py | 358 ++++++ - gi/_glib/pygiochannel.c | 764 +++++++++++ - gi/_glib/pygiochannel.h | 29 + - gi/_glib/pyglib-private.h | 49 + + Makefile.am | 2 +- + configure.ac | 6 +- + gi/Makefile.am | 8 +- + gi/_glib/Makefile.am | 58 + + gi/_glib/__init__.py | 25 + + gi/_glib/glibmodule.c | 969 ++++++++++++++ + gi/_glib/option.py | 358 ++++++ + gi/_glib/pygiochannel.c | 764 ++++++++++++ + gi/_glib/pygiochannel.h | 29 + + gi/_glib/pyglib-private.h | 49 + gi/_glib/pyglib-python-compat.h | 245 ++++ - gi/_glib/pyglib.c | 633 ++++++++++ - gi/_glib/pyglib.h | 83 ++ - gi/_glib/pygmaincontext.c | 126 ++ - gi/_glib/pygmaincontext.h | 40 + - gi/_glib/pygmainloop.c | 360 ++++++ - gi/_glib/pygmainloop.h | 36 + - gi/_glib/pygoptioncontext.c | 337 +++++ - gi/_glib/pygoptioncontext.h | 39 + - gi/_glib/pygoptiongroup.c | 298 +++++ - gi/_glib/pygoptiongroup.h | 42 + - gi/_glib/pygsource.c | 725 +++++++++++ - gi/_glib/pygsource.h | 39 + - gi/_glib/pygspawn.c | 264 ++++ - gi/_glib/pygspawn.h | 32 + - gi/_gobject/Makefile.am | 71 ++ - gi/_gobject/__init__.py | 117 ++ - gi/_gobject/constants.py | 83 ++ - gi/_gobject/ffi-marshaller.c | 194 +++ - gi/_gobject/ffi-marshaller.h | 31 + - gi/_gobject/gobjectmodule.c | 2638 + gi/_glib/pyglib.c | 633 ++++++++++ + gi/_glib/pyglib.h | 83 ++ + gi/_glib/pygmaincontext.c | 126 ++ + gi/_glib/pygmaincontext.h | 40 + + gi/_glib/pygmainloop.c | 360 ++++++ + gi/_glib/pygmainloop.h | 36 + + gi/_glib/pygoptioncontext.c | 337 +++++ + gi/_glib/pygoptioncontext.h | 39 + + gi/_glib/pygoptiongroup.c | 298 +++++ + gi/_glib/pygoptiongroup.h | 42 + + gi/_glib/pygsource.c | 725 +++++++++++ + gi/_glib/pygsource.h | 39 + + gi/_glib/pygspawn.c | 264 ++++ + gi/_glib/pygspawn.h | 32 + + gi/_gobject/Makefile.am | 71 ++ + gi/_gobject/__init__.py | 117 ++ + gi/_gobject/constants.py | 83 ++ + gi/_gobject/ffi-marshaller.c | 194 +++ + gi/_gobject/ffi-marshaller.h | 31 + + gi/_gobject/gobjectmodule.c | 2638 +++++++++++++++++++++++++++++++++++++++ - gi/_gobject/propertyhelper.py | 312 +++++ - gi/_gobject/pygboxed.c | 234 ++++ - gi/_gobject/pygboxed.h | 27 + - gi/_gobject/pygenum.c | 366 ++++++ - gi/_gobject/pygenum.h | 27 + - gi/_gobject/pygflags.c | 485 +++++++ - gi/_gobject/pygflags.h | 27 + - gi/_gobject/pyginterface.c | 122 ++ - gi/_gobject/pyginterface.h | 40 + + gi/_gobject/propertyhelper.py | 312 +++++ + gi/_gobject/pygboxed.c | 234 ++++ + gi/_gobject/pygboxed.h | 27 + + gi/_gobject/pygenum.c | 366 ++++++ + gi/_gobject/pygenum.h | 27 + + gi/_gobject/pygflags.c | 485 +++++++ + gi/_gobject/pygflags.h | 27 + + gi/_gobject/pyginterface.c | 122 ++ + gi/_gobject/pyginterface.h | 40 + gi/_gobject/pygobject-private.h | 241 ++++ - gi/_gobject/pygobject.c | 2397 + gi/_gobject/pygobject.c | 2397 +++++++++++++++++++++++++++++++++++ - gi/_gobject/pygobject.h | 667 ++++++++++ - gi/_gobject/pygparamspec.c | 404 ++++++ - gi/_gobject/pygparamspec.h | 31 + - gi/_gobject/pygpointer.c | 198 +++ - gi/_gobject/pygpointer.h | 27 + - gi/_gobject/pygtype.c | 1844 +++++++++++++++++++++++++++ - gi/_gobject/pygtype.h | 28 + - glib/Makefile.am | 61 - - glib/__init__.py | 25 - - glib/glibmodule.c | 969 -------------- - glib/option.py | 358 ------ - glib/pygiochannel.c | 764 ----------- - glib/pygiochannel.h | 29 - - glib/pyglib-private.h | 49 - - glib/pyglib-python-compat.h | 245 ---- - glib/pyglib.c | 633 ---------- - glib/pyglib.h | 83 -- - glib/pygmaincontext.c | 126 -- - glib/pygmaincontext.h | 40 - - glib/pygmainloop.c | 360 ------ - glib/pygmainloop.h | 36 - - glib/pygoptioncontext.c | 337 ----- - glib/pygoptioncontext.h | 39 - - glib/pygoptiongroup.c | 298 ----- - glib/pygoptiongroup.h | 42 - - glib/pygsource.c | 725 ----------- - glib/pygsource.h | 39 - - glib/pygspawn.c | 264 ---- - glib/pygspawn.h | 32 - - gobject/Makefile.am | 73 -- - gobject/__init__.py | 117 -- - gobject/constants.py | 83 -- - gobject/ffi-marshaller.c | 194 --- - gobject/ffi-marshaller.h | 31 - - gobject/gobjectmodule.c | 2638 + gi/_gobject/pygobject.h | 667 ++++++++++ + gi/_gobject/pygparamspec.c | 404 ++++++ + gi/_gobject/pygparamspec.h | 31 + + gi/_gobject/pygpointer.c | 198 +++ + gi/_gobject/pygpointer.h | 27 + + gi/_gobject/pygtype.c | 1844 +++++++++++++++++++++++++++ + gi/_gobject/pygtype.h | 28 + + glib/Makefile.am | 61 - + glib/__init__.py | 25 - + glib/glibmodule.c | 969 -------------- + glib/option.py | 358 ------ + glib/pygiochannel.c | 764 ------------ + glib/pygiochannel.h | 29 - + glib/pyglib-private.h | 49 - + glib/pyglib-python-compat.h | 245 ---- + glib/pyglib.c | 633 ---------- + glib/pyglib.h | 83 -- + glib/pygmaincontext.c | 126 -- + glib/pygmaincontext.h | 40 - + glib/pygmainloop.c | 360 ------ + glib/pygmainloop.h | 36 - + glib/pygoptioncontext.c | 337 ----- + glib/pygoptioncontext.h | 39 - + glib/pygoptiongroup.c | 298 ----- + glib/pygoptiongroup.h | 42 - + glib/pygsource.c | 725 ----------- + glib/pygsource.h | 39 - + glib/pygspawn.c | 264 ---- + glib/pygspawn.h | 32 - + gobject/Makefile.am | 73 -- + gobject/__init__.py | 117 -- + gobject/constants.py | 83 -- + gobject/ffi-marshaller.c | 194 --- + gobject/ffi-marshaller.h | 31 - + gobject/gobjectmodule.c | 2638 --------------------------------------- - gobject/propertyhelper.py | 312 ----- - gobject/pygboxed.c | 234 ---- - gobject/pygboxed.h | 27 - - gobject/pygenum.c | 366 ------ - gobject/pygenum.h | 27 - - gobject/pygflags.c | 485 ------- - gobject/pygflags.h | 27 - - gobject/pyginterface.c | 122 -- - gobject/pyginterface.h | 40 - - gobject/pygobject-private.h | 241 ---- - gobject/pygobject.c | 2397 + gobject/propertyhelper.py | 312 ----- + gobject/pygboxed.c | 234 ---- + gobject/pygboxed.h | 27 - + gobject/pygenum.c | 366 ------ + gobject/pygenum.h | 27 - + gobject/pygflags.c | 485 ------- + gobject/pygflags.h | 27 - + gobject/pyginterface.c | 122 -- + gobject/pyginterface.h | 40 - + gobject/pygobject-private.h | 241 ---- + gobject/pygobject.c | 2397 ----------------------------------- - gobject/pygobject.h | 667 ---------- - gobject/pygparamspec.c | 404 ------ - gobject/pygparamspec.h | 31 - - gobject/pygpointer.c | 198 --- - gobject/pygpointer.h | 27 - - gobject/pygtype.c | 1844 --------------------------- - gobject/pygtype.h | 28 - - tests/Makefile.am | 2 +- - 96 files changed, 16172 insertions(+), 16175 deletions(-) + gobject/pygobject.h | 667 ---------- + gobject/pygparamspec.c | 404 ------ + gobject/pygparamspec.h | 31 - + gobject/pygpointer.c | 198 --- + gobject/pygpointer.h | 27 - + gobject/pygtype.c | 1844 --------------------------- + gobject/pygtype.h | 28 - + tests/Makefile.am | 2 +- + 96 Dateien geändert, 16172 Zeilen hinzugefügt(+), 16175 Zeilen + entfernt(-) commit f0d2ddcf7e61c36f79a9adf8ccc53bf3db9349d3 Author: John (J5) Palmieri -Date: Mon Jul 18 18:46:31 2011 -0400 +Date: Mon Jul 18 18:46:31 2011 -0400 remove pygtk.py https://bugzilla.gnome.org/show_bug.cgi?id=642048 - Makefile.am | 5 --- - pygtk.py | 95 + Makefile.am | 5 ---- + pygtk.py | 95 ----------------------------------------------------------- - 2 files changed, 0 insertions(+), 100 deletions(-) + 2 Dateien geändert, 100 Zeilen entfernt(-) commit 75e9f7d80d9224c05e6063b88479f1baee48c489 Author: John (J5) Palmieri -Date: Mon Jul 18 18:41:41 2011 -0400 +Date: Mon Jul 18 18:41:41 2011 -0400 introspection is no longer optional https://bugzilla.gnome.org/show_bug.cgi?id=642048 - Makefile.am | 8 +------- - configure.ac | 43 +++++++++++++++++-------------------------- - gi/pygi.h | 37 ------------------------------------- - gobject/Makefile.am | 5 +---- - tests/Makefile.am | 7 +------ - 5 files changed, 20 insertions(+), 80 deletions(-) + Makefile.am | 8 +------- + configure.ac | 43 +++++++++++++++++-------------------------- + gi/pygi.h | 37 ------------------------------------- + gobject/Makefile.am | 5 +---- + tests/Makefile.am | 7 +------ + 5 Dateien geändert, 20 Zeilen hinzugefügt(+), 80 Zeilen entfernt(-) commit d862168d6a82edd59547d39f5b0ab8279b1e511c Author: John (J5) Palmieri -Date: Mon Jul 18 18:28:50 2011 -0400 +Date: Mon Jul 18 18:28:50 2011 -0400 up platform version to 3.0 https://bugzilla.gnome.org/show_bug.cgi?id=642048 - Makefile.am | 2 +- - configure.ac | 4 ++-- + Makefile.am | 2 +- + configure.ac | 4 ++-- pygobject-2.0-uninstalled.pc.in | 18 ------------------ - pygobject-2.0.pc.in | 22 ---------------------- + pygobject-2.0.pc.in | 22 ---------------------- pygobject-3.0-uninstalled.pc.in | 18 ++++++++++++++++++ - pygobject-3.0.pc.in | 22 ++++++++++++++++++++++ - 6 files changed, 43 insertions(+), 43 deletions(-) + pygobject-3.0.pc.in | 22 ++++++++++++++++++++++ + 6 Dateien geändert, 43 Zeilen hinzugefügt(+), 43 Zeilen entfernt(-) commit 5189b360ccddbbaee267ce857968fbf1aafdd07a Author: Martin Pitt -Date: Thu Aug 11 09:53:15 2011 +0200 +Date: Thu Aug 11 09:53:15 2011 +0200 [gi] Handle GVariants from callback return values Callbacks still use GIArgument, add missing GVariant support for return types. - gi/pygi-argument.c | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) + gi/pygi-argument.c | 6 ++++-- + 1 Datei geändert, 4 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit 18a240cc492d2e5ebe2709a0d7155e27c8ff9e63 Author: Martin Pitt -Date: Wed Aug 10 14:11:10 2011 +0200 +Date: Wed Aug 10 14:11:10 2011 +0200 Handle GVariants for callback arguments @@ -3430,121 +3635,121 @@ Date: Wed Aug 10 14:11:10 2011 +0200 is the equivalent of what commit 9d5604220bd56 did for pygi_marshall_*(). - gi/pygi-argument.c | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) + gi/pygi-argument.c | 7 +++++++ + 1 Datei geändert, 7 Zeilen hinzugefügt(+) commit aa820d6ce2fee83e61e3e9de7c6b7d2452e2847d Author: Laszlo Pandy -Date: Mon Aug 8 01:58:10 2011 +0200 +Date: Mon Aug 8 01:58:10 2011 +0200 [gi] Fix crash: check return value of _invoke_state_init_from_callable_cache() before continuing. gi/pygi-invoke.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) + 1 Datei geändert, 3 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit eaad9f3c71cedfe28ff2d2bb05ea6c64e323715f Author: Laszlo Pandy -Date: Fri Aug 5 21:03:33 2011 +0200 +Date: Fri Aug 5 21:03:33 2011 +0200 [gi] Pass gtype as first parameter to vfuncs (instead of using kwargs). gi/pygi-invoke.c | 32 ++++++++++++++++++-------------- - gi/types.py | 2 +- - 2 files changed, 19 insertions(+), 15 deletions(-) + gi/types.py | 2 +- + 2 Dateien geändert, 19 Zeilen hinzugefügt(+), 15 Zeilen entfernt(-) commit 76edfd0d5776f61c92c84fd9fb8dcc246c580e93 Author: John (J5) Palmieri -Date: Mon Jul 18 18:21:51 2011 -0400 +Date: Mon Jul 18 18:21:51 2011 -0400 remove codegen - Makefile.am | 2 +- - codegen/Makefile.am | 33 - - codegen/README.defs | 351 -------- - codegen/__init__.py | 16 - - codegen/argtypes.py | 1043 ----------------------- - codegen/code-coverage.py | 44 - - codegen/codegen.py | 1722 + Makefile.am | 2 +- + codegen/Makefile.am | 33 - + codegen/README.defs | 351 -------- + codegen/__init__.py | 16 - + codegen/argtypes.py | 1043 ----------------------- + codegen/code-coverage.py | 44 - + codegen/codegen.py | 1722 -------------------------------------- - codegen/createdefs.py | 17 - - codegen/definitions.py | 575 ------------- - codegen/defsconvert.py | 132 --- - codegen/defsgen.py | 737 ---------------- - codegen/defsparser.py | 153 ---- - codegen/docextract.py | 461 ---------- - codegen/docextract_to_xml.py | 142 ---- - codegen/docgen.py | 766 ----------------- - codegen/h2def.py | 631 -------------- - codegen/mergedefs.py | 26 - - codegen/missingdefs.py | 17 - - codegen/mkskel.py | 89 -- - codegen/override.py | 285 ------- + codegen/createdefs.py | 17 - + codegen/definitions.py | 575 ------------- + codegen/defsconvert.py | 132 --- + codegen/defsgen.py | 737 ---------------- + codegen/defsparser.py | 153 ---- + codegen/docextract.py | 461 ---------- + codegen/docextract_to_xml.py | 142 ---- + codegen/docgen.py | 766 ----------------- + codegen/h2def.py | 631 -------------- + codegen/mergedefs.py | 26 - + codegen/missingdefs.py | 17 - + codegen/mkskel.py | 89 -- + codegen/override.py | 285 ------- codegen/pygobject-codegen-2.0.in | 11 - - codegen/reversewrapper.py | 912 -------------------- - codegen/scanvirtuals.py | 54 -- - codegen/scmexpr.py | 143 ---- - configure.ac | 5 - + codegen/reversewrapper.py | 912 -------------------- + codegen/scanvirtuals.py | 54 -- + codegen/scmexpr.py | 143 ---- + configure.ac | 5 - pygobject-2.0-uninstalled.pc.in | 1 - - pygobject-2.0.pc.in | 1 - - 27 files changed, 1 insertions(+), 8368 deletions(-) + pygobject-2.0.pc.in | 1 - + 27 Dateien geändert, 1 Zeile hinzugefügt(+), 8368 Zeilen entfernt(-) commit bf284c7c47c3e52ab4d8700327a170903e9ebad2 Author: John (J5) Palmieri -Date: Mon Jul 18 11:04:58 2011 -0400 +Date: Mon Jul 18 11:04:58 2011 -0400 remove some left over ifdefs to complete merge of the invoke-rewrite branch - gi/pygi-cache.h | 2 -- - gi/pygi-info.c | 2 -- - gi/pygi-private.h | 5 +---- - gi/pygi.h | 2 -- - 4 files changed, 1 insertions(+), 10 deletions(-) + gi/pygi-cache.h | 2 -- + gi/pygi-info.c | 2 -- + gi/pygi-private.h | 5 +---- + gi/pygi.h | 2 -- + 4 Dateien geändert, 1 Zeile hinzugefügt(+), 10 Zeilen entfernt(-) commit 8c653ec3033fab47c4bb4071b5732a349357141f Author: John (J5) Palmieri -Date: Mon Jul 18 10:59:45 2011 -0400 +Date: Mon Jul 18 10:59:45 2011 -0400 rename pygi-invoke-ng to pygi-invoke - gi/Makefile.am | 3 +- - gi/pygi-invoke-ng.c | 464 + gi/Makefile.am | 3 +- + gi/pygi-invoke-ng.c | 464 --------------------------------------------------- - gi/pygi-invoke.c | 464 + gi/pygi-invoke.c | 464 +++++++++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 466 insertions(+), 465 deletions(-) + 3 Dateien geändert, 466 Zeilen hinzugefügt(+), 465 Zeilen entfernt(-) commit 62d59fa2c2b31d7a3cac8996d58234d4b13bb19f Author: John (J5) Palmieri -Date: Mon Jul 18 10:56:36 2011 -0400 +Date: Mon Jul 18 10:56:36 2011 -0400 make invoke-ng the only invoker - configure.ac | 11 - + configure.ac | 11 - gi/Makefile.am | 10 +- gi/pygi-invoke.c | 1030 ------------------------------------------------------ - 3 files changed, 1 insertions(+), 1050 deletions(-) + 3 Dateien geändert, 1 Zeile hinzugefügt(+), 1050 Zeilen entfernt(-) commit 2937cfe5bb7122dd3783c7919294d6a34a3dfc05 Merge: 519e556 917ea2d Author: John (J5) Palmieri -Date: Mon Jul 18 10:45:18 2011 -0400 +Date: Mon Jul 18 10:45:18 2011 -0400 Merge branch 'master' into invoke-rewrite commit 519e556dc1e5874e1668bad93043fb9258c7ee79 Merge: bab7e88 38cca3c Author: John (J5) Palmieri -Date: Mon Jul 18 10:37:20 2011 -0400 +Date: Mon Jul 18 10:37:20 2011 -0400 Merge branch 'master' into invoke-rewrite commit bab7e88251bffcd360186c6dedc26be8eb077084 Author: John (J5) Palmieri -Date: Mon Jul 18 10:35:10 2011 -0400 +Date: Mon Jul 18 10:35:10 2011 -0400 split the marshalling routines into two source files @@ -3559,49 +3764,49 @@ Date: Mon Jul 18 10:35:10 2011 -0400 gi/pygi-marshal.c | 2145 ------------------------------------------------- gi/pygi-marshal.h | 303 ------- - 8 files changed, 2515 insertions(+), 2451 deletions(-) + 8 Dateien geändert, 2515 Zeilen hinzugefügt(+), 2451 Zeilen entfernt(-) commit 917ea2dfa2d097e563233145003a66b3e4423287 Author: Martin Pitt -Date: Thu Jul 14 11:21:10 2011 +0200 +Date: Thu Jul 14 11:21:10 2011 +0200 Ship tests/te_ST@nouppera in release tarballs for tests to succeed - tests/Makefile.am | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + tests/Makefile.am | 1 + + 1 Datei geändert, 1 Zeile hinzugefügt(+) commit e024e832ab9c82d3e299cc6e1cb427de44f2d16e Author: John (J5) Palmieri -Date: Wed Jul 13 15:43:02 2011 -0400 +Date: Wed Jul 13 15:43:02 2011 -0400 [invoke] break out caller_allocates allocating into its own function - gi/pygi-invoke-ng.c | 78 + gi/pygi-invoke-ng.c | 78 ++++++++++++++++++++++++++++++++------------------- - 1 files changed, 49 insertions(+), 29 deletions(-) + 1 Datei geändert, 49 Zeilen hinzugefügt(+), 29 Zeilen entfernt(-) commit fc8b8ce768ac780f7ed9edc63b70dd35194153c0 Author: John (J5) Palmieri -Date: Wed Jul 13 15:42:26 2011 -0400 +Date: Wed Jul 13 15:42:26 2011 -0400 [invoke] missed a bit when removing constructor_class usage - gi/pygi-invoke-ng.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + gi/pygi-invoke-ng.c | 2 +- + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit c94bcf4ae7e36f90c356c89712b00609f9f849bd Author: John (J5) Palmieri -Date: Wed Jul 13 15:16:17 2011 -0400 +Date: Wed Jul 13 15:16:17 2011 -0400 [invoke] don't hold on to the constructor class, just add a TODO - gi/pygi-invoke-ng.c | 11 +++++------ + gi/pygi-invoke-ng.c | 11 +++++------ gi/pygi-invoke-state-struct.h | 1 - - 2 files changed, 5 insertions(+), 7 deletions(-) + 2 Dateien geändert, 5 Zeilen hinzugefügt(+), 7 Zeilen entfernt(-) commit c11d3195f324ea41e86e3da7ff99b55425c2faec Author: Martin Pitt -Date: Wed Jul 13 10:40:25 2011 +0200 +Date: Wed Jul 13 10:40:25 2011 +0200 [gi] Port test_properties from static gio to GI Gio @@ -3612,11 +3817,11 @@ Date: Wed Jul 13 10:40:25 2011 +0200 Python 3. Rewrite it to use gi.repository.Gio. tests/test_properties.py | 38 +++++++++++++++++++------------------- - 1 files changed, 19 insertions(+), 19 deletions(-) + 1 Datei geändert, 19 Zeilen hinzugefügt(+), 19 Zeilen entfernt(-) commit 8f89ff24fcac627ce15ca93038711fded1a7c5ed Author: Martin Pitt -Date: Wed Jul 13 08:42:22 2011 +0200 +Date: Wed Jul 13 08:42:22 2011 +0200 [python3] Fix maketrans import @@ -3625,31 +3830,31 @@ Date: Wed Jul 13 08:42:22 2011 +0200 This unbreaks gi/module.py for Python 3 again. gi/module.py | 8 ++++++-- - 1 files changed, 6 insertions(+), 2 deletions(-) + 1 Datei geändert, 6 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit 20aea4b052126fa0bface3e6e0dccfd77f9505b1 Author: John (J5) Palmieri -Date: Fri Jul 8 14:39:22 2011 -0400 +Date: Fri Jul 8 14:39:22 2011 -0400 [caching] remove all inline compiler flags gi/pygi-cache.c | 96 - +++++++++++++++++++++++++++--------------------------- - 1 files changed, 48 insertions(+), 48 deletions(-) + +++++++++++++++++++++++++++---------------------------- + 1 Datei geändert, 48 Zeilen hinzugefügt(+), 48 Zeilen entfernt(-) commit bf7bb79b66ad406063fb443e7452d830c55986ef Author: John (J5) Palmieri -Date: Fri Jul 8 14:35:20 2011 -0400 +Date: Fri Jul 8 14:35:20 2011 -0400 [caching] refactor function names to be less confusing gi/pygi-cache.c | 307 +++++++++++++++++++++++++++---------------------------- - 1 files changed, 150 insertions(+), 157 deletions(-) + 1 Datei geändert, 150 Zeilen hinzugefügt(+), 157 Zeilen entfernt(-) commit c167a9345b01c070bd5a84b4a4b3a53baf9e217d Author: John (J5) Palmieri -Date: Fri Jul 8 11:24:09 2011 -0400 +Date: Fri Jul 8 11:24:09 2011 -0400 [overrides] deprecate the use of type keyword MessageDialog constructor @@ -3665,12 +3870,12 @@ Date: Fri Jul 8 11:24:09 2011 -0400 NO_SEPARATOR flag - gi/overrides/Gtk.py | 13 ++++++++----- - 1 files changed, 8 insertions(+), 5 deletions(-) + gi/overrides/Gtk.py | 13 ++++++++----- + 1 Datei geändert, 8 Zeilen hinzugefügt(+), 5 Zeilen entfernt(-) commit 367e4ededd4a45125157050bcc9e4e685fd4a82d Author: Martin Pitt -Date: Fri Jul 8 10:15:53 2011 +0200 +Date: Fri Jul 8 10:15:53 2011 +0200 gdbus tests: Fix hang if test case fails @@ -3678,60 +3883,60 @@ Date: Fri Jul 8 10:15:53 2011 +0200 loop was never quit when the call failed. - tests/test_gdbus.py | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) + tests/test_gdbus.py | 6 ++++-- + 1 Datei geändert, 4 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit 11b578400cbf9f7c270b662a5e8953ccd466e5ef Author: John (J5) Palmieri -Date: Thu Jul 7 19:30:11 2011 -0400 +Date: Thu Jul 7 19:30:11 2011 -0400 use an enum instead of booleans to denote function type - gi/pygi-cache.c | 85 - +++++++++++++++++++++++++++++--------------------- - gi/pygi-cache.h | 18 ++++++++-- - gi/pygi-invoke-ng.c | 8 ++-- - 3 files changed, 67 insertions(+), 44 deletions(-) + gi/pygi-cache.c | 85 + +++++++++++++++++++++++++++++---------------------- + gi/pygi-cache.h | 18 ++++++++--- + gi/pygi-invoke-ng.c | 8 ++--- + 3 Dateien geändert, 67 Zeilen hinzugefügt(+), 44 Zeilen entfernt(-) commit 10e31005baec26f61c0f8fca2b5c0337b0be6c70 Author: John (J5) Palmieri -Date: Thu Jul 7 15:18:03 2011 -0400 +Date: Thu Jul 7 15:18:03 2011 -0400 rename aux arguments to child arguments to make their purpose clearer - gi/pygi-cache.c | 64 - +++++++++++++++++++++++++------------------------- - gi/pygi-cache.h | 29 ++++++++++++++++------- - gi/pygi-invoke-ng.c | 10 ++++---- - gi/pygi-marshal.c | 12 ++++---- - 4 files changed, 63 insertions(+), 52 deletions(-) + gi/pygi-cache.c | 64 + +++++++++++++++++++++++++-------------------------- + gi/pygi-cache.h | 29 +++++++++++++++-------- + gi/pygi-invoke-ng.c | 10 ++++---- + gi/pygi-marshal.c | 12 +++++----- + 4 Dateien geändert, 63 Zeilen hinzugefügt(+), 52 Zeilen entfernt(-) commit b4ad91c40f713ebdc278ce40b011e4adf9ddbbd7 Author: Timo Vanwynsberghe -Date: Thu Jul 7 10:59:08 2011 +0200 +Date: Thu Jul 7 10:59:08 2011 +0200 Fixed the cairo example https://bugzilla.gnome.org/show_bug.cgi?id=653844 examples/cairo-demo.py | 6 ++---- - 1 files changed, 2 insertions(+), 4 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-) commit a606bab1ddc605167f2e9dc7c46c8f929fdce23b Author: Adam Dingle -Date: Tue Jul 5 14:28:20 2011 -0700 +Date: Tue Jul 5 14:28:20 2011 -0700 Add override binding for Gtk.ListStore.prepend(). https://bugzilla.gnome.org/show_bug.cgi?id=654056 - gi/overrides/Gtk.py | 8 ++++++++ + gi/overrides/Gtk.py | 8 ++++++++ tests/test_overrides.py | 13 ++++++++++++- - 2 files changed, 20 insertions(+), 1 deletions(-) + 2 Dateien geändert, 20 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit fc5c869486c7f6929e285ea7a86623ec41ecd9bd Author: Martin Pitt -Date: Thu Jul 7 13:39:19 2011 +0200 +Date: Thu Jul 7 13:39:19 2011 +0200 Fix crash in Gtk.TextIter overrides @@ -3770,7 +3975,7 @@ Date: Thu Jul 7 13:39:19 2011 +0200 -------------- 8< ----------------- gi/overrides/Gtk.py | 10 ++++++++-- - 1 files changed, 8 insertions(+), 2 deletions(-) + 1 Datei geändert, 8 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit 5c04fc5b2ca7e262c052426d5863d69d0c4a24da Author: John (J5) Palmieri @@ -3782,7 +3987,7 @@ Date: Tue Jul 5 15:57:23 2011 -0400 gi/pygi-cache.h | 6 +++--- gi/pygi-invoke-ng.c | 6 +++--- gi/pygi-marshal-cleanup.c | 6 +++--- - 4 files changed, 21 insertions(+), 21 deletions(-) + 4 Dateien geändert, 21 Zeilen hinzugefügt(+), 21 Zeilen entfernt(-) commit ecc09749c34cd4eabf47cc722d768b042dc0be9f Author: John (J5) Palmieri @@ -3791,7 +3996,7 @@ Date: Tue Jul 5 14:17:30 2011 -0400 [cache] remove refrence to default value as it is not implemented yet gi/pygi-cache.h | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile entfernt(-) commit 433e0fb259047d8c81e5949a31abb5e0feefd27b Author: Sebastian Pölsterl @@ -3802,7 +4007,7 @@ Date: Thu May 12 18:53:06 2011 +0200 https://bugzilla.gnome.org/show_bug.cgi?id=647581 gi/pygi-argument.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+) commit 38cca3c14e79fbc383e3fc65a120bee03714b99f Author: John (J5) Palmieri @@ -3811,7 +4016,7 @@ Date: Fri Jul 1 05:19:15 2011 -0400 correctly initialize the _gi_cairo_functions array to be zero filled gi/pygi-foreign-cairo.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 9ae43fdbcc547eb1e3c61bf9545da40555b2e2c6 Author: John (J5) Palmieri @@ -3820,7 +4025,7 @@ Date: Fri Jul 1 05:19:15 2011 -0400 correctly initialize the _gi_cairo_functions array to be zero filled gi/pygi-foreign-cairo.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit d3ee40b36b1718e6fb4544dbe07e291138ea1eb9 Author: John (J5) Palmieri @@ -3829,7 +4034,7 @@ Date: Wed Jun 29 18:14:40 2011 -0400 pass in the address of the gerror, not the gerror itself gi/pygi-argument.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 49dc98eb9339ea64355cd752ca000c79da56f3a2 Author: John (J5) Palmieri @@ -3838,7 +4043,7 @@ Date: Wed Jun 29 18:01:44 2011 -0400 [gi] handle marshalling gerrors arguments for signals gi/pygi-argument.c | 18 ++++++++++++++++-- - 1 files changed, 16 insertions(+), 2 deletions(-) + 1 Datei geändert, 16 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit db9419fcef628e9ffee10591156007ea9c0bc1f0 Author: John (J5) Palmieri @@ -3848,7 +4053,7 @@ Date: Wed Jun 29 12:12:29 2011 -0400 struct gi/pygi-cache.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + 1 Datei geändert, 3 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-) commit 9027e1a20fd06df5c26edcec1893ef0814ec938a Author: John (J5) Palmieri @@ -3860,7 +4065,7 @@ Date: Tue Jun 28 18:21:55 2011 -0400 a TreeModel tests/test_overrides.py | 26 +++++++++++++++----------- - 1 files changed, 15 insertions(+), 11 deletions(-) + 1 Datei geändert, 15 Zeilen hinzugefügt(+), 11 Zeilen entfernt(-) commit b6842e4b2a28733e143d4022864041ca82e91f7a Author: John (J5) Palmieri @@ -3873,7 +4078,7 @@ Date: Tue Jun 28 18:13:38 2011 -0400 gi/overrides/Gtk.py | 7 ++++--- gobject/pygtype.c | 7 ++++--- - 2 files changed, 8 insertions(+), 6 deletions(-) + 2 Dateien geändert, 8 Zeilen hinzugefügt(+), 6 Zeilen entfernt(-) commit 7fc9d45860210fd9d333fd3769c6cf93a6a20eb6 Author: John (J5) Palmieri @@ -3882,7 +4087,7 @@ Date: Tue Jun 28 17:32:29 2011 -0400 [gi-invoke-ng] copy structs when transfer is full for array gi/pygi-marshal.c | 21 ++++++++++++++++++--- - 1 files changed, 18 insertions(+), 3 deletions(-) + 1 Datei geändert, 18 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-) commit 8d60c0bc7b327aa757a8727f1146f02cc0b78af8 Author: John (J5) Palmieri @@ -3895,7 +4100,7 @@ Date: Tue Jun 28 13:54:48 2011 -0400 which is not supported gi/overrides/Gtk.py | 12 ++++++++++++ - 1 files changed, 12 insertions(+), 0 deletions(-) + 1 Datei geändert, 12 Zeilen hinzugefügt(+) commit 7c589c0c1de1a786e00685afd5292b6fb1f93ed3 Author: John (J5) Palmieri @@ -3921,7 +4126,7 @@ Date: Tue Jun 28 13:08:49 2011 -0400 to avoid name clashing gi/overrides/Gtk.py | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) + 1 Datei geändert, 5 Zeilen hinzugefügt(+) commit 2aa12267bee91aa696633a0cea2a0accae09250a Author: Johan Dahlin @@ -3933,7 +4138,7 @@ Date: Mon Jun 27 10:56:20 2011 -0300 gobject/propertyhelper.py | 23 ++++++++++++++++------- tests/test_properties.py | 40 ++++++++++++++++++++++++++++++++++++---- - 2 files changed, 52 insertions(+), 11 deletions(-) + 2 Dateien geändert, 52 Zeilen hinzugefügt(+), 11 Zeilen entfernt(-) commit dc62e67b447ef526a6f2d1aa8648ad101d95024b Author: Johan Dahlin @@ -3945,7 +4150,7 @@ Date: Mon Jun 27 10:56:20 2011 -0300 gobject/propertyhelper.py | 23 ++++++++++++++++------- tests/test_properties.py | 40 ++++++++++++++++++++++++++++++++++++---- - 2 files changed, 52 insertions(+), 11 deletions(-) + 2 Dateien geändert, 52 Zeilen hinzugefügt(+), 11 Zeilen entfernt(-) commit 50cfccb5801c1b9a0a42ffe2826cd245f21fd88d Author: John (J5) Palmieri @@ -3956,7 +4161,7 @@ Date: Fri Jun 24 14:17:24 2011 -0400 gi/pygi-invoke-ng.c | 2 ++ gi/pygi-marshal-cleanup.c | 2 ++ - 2 files changed, 4 insertions(+), 0 deletions(-) + 2 Dateien geändert, 4 Zeilen hinzugefügt(+) commit eff65cd2ce490296865441c3c78b7846f380459c Author: John (J5) Palmieri @@ -3966,8 +4171,8 @@ Date: Fri Jun 24 11:49:05 2011 -0400 integers gi/pygi-marshal.c | 56 - +++++++++++++++++++++++++++++++++++++++++----------- - 1 files changed, 44 insertions(+), 12 deletions(-) + +++++++++++++++++++++++++++++++++++++++++------------ + 1 Datei geändert, 44 Zeilen hinzugefügt(+), 12 Zeilen entfernt(-) commit 05ed688d54e3ff04e961b60d0b5d3ed0b97c771d Author: John (J5) Palmieri @@ -3977,7 +4182,7 @@ Date: Wed Jun 22 12:26:39 2011 -0400 API are broken gi/pygi-cache.c | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) + 1 Datei geändert, 4 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit 4fd957a5de364c0588168dee15e1e61d4f12e173 Author: John (J5) Palmieri @@ -3986,7 +4191,7 @@ Date: Fri Jun 17 17:07:56 2011 -0400 [gi-invoke-ng] handle in pointer array marshalling gi/pygi-marshal.c | 28 ++++++++++++++++++++++------ - 1 files changed, 22 insertions(+), 6 deletions(-) + 1 Datei geändert, 22 Zeilen hinzugefügt(+), 6 Zeilen entfernt(-) commit df3911ad2ce83af9bf9679ed1b221847b23ba2de Author: Alex Eftimie @@ -3995,7 +4200,7 @@ Date: Fri Jun 10 08:44:04 2011 +0300 Adding GPtrArray tests tests/test_gi.py | 43 ++++++++++++++++++++++++++++++++++++++++++- - 1 files changed, 42 insertions(+), 1 deletions(-) + 1 Datei geändert, 42 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit e32c2be53175014399d89e1e85c9afc6e53c94be Author: John (J5) Palmieri @@ -4008,7 +4213,7 @@ Date: Fri Jun 17 11:32:28 2011 -0400 * special case GPtrArrays gi/pygi-marshal.c | 27 +++++++++------------------ - 1 files changed, 9 insertions(+), 18 deletions(-) + 1 Datei geändert, 9 Zeilen hinzugefügt(+), 18 Zeilen entfernt(-) commit 6e8dc28cb261cafbfed40fc0797a0dd5f91f497b Author: John (J5) Palmieri @@ -4018,7 +4223,7 @@ Date: Wed Jun 15 12:46:03 2011 -0400 arg failure gi/pygi-marshal-cleanup.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit af7c93ea98b7f492eef265e58c8b3c878805524f Author: John (J5) Palmieri @@ -4031,7 +4236,7 @@ Date: Wed Jun 15 12:06:47 2011 -0400 gi/overrides/GLib.py | 18 ++++++++---------- tests/test_overrides.py | 6 ++---- - 2 files changed, 10 insertions(+), 14 deletions(-) + 2 Dateien geändert, 10 Zeilen hinzugefügt(+), 14 Zeilen entfernt(-) commit c6112307f29f9a850e6e9efa5f55d5d4a363c6b0 Author: John (J5) Palmieri @@ -4040,7 +4245,7 @@ Date: Wed Jun 15 11:42:45 2011 -0400 [gi-invoke-ng] actual code to import overrides gi/pygi-cache.c | 7 +------ - 1 files changed, 1 insertions(+), 6 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 6 Zeilen entfernt(-) commit 902575d857beffb14e56821ea8a52f705385f6bb Author: John (J5) Palmieri @@ -4049,7 +4254,7 @@ Date: Wed Jun 15 11:25:10 2011 -0400 [gi-invoke-ng] import pytypes so we get overrides gi/pygi-marshal.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) + 1 Datei geändert, 3 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit 9d5604220bd56ae2708e9b74122c14208e0a30b4 Author: John (J5) Palmieri @@ -4058,7 +4263,7 @@ Date: Tue Jun 14 16:13:37 2011 -0400 [gi-invoke-ng] handle gvariants now that they are not foreign gi/pygi-marshal.c | 7 ++++++- - 1 files changed, 6 insertions(+), 1 deletions(-) + 1 Datei geändert, 6 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit c1f5651062687e800a52b5d8d16c88c0acde2934 Author: John (J5) Palmieri @@ -4067,7 +4272,7 @@ Date: Tue Jun 14 16:12:43 2011 -0400 [gi-invoke-ng] do not try to clean up NULL arguments gi/pygi-marshal-cleanup.c | 24 ++++++++++++++++-------- - 1 files changed, 16 insertions(+), 8 deletions(-) + 1 Datei geändert, 16 Zeilen hinzugefügt(+), 8 Zeilen entfernt(-) commit fbf5382fbc1aed49ed491d2255d616a1643a45fc Merge: 499b68d 1491f62 @@ -4090,7 +4295,7 @@ Date: Fri Jun 10 14:01:32 2011 +0200 closure: avoid double free crash gi/pygi-closure.c | 12 ++++-------- - 1 files changed, 4 insertions(+), 8 deletions(-) + 1 Datei geändert, 4 Zeilen hinzugefügt(+), 8 Zeilen entfernt(-) commit 929f4236f2b8601e7960a4a7b0a860d976ad83c6 Author: Jason Siefken @@ -4103,7 +4308,7 @@ Date: Fri Jun 3 23:11:17 2011 -0700 gi/overrides/Gdk.py | 6 ++++++ tests/test_overrides.py | 4 ++++ - 2 files changed, 10 insertions(+), 0 deletions(-) + 2 Dateien geändert, 10 Zeilen hinzugefügt(+) commit dff5961ba229c7c34bd7b0a18a446b56bbe39e3a Author: Ignacio Casal Quinteiro @@ -4112,7 +4317,7 @@ Date: Wed Jun 8 19:13:48 2011 +0200 closure: Check the out arg is not null. Fixes bug #651812 gi/pygi-closure.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) + 1 Datei geändert, 3 Zeilen hinzugefügt(+) commit d7d178206bfbb0858556fcfd6c9ca8eefda3fdf5 Author: Tomeu Vizoso @@ -4121,7 +4326,7 @@ Date: Wed Jun 8 09:47:20 2011 +0200 Use constants instead of literals tests/test_overrides.py | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) + 1 Datei geändert, 4 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-) commit fe386a0ad548a23e30e9cb947bfa2198fb48ef29 Author: Tomeu Vizoso @@ -4133,7 +4338,7 @@ Date: Mon Jun 6 19:07:22 2011 +0200 gi/pygi-argument.c | 8 ++++---- gi/pygi-invoke.c | 20 +++++++++++++------- - 2 files changed, 17 insertions(+), 11 deletions(-) + 2 Dateien geändert, 17 Zeilen hinzugefügt(+), 11 Zeilen entfernt(-) commit bd7b8d96a7420522c1fdc127ef8cfb7d6e8a1b31 Author: Tomeu Vizoso @@ -4144,7 +4349,7 @@ Date: Mon Jun 6 19:05:07 2011 +0200 https://bugzilla.gnome.org/show_bug.cgi?id=647509 gi/gimodule.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 2d73012e5dbcc45a5782a6c119dfb272c14b5a61 Author: Tomeu Vizoso @@ -4155,7 +4360,7 @@ Date: Mon Jun 6 17:38:21 2011 +0200 https://bugzilla.gnome.org/show_bug.cgi?id=647509 gi/module.py | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) + 1 Datei geändert, 3 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit d82e6c8d1d9f2fc48fdcc15b7d2a97e4f24cf3bf Author: Tomeu Vizoso @@ -4165,7 +4370,7 @@ Date: Mon Jun 6 17:24:28 2011 +0200 HACKING | 16 ++++++++++++++++ gi/HACKING | 26 -------------------------- - 2 files changed, 16 insertions(+), 26 deletions(-) + 2 Dateien geändert, 16 Zeilen hinzugefügt(+), 26 Zeilen entfernt(-) commit 92aca4416a7930e5870b8d1a4016bae8140462ee Author: Daniel Drake @@ -4215,7 +4420,7 @@ Date: Fri Jun 3 16:59:15 2011 +0100 glib/pygsource.c | 6 ++++-- gobject/pygobject.c | 8 +++++++- - 2 files changed, 11 insertions(+), 3 deletions(-) + 2 Dateien geändert, 11 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-) commit 4c9bcedb4e11ad66a4b86174e2425c7afcafc473 Author: John (J5) Palmieri @@ -4224,7 +4429,7 @@ Date: Tue May 31 16:59:41 2011 -0400 [gi-invoke-ng] enable invoke-ng by default configure.ac | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) + 1 Datei geändert, 4 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-) commit 2e4cfb85a55ff205e263591d573ee5ecf0ffff3e Author: John (J5) Palmieri @@ -4233,7 +4438,7 @@ Date: Tue May 31 16:37:21 2011 -0400 [gi-invoke-ng] add code to clean up when input values fail to marshal gi/pygi-marshal-cleanup.c | 30 +++++++++++++++++++++++++----- - 1 files changed, 25 insertions(+), 5 deletions(-) + 1 Datei geändert, 25 Zeilen hinzugefügt(+), 5 Zeilen entfernt(-) commit 508b1b6ca1b143f1e123a3ddb83e8ce146758dfc Author: John (J5) Palmieri @@ -4241,11 +4446,11 @@ Date: Tue May 31 16:01:03 2011 -0400 [gi-invoke-ng] add hash cleanup routines - gi/pygi-cache.c | 2 + + gi/pygi-cache.c | 2 ++ gi/pygi-marshal-cleanup.c | 64 +++++++++++++++++++++++++++++++++++++++++++++ - gi/pygi-marshal-cleanup.h | 10 +++++- - 3 files changed, 74 insertions(+), 2 deletions(-) + gi/pygi-marshal-cleanup.h | 10 +++++-- + 3 Dateien geändert, 74 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit 1954c75b94a74259b4e5d28f5ff8d76aa4610832 Author: John (J5) Palmieri @@ -4254,7 +4459,7 @@ Date: Tue May 31 14:47:30 2011 -0400 [gi-invoke-ng] handle arrays with transfers of GI_TRANSFER_CONTAINER gi/pygi-marshal-cleanup.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit b626c46b4a95602c7bf1278c2a39aacb7f5027d9 Author: John (J5) Palmieri @@ -4262,11 +4467,11 @@ Date: Tue May 31 14:40:49 2011 -0400 [gi-invoke-ng] add list cleanup routines - gi/pygi-cache.c | 8 ++-- + gi/pygi-cache.c | 8 ++--- gi/pygi-marshal-cleanup.c | 84 +++++++++++++++++++++++++++++++++++++++++++++ - gi/pygi-marshal-cleanup.h | 8 ++++ - 3 files changed, 96 insertions(+), 4 deletions(-) + gi/pygi-marshal-cleanup.h | 8 +++++ + 3 Dateien geändert, 96 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-) commit 2e542c327cd52c1f77af28905557dd25c64175d8 Author: John (J5) Palmieri @@ -4275,7 +4480,7 @@ Date: Thu May 26 16:10:13 2011 -0400 indentation fix gi/pygi-marshal.c | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) + 1 Datei geändert, 4 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-) commit 601aec11c49e821fe97dd30a2187fe3c75844712 Author: John (J5) Palmieri @@ -4286,7 +4491,7 @@ Date: Thu May 26 16:09:38 2011 -0400 gi/pygi-cache.c | 2 +- gi/pygi-marshal-cleanup.c | 24 ++++++++++++++++++++++++ gi/pygi-marshal.c | 37 +++++++++++++++++++++++++++++++------ - 3 files changed, 56 insertions(+), 7 deletions(-) + 3 Dateien geändert, 56 Zeilen hinzugefügt(+), 7 Zeilen entfernt(-) commit e9ad4428b769f8c9ace1cdc973c684de84fb1a5e Author: John (J5) Palmieri @@ -4298,7 +4503,7 @@ Date: Thu May 26 13:22:38 2011 -0400 null byte gi/pygi-marshal.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit a986b2b8e5ee37f2a330f5aabc85c73ebb0de508 Author: John (J5) Palmieri @@ -4309,9 +4514,9 @@ Date: Thu May 26 13:21:55 2011 -0400 gi/pygi-cache.c | 2 +- gi/pygi-marshal-cleanup.c | 72 ++++++++++++++++++++++++++++++++++++++++++++- - gi/pygi-marshal-cleanup.h | 9 +++++ + gi/pygi-marshal-cleanup.h | 9 ++++++ gi/pygi-marshal.c | 13 ++++++-- - 4 files changed, 91 insertions(+), 5 deletions(-) + 4 Dateien geändert, 91 Zeilen hinzugefügt(+), 5 Zeilen entfernt(-) commit 990c60805c8ef718eb29e2e1b24f057552c6159e Author: John (J5) Palmieri @@ -4321,7 +4526,7 @@ Date: Mon May 23 17:06:30 2011 -0400 gi/pygi-invoke-ng.c | 7 +------ gi/pygi-invoke-state-struct.h | 14 -------------- - 2 files changed, 1 insertions(+), 20 deletions(-) + 2 Dateien geändert, 1 Zeile hinzugefügt(+), 20 Zeilen entfernt(-) commit dbbcf4a0e76fb572d85843ee31c3798df5cd5cc5 Author: John (J5) Palmieri @@ -4341,13 +4546,13 @@ Date: Mon May 23 16:59:57 2011 -0400 gi/pygi-cache.c | 19 ++- gi/pygi-cache.h | 7 +- - gi/pygi-invoke-ng.c | 10 +-- + gi/pygi-invoke-ng.c | 10 +- gi/pygi-invoke-state-struct.h | 2 + gi/pygi-marshal-cleanup.c | 301 ++++++++++++++++------------------------- - gi/pygi-marshal-cleanup.h | 45 ++++--- + gi/pygi-marshal-cleanup.h | 45 +++--- gi/pygi-marshal.c | 15 +- - 7 files changed, 174 insertions(+), 225 deletions(-) + 7 Dateien geändert, 174 Zeilen hinzugefügt(+), 225 Zeilen entfernt(-) commit 198714dc4585f7463f38929f1ca4e4b60a27dadb Author: John (J5) Palmieri @@ -4360,11 +4565,11 @@ Date: Thu May 12 17:29:20 2011 -0400 * Now we call specific cleanup functions at the point of failure (or successful completion of a marshalling stage) - gi/pygi-invoke-ng.c | 59 ++++++++++++++++++++++++++++++------ + gi/pygi-invoke-ng.c | 59 ++++++++++++++++++++++++++++++------- gi/pygi-marshal-cleanup.c | 72 +++++++++++++++++++++++++++++++++++++++++++++ gi/pygi-marshal-cleanup.h | 14 +++++++++ - 3 files changed, 135 insertions(+), 10 deletions(-) + 3 Dateien geändert, 135 Zeilen hinzugefügt(+), 10 Zeilen entfernt(-) commit c1389dadbf35afee3f28d90ef637efd8c1f071a5 Author: José Alburquerque @@ -4382,7 +4587,7 @@ Date: Thu May 12 11:53:40 2011 -0400 processing. codegen/docextract.py | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit 303d8e8ab9e60cb554de7fc0e8592cd9b2c50843 Author: José Alburquerque @@ -4402,7 +4607,7 @@ Date: Mon May 9 17:32:09 2011 -0400 codegen/docextract.py | 15 ++++++++++++++- codegen/docextract_to_xml.py | 9 ++++++--- - 2 files changed, 20 insertions(+), 4 deletions(-) + 2 Dateien geändert, 20 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-) commit 4f615c6e300d6f2d7551b640efa301060206ab58 Author: John (J5) Palmieri @@ -4414,8 +4619,8 @@ Date: Thu May 5 14:04:34 2011 -0400 gi/pygi-marshal-cleanup.c | 87 ++++++++++++++++++++++++++++++++++----------- gi/pygi-marshal-cleanup.h | 6 ++-- - gi/pygi-marshal.c | 11 +----- - 4 files changed, 76 insertions(+), 33 deletions(-) + gi/pygi-marshal.c | 11 ++---- + 4 Dateien geändert, 76 Zeilen hinzugefügt(+), 33 Zeilen entfernt(-) commit 63c7f17c224821cb7136d06e8ef87eab7291848d Author: Martin Pitt @@ -4444,7 +4649,7 @@ Date: Mon May 2 15:49:52 2011 +0200 tests/te_ST@nouppera | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ tests/test_gi.py | 30 ++++++++++++++++++++++++++++++ - 3 files changed, 88 insertions(+), 1 deletions(-) + 3 Dateien geändert, 88 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit b5e150da76c3d4de1a75f58d03c3a761e9005a63 Author: Martin Pitt @@ -4453,7 +4658,7 @@ Date: Wed May 4 08:35:27 2011 +0200 [gi] pygi-convert.sh: Convert gtk.gdk.CROSSHAIR pygi-convert.sh | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+) commit fcc5ea201ab25da6db94ea8a37364a1d3c4d7c65 Author: John (J5) Palmieri @@ -4462,7 +4667,7 @@ Date: Fri Apr 29 17:41:08 2011 -0400 [gi-invoke-ng] handle filename cleanup with the utf8 cleanup function gi/pygi-cache.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+) commit dbe8c4fabc8ac19415a3be0e854d3a54c2317e0b Author: John (J5) Palmieri @@ -4470,11 +4675,11 @@ Date: Fri Apr 29 17:40:13 2011 -0400 [gi-invoke-ng] handle caller allocates cleanup - gi/pygi-invoke-ng.c | 5 +- + gi/pygi-invoke-ng.c | 5 ++- gi/pygi-marshal-cleanup.c | 104 ++++++++++++++++++++++++++++++++++++--------- - gi/pygi-marshal-cleanup.h | 7 ++- - 3 files changed, 90 insertions(+), 26 deletions(-) + gi/pygi-marshal-cleanup.h | 7 +-- + 3 Dateien geändert, 90 Zeilen hinzugefügt(+), 26 Zeilen entfernt(-) commit cdbf57f3b1f041a06cf545a5557424f701ed1ec7 Author: John (J5) Palmieri @@ -4483,13 +4688,13 @@ Date: Thu Apr 28 19:16:02 2011 -0400 [gi-invoke-ng] refactor the cleanup code and add utf8 cleanup as initial test - gi/pygi-cache.c | 15 +---------- - gi/pygi-invoke-ng.c | 8 ++---- - gi/pygi-invoke-state-struct.h | 2 + + gi/pygi-cache.c | 15 ++---------- + gi/pygi-invoke-ng.c | 8 +++---- + gi/pygi-invoke-state-struct.h | 2 ++ gi/pygi-marshal-cleanup.c | 51 ++++++++++++++++++++++++++++++++++++++++- - gi/pygi-marshal-cleanup.h | 3 ++ - 5 files changed, 60 insertions(+), 19 deletions(-) + gi/pygi-marshal-cleanup.h | 3 +++ + 5 Dateien geändert, 60 Zeilen hinzugefügt(+), 19 Zeilen entfernt(-) commit d1f1f4ccc55f9ecab73b7c0ee78762c4039b2c79 Author: John (J5) Palmieri @@ -4503,7 +4708,7 @@ Date: Wed Apr 27 15:47:19 2011 -0400 configure.ac | 15 +++++++++++---- gi/pygi-foreign-cairo.c | 2 +- - 2 files changed, 12 insertions(+), 5 deletions(-) + 2 Dateien geändert, 12 Zeilen hinzugefügt(+), 5 Zeilen entfernt(-) commit 83b7823a510b0b391560c6deaf9d15d8303c7b14 Author: Ignacio Casal Quinteiro @@ -4512,7 +4717,7 @@ Date: Thu Apr 21 16:52:20 2011 +0200 [python3] fix build. PYcairo_IMPORT doesn't exists anymore gi/pygi-foreign-cairo.c | 7 ++++++- - 1 files changed, 6 insertions(+), 1 deletions(-) + 1 Datei geändert, 6 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit 3e933784df423757e591d703614cb700adb0bbe0 Author: Sebastian Pölsterl @@ -4521,7 +4726,7 @@ Date: Mon Apr 18 18:36:25 2011 +0200 Updated DOAP file pygobject.doap | 15 +++++++++++++++ - 1 files changed, 15 insertions(+), 0 deletions(-) + 1 Datei geändert, 15 Zeilen hinzugefügt(+) commit 399d06b4b20685eb38acfd7e43226e06737ab7d2 Author: Sebastian Pölsterl @@ -4530,7 +4735,7 @@ Date: Sat Apr 16 16:02:05 2011 +0200 [gi] Don't create variant twice gi/overrides/GLib.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 8d8a84ea23d28d25851c5870f261c020d762cef4 Author: Sebastian Pölsterl @@ -4542,7 +4747,7 @@ Date: Fri Apr 15 16:14:43 2011 +0200 https://bugzilla.gnome.org/show_bug.cgi?id=647736 pygi-convert.sh | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+) commit 3b51d6426d0f59b2dd7e0dcdcded4bed43d6b9d8 Author: Sebastian Pölsterl @@ -4555,7 +4760,7 @@ Date: Fri Apr 15 15:58:53 2011 +0200 https://bugzilla.gnome.org/show_bug.cgi?id=647796 gi/overrides/GLib.py | 14 +------------- - 1 files changed, 1 insertions(+), 13 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 13 Zeilen entfernt(-) commit bb4dce14ba666969815d4e56adbc38f0ac4f7ff7 Author: Sebastian Pölsterl @@ -4564,7 +4769,7 @@ Date: Fri Apr 15 15:58:31 2011 +0200 [gi] Added additional test case for GVariant handling tests/test_overrides.py | 15 +++++++++++++++ - 1 files changed, 15 insertions(+), 0 deletions(-) + 1 Datei geändert, 15 Zeilen hinzugefügt(+) commit 138df2778543409752e229a09828a805f68a420d Author: Sebastian Pölsterl @@ -4579,7 +4784,7 @@ Date: Mon Apr 11 18:34:31 2011 +0200 https://bugzilla.gnome.org/show_bug.cgi?id=647477 gi/pygi-argument.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+) commit 985f239d891c7697d76ccecb797b189669ae6ee1 Author: John (J5) Palmieri @@ -4596,7 +4801,7 @@ Date: Tue Mar 22 18:46:28 2011 -0400 gobject/pygtype.c | 28 +++++++++++++++++++--------- tests/test_properties.py | 8 ++++++++ - 2 files changed, 27 insertions(+), 9 deletions(-) + 2 Dateien geändert, 27 Zeilen hinzugefügt(+), 9 Zeilen entfernt(-) commit 58cfc3cd1152b4448b56a6ff597f954d8450b83e Author: Dieter Verfaillie @@ -4606,7 +4811,7 @@ Date: Tue Mar 22 20:47:51 2011 +0100 files (so \n does not become \r\n) dsextras.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 629d267478982c426ba61a639d5c9603fed856e6 Author: Dieter Verfaillie @@ -4615,7 +4820,7 @@ Date: Tue Mar 22 11:35:44 2011 +0100 dsextras.py: remove \r as wel as \n character dsextras.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 426c7109d4c0dbf0d56cc075f97f33b3451f79a8 Author: John (J5) Palmieri @@ -4629,7 +4834,7 @@ Date: Wed Apr 27 15:47:19 2011 -0400 configure.ac | 15 +++++++++++---- gi/pygi-foreign-cairo.c | 2 +- - 2 files changed, 12 insertions(+), 5 deletions(-) + 2 Dateien geändert, 12 Zeilen hinzugefügt(+), 5 Zeilen entfernt(-) commit 4e5833d0c2fe548617e5ea510f05920fd0caf73b Author: Ignacio Casal Quinteiro @@ -4638,7 +4843,7 @@ Date: Thu Apr 21 16:52:20 2011 +0200 [python3] fix build. PYcairo_IMPORT doesn't exists anymore gi/pygi-foreign-cairo.c | 7 ++++++- - 1 files changed, 6 insertions(+), 1 deletions(-) + 1 Datei geändert, 6 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit 91ec337359720839862d3f5a8a0ea98f760a0752 Author: Sebastian Pölsterl @@ -4647,7 +4852,7 @@ Date: Mon Apr 18 18:36:25 2011 +0200 Updated DOAP file pygobject.doap | 15 +++++++++++++++ - 1 files changed, 15 insertions(+), 0 deletions(-) + 1 Datei geändert, 15 Zeilen hinzugefügt(+) commit 05c766044c83340c44564d0097514bfc1d1d9df7 Author: Sebastian Pölsterl @@ -4656,7 +4861,7 @@ Date: Sat Apr 16 16:02:05 2011 +0200 [gi] Don't create variant twice gi/overrides/GLib.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit eb8f212e3687af30407cf01fcdfbf530257bcddb Author: Sebastian Pölsterl @@ -4668,7 +4873,7 @@ Date: Fri Apr 15 16:14:43 2011 +0200 https://bugzilla.gnome.org/show_bug.cgi?id=647736 pygi-convert.sh | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+) commit af31729573de24161ee90563e5738187c749783c Author: Sebastian Pölsterl @@ -4681,7 +4886,7 @@ Date: Fri Apr 15 15:58:53 2011 +0200 https://bugzilla.gnome.org/show_bug.cgi?id=647796 gi/overrides/GLib.py | 14 +------------- - 1 files changed, 1 insertions(+), 13 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 13 Zeilen entfernt(-) commit 070f6688be4afb926656038dcceac4c8b8ed97c7 Author: Sebastian Pölsterl @@ -4690,7 +4895,7 @@ Date: Fri Apr 15 15:58:31 2011 +0200 [gi] Added additional test case for GVariant handling tests/test_overrides.py | 15 +++++++++++++++ - 1 files changed, 15 insertions(+), 0 deletions(-) + 1 Datei geändert, 15 Zeilen hinzugefügt(+) commit 65aa040e86d94ee6bb227a2bce09668b60208027 Author: John (J5) Palmieri @@ -4699,7 +4904,7 @@ Date: Tue Apr 12 14:51:35 2011 -0400 [gi-invoke-ng] fix prototype gi/pygi-cache.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 12aa4e6376366ca9d758434f6544c9c70a1e5df8 Author: John (J5) Palmieri @@ -4714,7 +4919,7 @@ Date: Tue Apr 12 14:48:16 2011 -0400 marshalling the out parameters and at any time an error occures - gi/Makefile.am | 4 ++- + gi/Makefile.am | 4 +- gi/pygi-cache.c | 25 +++++++------ gi/pygi-cache.h | 5 ++- gi/pygi-invoke-ng.c | 34 ++++++++++++++--- @@ -4723,7 +4928,7 @@ Date: Tue Apr 12 14:48:16 2011 -0400 +++++++++++++++++++++++++++++++++++++++++ gi/pygi-marshal-cleanup.h | 43 ++++++++++++++++++++++ gi/pygi-marshal.c | 1 + - 8 files changed, 187 insertions(+), 19 deletions(-) + 8 Dateien geändert, 187 Zeilen hinzugefügt(+), 19 Zeilen entfernt(-) commit 0463295cd046bd6382ad9dc71ea1518858d63c5f Author: Sebastian Pölsterl @@ -4738,7 +4943,7 @@ Date: Mon Apr 11 18:34:31 2011 +0200 https://bugzilla.gnome.org/show_bug.cgi?id=647477 gi/pygi-argument.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+) commit 1d64c3d3db2ec17b9a48df55271f712db6c07060 Author: John (J5) Palmieri @@ -4748,7 +4953,7 @@ Date: Wed Mar 30 16:40:31 2011 -0400 pygi-arguments.h gi/pygi-marshal.h | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) + 1 Datei geändert, 4 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-) commit 3580cd1c7222022ebeef3476f9e609c8045f12a3 Author: John (J5) Palmieri @@ -4757,10 +4962,10 @@ Date: Wed Mar 30 15:53:13 2011 -0400 [gi-invoke-ng] code style space fixes gi/pygi-cache.c | 420 +++++++++++++++++++------------------- - gi/pygi-invoke-ng.c | 145 +++++++------- + gi/pygi-invoke-ng.c | 145 +++++++------ gi/pygi-marshal.c | 565 ++++++++++++++++++++++++++------------------------- - 3 files changed, 566 insertions(+), 564 deletions(-) + 3 Dateien geändert, 566 Zeilen hinzugefügt(+), 564 Zeilen entfernt(-) commit 81662fcd09f112bfffcdc5b7f01a5537b84cd9d4 Author: John (J5) Palmieri @@ -4769,7 +4974,7 @@ Date: Tue Mar 29 16:54:44 2011 -0400 [gi-invoke-ng] don't decref value taken from a dict as it is borrowed gi/pygi-invoke-ng.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile entfernt(-) commit a456fc0adc1f8a0754bf59cde8924f905bfc7dc1 Author: John (J5) Palmieri @@ -4778,7 +4983,7 @@ Date: Tue Mar 29 15:23:06 2011 -0400 [gi-invoke-ng] return None when appropriate so we don't crash gi/pygi-marshal.c | 18 +++++++++++++++++- - 1 files changed, 17 insertions(+), 1 deletions(-) + 1 Datei geändert, 17 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit e8c8c37e5587dc7ff62519df336988a12e6f5d0a Author: John (J5) Palmieri @@ -4787,7 +4992,7 @@ Date: Tue Mar 29 15:21:41 2011 -0400 [gi-invoke-ng] fix aux value caching gi/pygi-cache.c | 15 ++++++++++----- - 1 files changed, 10 insertions(+), 5 deletions(-) + 1 Datei geändert, 10 Zeilen hinzugefügt(+), 5 Zeilen entfernt(-) commit 4e4c1847c713a4eb4ab34d04488e94dac24d9167 Author: John (J5) Palmieri @@ -4796,7 +5001,7 @@ Date: Mon Mar 28 20:25:46 2011 -0400 [gi-invoke-ng] backport handling flags with no gtype gi/pygi-marshal.c | 25 ++++++++++++++++++++++++- - 1 files changed, 24 insertions(+), 1 deletions(-) + 1 Datei geändert, 24 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit fd76423e655b3711e1ffbf9b61ea4e2c94040234 Author: John (J5) Palmieri @@ -4805,7 +5010,7 @@ Date: Mon Mar 28 18:32:00 2011 -0400 [gi-invoke-ng] backport raw gvalue handling gi/pygi-marshal.c | 23 ++++++++++++++++++----- - 1 files changed, 18 insertions(+), 5 deletions(-) + 1 Datei geändert, 18 Zeilen hinzugefügt(+), 5 Zeilen entfernt(-) commit 507b5051c83f70ceae79e0fa693c86e5cbb9f442 Author: John (J5) Palmieri @@ -4816,7 +5021,7 @@ Date: Mon Mar 28 18:30:31 2011 -0400 gi/pygi-cache.c | 2 +- gi/pygi-marshal.c | 38 ++++++++++++++++++++++++++++++++++++++ - 2 files changed, 39 insertions(+), 1 deletions(-) + 2 Dateien geändert, 39 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit 726a27c0e74ace3ff23d9cc4d393ae53e57f1fac Author: John (J5) Palmieri @@ -4830,9 +5035,9 @@ Date: Mon Mar 28 18:26:09 2011 -0400 gi/pygi-info.c | 2 +- gi/pygi-invoke-ng.c | 40 +++--- gi/pygi-marshal.c | 140 +++++++++--------- - gi/pygi-marshal.h | 159 ++++++++------------- + gi/pygi-marshal.h | 159 +++++++++------------ gi/pygi.h | 2 +- - 7 files changed, 362 insertions(+), 385 deletions(-) + 7 Dateien geändert, 362 Zeilen hinzugefügt(+), 385 Zeilen entfernt(-) commit 3d5d9ff5c18a850650992bdd52e8e4c722b23396 Author: John (J5) Palmieri @@ -4841,7 +5046,7 @@ Date: Mon Mar 28 15:01:12 2011 -0400 [gi-invoke-rewrite] backport glib error handling gi/pygi-invoke-ng.c | 14 ++++++-------- - 1 files changed, 6 insertions(+), 8 deletions(-) + 1 Datei geändert, 6 Zeilen hinzugefügt(+), 8 Zeilen entfernt(-) commit 37b14b28a5f2aec16ac7f321efbf07e1403e9531 Author: John (J5) Palmieri @@ -4850,7 +5055,7 @@ Date: Fri Mar 25 18:48:42 2011 -0400 [gi-invoke-ng] backport closure passing from invoke gi/pygi-marshal.c | 13 ++++++++++--- - 1 files changed, 10 insertions(+), 3 deletions(-) + 1 Datei geändert, 10 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-) commit cf7f97eabc9c49773c2916929b8c43ef453d0652 Author: John (J5) Palmieri @@ -4858,12 +5063,12 @@ Date: Fri Mar 25 18:47:36 2011 -0400 [gi-invoke-ng] handle vfuncs and fix cosntrutors - gi/pygi-cache.c | 9 ++++++ - gi/pygi-cache.h | 2 + + gi/pygi-cache.c | 9 +++++++ + gi/pygi-cache.h | 2 ++ gi/pygi-invoke-ng.c | 56 - ++++++++++++++++++++++++++++++---------- - gi/pygi-invoke-state-struct.h | 2 + - 4 files changed, 55 insertions(+), 14 deletions(-) + ++++++++++++++++++++++++++++++----------- + gi/pygi-invoke-state-struct.h | 2 ++ + 4 Dateien geändert, 55 Zeilen hinzugefügt(+), 14 Zeilen entfernt(-) commit af2ce400fcf771ee6c9bc01aecfb59467be5a0ce Author: John (J5) Palmieri @@ -4873,7 +5078,7 @@ Date: Fri Mar 25 18:39:06 2011 -0400 gi/pygi-cache.c | 22 ++++++---------------- gi/pygi-marshal.c | 3 +++ - 2 files changed, 9 insertions(+), 16 deletions(-) + 2 Dateien geändert, 9 Zeilen hinzugefügt(+), 16 Zeilen entfernt(-) commit 482553ae5d863ca523be3bd1eededa5d02a4f87e Author: John (J5) Palmieri @@ -4887,9 +5092,9 @@ Date: Fri Mar 25 13:14:01 2011 -0400 keep it around in the state for future use. gi/pygi-invoke-ng.c | 46 - +++++++++++++++++++++++++++++++++++----- + +++++++++++++++++++++++++++++++++++------ gi/pygi-invoke-state-struct.h | 1 + - 2 files changed, 41 insertions(+), 6 deletions(-) + 2 Dateien geändert, 41 Zeilen hinzugefügt(+), 6 Zeilen entfernt(-) commit 0534eb0e843cdf09611143da184052f7e549e4dc Author: John (J5) Palmieri @@ -4906,7 +5111,7 @@ Date: Tue Mar 22 18:46:28 2011 -0400 gobject/pygtype.c | 28 +++++++++++++++++++--------- tests/test_properties.py | 8 ++++++++ - 2 files changed, 27 insertions(+), 9 deletions(-) + 2 Dateien geändert, 27 Zeilen hinzugefügt(+), 9 Zeilen entfernt(-) commit 5f0e130026a663a57ed1317e0fa0e1f78f9e6e0a Author: Dieter Verfaillie @@ -4916,7 +5121,7 @@ Date: Tue Mar 22 20:47:51 2011 +0100 files (so \n does not become \r\n) dsextras.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 62a6274105003ef386ddfe9ef38e8afa8c43d124 Author: Dieter Verfaillie @@ -4925,7 +5130,7 @@ Date: Tue Mar 22 11:35:44 2011 +0100 dsextras.py: remove \r as wel as \n character dsextras.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 86c436978c933f6ebe17627abe98325ce66f6baa Author: John (J5) Palmieri @@ -4940,7 +5145,7 @@ Date: Tue Mar 22 16:13:58 2011 -0400 gi/pygi-marshal.c | 1962 +-------------------------------------------------- gi/pygi-private.h | 4 +- - 6 files changed, 9 insertions(+), 2809 deletions(-) + 6 Dateien geändert, 9 Zeilen hinzugefügt(+), 2809 Zeilen entfernt(-) commit 35619fec43f4df85edf5456f3fc9733b16f2ba90 Author: John (J5) Palmieri @@ -4954,7 +5159,7 @@ Date: Tue Mar 22 15:40:02 2011 -0400 gi/pygi-info.c | 4 +++- gi/pygi-private.h | 9 +++++++-- gi/pygi.h | 4 +++- - 6 files changed, 37 insertions(+), 9 deletions(-) + 6 Dateien geändert, 37 Zeilen hinzugefügt(+), 9 Zeilen entfernt(-) commit 83c51bd2bb6ca24ce610c04cff1527bcd2689d90 Author: John (J5) Palmieri @@ -4963,7 +5168,7 @@ Date: Tue Mar 22 15:37:24 2011 -0400 [gi] revert back to the type.py from master gi/types.py | 21 +++++++++++++++------ - 1 files changed, 15 insertions(+), 6 deletions(-) + 1 Datei geändert, 15 Zeilen hinzugefügt(+), 6 Zeilen entfernt(-) commit cb30d00d1c92e73d9bfb08cc7b600a5aa70f2fc0 Author: John (J5) Palmieri @@ -4972,10 +5177,10 @@ Date: Tue Mar 22 14:46:29 2011 -0400 [gi] revert pygi-argument.h and move the invoke-ng code to pygi-marshal.h - gi/pygi-argument.h | 268 +----------------------------------------- + gi/pygi-argument.h | 268 +---------------------------------------- gi/pygi-marshal.h | 336 ++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 337 insertions(+), 267 deletions(-) + 2 Dateien geändert, 337 Zeilen hinzugefügt(+), 267 Zeilen entfernt(-) commit 17cb714cfdaf45b6d7dd627b0189bd24e6578f74 Merge: 7332a1b 01596a9 @@ -5016,7 +5221,7 @@ Date: Tue Mar 22 13:20:54 2011 -0400 gi/pygi-foreign.h | 8 ++++---- gi/pygi-invoke.c | 6 +++--- gi/pygi.h | 12 ++++++------ - 7 files changed, 42 insertions(+), 48 deletions(-) + 7 Dateien geändert, 42 Zeilen hinzugefügt(+), 48 Zeilen entfernt(-) commit fbabc1fdafa1dcbd1f6aaea7b821bd1c64a546ab Author: Martin Pitt @@ -5034,7 +5239,7 @@ Date: Tue Mar 22 15:04:01 2011 +0100 tests/Makefile.am | 3 ++- tests/test_overrides.py | 4 +++- - 2 files changed, 5 insertions(+), 2 deletions(-) + 2 Dateien geändert, 5 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit 7332a1b99775519fdc5500cab6628b713e946a8c Author: John (J5) Palmieri @@ -5047,12 +5252,12 @@ Date: Mon Mar 21 19:03:29 2011 -0400 own, nonconflicting files * copy the old files out of master - gi/pygi-argument.c | 2101 +++------------------------- + gi/pygi-argument.c | 2101 +++------------------------ gi/pygi-invoke-ng.c | 1179 ++++++++++++++++ gi/pygi-invoke.c | 421 ++---- gi/pygi-marshal.c | 3916 +++++++++++++++++++++++++++++++++++++++++++++++++++ - 4 files changed, 5389 insertions(+), 2228 deletions(-) + 4 Dateien geändert, 5389 Zeilen hinzugefügt(+), 2228 Zeilen entfernt(-) commit 62b49dae97441953452d097cb1751df14302547a Author: John (J5) Palmieri @@ -5069,7 +5274,7 @@ Date: Wed Mar 16 17:34:18 2011 -0400 gi/pygi-argument.c | 17 ++++++++++------- tests/test_gi.py | 4 ++++ - 2 files changed, 14 insertions(+), 7 deletions(-) + 2 Dateien geändert, 14 Zeilen hinzugefügt(+), 7 Zeilen entfernt(-) commit 1e70957c5470a0f4bceba38ca66a4e4274fdc8d8 Author: John Stowers @@ -5080,7 +5285,7 @@ Date: Sun Mar 6 23:41:01 2011 +1300 https://bugzilla.gnome.org/show_bug.cgi?id=644347 pygi-convert.sh | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) + 1 Datei geändert, 7 Zeilen hinzugefügt(+) commit 2292673c96e7973a0732ca15bbd5b0bf7a9c7dcf Author: John Stowers @@ -5091,7 +5296,7 @@ Date: Sun Mar 6 23:41:30 2011 +1300 https://bugzilla.gnome.org/show_bug.cgi?id=644347 pygi-convert.sh | 28 ---------------------------- - 1 files changed, 0 insertions(+), 28 deletions(-) + 1 Datei geändert, 28 Zeilen entfernt(-) commit d26e5cc45f277f6b7edb32aa416520bb53bff9c2 Author: John (J5) Palmieri @@ -5101,7 +5306,7 @@ Date: Fri Mar 11 14:09:02 2011 -0500 demos/gtk-demo/demos/pickers.py | 74 +++++++++++++++++++++++++++++++++++++++ - 1 files changed, 74 insertions(+), 0 deletions(-) + 1 Datei geändert, 74 Zeilen hinzugefügt(+) commit b8d926a458ed7d7e92719e41b5bc1c36f68882b3 Author: John (J5) Palmieri @@ -5111,7 +5316,7 @@ Date: Thu Mar 10 18:12:50 2011 -0500 demos/gtk-demo/demos/menus.py | 122 +++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 122 insertions(+), 0 deletions(-) + 1 Datei geändert, 122 Zeilen hinzugefügt(+) commit 9baec8ed1c5d99c1677a75eaa1d38912f41f0b2d Author: John (J5) Palmieri @@ -5120,7 +5325,7 @@ Date: Wed Mar 9 13:02:50 2011 -0500 [gi-overrides] fix exception block so it works in Python 2.5 gi/overrides/Gio.py | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) + 1 Datei geändert, 4 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit 5ac534ac3ceee3cc19fe2297e3cd009817ed726f Author: Martin Pitt @@ -5142,7 +5347,7 @@ Date: Mon Mar 21 13:19:58 2011 +0100 glib/Makefile.am | 2 +- m4/python.m4 | 7 ++----- tests/Makefile.am | 2 +- - 4 files changed, 5 insertions(+), 10 deletions(-) + 4 Dateien geändert, 5 Zeilen hinzugefügt(+), 10 Zeilen entfernt(-) commit cd01f8ce1373f28b1427dd847bef44f747f1e6b3 Author: Dieter Verfaillie @@ -5151,7 +5356,7 @@ Date: Fri Mar 18 17:06:08 2011 +0100 setup.py: fix user_access_control option setup.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 2da60baec4f43c41f43527cbfde4e21e0eea728c Author: Martin Pitt @@ -5164,7 +5369,7 @@ Date: Wed Mar 16 10:22:35 2011 +0100 Chou for spotting this! gi/overrides/Gtk.py | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+) commit 029a79d1af1e0998aa6bc88ce1c1f48ce0ccd2a0 Author: Martin Pitt @@ -5189,7 +5394,7 @@ Date: Tue Mar 15 10:22:39 2011 +0100 gi/overrides/Gio.py | 16 +++++++++++++++- tests/test_gdbus.py | 13 +++++++++++++ - 2 files changed, 28 insertions(+), 1 deletions(-) + 2 Dateien geändert, 28 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit 5bf66ce79267b25bcc80251f9170498fa1d765f6 Author: John Stowers @@ -5200,7 +5405,7 @@ Date: Sun Mar 6 23:05:33 2011 +1300 https://bugzilla.gnome.org/show_bug.cgi?id=644343 gi/overrides/Gtk.py | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+) commit 8e4f86e17a1de533a93b0748fd8de3cbfa70ba62 Author: John Stowers @@ -5209,7 +5414,7 @@ Date: Sun Mar 6 17:48:04 2011 +1300 [gi-demos] dont try and run demos that represent directories demos/gtk-demo/gtk-demo.py | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit 097e5efab29d3d2d91d0b9fc75bf00219e9b7810 Author: John (J5) Palmieri @@ -5221,7 +5426,7 @@ Date: Mon Mar 7 18:09:18 2011 -0500 demos/gtk-demo/demos/Tree View/liststore.py | 2 +- demos/gtk-demo/demos/rotatedtext.py | 4 ++-- demos/gtk-demo/gtk-demo.py | 4 ++-- - 4 files changed, 11 insertions(+), 5 deletions(-) + 4 Dateien geändert, 11 Zeilen hinzugefügt(+), 5 Zeilen entfernt(-) commit fd5d5ef3abc947d3c6066eea6378514f87b7f0ce Author: John (J5) Palmieri @@ -5231,7 +5436,7 @@ Date: Tue Feb 22 15:07:40 2011 -0500 demos/gtk-demo/demos/Tree View/liststore.py | 205 +++++++++++++++++++++++++++ - 1 files changed, 205 insertions(+), 0 deletions(-) + 1 Datei geändert, 205 Zeilen hinzugefügt(+) commit 09de5cf99474fc8a34b5f4a61cede1fb47353ebb Author: John (J5) Palmieri @@ -5240,7 +5445,7 @@ Date: Mon Mar 7 18:08:40 2011 -0500 [gi-demos] catch the correct error class demos/gtk-demo/demos/images.py | 11 ++++++----- - 1 files changed, 6 insertions(+), 5 deletions(-) + 1 Datei geändert, 6 Zeilen hinzugefügt(+), 5 Zeilen entfernt(-) commit 7284d2d4622978fc9ddfd00f2714b3a572b7ab56 Author: Steve Frécinaux @@ -5258,7 +5463,7 @@ Date: Sun Mar 6 21:18:36 2011 +0100 gobject/propertyhelper.py | 5 ++--- tests/test_properties.py | 23 +++++++++++++++++++++++ - 2 files changed, 25 insertions(+), 3 deletions(-) + 2 Dateien geändert, 25 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-) commit 618dbb0ee15b47e5e7cb16a34ffce0937d7fa26d Author: John (J5) Palmieri @@ -5275,7 +5480,7 @@ Date: Fri Mar 4 12:25:49 2011 -0500 and a PyBytes object in Python 3 gobject/pygtype.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 7e9483ff75b7a63ddda0fa9a9847f9f22ad71240 Author: John (J5) Palmieri @@ -5284,7 +5489,7 @@ Date: Fri Mar 4 12:24:35 2011 -0500 [gi-overrides] handle unichar gvalues when setting treemodels gi/overrides/Gtk.py | 10 ++++++++++ - 1 files changed, 10 insertions(+), 0 deletions(-) + 1 Datei geändert, 10 Zeilen hinzugefügt(+) commit 6367bffa006e94dc667d7008fccad8d47d8d3646 Author: John (J5) Palmieri @@ -5294,7 +5499,7 @@ Date: Fri Mar 4 11:43:51 2011 -0500 gi/overrides/Gtk.py | 6 +++++- tests/test_overrides.py | 8 ++++---- - 2 files changed, 9 insertions(+), 5 deletions(-) + 2 Dateien geändert, 9 Zeilen hinzugefügt(+), 5 Zeilen entfernt(-) commit 83b0f8a37d5f3236780d87a1ca466c5e44ae2bc0 Author: John (J5) Palmieri @@ -5304,7 +5509,7 @@ Date: Fri Mar 4 11:10:16 2011 -0500 not found configure.ac | 6 +++++- - 1 files changed, 5 insertions(+), 1 deletions(-) + 1 Datei geändert, 5 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit 4645af87d3c587f535404867dab56608719e5c7b Author: John (J5) Palmieri @@ -5314,7 +5519,7 @@ Date: Fri Mar 4 00:39:23 2011 -0500 demos/gtk-demo/demos/Icon View/iconviewbasics.py | 212 ++++++++++++++++++++++ - 1 files changed, 212 insertions(+), 0 deletions(-) + 1 Datei geändert, 212 Zeilen hinzugefügt(+) commit 761dcb516a04f7a89b3c7d68e88fff23055e2a80 Author: John (J5) Palmieri @@ -5327,7 +5532,7 @@ Date: Thu Mar 3 18:39:16 2011 -0500 *args. You can only send in **kwds. gi/types.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit f9604e90af12a1b9dbe7d7f311308e87cd0ed7dd Author: John (J5) Palmieri @@ -5337,7 +5542,7 @@ Date: Thu Mar 3 18:30:40 2011 -0500 demos/gtk-demo/demos/combobox.py | 49 +++++++++++++++++++++++++++++++++++++- - 1 files changed, 48 insertions(+), 1 deletions(-) + 1 Datei geändert, 48 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit b70f4daf071cf77a4561b57f5521eb928f66d1ce Author: John (J5) Palmieri @@ -5347,7 +5552,7 @@ Date: Thu Mar 3 16:47:51 2011 -0500 gi/overrides/Gdk.py | 18 ++++++++++++++++++ tests/test_overrides.py | 10 ++++++++++ - 2 files changed, 28 insertions(+), 0 deletions(-) + 2 Dateien geändert, 28 Zeilen hinzugefügt(+) commit ee2b63f60f350332ed21927721ed9ddff3a8034e Author: John (J5) Palmieri @@ -5357,7 +5562,7 @@ Date: Thu Mar 3 16:10:17 2011 -0500 master demos/gtk-demo/demos/Entry/search_entry.py | 23 +++++++++-------------- - 1 files changed, 9 insertions(+), 14 deletions(-) + 1 Datei geändert, 9 Zeilen hinzugefügt(+), 14 Zeilen entfernt(-) commit cd046e4c355706ead5f512b810a2a48317f8c32e Author: John (J5) Palmieri @@ -5367,7 +5572,7 @@ Date: Wed Mar 2 18:13:43 2011 -0500 demos/gtk-demo/demos/Entry/search_entry.py | 257 ++++++++++++++++++++++++++++ - 1 files changed, 257 insertions(+), 0 deletions(-) + 1 Datei geändert, 257 Zeilen hinzugefügt(+) commit d5ddaa92e6349c2f52b67317326060973cb69661 Author: John (J5) Palmieri @@ -5376,7 +5581,7 @@ Date: Wed Mar 2 15:37:27 2011 -0500 [gi] wrap map in a list for Python 3 compat gi/types.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 3e5ab72a2e1fa2d8c4c2864137c6251f264ff4af Author: John (J5) Palmieri @@ -5385,7 +5590,7 @@ Date: Tue Mar 1 14:52:00 2011 -0500 [gi-demos] fix up the validation combobox demos/gtk-demo/demos/combobox.py | 21 +++++++++++++++------ - 1 files changed, 15 insertions(+), 6 deletions(-) + 1 Datei geändert, 15 Zeilen hinzugefügt(+), 6 Zeilen entfernt(-) commit 08af5f99f0838b3584f6a3b210d0a0304811e8ff Author: John (J5) Palmieri @@ -5394,7 +5599,7 @@ Date: Tue Mar 1 12:31:35 2011 -0500 add overridesdir variable in the .pc file for 3rd party overrides pygobject-2.0.pc.in | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+) commit 4a6b14a92a687a2311516b2c16c355216b5270a7 Author: Dieter Verfaillie @@ -5403,7 +5608,7 @@ Date: Fri Feb 11 17:14:11 2011 +0100 setup.py: Set bdist_wininst user-access-control property setup.py | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit ad3ab659b83cb985730e19a83651da319d4bcb9c Author: Martin Pitt @@ -5412,7 +5617,7 @@ Date: Wed Mar 2 16:29:00 2011 +0100 Fix uninitialized variable in gi.require_version() gi/__init__.py | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit 6e7606ee8830f6f51b777f41f6df2f6ea1784e89 Author: Martin Pitt @@ -5426,7 +5631,7 @@ Date: Tue Mar 1 23:26:07 2011 +0100 test suite. tests/runtests.py | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+) commit 0461e05174637ae02f34029b85ba217d5ae48c53 Author: John (J5) Palmieri @@ -5436,7 +5641,7 @@ Date: Mon Feb 28 18:21:43 2011 -0500 demos/gtk-demo/demos/combobox.py | 2 +- gi/overrides/Gtk.py | 9 +++++++++ - 2 files changed, 10 insertions(+), 1 deletions(-) + 2 Dateien geändert, 10 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit 40decf3501823004a6e4d3acbbf204c4d4d0a7ec Author: John (J5) Palmieri @@ -5446,7 +5651,7 @@ Date: Mon Feb 28 14:16:00 2011 -0500 branch) NEWS | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 50 insertions(+), 0 deletions(-) + 1 Datei geändert, 50 Zeilen hinzugefügt(+) commit c2d5122b8e3cf51ec52418f90f1788895b842b6a Author: John (J5) Palmieri @@ -5460,7 +5665,7 @@ Date: Mon Feb 28 14:08:05 2011 -0500 instead of creating our own button press event tests/test_overrides.py | 9 +++++---- - 1 files changed, 5 insertions(+), 4 deletions(-) + 1 Datei geändert, 5 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-) commit 1be1a2ea2787dffeb71ab4a38233fb71e761bd21 Author: Laszlo Pandy @@ -5474,7 +5679,7 @@ Date: Thu Feb 24 19:30:32 2011 +0100 https://bugzilla.gnome.org/show_bug.cgi?id=642554 tests/test_overrides.py | 21 +++++++++++++++++++++ - 1 files changed, 21 insertions(+), 0 deletions(-) + 1 Datei geändert, 21 Zeilen hinzugefügt(+) commit 99044a4860dd65c97f52b41b7cd3f216f4a97cd4 Author: John (J5) Palmieri @@ -5486,7 +5691,7 @@ Date: Wed Feb 23 18:43:27 2011 -0500 gi/overrides/Gdk.py | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 70 insertions(+), 0 deletions(-) + 1 Datei geändert, 70 Zeilen hinzugefügt(+) commit 6e30c69d38fd382414eb820097c297a80be547ac Author: John (J5) Palmieri @@ -5511,7 +5716,7 @@ Date: Wed Feb 23 14:14:16 2011 -0500 https://bugzilla.gnome.org/show_bug.cgi?id=642554 gi/pygi-argument.c | 38 ++++++++++++++++++++++++++++++++++++++ - 1 files changed, 38 insertions(+), 0 deletions(-) + 1 Datei geändert, 38 Zeilen hinzugefügt(+) commit 525f21d1365c24488b768955362085bf82512dee Author: Tomeu Vizoso @@ -5524,7 +5729,7 @@ Date: Wed Feb 16 09:44:12 2011 +0100 gi/types.py | 40 ++++++++++++++++++++++++++++++++++++++++ gobject/gobjectmodule.c | 9 +++++++-- tests/test_gi.py | 16 ++++++++++++++++ - 3 files changed, 63 insertions(+), 2 deletions(-) + 3 Dateien geändert, 63 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit da212024772a7a0c32f04f3589bfb24d2eb5706f Author: Laszlo Pandy @@ -5535,7 +5740,7 @@ Date: Thu Feb 24 18:46:15 2011 +0100 gi/importer.py | 2 +- gi/module.py | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) + 2 Dateien geändert, 2 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit 2ce6b58c7427cf67ba4f55731ba0a4c04703e495 Author: Laszlo Pandy @@ -5586,7 +5791,7 @@ Date: Wed Feb 23 12:05:03 2011 +0100 gi/pygi-invoke.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++---- tests/test_gi.py | 9 +++++++++ - 2 files changed, 59 insertions(+), 4 deletions(-) + 2 Dateien geändert, 59 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-) commit 702a89beca92cab6b0142829b20281b9245f28b8 Author: John (J5) Palmieri @@ -5598,7 +5803,7 @@ Date: Wed Feb 23 15:11:59 2011 -0500 gi/overrides/Gtk.py | 3 +++ tests/test_overrides.py | 18 +++++++++++++----- - 2 files changed, 16 insertions(+), 5 deletions(-) + 2 Dateien geändert, 16 Zeilen hinzugefügt(+), 5 Zeilen entfernt(-) commit 498f0d9c903131aca5efe27ffaad7620e40f72ea Author: Laszlo Pandy @@ -5609,7 +5814,7 @@ Date: Wed Feb 23 14:23:19 2011 +0100 gi/gimodule.c | 22 ++++++++++++++++++---- tests/test_gi.py | 36 ++++++++++++++++++++++++++++++++++++ - 2 files changed, 54 insertions(+), 4 deletions(-) + 2 Dateien geändert, 54 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-) commit 824aeb7fab17d6590e5babf2d1f64298f2d0e16b Author: Laszlo Pandy @@ -5627,7 +5832,7 @@ Date: Wed Feb 23 11:40:55 2011 +0100 found in the dict, a new one is created anyway. gobject/pygflags.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 3afbebeee486e14fd3f48552368903eb78f6b10c Author: Laszlo Pandy @@ -5642,7 +5847,7 @@ Date: Tue Feb 22 21:37:33 2011 +0100 https://bugzilla.gnome.org/show_bug.cgi?id=642305 gi/importer.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 2a9cbfb435b47dc646e2c6ffe630464b560229a6 Author: John (J5) Palmieri @@ -5654,10 +5859,10 @@ Date: Mon Feb 21 17:20:57 2011 -0500 https://bugzilla.gnome.org/show_bug.cgi?id=642921 - gi/overrides/Gtk.py | 37 ++++++++++++++++++-- + gi/overrides/Gtk.py | 37 +++++++++++++++++--- tests/test_overrides.py | 87 ++++++++++++++++++++++++++++++++++++++++------- - 2 files changed, 107 insertions(+), 17 deletions(-) + 2 Dateien geändert, 107 Zeilen hinzugefügt(+), 17 Zeilen entfernt(-) commit 9e4ce7dc0f03ea407654c4af028122f57cbc4c5e Author: John (J5) Palmieri @@ -5689,7 +5894,7 @@ Date: Mon Feb 21 16:14:20 2011 -0500 gi/pygi-argument.c | 24 ++++++++++++++++++------ tests/test_gi.py | 9 ++++++++- - 2 files changed, 26 insertions(+), 7 deletions(-) + 2 Dateien geändert, 26 Zeilen hinzugefügt(+), 7 Zeilen entfernt(-) commit b458f6f3424a04f6ceece09d443009372d70544c Author: John (J5) Palmieri @@ -5699,7 +5904,7 @@ Date: Sat Feb 19 19:42:41 2011 -0500 demos/gtk-demo/demos/Icon View/iconviewedit.py | 101 ++++++++++++++++++++++++ - 1 files changed, 101 insertions(+), 0 deletions(-) + 1 Datei geändert, 101 Zeilen hinzugefügt(+) commit 7b47289e25d1dd57ce15556ccfbb3ede1c4bfe8b Author: John (J5) Palmieri @@ -5709,7 +5914,7 @@ Date: Sat Feb 19 17:26:42 2011 -0500 demos/gtk-demo/demos/infobars.py | 99 ++++++++++++++++++++++++++++++++++++++ - 1 files changed, 99 insertions(+), 0 deletions(-) + 1 Datei geändert, 99 Zeilen hinzugefügt(+) commit 76758efb6579752237a0dc4d56cf9518de6c6e55 Author: Tomeu Vizoso @@ -5725,7 +5930,7 @@ Date: Wed Feb 16 11:53:18 2011 +0100 gi/importer.py | 1 + gi/module.py | 21 ++++----------------- gi/pygi-repository.c | 23 +++++++++++++++++++++++ - 4 files changed, 56 insertions(+), 18 deletions(-) + 4 Dateien geändert, 56 Zeilen hinzugefügt(+), 18 Zeilen entfernt(-) commit 96f7d1aed732db09a74cd463ed894b7347dbcb15 Author: Laszlo Pandy @@ -5752,8 +5957,8 @@ Date: Sat Feb 19 23:11:25 2011 +0100 gi/pygi-info.c | 15 +++++++ gi/types.py | 16 ------- gobject/pygflags.c | 13 ++++-- - tests/test_gi.py | 35 +++++++++++++++ - 6 files changed, 191 insertions(+), 29 deletions(-) + tests/test_gi.py | 35 ++++++++++++++++ + 6 Dateien geändert, 191 Zeilen hinzugefügt(+), 29 Zeilen entfernt(-) commit 63a60bcc20e724f96ea8d565ee0cf13a228b72b9 Author: Martin Pitt @@ -5781,7 +5986,7 @@ Date: Tue Feb 8 15:38:21 2011 +0100 +++++++++++++++++++++++++++++++++++++++++++++++++ tests/test_gdbus.py | 102 ++++++++++++++++++++++++++++++++++++++++++++++++++- - 2 files changed, 199 insertions(+), 2 deletions(-) + 2 Dateien geändert, 199 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit ed5cdbb6f52bdbd13521a814516b15687955d6f7 Author: Laszlo Pandy @@ -5797,7 +6002,7 @@ Date: Fri Feb 18 22:48:59 2011 +0100 https://bugzilla.gnome.org/show_bug.cgi?id=642715 gi/pygi-closure.c | 8 ++++++++ - 1 files changed, 8 insertions(+), 0 deletions(-) + 1 Datei geändert, 8 Zeilen hinzugefügt(+) commit 5a5ee3877e22939a697772a7f0630ef8cae3d52f Author: Laszlo Pandy @@ -5806,7 +6011,7 @@ Date: Fri Feb 18 10:15:59 2011 +0100 Fix runtests.py to work with Python3 (print function syntax error). tests/runtests.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit ad5d3fccff9433e2dadac89d731dac5cafb0eac3 Author: John (J5) Palmieri @@ -5818,7 +6023,7 @@ Date: Thu Feb 17 19:46:49 2011 -0500 demos/gtk-demo/demos/rotatedtext.py | 196 +++++++++++++++++++++++++++++++++++ - 1 files changed, 196 insertions(+), 0 deletions(-) + 1 Datei geändert, 196 Zeilen hinzugefügt(+) commit 9ac11c3c3b1c0399c85ece57c0983ed60d419d7a Author: John (J5) Palmieri @@ -5830,7 +6035,7 @@ Date: Thu Feb 17 17:25:00 2011 -0500 demos/gtk-demo/demos/images.py | 311 ++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 311 insertions(+), 0 deletions(-) + 1 Datei geändert, 311 Zeilen hinzugefügt(+) commit 13b06170b89b3468e6255be32af4833ffc675c9d Author: John (J5) Palmieri @@ -5840,7 +6045,7 @@ Date: Thu Feb 17 14:48:24 2011 -0500 demos/gtk-demo/demos/pixbuf.py | 183 ++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 183 insertions(+), 0 deletions(-) + 1 Datei geändert, 183 Zeilen hinzugefügt(+) commit 7abcfd5b4db99bb0f50c5a47d346a2de3836f994 Author: John (J5) Palmieri @@ -5849,7 +6054,7 @@ Date: Thu Feb 17 14:47:12 2011 -0500 [gi-demos] remove fixmes from print demo, fixed in pango demos/gtk-demo/demos/printing.py | 10 +++------- - 1 files changed, 3 insertions(+), 7 deletions(-) + 1 Datei geändert, 3 Zeilen hinzugefügt(+), 7 Zeilen entfernt(-) commit 9b13f49356da7d71c69b82da2a59d92f456a6913 Author: John (J5) Palmieri @@ -5861,7 +6066,7 @@ Date: Wed Feb 16 19:39:30 2011 -0500 demos/gtk-demo/demos/printing.py | 177 ++++++++++++++++++++++++++++++++++++++ - 1 files changed, 177 insertions(+), 0 deletions(-) + 1 Datei geändert, 177 Zeilen hinzugefügt(+) commit 6025b62ee662af347e48b6752e6d5be74b4a8215 Author: John (J5) Palmieri @@ -5873,7 +6078,7 @@ Date: Wed Feb 16 17:52:38 2011 -0500 gi/overrides/Gdk.py | 41 +++++++++++++++++++++++++++++++++++++++++ tests/test_overrides.py | 23 +++++++++++++++++++++++ - 2 files changed, 64 insertions(+), 0 deletions(-) + 2 Dateien geändert, 64 Zeilen hinzugefügt(+) commit 03c0aa498470037ef2aa6a8233198ff521f8d42f Author: John (J5) Palmieri @@ -5883,7 +6088,7 @@ Date: Wed Feb 16 16:18:24 2011 -0500 demos/gtk-demo/demos/links.py | 74 +++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 74 insertions(+), 0 deletions(-) + 1 Datei geändert, 74 Zeilen hinzugefügt(+) commit 79ecddf8d54b3f4f8b5ef05d302675152622c832 Author: John (J5) Palmieri @@ -5893,7 +6098,7 @@ Date: Wed Feb 16 15:48:40 2011 -0500 demos/gtk-demo/demos/expander.py | 60 ++++++++++++++++++++++++++++++++++++++ - 1 files changed, 60 insertions(+), 0 deletions(-) + 1 Datei geändert, 60 Zeilen hinzugefügt(+) commit 76cdb13ab872f91f8384d26b0f2932087a746117 Author: John (J5) Palmieri @@ -5904,7 +6109,7 @@ Date: Wed Feb 16 15:14:35 2011 -0500 gi/overrides/Gtk.py | 6 ++---- tests/test_overrides.py | 8 ++++++++ - 2 files changed, 10 insertions(+), 4 deletions(-) + 2 Dateien geändert, 10 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-) commit 6ef83c049735689c42f085ca9d7b8e1f251c410f Author: Laszlo Pandy @@ -5925,7 +6130,7 @@ Date: Tue Feb 15 20:07:42 2011 +0100 tests/Makefile.am | 19 +++++++++++-------- tests/runtests.py | 4 +++- - 2 files changed, 14 insertions(+), 9 deletions(-) + 2 Dateien geändert, 14 Zeilen hinzugefügt(+), 9 Zeilen entfernt(-) commit e0896b45f60f37097ec521f1bc38778383b78dd8 Author: John (J5) Palmieri @@ -5935,7 +6140,7 @@ Date: Tue Feb 15 14:47:10 2011 -0500 demos/gtk-demo/demos/dialogs.py | 153 +++++++++++++++++++++++++++++++++++++++ - 1 files changed, 153 insertions(+), 0 deletions(-) + 1 Datei geändert, 153 Zeilen hinzugefügt(+) commit 2dea743e82f6b18697950c34f116b2d0f1d6b1dd Author: John (J5) Palmieri @@ -5944,7 +6149,7 @@ Date: Tue Feb 15 14:46:41 2011 -0500 [gi-overrides] fix typo in GtkTable constructor gi/overrides/Gtk.py | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) + 1 Datei geändert, 4 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-) commit 9c277e1782c5a9d672d91fabf5289c5415891682 Author: John (J5) Palmieri @@ -5954,7 +6159,7 @@ Date: Tue Feb 15 13:26:38 2011 -0500 in app class demos/gtk-demo/demos/clipboard.py | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) + 1 Datei geändert, 4 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-) commit 18800c4db0e1faea38fd84f635d26a7ded5d10de Author: John (J5) Palmieri @@ -5963,7 +6168,7 @@ Date: Tue Feb 15 13:25:13 2011 -0500 [gi-overrides] add a Gtk.Menu override for the popup method gi/overrides/Gtk.py | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) + 1 Datei geändert, 7 Zeilen hinzugefügt(+) commit ad93386ba9f73ef4c3826544b3868cf03c01225e Author: John (J5) Palmieri @@ -5972,7 +6177,7 @@ Date: Tue Feb 15 13:24:33 2011 -0500 [gi-demos] fix the about dialog in appwindow demo demos/gtk-demo/demos/appwindow.py | 22 +++++++++------------- - 1 files changed, 9 insertions(+), 13 deletions(-) + 1 Datei geändert, 9 Zeilen hinzugefügt(+), 13 Zeilen entfernt(-) commit d0c45c80974f05b6adfd3bb01d785be268a53a98 Author: John (J5) Palmieri @@ -5985,7 +6190,7 @@ Date: Tue Feb 15 11:21:13 2011 -0500 notify demos/gtk-demo/demos/clipboard.py | 20 ++++++++++---------- - 1 files changed, 10 insertions(+), 10 deletions(-) + 1 Datei geändert, 10 Zeilen hinzugefügt(+), 10 Zeilen entfernt(-) commit 02d0327508234ab2e3b7dc6de506d70e6fcaaa17 Author: John (J5) Palmieri @@ -5994,7 +6199,7 @@ Date: Tue Feb 15 10:18:53 2011 -0500 [gi-demos] fix clipboard demo to reflect new API demos/gtk-demo/demos/clipboard.py | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + 1 Datei geändert, 3 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-) commit aa006cad6990eff0cbb68fa9550e428f2bc96473 Author: John (J5) Palmieri @@ -6004,8 +6209,8 @@ Date: Mon Feb 14 18:17:20 2011 -0500 color apis demos/gtk-demo/demos/colorselector.py | 44 - ++++++++++++-------------------- - 1 files changed, 17 insertions(+), 27 deletions(-) + +++++++++++++-------------------- + 1 Datei geändert, 17 Zeilen hinzugefügt(+), 27 Zeilen entfernt(-) commit f94a96c53e9432ac085bd05acee7ebdd2803fbad Author: John (J5) Palmieri @@ -6016,7 +6221,7 @@ Date: Mon Feb 14 17:58:25 2011 -0500 * Still having some issues with filtering the ComboBoxText widget demos/gtk-demo/demos/combobox.py | 17 ++++++++--------- - 1 files changed, 8 insertions(+), 9 deletions(-) + 1 Datei geändert, 8 Zeilen hinzugefügt(+), 9 Zeilen entfernt(-) commit 3606eb20ad1651af621bf1aa429ec102082565eb Author: Laszlo Pandy @@ -6037,9 +6242,9 @@ Date: Mon Feb 14 19:36:27 2011 +0100 gi/pygi-signal-closure.c | 245 ++++++++++++++++++++++++++++++++++++++++++++++ gi/pygi-signal-closure.h | 46 +++++++++ - gi/pygi.h | 28 +++++ + gi/pygi.h | 28 ++++++ gobject/pygobject.c | 24 ++++- - 9 files changed, 436 insertions(+), 4 deletions(-) + 9 Dateien geändert, 436 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-) commit 2e39d5e8f96be2253acb2f34a0d0b5b9c9adb8ff Author: John (J5) Palmieri @@ -6049,7 +6254,7 @@ Date: Mon Feb 14 16:47:03 2011 -0500 demos/gtk-demo/demos/drawingarea.py | 144 ++++++++++++----------------------- - 1 files changed, 50 insertions(+), 94 deletions(-) + 1 Datei geändert, 50 Zeilen hinzugefügt(+), 94 Zeilen entfernt(-) commit 8385afbbc5df295d9b7cd3b5d19c90faa1f7ea8e Author: John (J5) Palmieri @@ -6063,7 +6268,7 @@ Date: Mon Feb 14 16:43:35 2011 -0500 * we alias this so people do not get confused gi/overrides/Gdk.py | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) + 1 Datei geändert, 5 Zeilen hinzugefügt(+) commit d491c369e049ab726f09002af0462391d5c2f3ec Author: John (J5) Palmieri @@ -6078,7 +6283,7 @@ Date: Mon Feb 14 15:07:11 2011 -0500 * support both gi/overrides/Gtk.py | 8 ++++++++ - 1 files changed, 8 insertions(+), 0 deletions(-) + 1 Datei geändert, 8 Zeilen hinzugefügt(+) commit 95bc2b2b025d659725d701c3b759c0c4d9681a36 Author: John (J5) Palmieri @@ -6087,7 +6292,7 @@ Date: Mon Feb 14 15:06:38 2011 -0500 [gi-demos] get appwindow demo working again demos/gtk-demo/demos/appwindow.py | 24 ++++-------------------- - 1 files changed, 4 insertions(+), 20 deletions(-) + 1 Datei geändert, 4 Zeilen hinzugefügt(+), 20 Zeilen entfernt(-) commit 015185f502c498c21cb108d3bb288c5b6dbf202f Author: John (J5) Palmieri @@ -6096,7 +6301,7 @@ Date: Mon Feb 14 15:05:44 2011 -0500 [gi-demos] fixed use of tree_iter_get demos/gtk-demo/gtk-demo.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 0c20977e4598e5447dd07c069e91226efacb1160 Author: Simon van der Linden @@ -6113,7 +6318,7 @@ Date: Fri Feb 11 22:02:03 2011 +0100 examples/gio/downloader.py | 77 --------------------------------------- pygobject.doap | 2 +- - 6 files changed, 3 insertions(+), 117 deletions(-) + 6 Dateien geändert, 3 Zeilen hinzugefügt(+), 117 Zeilen entfernt(-) commit e4ebbd7de5570af1abf41bdf9469d4ce3edd48cb Author: Simon van der Linden @@ -6166,7 +6371,7 @@ Date: Fri Feb 11 18:38:27 2011 +0100 docs/reference/pygio-volumemonitor.xml | 844 ----- docs/reference/pygiounix-classes.xml | 13 - docs/reference/pygobject-ref.xml | 2 - - 42 files changed, 1 insertions(+), 19020 deletions(-) + 42 Dateien geändert, 1 Zeile hinzugefügt(+), 19020 Zeilen entfernt(-) commit abdebc7f6515f9658812c0355d8ad0892e5371e4 Author: John (J5) Palmieri @@ -6182,7 +6387,7 @@ Date: Fri Feb 11 11:05:04 2011 -0500 NEWS | 289 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 4 +- - 2 files changed, 291 insertions(+), 2 deletions(-) + 2 Dateien geändert, 291 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit 16140237aa45b4f188923da9f95b9d2af971011b Author: John (J5) Palmieri @@ -6194,7 +6399,7 @@ Date: Thu Feb 10 16:46:08 2011 -0500 configure.ac | 6 ------ m4/python.m4 | 9 +++++---- tests/runtests.py | 1 + - 4 files changed, 9 insertions(+), 10 deletions(-) + 4 Dateien geändert, 9 Zeilen hinzugefügt(+), 10 Zeilen entfernt(-) commit c2079f415638ef892b1e51f25eaafa3e1621667f Author: Simon van der Linden @@ -6204,7 +6409,7 @@ Date: Thu Feb 10 22:26:00 2011 +0100 glib/Makefile.am | 2 +- gobject/Makefile.am | 1 + - 2 files changed, 2 insertions(+), 1 deletions(-) + 2 Dateien geändert, 2 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit 3cca62a9e7afd3d3d302c66f4fafe253f7743d4e Author: Steve Frécinaux @@ -6219,7 +6424,7 @@ Date: Wed Jan 19 15:00:56 2011 +0100 https://bugzilla.gnome.org/show_bug.cgi?id=639948 tests/runtests.py | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) + 1 Datei geändert, 9 Zeilen hinzugefügt(+) commit 14c4cf8e6edae893538680964380d543bde4a14d Author: Martin Pitt @@ -6234,7 +6439,7 @@ Date: Wed Feb 9 11:34:59 2011 +0100 D-BUS (such as distribution package builds). tests/Makefile.am | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit 0858f550e2b6f75e3f583f963f5952f5ddae4e0e Author: Martin Pitt @@ -6246,7 +6451,7 @@ Date: Tue Feb 8 15:46:36 2011 +0100 - Exceptions don't have a message attribute any more, use str(e) tests/test_gdbus.py | 34 +++++++++++++++------------------- - 1 files changed, 15 insertions(+), 19 deletions(-) + 1 Datei geändert, 15 Zeilen hinzugefügt(+), 19 Zeilen entfernt(-) commit b7f32e4cca0cef201489b55653f96ac64a8f9ab9 Author: Martin Pitt @@ -6263,8 +6468,8 @@ Date: Sat Jan 29 12:20:50 2011 +0100 gi/overrides/Gio.py | 54 ++++++++++++++++++++++++++++ tests/org.gnome.test.gschema.xml | 9 +++++ tests/test_overrides.py | 73 - ++++++++++++++++++++++++++++++------- - 3 files changed, 122 insertions(+), 14 deletions(-) + ++++++++++++++++++++++++++++++-------- + 3 Dateien geändert, 122 Zeilen hinzugefügt(+), 14 Zeilen entfernt(-) commit 8dad0eaed60a9de26e9a729a48a1f6bc74be486e Author: Laszlo Pandy @@ -6281,7 +6486,7 @@ Date: Fri Feb 4 16:36:07 2011 +0100 gi/types.py | 4 +++- tests/test_gi.py | 8 ++++++++ - 2 files changed, 11 insertions(+), 1 deletions(-) + 2 Dateien geändert, 11 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit 2660be1f227be7a53092483bc9d8ead1bd1fb266 Author: Laszlo Pandy @@ -6297,7 +6502,7 @@ Date: Thu Feb 3 15:31:42 2011 +0100 https://bugzilla.gnome.org/show_bug.cgi?id=639945 tests/test_overrides.py | 40 ++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 40 insertions(+), 0 deletions(-) + 1 Datei geändert, 40 Zeilen hinzugefügt(+) commit d57500537014b3da624be33b40401ba289fa22b8 Author: John (J5) Palmieri @@ -6307,7 +6512,7 @@ Date: Thu Feb 3 09:02:16 2011 -0500 gi/pygi-cache.c | 18 +++--------------- gi/pygi-invoke.c | 37 ++++++++++++++++++++++++++++++++++--- - 2 files changed, 37 insertions(+), 18 deletions(-) + 2 Dateien geändert, 37 Zeilen hinzugefügt(+), 18 Zeilen entfernt(-) commit 99d6e6c8d806e6f9e48c3c2380024fb3511d110a Author: John (J5) Palmieri @@ -6317,7 +6522,7 @@ Date: Wed Feb 2 19:27:40 2011 -0500 gi/pygi-argument.c | 7 +++---- gi/pygi-cache.c | 12 ++++-------- - 2 files changed, 7 insertions(+), 12 deletions(-) + 2 Dateien geändert, 7 Zeilen hinzugefügt(+), 12 Zeilen entfernt(-) commit 09acaff29dfaabc77477cffca2c7137f68991e7f Author: Ignacio Casal Quinteiro @@ -6328,7 +6533,7 @@ Date: Wed Feb 2 21:00:48 2011 +0100 codegen/argtypes.py | 8 ++++---- codegen/definitions.py | 14 +++++++------- gi/overrides/Gtk.py | 2 +- - 3 files changed, 12 insertions(+), 12 deletions(-) + 3 Dateien geändert, 12 Zeilen hinzugefügt(+), 12 Zeilen entfernt(-) commit 36094e5982d3e05d5662843b6d401f0974f5235f Author: Ignacio Casal Quinteiro @@ -6337,7 +6542,7 @@ Date: Wed Feb 2 20:50:12 2011 +0100 [gi] return PYGLIB_MODULE_ERROR_RETURN on error and use pygobject_init tests/testhelpermodule.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + 1 Datei geändert, 3 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-) commit c913c1789296310c2cf27554ce719d7f6e9c94cd Author: Ignacio Casal Quinteiro @@ -6348,7 +6553,7 @@ Date: Wed Feb 2 20:37:21 2011 +0100 This is to avoid some warnings when building with python 3 gi/gimodule.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + 1 Datei geändert, 3 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-) commit 7bc4122897d9d05172a2bd5b56bded87e2afaec4 Author: Steve Frécinaux @@ -6370,7 +6575,7 @@ Date: Sat Jan 29 00:16:50 2011 +0100 gobject/pygobject.c | 4 +++- tests/test_everything.py | 9 ++++++++- - 2 files changed, 11 insertions(+), 2 deletions(-) + 2 Dateien geändert, 11 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit afeaaa126f7cd6556fb855ecd0facc174c0f946c Author: Simon Schampijer @@ -6388,7 +6593,7 @@ Date: Wed Jan 19 16:19:46 2011 +0100 gi/overrides/Gdk.py | 6 ++++++ tests/test_overrides.py | 8 ++++++++ - 2 files changed, 14 insertions(+), 0 deletions(-) + 2 Dateien geändert, 14 Zeilen hinzugefügt(+) commit 4a67f45880433905de33632fe0c32a13b44c0b33 Author: John (J5) Palmieri @@ -6397,7 +6602,7 @@ Date: Mon Jan 31 16:51:37 2011 -0500 [gi] handle hash being NULL gi/pygi-argument.c | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) + 1 Datei geändert, 6 Zeilen hinzugefügt(+) commit 2fbfe410f4b4394a2018ada0e538585c1bec23ae Author: John (J5) Palmieri @@ -6406,9 +6611,9 @@ Date: Mon Jan 31 16:50:52 2011 -0500 [gi] handle the situation where an aux arg comes before its parent gi/pygi-cache.c | 70 - ++++++++++++++++++++++++++++++++++++++--------------- + ++++++++++++++++++++++++++++++++++++++---------------- gi/pygi-invoke.c | 2 +- - 2 files changed, 51 insertions(+), 21 deletions(-) + 2 Dateien geändert, 51 Zeilen hinzugefügt(+), 21 Zeilen entfernt(-) commit 858669f92c9907dd70b4966d6a8521ed122225be Author: Martin Pitt @@ -6417,7 +6622,7 @@ Date: Mon Jan 31 17:38:52 2011 +0100 Ship tests/org.gnome.test.gschema.xml in dist tarballs tests/Makefile.am | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit 77d76df59606e470808085e977fb199cc76e8251 Author: John (J5) Palmieri @@ -6426,9 +6631,9 @@ Date: Sun Jan 30 18:21:24 2011 -0500 [gi] allow caching and marshalling of ghash out gi/pygi-argument.c | 155 - ++++++++++++++++++++++++++++++++++++++++++++++++--- - gi/pygi-cache.c | 27 ++++++--- - 2 files changed, 162 insertions(+), 20 deletions(-) + ++++++++++++++++++++++++++++++++++++++++++++++++---- + gi/pygi-cache.c | 27 +++++---- + 2 Dateien geändert, 162 Zeilen hinzugefügt(+), 20 Zeilen entfernt(-) commit bd66af67f248a3ca90d2fa2626605263c2392e16 Author: John (J5) Palmieri @@ -6437,8 +6642,8 @@ Date: Sun Jan 30 17:06:44 2011 -0500 [gi] whitespace fixes gi/pygi-cache.c | 60 - +++++++++++++++++++++++++++--------------------------- - 1 files changed, 30 insertions(+), 30 deletions(-) + +++++++++++++++++++++++++++---------------------------- + 1 Datei geändert, 30 Zeilen hinzugefügt(+), 30 Zeilen entfernt(-) commit 1cdbd4be9b015f792c2c02afa5ac7e24edbdae86 Author: John (J5) Palmieri @@ -6451,12 +6656,12 @@ Date: Sun Jan 30 17:04:13 2011 -0500 * this works for now but is fragile if new aux values are added in the future - gi/pygi-argument.c | 12 ++++++++- + gi/pygi-argument.c | 12 ++++++++-- gi/pygi-cache.c | 66 - +++++++++++++++++++++++++++++++++++---------------- - gi/pygi-cache.h | 2 + - gi/pygi-invoke.c | 12 +++++++-- - 4 files changed, 66 insertions(+), 26 deletions(-) + +++++++++++++++++++++++++++++++++++----------------- + gi/pygi-cache.h | 2 ++ + gi/pygi-invoke.c | 12 +++++++--- + 4 Dateien geändert, 66 Zeilen hinzugefügt(+), 26 Zeilen entfernt(-) commit c51447f4efde2ce4caf39c1ffac905ec428d1d64 Author: John (J5) Palmieri @@ -6472,7 +6677,7 @@ Date: Sun Jan 30 11:30:54 2011 -0500 gi/pygi-cache.c | 1445 ++++++++++++++++++++++++++---------------------------- gi/pygi-invoke.c | 19 +- - 2 files changed, 711 insertions(+), 753 deletions(-) + 2 Dateien geändert, 711 Zeilen hinzugefügt(+), 753 Zeilen entfernt(-) commit 2b185362de45f46ce0f0b8816499aef06ab1ad1e Author: John (J5) Palmieri @@ -6481,8 +6686,8 @@ Date: Sat Jan 29 13:49:36 2011 -0500 [gi] marshal arrays out gi/pygi-argument.c | 101 - ++++++++++++++++++++++++++++++++++++++++++++++++++- - 1 files changed, 99 insertions(+), 2 deletions(-) + ++++++++++++++++++++++++++++++++++++++++++++++++++-- + 1 Datei geändert, 99 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit e62e7062d5cfd782eac64852f681c63e2776b8d4 Author: John (J5) Palmieri @@ -6492,7 +6697,7 @@ Date: Sat Jan 29 13:48:23 2011 -0500 gi/pygi-cache.c | 111 +++++++++++++++++++++++++++++++++++++++++++------------ - 1 files changed, 87 insertions(+), 24 deletions(-) + 1 Datei geändert, 87 Zeilen hinzugefügt(+), 24 Zeilen entfernt(-) commit 69207910209ebfe450df616aeb8fa4cc2e7eccf3 Author: Martin Pitt @@ -6507,7 +6712,7 @@ Date: Fri Jan 28 17:14:19 2011 +0100 tests/Makefile.am | 7 +++++-- tests/org.gnome.test.gschema.xml | 16 ++++++++++++++++ tests/test_overrides.py | 31 +++++++++++++++++++++++++++++++ - 3 files changed, 52 insertions(+), 2 deletions(-) + 3 Dateien geändert, 52 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit 488478a83640d50baee963337fcc870fec76b784 Author: Martin Pitt @@ -6522,7 +6727,7 @@ Date: Fri Jan 28 07:20:26 2011 +0100 gi/overrides/Gtk.py | 19 ++++++++++++++----- tests/test_overrides.py | 4 ++-- - 2 files changed, 16 insertions(+), 7 deletions(-) + 2 Dateien geändert, 16 Zeilen hinzugefügt(+), 7 Zeilen entfernt(-) commit dace1a553793fb7fb054b60760f02c9e5cf00b38 Author: Martin Pitt @@ -6537,7 +6742,7 @@ Date: Thu Jan 27 13:37:18 2011 +0100 gi/overrides/Gtk.py | 5 +++++ tests/test_overrides.py | 9 +++++++++ - 2 files changed, 14 insertions(+), 0 deletions(-) + 2 Dateien geändert, 14 Zeilen hinzugefügt(+) commit 91d34124b2a5128e93e13c7fee8693d5edc4e9bb Author: Ignacio Casal Quinteiro @@ -6549,7 +6754,7 @@ Date: Thu Jan 27 12:23:18 2011 +0100 files. Makefile.am | 27 +++++++++++++++++++++++++++ - 1 files changed, 27 insertions(+), 0 deletions(-) + 1 Datei geändert, 27 Zeilen hinzugefügt(+) commit 8a98d26981ce68809a21c64cac4962e58c927905 Author: Ignacio Casal Quinteiro @@ -6560,7 +6765,7 @@ Date: Thu Jan 27 12:15:30 2011 +0100 git.mk is a script maintained in pango. From time to time we must check if it was updated and update it here. - .gitignore | 46 ---------- + .gitignore | 46 ----------- Makefile.am | 2 + codegen/.gitignore | 2 - codegen/Makefile.am | 2 + @@ -6579,7 +6784,7 @@ Date: Thu Jan 27 12:15:30 2011 +0100 gobject/Makefile.am | 2 + tests/.gitignore | 2 - tests/Makefile.am | 2 + - 18 files changed, 222 insertions(+), 100 deletions(-) + 18 Dateien geändert, 222 Zeilen hinzugefügt(+), 100 Zeilen entfernt(-) commit 331c42b63bc60a3b906fa21e1c0a7c1b9428f347 Author: Martin Pitt @@ -6588,7 +6793,7 @@ Date: Thu Jan 27 12:04:19 2011 +0100 pygi-convert.sh: Convert Pango.TabAlign.* pygi-convert.sh | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+) commit be1a2959fa0a3d8682e0e8aef389d73dacab0689 Author: Martin Pitt @@ -6600,7 +6805,7 @@ Date: Thu Jan 27 12:02:39 2011 +0100 self.window. pygi-convert.sh | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile entfernt(-) commit dd7deb4b658c56857c26b1a278a3d688f2ea6a2a Author: Martin Pitt @@ -6609,7 +6814,7 @@ Date: Thu Jan 27 11:58:26 2011 +0100 pygi-convert.sh: Don't convert self.window assignments pygi-convert.sh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 975341a26772966d4afc87a88a6a566d61237fa0 Author: Steve Frécinaux @@ -6621,7 +6826,7 @@ Date: Fri Jan 21 18:41:54 2011 +0100 gobject/gobjectmodule.c | 1 + tests/test_gobject.py | 4 ++++ - 2 files changed, 5 insertions(+), 0 deletions(-) + 2 Dateien geändert, 5 Zeilen hinzugefügt(+) commit a59e2d58bdb3f31a4f415dbe14b7d9988ac28ce3 Author: Steve Frécinaux @@ -6632,7 +6837,7 @@ Date: Fri Jan 21 15:54:43 2011 +0100 https://bugzilla.gnome.org/show_bug.cgi?id=640184 tests/test_gobject.py | 21 +++++++++++++++++++++ - 1 files changed, 21 insertions(+), 0 deletions(-) + 1 Datei geändert, 21 Zeilen hinzugefügt(+) commit 7d70105eb324ea4b6a58c2d3fb3f2dda36e7ab33 Author: Steve Frécinaux @@ -6645,8 +6850,8 @@ Date: Fri Jan 21 17:24:49 2011 +0100 gobject/gobjectmodule.c | 35 ++------------------- gobject/pygobject-private.h | 5 +++ gobject/pygobject.c | 71 - +++++++++++++++++++++++++----------------- - 3 files changed, 50 insertions(+), 61 deletions(-) + +++++++++++++++++++++++++------------------ + 3 Dateien geändert, 50 Zeilen hinzugefügt(+), 61 Zeilen entfernt(-) commit a3e0cfe8924887ecd1e07cedd2cfb999c853ac62 Author: John (J5) Palmieri @@ -6655,7 +6860,7 @@ Date: Wed Jan 26 15:34:24 2011 -0500 [gi] in python 3 an array of uint8 can be bytes but not string tests/test_gi.py | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) + 1 Datei geändert, 3 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit 843553ea958eddec185bb660851a310dc050a14b Author: John (J5) Palmieri @@ -6664,7 +6869,7 @@ Date: Wed Jan 26 15:30:06 2011 -0500 [gi] fix Gio.FileEnumerator to reflect the Python 3 iter protocol gi/overrides/Gio.py | 6 +++++- - 1 files changed, 5 insertions(+), 1 deletions(-) + 1 Datei geändert, 5 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit 6ff357839feb39930a5f3175de3d0ed35f24d3f4 Author: John (J5) Palmieri @@ -6733,7 +6938,7 @@ Date: Wed Jan 26 15:17:03 2011 -0500 tests/test_gdbus.py | 12 ++++++++---- tests/test_gi.py | 19 ++++++++++++------- tests/test_overrides.py | 8 +++++--- - 6 files changed, 56 insertions(+), 23 deletions(-) + 6 Dateien geändert, 56 Zeilen hinzugefügt(+), 23 Zeilen entfernt(-) commit 832d662b9f90f5762bbf28b3cca73f947c1f83ce Author: John (J5) Palmieri @@ -6743,7 +6948,7 @@ Date: Wed Jan 26 14:00:08 2011 -0500 gi/overrides/GLib.py | 4 ++-- gi/overrides/Gdk.py | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) + 2 Dateien geändert, 3 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-) commit d3e30e240fed6ef1dd40fd29fd13dc2effc6c7b1 Author: Martin Pitt @@ -6752,7 +6957,7 @@ Date: Wed Jan 26 19:03:48 2011 +0100 [gi] Add docstring to GLib.Variant constructor gi/overrides/GLib.py | 11 +++++++++++ - 1 files changed, 11 insertions(+), 0 deletions(-) + 1 Datei geändert, 11 Zeilen hinzugefügt(+) commit 963cd52fec26f7a4fb34414f8ac6662932ede322 Author: Martin Pitt @@ -6761,7 +6966,7 @@ Date: Wed Jan 26 18:45:38 2011 +0100 [gi] update gdbus test cases for previous GVariant change tests/test_gdbus.py | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit 27e3a6276ff5f2cdc03ddf69ee80d44c3bf2c094 Author: Martin Pitt @@ -6787,7 +6992,7 @@ Date: Wed Jan 26 18:39:17 2011 +0100 gi/overrides/GLib.py | 25 ++++++++++--------------- tests/test_overrides.py | 32 +++++++++++++------------------- - 2 files changed, 23 insertions(+), 34 deletions(-) + 2 Dateien geändert, 23 Zeilen hinzugefügt(+), 34 Zeilen entfernt(-) commit b15e8e2c0c933d0f827a70280faf875ac383d81b Author: Laszlo Pandy @@ -6815,7 +7020,7 @@ Date: Wed Jan 26 00:40:49 2011 +0100 gi/types.py | 26 +++++++++++++------------- tests/test_gi.py | 13 +++++++++++++ - 2 files changed, 26 insertions(+), 13 deletions(-) + 2 Dateien geändert, 26 Zeilen hinzugefügt(+), 13 Zeilen entfernt(-) commit 569d42ac2f50fb706ef289ff631db743483f40ee Author: Laszlo Pandy @@ -6850,7 +7055,7 @@ Date: Thu Jan 20 16:26:18 2011 +0100 gi/types.py | 104 +++++++++++++++++++++++++++++++++--------------------- tests/test_gi.py | 13 +++++++ - 2 files changed, 77 insertions(+), 40 deletions(-) + 2 Dateien geändert, 77 Zeilen hinzugefügt(+), 40 Zeilen entfernt(-) commit 8f4e6536f3c2edf38a45632d1c23eb7c6681c3be Author: Sebastian Pölsterl @@ -6859,7 +7064,7 @@ Date: Mon Jan 24 19:23:19 2011 +0100 pygi-convert.sh: Convert gtk.UI_MANAGER_* pygi-convert.sh | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+) commit 1f473b5164407a178203eb8cc7f3c786e0d0e5c2 Author: Sebastian Pölsterl @@ -6868,7 +7073,7 @@ Date: Fri Jan 21 18:41:54 2011 +0100 pygi-convert.sh: Convert gdk.GRAB_* pygi-convert.sh | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+) commit f5d0b7b9d189f65503c0bf66d8bda4186ca3223a Author: Ignacio Casal Quinteiro @@ -6877,7 +7082,7 @@ Date: Fri Jan 21 16:45:07 2011 +0100 [gi] set the gtype GValue correctly gi/pygi-property.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit ce521011d7f6d7f082aaea76fa05c5af9f6e93f5 Author: Ignacio Casal Quinteiro @@ -6890,7 +7095,7 @@ Date: Fri Jan 21 16:20:23 2011 +0100 gi/pygi-foreign-gvariant.h | 2 +- gi/pygi-foreign.c | 2 +- gi/pygi.h | 2 +- - 5 files changed, 9 insertions(+), 9 deletions(-) + 5 Dateien geändert, 9 Zeilen hinzugefügt(+), 9 Zeilen entfernt(-) commit 9f101baaa63a75acf62f955cfc4b311ff0dd5464 Author: John (J5) Palmieri @@ -6900,7 +7105,7 @@ Date: Fri Jan 21 09:23:54 2011 -0500 gi/pygi-argument.c | 14 +++++++++----- gi/pygi-cache.c | 24 ++++++++++++------------ - 2 files changed, 21 insertions(+), 17 deletions(-) + 2 Dateien geändert, 21 Zeilen hinzugefügt(+), 17 Zeilen entfernt(-) commit 4c93bdeae76830aa4029dfc86e32e6f277d5271d Author: John (J5) Palmieri @@ -6909,7 +7114,7 @@ Date: Fri Jan 21 08:18:37 2011 -0500 [gi] marshal unions gi/pygi-cache.c | 27 +++++++++++++-------------- - 1 files changed, 13 insertions(+), 14 deletions(-) + 1 Datei geändert, 13 Zeilen hinzugefügt(+), 14 Zeilen entfernt(-) commit a060287d1a6d190acb9d344f08fd5662e3296da5 Author: Martin Pitt @@ -6920,7 +7125,7 @@ Date: Fri Jan 21 11:00:27 2011 +0100 tests/Makefile.am | 1 + tests/test_gdbus.py | 94 +++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 95 insertions(+), 0 deletions(-) + 2 Dateien geändert, 95 Zeilen hinzugefügt(+) commit e7699d9af41f8c374326b8a4ec0939ef1426e386 Author: John (J5) Palmieri @@ -6929,7 +7134,7 @@ Date: Fri Jan 21 04:28:15 2011 -0500 [gi] error out if the constructor returns NULL gi/pygi-invoke.c | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) + 1 Datei geändert, 7 Zeilen hinzugefügt(+) commit 58ff2b2c38c1004861083ca88633be76767229f0 Author: John (J5) Palmieri @@ -6939,7 +7144,7 @@ Date: Fri Jan 21 04:26:45 2011 -0500 support it gi/pygi-cache.c | 11 +++++++++++ - 1 files changed, 11 insertions(+), 0 deletions(-) + 1 Datei geändert, 11 Zeilen hinzugefügt(+) commit 5eb779439daa8bf1e86df689377dc10ef1430eab Author: John (J5) Palmieri @@ -6949,7 +7154,7 @@ Date: Fri Jan 21 04:26:11 2011 -0500 gi/pygi-argument.c | 30 ++++++++++++++++++++++++++---- gi/pygi-cache.c | 15 ++------------- - 2 files changed, 28 insertions(+), 17 deletions(-) + 2 Dateien geändert, 28 Zeilen hinzugefügt(+), 17 Zeilen entfernt(-) commit 3133dc595adf44279397d30712c0f8595f0e1acc Author: John (J5) Palmieri @@ -6975,7 +7180,7 @@ Date: Fri Jan 21 04:22:06 2011 -0500 gi/pygi-foreign.c | 21 +++++++++------------ gi/pygi-foreign.h | 6 +++--- gi/pygi.h | 8 ++++---- - 9 files changed, 77 insertions(+), 70 deletions(-) + 9 Dateien geändert, 77 Zeilen hinzugefügt(+), 70 Zeilen entfernt(-) commit e97e28048efb966ecc1a03277d36cbaa81b8db7d Author: Martin Pitt @@ -6990,7 +7195,7 @@ Date: Fri Jan 21 09:54:14 2011 +0100 gi/overrides/GLib.py | 18 +++++++++++++++++- tests/test_overrides.py | 26 ++++++++++++++++++++++++++ - 2 files changed, 43 insertions(+), 1 deletions(-) + 2 Dateien geändert, 43 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit 71dd03261fc06b8180c14cd31b54d8e4b200be3a Merge: bc29600 bd002c7 @@ -7008,7 +7213,7 @@ Date: Thu Jan 20 19:48:23 2011 +0100 GNOME bug #639880 pygi-convert.sh | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+) commit d1b0fa501cc431baa530d96fb50f4c35590890ac Author: Thomas Hindoe Paaboel Andersen @@ -7019,7 +7224,7 @@ Date: Thu Jan 20 19:45:01 2011 +0100 GNOME bug #639880 pygi-convert.sh | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+) commit 6d8ff4d5bdda5480089543869535cc3ee83da2f5 Author: Martin Pitt @@ -7045,8 +7250,8 @@ Date: Wed Jan 19 11:41:11 2011 +0100 gi/overrides/GLib.py | 229 +++++++++++++++++++++++++---------------------- - tests/test_overrides.py | 159 +++++++++++++++++++++++++++++++-- - 2 files changed, 273 insertions(+), 115 deletions(-) + tests/test_overrides.py | 159 ++++++++++++++++++++++++++++++-- + 2 Dateien geändert, 273 Zeilen hinzugefügt(+), 115 Zeilen entfernt(-) commit ac095f5435f106e175fa3297cb273e63c85d2809 Author: Tomeu Vizoso @@ -7055,7 +7260,7 @@ Date: Thu Jan 20 15:55:45 2011 +0100 Uncomment test_gi.TestInterfaceClash tests/test_gi.py | 22 +++++++++++----------- - 1 files changed, 11 insertions(+), 11 deletions(-) + 1 Datei geändert, 11 Zeilen hinzugefügt(+), 11 Zeilen entfernt(-) commit 1239f3709ba257c404dda72b7067b77b19c240fa Author: John (J5) Palmieri @@ -7064,9 +7269,9 @@ Date: Thu Jan 20 09:05:02 2011 -0500 [gi] add support for enum and flags gi/pygi-argument.c | 121 - ++++++++++++++++++++++++++++++++++++++++----------- + +++++++++++++++++++++++++++++++++++++++++----------- gi/pygi-cache.c | 30 +++++++------ - 2 files changed, 111 insertions(+), 40 deletions(-) + 2 Dateien geändert, 111 Zeilen hinzugefügt(+), 40 Zeilen entfernt(-) commit f0a0b6c2eda89622de2b1e5ebb6a48103ad72a42 Author: Steve Frécinaux @@ -7080,14 +7285,14 @@ Date: Thu Jan 20 14:14:15 2011 +0100 https://bugzilla.gnome.org/show_bug.cgi?id=639949 - gobject/gobjectmodule.c | 2 + - gobject/pygobject.c | 14 +++++----- + gobject/gobjectmodule.c | 2 ++ + gobject/pygobject.c | 14 +++++------ tests/test-floating.c | 36 ++++++++++++++++++++++++++ - tests/test-floating.h | 21 +++++++++++++++ + tests/test-floating.h | 21 ++++++++++++++++ tests/test_gobject.py | 63 ++++++++++++++++++++++++++++++++++++++++++++++ tests/testhelpermodule.c | 50 ++++++++++++++++++++++++++++++++++++ - 6 files changed, 179 insertions(+), 7 deletions(-) + 6 Dateien geändert, 179 Zeilen hinzugefügt(+), 7 Zeilen entfernt(-) commit cae2cf3d4fb049c94389bf8f84d7d97a544d7a3f Author: Steve Frécinaux @@ -7105,8 +7310,8 @@ Date: Wed Jan 19 16:57:57 2011 +0100 tests/test-floating.h | 20 +++++++++++++++ tests/test_gobject.py | 62 ++++++++++++++++++++++++++++++++++++++++++++++ - tests/testhelpermodule.c | 51 +++++++++++++++++++++++++++++++++++++ - 4 files changed, 163 insertions(+), 0 deletions(-) + tests/testhelpermodule.c | 51 ++++++++++++++++++++++++++++++++++++++ + 4 Dateien geändert, 163 Zeilen hinzugefügt(+) commit b6737b91938d527872eff1d645a205cacf94e15d Author: Steve Frécinaux @@ -7117,7 +7322,7 @@ Date: Wed Jan 19 14:52:41 2011 +0100 https://bugzilla.gnome.org/show_bug.cgi?id=639949 tests/test_gobject.py | 8 +++++++- - 1 files changed, 7 insertions(+), 1 deletions(-) + 1 Datei geändert, 7 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit 2b0f1ede820414ef1cfd6b37569fcb946d2031fc Author: Martin Pitt @@ -7132,7 +7337,7 @@ Date: Thu Jan 20 14:15:52 2011 +0100 drop the explicit array length argument from the call in the override. gi/overrides/Gtk.py | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) + 1 Datei geändert, 2 Zeilen entfernt(-) commit b59edf4f0f7cab44033f9d704d476e10ee0d0c0a Author: Steve Frécinaux @@ -7141,7 +7346,7 @@ Date: Wed Jan 19 18:04:10 2011 +0100 Fix a typo in a private symbol name. gobject/gobjectmodule.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + 1 Datei geändert, 3 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-) commit 6447688e283a8fb22de3ab68cbc06e34ad23d198 Author: Martin Pitt @@ -7150,7 +7355,7 @@ Date: Thu Jan 20 11:49:08 2011 +0100 pygi-convert.sh: Convert glib.source_remove() pygi-convert.sh | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+) commit 84ee8de4bc00a8f901926cc6386d73c12dbd0b0b Author: Martin Pitt @@ -7159,7 +7364,7 @@ Date: Thu Jan 20 11:42:34 2011 +0100 Fix typo in previous commit to actually convert glib.GError pygi-convert.sh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit b238cb614338f46e6feb7935cca0a55c7a929418 Author: Martin Pitt @@ -7169,7 +7374,7 @@ Date: Thu Jan 20 11:40:14 2011 +0100 by gobject pygi-convert.sh | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) + 1 Datei geändert, 3 Zeilen hinzugefügt(+) commit 21c09a7ee294b59abb3eca6f64f13bf5c8a2fa0e Author: Laszlo Pandy @@ -7188,7 +7393,7 @@ Date: Wed Jan 19 12:00:02 2011 +0100 gi/overrides/Gtk.py | 14 ++++++++++++-- tests/test_overrides.py | 34 +++++++++++++++++++++++++++------- - 2 files changed, 39 insertions(+), 9 deletions(-) + 2 Dateien geändert, 39 Zeilen hinzugefügt(+), 9 Zeilen entfernt(-) commit d465e25297ad6589ff2cd0c00e11e8bd8ffe3f78 Author: Martin Pitt @@ -7203,7 +7408,7 @@ Date: Wed Jan 19 22:52:51 2011 +0100 639939 does. tests/test_overrides.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 2b8e1d0531dcb8f57dc9f2fddf25970bee3daa90 Author: Martin Pitt @@ -7215,7 +7420,7 @@ Date: Wed Jan 19 20:18:19 2011 +0100 gi/overrides/GLib.py | 8 +++++++- tests/test_overrides.py | 13 +++++++++++++ - 2 files changed, 20 insertions(+), 1 deletions(-) + 2 Dateien geändert, 20 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit 8efd14c87b35072cdd039bf223f8ced8f51be9bb Author: John (J5) Palmieri @@ -7224,7 +7429,7 @@ Date: Wed Jan 19 14:08:03 2011 -0500 [gi] return NULL if out_marshaller fails gi/pygi-invoke.c | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) + 1 Datei geändert, 5 Zeilen hinzugefügt(+) commit 5b1db41d60204c8021f47f43b85dac126c389c8d Author: John (J5) Palmieri @@ -7235,7 +7440,7 @@ Date: Wed Jan 19 13:57:54 2011 -0500 gi/pygi-argument.c | 4 ++++ gi/pygi-cache.c | 11 ++++++++--- gi/pygi-invoke.c | 17 +++++++++-------- - 3 files changed, 21 insertions(+), 11 deletions(-) + 3 Dateien geändert, 21 Zeilen hinzugefügt(+), 11 Zeilen entfernt(-) commit 7c2f48bb6d67ec9a1ee5ac03a5aee34b54c6ebdd Author: Tomeu Vizoso @@ -7251,7 +7456,7 @@ Date: Wed Jan 19 18:09:23 2011 +0100 gi/pygi-info.c | 37 +++++++++++++++++++++++++++++++++++++ gi/types.py | 7 +++++++ - 2 files changed, 44 insertions(+), 0 deletions(-) + 2 Dateien geändert, 44 Zeilen hinzugefügt(+) commit db7300e173388d9557dcd2333781bfaa6b021605 Author: Martin Pitt @@ -7260,7 +7465,7 @@ Date: Wed Jan 19 18:54:39 2011 +0100 pygi-convert.sh: Migrate Gdk.Cursor constructor, and some cursor names pygi-convert.sh | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+) commit 4c1d4faddf1c9cb233c484da3eadd8e31c231f70 Author: Martin Pitt @@ -7273,7 +7478,7 @@ Date: Wed Jan 19 18:43:29 2011 +0100 GtkWidget methods instead. pygi-convert.sh | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) + 1 Datei geändert, 4 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit b1049b947d073fb569ba900a4d5c8519482d831e Author: Tomeu Vizoso @@ -7286,7 +7491,7 @@ Date: Wed Jan 19 17:35:09 2011 +0100 https://bugzilla.gnome.org/show_bug.cgi?id=639967 gi/pygi-argument.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit 25b69ae257a12b6dc97ed3f2f7ea54b166ddbba1 Author: Laszlo Pandy @@ -7308,7 +7513,7 @@ Date: Wed Jan 19 17:45:11 2011 +0100 gi/Makefile.am | 3 ++- gi/pygi-invoke.c | 12 +++--------- tests/test_gi.py | 10 ++++++++++ - 3 files changed, 15 insertions(+), 10 deletions(-) + 3 Dateien geändert, 15 Zeilen hinzugefügt(+), 10 Zeilen entfernt(-) commit 18b84767db1d66e3d6f09067ab19ffd4b82539ca Author: John (J5) Palmieri @@ -7318,7 +7523,7 @@ Date: Wed Jan 19 12:05:45 2011 -0500 gi/pygi-argument.c | 2 +- gi/pygi-cache.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) + 2 Dateien geändert, 2 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit c5d7c730008275b2c585b2609fc2ff5e051cce47 Author: John (J5) Palmieri @@ -7330,7 +7535,7 @@ Date: Wed Jan 19 11:59:09 2011 -0500 gi/pygi-argument.c | 90 +++++++++++++++++++++++++++++++++++++++++++--------- gi/pygi-cache.c | 2 +- - 2 files changed, 76 insertions(+), 16 deletions(-) + 2 Dateien geändert, 76 Zeilen hinzugefügt(+), 16 Zeilen entfernt(-) commit e6fcafc6179e963cbae7774e7ee50415bde2c523 Author: Martin Pitt @@ -7348,7 +7553,7 @@ Date: Wed Jan 19 17:03:06 2011 +0100 now, so disable the replacement rules. pygi-convert.sh | 19 ++++++++++--------- - 1 files changed, 10 insertions(+), 9 deletions(-) + 1 Datei geändert, 10 Zeilen hinzugefügt(+), 9 Zeilen entfernt(-) commit 167261d556eab0d2e448c7ed28eef540a024ba1d Author: Tomeu Vizoso @@ -7357,7 +7562,7 @@ Date: Wed Jan 19 16:47:08 2011 +0100 Link libregress.so to GIO_LIBS again configure.ac | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) + 1 Datei geändert, 5 Zeilen hinzugefügt(+) commit d143afa6da4f5b5f47be8df11fa41d7b47ab1794 Author: Laszlo Pandy @@ -7370,7 +7575,7 @@ Date: Wed Jan 19 16:14:42 2011 +0100 syntax error. gi/overrides/Gdk.py | 7 +++++-- - 1 files changed, 5 insertions(+), 2 deletions(-) + 1 Datei geändert, 5 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit 4f5d20966d4a8c649e5fae584039621edab178f3 Author: John (J5) Palmieri @@ -7379,7 +7584,7 @@ Date: Wed Jan 19 10:02:40 2011 -0500 [gi] use correct format stings when setting errors gi/pygi-argument.c | 12 ++++++------ - 1 files changed, 6 insertions(+), 6 deletions(-) + 1 Datei geändert, 6 Zeilen hinzugefügt(+), 6 Zeilen entfernt(-) commit 7f08fd5c33ee5c9907f5becbe2f21fb7122d6e19 Author: John (J5) Palmieri @@ -7388,7 +7593,7 @@ Date: Wed Jan 19 09:45:09 2011 -0500 [gi] allow marshalling strings as None gi/pygi-argument.c | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) + 1 Datei geändert, 5 Zeilen hinzugefügt(+) commit 093242a9e125998cd07bf66fc4b2880f532a2e4d Author: John (J5) Palmieri @@ -7398,7 +7603,7 @@ Date: Wed Jan 19 09:41:56 2011 -0500 gi/pygi-argument.c | 2 +- gi/pygi-cache.c | 18 +++++++++--------- - 2 files changed, 10 insertions(+), 10 deletions(-) + 2 Dateien geändert, 10 Zeilen hinzugefügt(+), 10 Zeilen entfernt(-) commit f0b17605ed2eb917b350654b070984beb553eae3 Author: John (J5) Palmieri @@ -7407,7 +7612,7 @@ Date: Wed Jan 19 09:41:13 2011 -0500 [gi] allow marshalling None for hashes gi/pygi-argument.c | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) + 1 Datei geändert, 5 Zeilen hinzugefügt(+) commit 93f1b787ab8420300d1064c0237a0c2d8a2ac98f Author: John (J5) Palmieri @@ -7417,7 +7622,7 @@ Date: Wed Jan 19 09:40:37 2011 -0500 gi/pygi-argument.c | 50 +++++++++++++++++++++++++++++++++++++++++--------- - 1 files changed, 41 insertions(+), 9 deletions(-) + 1 Datei geändert, 41 Zeilen hinzugefügt(+), 9 Zeilen entfernt(-) commit 614b6ca7f45c4acbee088fe74fecf279ed50cc0c Author: Sebastian Pölsterl @@ -7426,7 +7631,7 @@ Date: Wed Jan 19 15:27:33 2011 +0100 [gi] Fixed typo in exception gi/overrides/Gtk.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 5f16df31b5a5a9f45f702eee48c3a18899ea3f71 Author: John (J5) Palmieri @@ -7437,7 +7642,7 @@ Date: Wed Jan 19 09:13:44 2011 -0500 gi/pygi-argument.c | 47 +++++++++++++++++++++++++++++++++++------------ gi/pygi-foreign.c | 18 ++++++++++++------ gi/pygi-foreign.h | 8 ++++---- - 3 files changed, 51 insertions(+), 22 deletions(-) + 3 Dateien geändert, 51 Zeilen hinzugefügt(+), 22 Zeilen entfernt(-) commit b2189424f9dd6d3a4a5b9792f0d5843fc27657d1 Author: Sebastian Pölsterl @@ -7446,7 +7651,7 @@ Date: Wed Jan 19 15:12:25 2011 +0100 [gi] Enable handling of Gdk.EventType.2BUTTON_PRESS and 3BUTTON_PRESS gi/overrides/Gdk.py | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit 5eca5ff2c9509ec96158fe43b29f0fd951243efe Author: Martin Pitt @@ -7470,7 +7675,7 @@ Date: Wed Jan 19 14:54:57 2011 +0100 gi/overrides/Pango.py | 5 ++++- tests/test_overrides.py | 5 +++++ - 2 files changed, 9 insertions(+), 1 deletions(-) + 2 Dateien geändert, 9 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit 9e7b95b3676a1b502662523a9bd4ebe40ccb4845 Author: Tony Young @@ -7481,7 +7686,7 @@ Date: Thu Dec 16 23:39:33 2010 +0000 gi/overrides/Gio.py | 41 +++++++++++++++++++++++++++++++++++++++++ gi/overrides/Makefile.am | 1 + tests/test_overrides.py | 20 ++++++++++++++++++++ - 3 files changed, 62 insertions(+), 0 deletions(-) + 3 Dateien geändert, 62 Zeilen hinzugefügt(+) commit bca5834fc8fa342149e0eec7b396877a2abe6d33 Author: Tomeu Vizoso @@ -7515,7 +7720,7 @@ Date: Fri Jan 7 12:10:37 2011 +0100 gio/gio.defs | 7465 ------------------------------------- gio/gio.override | 409 -- - gio/giomodule.c | 208 - + gio/giomodule.c | 208 -- gio/giostream.override | 68 - gio/gmemoryinputstream.override | 91 - gio/gmemoryoutputstream.override | 45 - @@ -7538,7 +7743,7 @@ Date: Fri Jan 7 12:10:37 2011 +0100 tests/test_gio.py | 1138 ------ tests/test_gresolver.py | 68 - tests/test_gsocket.py | 126 - - 46 files changed, 1 insertions(+), 18191 deletions(-) + 46 Dateien geändert, 1 Zeile hinzugefügt(+), 18191 Zeilen entfernt(-) commit 6ab3d8d286573289cf8e41eee31eb806621f6f43 Author: John (J5) Palmieri @@ -7549,7 +7754,7 @@ Date: Wed Jan 19 07:56:16 2011 -0500 gi/pygi-argument.c | 54 ++++++++++++++++++++++++++-------------------------- - 1 files changed, 27 insertions(+), 27 deletions(-) + 1 Datei geändert, 27 Zeilen hinzugefügt(+), 27 Zeilen entfernt(-) commit 762ccb3d2620ea22023446b6ae79f3a111d8b56a Author: John (J5) Palmieri @@ -7558,7 +7763,7 @@ Date: Wed Jan 19 07:49:52 2011 -0500 [gi] return FALSE when setting errors in the marshaller gi/pygi-argument.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit cbaba6357937cbed3ebd34d2db1cdd59d37df118 Author: John (J5) Palmieri @@ -7570,7 +7775,7 @@ Date: Wed Jan 19 07:14:18 2011 -0500 gi/pygi-cache.h | 14 ++++++++------ gi/pygi-invoke-state-struct.h | 2 +- gi/pygi-invoke.c | 20 +++++++++++++++++++- - 4 files changed, 30 insertions(+), 8 deletions(-) + 4 Dateien geändert, 30 Zeilen hinzugefügt(+), 8 Zeilen entfernt(-) commit f45033858bed70d7defec3f71f26aa5b3999d680 Author: John (J5) Palmieri @@ -7579,7 +7784,7 @@ Date: Wed Jan 19 06:35:45 2011 -0500 [gi] set length for uint8 in arrays in new invoke marshaller gi/pygi-argument.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+) commit 09f7ca7e2378e6679002677ac3f4802f4cc7d9d5 Author: Ignacio Casal Quinteiro @@ -7589,7 +7794,7 @@ Date: Wed Jan 19 12:04:15 2011 +0100 gi/pygi-argument.c | 1 + tests/test_gi.py | 4 ++++ - 2 files changed, 5 insertions(+), 0 deletions(-) + 2 Dateien geändert, 5 Zeilen hinzugefügt(+) commit 22eee43e50a150ace80694213fb87be9f0c72f51 Author: Sebastian Pölsterl @@ -7598,7 +7803,7 @@ Date: Wed Jan 19 10:27:47 2011 +0100 Convert Gdk.Pixbuf to GdkPixbuf.Pixbuf pygi-convert.sh | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+) commit a4b210d69c832629894090b7154ae194209b0c60 Author: Arnaud Charlet @@ -7614,7 +7819,7 @@ Date: Tue Jan 18 18:31:29 2011 +0100 glib/pyglib.c | 12 ++++++++++++ gobject/pygobject-private.h | 6 ++++++ - 2 files changed, 18 insertions(+), 0 deletions(-) + 2 Dateien geändert, 18 Zeilen hinzugefügt(+) commit 329afb6fb1b3c325a6a9de2b6aca91c64d51dd9f Author: John (J5) Palmieri @@ -7625,7 +7830,7 @@ Date: Tue Jan 18 12:31:57 2011 -0500 gi/pygi-argument.c | 9 +++++++-- gi/pygi-cache.c | 2 ++ gi/pygi-cache.h | 1 + - 3 files changed, 10 insertions(+), 2 deletions(-) + 3 Dateien geändert, 10 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit a000627ec3904b9414ce375aec8d144fc0c26248 Author: Martin Pitt @@ -7635,7 +7840,7 @@ Date: Tue Jan 18 18:29:50 2011 +0100 these should be ported properly pygi-convert.sh | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile entfernt(-) commit 99ff4610fb5ece2fc8d2f9eba13e661968adf3f0 Author: Martin Pitt @@ -7644,7 +7849,7 @@ Date: Tue Jan 18 18:26:01 2011 +0100 pygi-convert.sh: Fix match for adding missing imports pygi-convert.sh | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) + 1 Datei geändert, 4 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-) commit 3aa95011fad67df20370e92bf25236a34d7d08d3 Author: Martin Pitt @@ -7658,7 +7863,7 @@ Date: Tue Jan 18 18:09:30 2011 +0100 assertion. pygi-convert.sh | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) + 1 Datei geändert, 3 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit f66051380c0432bf142774542ade2144adcd455e Author: John (J5) Palmieri @@ -7667,7 +7872,7 @@ Date: Tue Jan 18 11:44:27 2011 -0500 [gi] use correct union memeber when marshalling floats gi/pygi-argument.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 36bc1c17e7d4189059337cc6a73c64edd819ec12 Author: Laszlo Pandy @@ -7676,7 +7881,7 @@ Date: Tue Jan 18 17:29:52 2011 +0100 Remove trailing whitespace from gi/overrides/Gtk.py gi/overrides/Gtk.py | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) + 1 Datei geändert, 5 Zeilen hinzugefügt(+), 5 Zeilen entfernt(-) commit 1006df1929a667716c25e74b35b8f14643358732 Author: John (J5) Palmieri @@ -7689,12 +7894,12 @@ Date: Tue Jan 18 11:24:06 2011 -0500 static methods which happen to return an instance - gi/pygi-argument.c | 8 +-- + gi/pygi-argument.c | 8 ++-- gi/pygi-cache.c | 132 ++++++++++++++++++++++++++++++++++++++++++++++++++-- gi/pygi-invoke.c | 9 ++-- - gi/types.py | 21 ++------ - 4 files changed, 142 insertions(+), 28 deletions(-) + gi/types.py | 21 +++------ + 4 Dateien geändert, 142 Zeilen hinzugefügt(+), 28 Zeilen entfernt(-) commit 8878c57676091c08e66bc6cbe735d898cb420582 Author: Martin Pitt @@ -7709,7 +7914,7 @@ Date: Tue Jan 18 16:47:10 2011 +0100 just fine now). gi/overrides/Pango.py | 7 +------ - 1 files changed, 1 insertions(+), 6 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 6 Zeilen entfernt(-) commit efbbe71634037fa100b17327389b883b259cca54 Author: Martin Pitt @@ -7720,7 +7925,7 @@ Date: Tue Jan 18 16:23:39 2011 +0100 This allows us to run the test suite against local typelibs. tests/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit c96ca383350e5b9b079d9a86464922314939c006 Author: John (J5) Palmieri @@ -7734,7 +7939,7 @@ Date: Tue Jan 18 07:16:40 2011 -0500 support all types gi/pygi-cache.c | 42 ++++++++++++++++++++++++------------------ - 1 files changed, 24 insertions(+), 18 deletions(-) + 1 Datei geändert, 24 Zeilen hinzugefügt(+), 18 Zeilen entfernt(-) commit f56d85a7f39c2088bf9fd50b1b1e5b67c03104d3 Merge: 84d6142 7d997b6 @@ -7752,7 +7957,7 @@ Date: Tue Jan 18 13:12:36 2011 +0100 gi/overrides/Gtk.py | 28 ++++++++++++++++++---------- tests/test_overrides.py | 12 +++++++++++- - 2 files changed, 29 insertions(+), 11 deletions(-) + 2 Dateien geändert, 29 Zeilen hinzugefügt(+), 11 Zeilen entfernt(-) commit 84d6142c14a7ebfb7284d3db52e14d3393f93905 Author: Steve Frécinaux @@ -7776,7 +7981,7 @@ Date: Mon Jan 17 18:57:58 2011 +0100 gobject/__init__.py | 6 +++--- tests/test_gi.py | 21 ++------------------- - 2 files changed, 5 insertions(+), 22 deletions(-) + 2 Dateien geändert, 5 Zeilen hinzugefügt(+), 22 Zeilen entfernt(-) commit 30750ccef31e6c864628f418fc00e8c573d29a1b Author: Simon van der Linden @@ -7787,7 +7992,7 @@ Date: Tue Jan 18 12:57:13 2011 +0100 https://bugzilla.gnome.org/show_bug.cgi?id=612126 configure.ac | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + 1 Datei geändert, 3 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-) commit 761e98d32729f5894f4c75a54c65ed11329dc9d5 Author: Martin Pitt @@ -7796,7 +8001,7 @@ Date: Tue Jan 18 12:52:32 2011 +0100 pygi-convert.sh: Handle keysyms pygi-convert.sh | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+) commit d62cdfa38a675c1daf3bc12d5cd769434eea5dc8 Author: Martin Pitt @@ -7805,7 +8010,7 @@ Date: Tue Jan 18 12:14:09 2011 +0100 GLib overrides: Add test case for array variant building tests/test_overrides.py | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) + 1 Datei geändert, 7 Zeilen hinzugefügt(+) commit 69a78307f3762e3f54d28d98514cec7d31ff20db Author: Tomeu Vizoso @@ -7817,7 +8022,7 @@ Date: Tue Jan 18 10:21:03 2011 +0100 gi/pygi-foreign-cairo.c | 96 ----------------------------------------------- - 1 files changed, 0 insertions(+), 96 deletions(-) + 1 Datei geändert, 96 Zeilen entfernt(-) commit 017680c9a5e163021628bf29543598861a3b600a Author: Tomeu Vizoso @@ -7828,7 +8033,7 @@ Date: Tue Jan 18 10:20:25 2011 +0100 https://bugzilla.gnome.org/show_bug.cgi?id=639823 gi/pygi-invoke.c | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) + 1 Datei geändert, 4 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit 771ef76574690eb98926249f38661d741d1ebbb0 Author: Ignacio Casal Quinteiro @@ -7837,7 +8042,7 @@ Date: Tue Jan 18 12:02:01 2011 +0100 The tags can be Empty not None. gi/overrides/Gtk.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit b1a98083cdc50653e1d7bfb809bdf089f833df3d Author: Martin Pitt @@ -7854,7 +8059,7 @@ Date: Tue Jan 18 12:01:28 2011 +0100 gi/overrides/GLib.py | 50 ++++++++++++++++++++++++++++++++++++++++++ tests/test_overrides.py | 55 +++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 105 insertions(+), 0 deletions(-) + 2 Dateien geändert, 105 Zeilen hinzugefügt(+) commit ecb9f824c503c529d43e585b4cdb4c1c9ab14593 Author: Martin Pitt @@ -7873,7 +8078,7 @@ Date: Tue Jan 18 10:48:03 2011 +0100 gi/overrides/GLib.py | 45 +++++++++++++++++++++++++++++++++++++++++++++ tests/test_overrides.py | 33 ++++++++++++++++++++++++++++++++- - 2 files changed, 77 insertions(+), 1 deletions(-) + 2 Dateien geändert, 77 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit 31c73dee34a52fd22b5ff3a23adce92cea5ddc3d Author: Ignacio Casal Quinteiro @@ -7883,7 +8088,7 @@ Date: Tue Jan 18 10:56:18 2011 +0100 gi/overrides/Gtk.py | 12 ++++++++++++ tests/test_overrides.py | 6 ++++++ - 2 files changed, 18 insertions(+), 0 deletions(-) + 2 Dateien geändert, 18 Zeilen hinzugefügt(+) commit fc7d7f7f153d57ff3866b7bfd5e6479d702cc4d9 Author: Simon van der Linden @@ -7898,7 +8103,7 @@ Date: Mon Jan 17 14:35:14 2011 +0100 glib/Makefile.am | 2 +- m4/python.m4 | 7 +++++-- tests/Makefile.am | 2 +- - 5 files changed, 12 insertions(+), 7 deletions(-) + 5 Dateien geändert, 12 Zeilen hinzugefügt(+), 7 Zeilen entfernt(-) commit bceec758b27e6c396d17a79424633b5dc9116f54 Author: Simon van der Linden @@ -7912,7 +8117,7 @@ Date: Mon Jan 17 14:20:55 2011 +0100 configure.ac | 2 +- m4/python.m4 | 31 +------------------------------ - 2 files changed, 2 insertions(+), 31 deletions(-) + 2 Dateien geändert, 2 Zeilen hinzugefügt(+), 31 Zeilen entfernt(-) commit e2dea065da94d17a915abe1ce4671b1dc48e02c0 Author: Sebastian Pölsterl @@ -7928,7 +8133,7 @@ Date: Mon Jan 17 19:09:27 2011 +0100 gi/overrides/Gtk.py gi/overrides/Gtk.py | 10 ---------- - 1 files changed, 0 insertions(+), 10 deletions(-) + 1 Datei geändert, 10 Zeilen entfernt(-) commit 4fbae9629adc166627de05bb0946b71485343d69 Author: Sebastian Pölsterl @@ -7940,7 +8145,7 @@ Date: Mon Jan 17 19:08:23 2011 +0100 This reverts commit 232841148f35684be83a2f47b5b18da4fb74f63a. gi/overrides/Gtk.py | 13 ++----------- - 1 files changed, 2 insertions(+), 11 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+), 11 Zeilen entfernt(-) commit c054f0aca67952876b3519bb75ddc62c5517f7cb Author: Sebastian Pölsterl @@ -7952,7 +8157,7 @@ Date: Mon Jan 17 19:08:06 2011 +0100 This reverts commit ed7e7a8f22b1481acf78c0c2e4c489dbad72f599. gi/overrides/Gtk.py | 9 --------- - 1 files changed, 0 insertions(+), 9 deletions(-) + 1 Datei geändert, 9 Zeilen entfernt(-) commit 2d9534f347505573da46743b47318e08bf073aef Author: Martin Pitt @@ -7961,7 +8166,7 @@ Date: Mon Jan 17 18:54:10 2011 +0100 pygi-convert.sh: Handle gtk.combo_box_new_text() pygi-convert.sh | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+) commit 0586a83212a9f9234fe00659ae744ab04e7ccc67 Author: John (J5) Palmieri @@ -7971,10 +8176,10 @@ Date: Mon Jan 17 12:31:03 2011 -0500 gi/pygi-argument.c | 68 ++++++++++++++++++++++++++++++++++++++++++-- gi/pygi-cache.c | 80 - +++++++++++++++++++++++++++++++++++++++------------ - gi/pygi-cache.h | 13 +++++++- + +++++++++++++++++++++++++++++++++++++++------------- + gi/pygi-cache.h | 13 +++++++-- gi/pygi-invoke.c | 2 +- - 4 files changed, 138 insertions(+), 25 deletions(-) + 4 Dateien geändert, 138 Zeilen hinzugefügt(+), 25 Zeilen entfernt(-) commit 914d3a0a29680f4d3aa0e1f8afdd625b017b013a Author: Sebastian Pölsterl @@ -7984,7 +8189,7 @@ Date: Mon Jan 17 16:57:53 2011 +0100 add default values to be pygtk compliant gi/overrides/Gtk.py | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) + 1 Datei geändert, 6 Zeilen hinzugefügt(+) commit ed7e7a8f22b1481acf78c0c2e4c489dbad72f599 Author: Sebastian Pölsterl @@ -7994,7 +8199,7 @@ Date: Mon Jan 17 16:29:28 2011 +0100 set_cell_data_func to add default values to be compliant with pygtk gi/overrides/Gtk.py | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) + 1 Datei geändert, 9 Zeilen hinzugefügt(+) commit 232841148f35684be83a2f47b5b18da4fb74f63a Author: Sebastian Pölsterl @@ -8004,7 +8209,7 @@ Date: Mon Jan 17 16:28:51 2011 +0100 to be compliant with pygtk gi/overrides/Gtk.py | 13 +++++++++++-- - 1 files changed, 11 insertions(+), 2 deletions(-) + 1 Datei geändert, 11 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit 1dec12826753756fcadefc8ef8c756fc902c320b Author: Sebastian Pölsterl @@ -8014,7 +8219,7 @@ Date: Mon Jan 17 15:54:32 2011 +0100 compliant with pygtk gi/overrides/Gtk.py | 10 ++++++++++ - 1 files changed, 10 insertions(+), 0 deletions(-) + 1 Datei geändert, 10 Zeilen hinzugefügt(+) commit a8c727b9c4195d8085a45661683a18614ae84485 Author: Sebastian Pölsterl @@ -8024,7 +8229,7 @@ Date: Mon Jan 17 15:46:25 2011 +0100 be compliant with pygtk gi/overrides/Gtk.py | 10 ++++++++++ - 1 files changed, 10 insertions(+), 0 deletions(-) + 1 Datei geändert, 10 Zeilen hinzugefügt(+) commit 7cc8ac35bb0d8dbf7d66f014f8cd7ff070b3acb8 Author: Steve Frécinaux @@ -8036,7 +8241,7 @@ Date: Wed Aug 4 00:30:05 2010 +0200 gobject/propertyhelper.py | 26 +++++++++++++------------- tests/test_properties.py | 9 +++++++++ - 2 files changed, 22 insertions(+), 13 deletions(-) + 2 Dateien geändert, 22 Zeilen hinzugefügt(+), 13 Zeilen entfernt(-) commit 7a0548dbfbdfe481f75315b6bc7824a9f1a8a87b Author: Martin Pitt @@ -8054,7 +8259,7 @@ Date: Mon Jan 17 17:52:15 2011 +0100 gi/overrides/Gtk.py | 2 +- tests/test_overrides.py | 12 +++++++++++- - 2 files changed, 12 insertions(+), 2 deletions(-) + 2 Dateien geändert, 12 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit 09c21c79fb6063c8451f53d4588363d2be7239f4 Author: Laszlo Pandy @@ -8078,7 +8283,7 @@ Date: Mon Jan 17 16:46:08 2011 +0100 gi/overrides/Pango.py | 2 +- gi/overrides/__init__.py | 2 +- tests/test_everything.py | 2 +- - 8 files changed, 24 insertions(+), 24 deletions(-) + 8 Dateien geändert, 24 Zeilen hinzugefügt(+), 24 Zeilen entfernt(-) commit 2c70beca9e76e4dc253453c556e6985ce59a3dd9 Author: Laszlo Pandy @@ -8089,7 +8294,7 @@ Date: Mon Jan 17 16:17:25 2011 +0100 gi/module.py | 2 +- gi/types.py | 6 +++--- - 2 files changed, 4 insertions(+), 4 deletions(-) + 2 Dateien geändert, 4 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-) commit 6fbb6be5a5d0d9cd43e1504b8dda5aa75feb95ca Author: Martin Pitt @@ -8098,7 +8303,7 @@ Date: Mon Jan 17 16:16:45 2011 +0100 pygi-convert.sh: Handle GdkPixbuf.InterpType pygi-convert.sh | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+) commit 66a5784f4ab5de5b6d8d51eb4ce869fa26f6a601 Author: Laszlo Pandy @@ -8118,7 +8323,7 @@ Date: Mon Jan 17 15:43:34 2011 +0100 gi/module.py | 2 +- gi/types.py | 2 ++ tests/test_gi.py | 10 ++++++++++ - 3 files changed, 13 insertions(+), 1 deletions(-) + 3 Dateien geändert, 13 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit da50d5620a42046d4fc905bb28a0890d73533cb1 Author: Tomeu Vizoso @@ -8128,13 +8333,13 @@ Date: Mon Dec 13 18:03:51 2010 +0100 https://bugzilla.gnome.org/show_bug.cgi?id=637165 - gi/pygi-info.c | 4 +- + gi/pygi-info.c | 4 +-- gi/pygi-invoke.c | 72 - +++++++++++++++++++++++++++++++++++++++++------------ - gi/pygi-invoke.h | 3 +- + +++++++++++++++++++++++++++++++++++++++++------------- + gi/pygi-invoke.h | 3 ++- gi/types.py | 28 ++++++++++++++++++++- - tests/test_gi.py | 5 ++- - 5 files changed, 89 insertions(+), 23 deletions(-) + tests/test_gi.py | 5 ++-- + 5 Dateien geändert, 89 Zeilen hinzugefügt(+), 23 Zeilen entfernt(-) commit 8ceef79c98a1c2e22ed8ab655ef1169f1763dd23 Author: Simon van der Linden @@ -8158,19 +8363,19 @@ Date: Fri Dec 31 18:38:04 2010 +0100 https://bugzilla.gnome.org/show_bug.cgi?id=636656 - glib/glibmodule.c | 5 +++- - glib/pyglib-private.h | 3 ++ + glib/glibmodule.c | 5 ++++- + glib/pyglib-private.h | 3 +++ glib/pyglib.c | 48 - ++-------------------------------------------- - glib/pygmaincontext.c | 22 +++++++++++++++++++++ + +++-------------------------------------------- + glib/pygmaincontext.c | 22 ++++++++++++++++++++++ glib/pygmaincontext.h | 2 +- glib/pygmainloop.c | 2 +- - glib/pygoptioncontext.c | 21 ++++++++++++++++++++ - glib/pygoptioncontext.h | 2 + + glib/pygoptioncontext.c | 21 +++++++++++++++++++++ + glib/pygoptioncontext.h | 2 ++ glib/pygoptiongroup.c | 26 +++++++++++++++++++++++++ - glib/pygoptiongroup.h | 2 + + glib/pygoptiongroup.h | 2 ++ glib/pygsource.c | 2 +- - 11 files changed, 86 insertions(+), 49 deletions(-) + 11 Dateien geändert, 86 Zeilen hinzugefügt(+), 49 Zeilen entfernt(-) commit 17caffe4eeefeaf33a56ececbc6c7454f60b9d76 Author: Martin Pitt @@ -8179,7 +8384,7 @@ Date: Mon Jan 17 14:51:26 2011 +0100 pygi-convert.sh: Handle Gdk.DragAction pygi-convert.sh | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+) commit aa390aa80f06ac83ec89e5c5ee143d21ace97917 Author: Martin Pitt @@ -8190,7 +8395,7 @@ Date: Mon Jan 17 14:46:58 2011 +0100 There are other GSettings.get_* functions like get_for_screen(). pygi-convert.sh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 2e6d5bb49425e6087ca61765ecb72e7a760f2ab2 Author: Martin Pitt @@ -8201,7 +8406,7 @@ Date: Mon Jan 17 11:22:46 2011 +0100 This particular affects dbus.mainloop.glib.* pygi-convert.sh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 3887b030fc19d25e0cd7b4ed504f4ed23363c3d6 Author: Paolo Borelli @@ -8212,7 +8417,7 @@ Date: Sun Jan 16 22:09:56 2011 +0100 Do not leak interface info in (g|s)_et_property. gi/pygi-property.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) + 1 Datei geändert, 4 Zeilen hinzugefügt(+) commit a4950b4cbb3c7567a8586061bb361adb7d9afb98 Author: Paolo Borelli @@ -8223,7 +8428,7 @@ Date: Sun Jan 16 21:43:30 2011 +0100 Do not leak type_info in find_vfunc_info gi/gimodule.c | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) + 1 Datei geändert, 5 Zeilen hinzugefügt(+), 5 Zeilen entfernt(-) commit d0cbcc45366d40702c69cef207d3c0f361260c02 Author: Paolo Borelli @@ -8235,7 +8440,7 @@ Date: Sun Jan 16 12:16:31 2011 +0100 gi/overrides/Gtk.py | 3 +++ tests/test_overrides.py | 4 ++++ - 2 files changed, 7 insertions(+), 0 deletions(-) + 2 Dateien geändert, 7 Zeilen hinzugefügt(+) commit 6409d659326bf3cefdf6051379e8bc2031f16733 Author: Martin Pitt @@ -8244,7 +8449,7 @@ Date: Sat Jan 15 11:20:23 2011 -0600 pygi-convert.sh: Convert Pango.WrapMode pygi-convert.sh | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+) commit 6aaa6a38198e84a189ca1e8d26b1871d5b6bb711 Author: Martin Pitt @@ -8257,7 +8462,7 @@ Date: Sat Jan 15 11:17:09 2011 -0600 just change module names which start with "gtk" or "gdk". pygi-convert.sh | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit 9be0f1f2dfb89150faf1827ef482feea03645149 Author: John (J5) Palmieri @@ -8269,7 +8474,7 @@ Date: Thu Jan 13 23:56:19 2011 -0500 gi/pygi-cache.c | 36 ++++++++++++++++++++++++++++-------- gi/pygi-cache.h | 1 - gi/pygi-invoke.c | 8 ++++++-- - 4 files changed, 42 insertions(+), 11 deletions(-) + 4 Dateien geändert, 42 Zeilen hinzugefügt(+), 11 Zeilen entfernt(-) commit cfca2f0a53a5c29f543875ca4cb83a2e18d3bc72 Author: John (J5) Palmieri @@ -8277,10 +8482,10 @@ Date: Thu Jan 13 21:07:25 2011 -0500 [gi] marshal in hashes - gi/pygi-argument.c | 93 ++++++++++++++++++++++++++++++++++++++- + gi/pygi-argument.c | 93 +++++++++++++++++++++++++++++++++++++-- gi/pygi-cache.c | 122 - ++++++++++++++++++++++++++++++++++++--------------- - 2 files changed, 176 insertions(+), 39 deletions(-) + ++++++++++++++++++++++++++++++++++++---------------- + 2 Dateien geändert, 176 Zeilen hinzugefügt(+), 39 Zeilen entfernt(-) commit c36fbf4918c8557a8e274a12004a412da3b22b2c Author: Laszlo Pandy @@ -8302,7 +8507,7 @@ Date: Tue Jan 11 21:41:47 2011 +0100 gi/module.py | 28 +++++++++++++++++++++------- tests/test_everything.py | 18 ++++++++++++++++++ - 2 files changed, 39 insertions(+), 7 deletions(-) + 2 Dateien geändert, 39 Zeilen hinzugefügt(+), 7 Zeilen entfernt(-) commit 1679e6af3f212e4d4644e048dc3c6177ed3fac6b Author: Paolo Borelli @@ -8311,7 +8516,7 @@ Date: Thu Jan 13 00:02:20 2011 +0100 pygi-convert.sh: handle ReliefStyle pygi-convert.sh | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+) commit e9166ba5d19f2b586f65a3b83a671a5afd486d8f Author: John (J5) Palmieri @@ -8321,7 +8526,7 @@ Date: Wed Jan 12 16:50:30 2011 -0500 gi/pygi-argument.c | 122 +++++++++++++++++++++++++++++++++++++++++++++++++--- - 1 files changed, 116 insertions(+), 6 deletions(-) + 1 Datei geändert, 116 Zeilen hinzugefügt(+), 6 Zeilen entfernt(-) commit 9baf3240fbac103823ad0feaaf1c82e46d276722 Author: John (J5) Palmieri @@ -8332,7 +8537,7 @@ Date: Wed Jan 12 16:24:17 2011 -0500 gi/pygi-cache.c | 3 ++- gi/pygi-cache.h | 1 + gi/pygi-invoke.c | 7 +++++++ - 3 files changed, 10 insertions(+), 1 deletions(-) + 3 Dateien geändert, 10 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit d54d12c66226910952b0dc44c8d9514a7edaa6f2 Author: John (J5) Palmieri @@ -8344,7 +8549,7 @@ Date: Wed Jan 12 16:23:02 2011 -0500 gi/pygi-argument.c | 39 ++++++++++++++++++++++----------------- gi/pygi-cache.c | 3 ++- - 2 files changed, 24 insertions(+), 18 deletions(-) + 2 Dateien geändert, 24 Zeilen hinzugefügt(+), 18 Zeilen entfernt(-) commit 3b0eff80d2ee35e0417476f0a170b9e178e3d1ee Author: John (J5) Palmieri @@ -8353,11 +8558,11 @@ Date: Tue Jan 11 17:20:43 2011 -0500 [gi] implement out arg handling gi/pygi-argument.c | 43 +++++++++-------------------------- - gi/pygi-cache.c | 22 ++++++++++++++---- - gi/pygi-invoke-state-struct.h | 13 ++++++++++ + gi/pygi-cache.c | 22 +++++++++++++----- + gi/pygi-invoke-state-struct.h | 13 +++++++++++ gi/pygi-invoke.c | 50 - +++++++++++++++++++++++++++++++++++++++- - 4 files changed, 89 insertions(+), 39 deletions(-) + +++++++++++++++++++++++++++++++++++++++-- + 4 Dateien geändert, 89 Zeilen hinzugefügt(+), 39 Zeilen entfernt(-) commit bd002c72675d35b5e60ab773181e7c36c30d2625 Author: Dieter Verfaillie @@ -8366,7 +8571,7 @@ Date: Tue Jan 11 22:21:18 2011 +0100 setup.py: fix the provides keyword argument setup.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 59dac72d0fa8e1d68bbbc13d76c2747f1cb11857 Author: Dieter Verfaillie @@ -8375,7 +8580,7 @@ Date: Tue Jan 11 22:19:18 2011 +0100 setup.py: use the same spaces-less format for all setup() parameters setup.py | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) + 1 Datei geändert, 4 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-) commit c5c149be171895d292852df364541f14f0ec423a Author: John (J5) Palmieri @@ -8386,10 +8591,10 @@ Date: Tue Jan 11 15:39:09 2011 -0500 gi/pygi-argument.c | 387 +++++++++++++++++++++++++++++++++++++++++++++++++++- gi/pygi-argument.h | 117 ++++++++++++++++ - gi/pygi-cache.c | 316 ++++++++++++++++++++++++++++++++++++++++++- + gi/pygi-cache.c | 316 +++++++++++++++++++++++++++++++++++++++++- gi/pygi-cache.h | 8 +- - gi/pygi-invoke.c | 12 ++- - 5 files changed, 829 insertions(+), 11 deletions(-) + gi/pygi-invoke.c | 12 +- + 5 Dateien geändert, 829 Zeilen hinzugefügt(+), 11 Zeilen entfernt(-) commit 4fcca8518774ab89607196dfc52037e3da30ac8a Author: John (J5) Palmieri @@ -8398,11 +8603,11 @@ Date: Tue Jan 11 13:49:58 2011 -0500 [gi] flesh out interface in marshalling a bit more gi/pygi-argument.c | 74 - +++++++++++++++++++++++++++++++++++++++--------- + ++++++++++++++++++++++++++++++++++++++---------- gi/pygi-cache.c | 79 - ++++++++++++++++++++++++++++++++++++++++----------- + +++++++++++++++++++++++++++++++++++++++++----------- gi/pygi-cache.h | 1 + - 3 files changed, 123 insertions(+), 31 deletions(-) + 3 Dateien geändert, 123 Zeilen hinzugefügt(+), 31 Zeilen entfernt(-) commit 4992dca9f5cea68d85eb2ed86105c9c6b8311d79 Author: Laszlo Pandy @@ -8422,7 +8627,7 @@ Date: Tue Jan 11 19:30:38 2011 +0100 https://bugzilla.gnome.org/show_bug.cgi?id=639232 gi/module.py | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) + 1 Datei geändert, 9 Zeilen hinzugefügt(+) commit 2ffaec59e7349c145a0e2a5edba2ffb7d8628369 Author: Tomeu Vizoso @@ -8433,7 +8638,7 @@ Date: Tue Jan 11 19:40:19 2011 +0100 Breaks marshalling of some types gi/module.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 52a298cc0f05ceec96457f17f9a801e9838fb757 Author: Laszlo Pandy @@ -8454,7 +8659,7 @@ Date: Tue Jan 11 19:26:50 2011 +0100 https://bugzilla.gnome.org/show_bug.cgi?id=639229 gi/module.py | 10 +++++++--- - 1 files changed, 7 insertions(+), 3 deletions(-) + 1 Datei geändert, 7 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-) commit 369a75ba5fb64ff7a7c95d21f8bfe359e639e9ff Author: John (J5) Palmieri @@ -8465,12 +8670,12 @@ Date: Mon Jan 10 17:55:03 2011 -0500 * also remove the PyGIArgCleanup sinature as GDestroyNotify works just fine - gi/pygi-argument.c | 15 +++- + gi/pygi-argument.c | 15 +++-- gi/pygi-cache.c | 182 +++++++++++++++++++++++++++++++++++++++++++++++----- gi/pygi-cache.h | 1 - gi/pygi-invoke.c | 1 + - 4 files changed, 178 insertions(+), 21 deletions(-) + 4 Dateien geändert, 178 Zeilen hinzugefügt(+), 21 Zeilen entfernt(-) commit 88531c58d0491a31dd319387237a03df5c9edc07 Author: John (J5) Palmieri @@ -8479,7 +8684,7 @@ Date: Mon Jan 10 15:33:56 2011 -0500 [gi] fix casting when marshaling a char to uint8 gi/pygi-argument.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 441da4a7346ca059630dbc820c5b46e4d0222f4b Author: John (J5) Palmieri @@ -8494,14 +8699,14 @@ Date: Mon Jan 10 15:07:16 2011 -0500 gi/Makefile.am | 1 + gi/pygi-argument.c | 60 +++++++++-------- - gi/pygi-argument.h | 60 ++++++++-------- + gi/pygi-argument.h | 60 ++++++++--------- gi/pygi-cache.h | 6 +- gi/pygi-invoke-state-struct.h | 26 +++++++ gi/pygi-invoke.c | 149 - +++++++++++++++++++++++++++++++--------- + +++++++++++++++++++++++++++++++---------- gi/pygi-invoke.h | 2 +- gi/pygi-private.h | 1 + - 8 files changed, 208 insertions(+), 97 deletions(-) + 8 Dateien geändert, 208 Zeilen hinzugefügt(+), 97 Zeilen entfernt(-) commit f32b1f494aa5d09b9b198f607722c819c6bbd808 Author: John (J5) Palmieri @@ -8513,11 +8718,11 @@ Date: Sun Jan 9 19:37:55 2011 -0500 * throws exceptions for everything that can not be cached yet gi/pygi-cache.c | 59 - ++++++++++++++++++++++++++++++++++++++++++----------- - gi/pygi-info.c | 3 ++ - gi/pygi-invoke.c | 5 ++++ - gi/pygi.h | 2 + - 4 files changed, 56 insertions(+), 13 deletions(-) + ++++++++++++++++++++++++++++++++++++++++++------------ + gi/pygi-info.c | 3 +++ + gi/pygi-invoke.c | 5 +++++ + gi/pygi.h | 2 ++ + 4 Dateien geändert, 56 Zeilen hinzugefügt(+), 13 Zeilen entfernt(-) commit c2bf1d4d9cf2e9f8e313528fe717f6279dad5da1 Author: John (J5) Palmieri @@ -8526,7 +8731,7 @@ Date: Sun Jan 9 18:05:31 2011 -0500 [gi] fix some function names gi/pygi-cache.c | 5 ++--- - 1 files changed, 2 insertions(+), 3 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-) commit 2ec4230a5180f048c26c2e4234b2a098d42f030b Author: John (J5) Palmieri @@ -8538,7 +8743,7 @@ Date: Sun Jan 9 15:58:06 2011 -0500 gi/pygi-cache.c | 344 ++++++++++++++++++++++++++++------------------------ gi/pygi-cache.h | 50 ++++---- - 3 files changed, 273 insertions(+), 243 deletions(-) + 3 Dateien geändert, 273 Zeilen hinzugefügt(+), 243 Zeilen entfernt(-) commit f4cdf0c0321285da015686fcb7115bd91bfd5c7c Author: John (J5) Palmieri @@ -8552,9 +8757,9 @@ Date: Sat Jan 8 20:45:11 2011 -0500 gi/pygi-argument.h | 174 +++++++++++++++++++++++++++++++++++++++++++--------- gi/pygi-cache.c | 169 - ++++++++++++++++++++++++-------------------------- - gi/pygi-cache.h | 25 ++++--- - 5 files changed, 293 insertions(+), 177 deletions(-) + +++++++++++++++++++++++++------------------------- + gi/pygi-cache.h | 25 ++++---- + 5 Dateien geändert, 293 Zeilen hinzugefügt(+), 177 Zeilen entfernt(-) commit 5f8f3044dd8085b2e8ce0bf70e9d52f05abf909d Author: John (J5) Palmieri @@ -8571,7 +8776,7 @@ Date: Sat Jan 8 19:10:29 2011 -0500 gi/pygi-cache.c | 242 ++++++++++++++++++++++------------------------------ gi/pygi-cache.h | 4 +- - 3 files changed, 175 insertions(+), 147 deletions(-) + 3 Dateien geändert, 175 Zeilen hinzugefügt(+), 147 Zeilen entfernt(-) commit 202a268db7f98f5a3c525c6e65ec4bff1917257e Author: Emilio Pozuelo Monfort @@ -8582,7 +8787,7 @@ Date: Sat Jan 8 02:19:52 2011 +0000 Needed for G_TYPE_CONVERTER_FLAGS and others. configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit c3aa36151fdef9ed9884d93114786bbe86387983 Author: Tomeu Vizoso @@ -8591,7 +8796,7 @@ Date: Fri Jan 7 12:58:11 2011 +0100 Add test for incorrect attributes in Gdk.Event tests/test_overrides.py | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) + 1 Datei geändert, 4 Zeilen hinzugefügt(+) commit 204b45c7e95eb50d9e3843127fb10e13b1b17fee Author: Simon van der Linden @@ -8614,7 +8819,7 @@ Date: Sun Jan 2 19:25:55 2011 +0100 https://bugzilla.gnome.org/show_bug.cgi?id=638523 gi/overrides/Gdk.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 6cf298ca5565d0eb99824f050ff47407e50a5c01 Author: Mike Gorse @@ -8625,7 +8830,7 @@ Date: Fri Jan 7 09:08:31 2011 +0100 https://bugzilla.gnome.org/show_bug.cgi?id=638847 gi/pygi-closure.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) + 1 Datei geändert, 3 Zeilen hinzugefügt(+) commit 1be76d5e006efa24598ff7bf26153660dbe0a890 Author: Mike Gorse @@ -8636,7 +8841,7 @@ Date: Fri Jan 7 09:07:35 2011 +0100 https://bugzilla.gnome.org/show_bug.cgi?id=638847 gi/pygi-argument.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+) commit 43849c51391fc9cd239697065c3d40fa02fb6783 Author: John (J5) Palmieri @@ -8646,7 +8851,7 @@ Date: Thu Jan 6 17:30:14 2011 -0500 gi/pygi-cache.c | 24 ++++++++++++------------ gi/pygi-cache.h | 42 +++++++++++++++++++++--------------------- - 2 files changed, 33 insertions(+), 33 deletions(-) + 2 Dateien geändert, 33 Zeilen hinzugefügt(+), 33 Zeilen entfernt(-) commit 8b5b3d2bbbbdf5d26c83e9a6fe67121cbd77ebe1 Author: John (J5) Palmieri @@ -8658,10 +8863,10 @@ Date: Thu Jan 6 17:29:00 2011 -0500 gi/pygi-argument.c | 708 ++++++++++++++++++++++++++++++++++++++++++++++++++++ - gi/pygi-argument.h | 35 +++- - gi/pygi-cache.c | 82 +++++-- - gi/pygi-cache.h | 41 +++- - 4 files changed, 832 insertions(+), 34 deletions(-) + gi/pygi-argument.h | 35 ++- + gi/pygi-cache.c | 82 ++++-- + gi/pygi-cache.h | 41 ++- + 4 Dateien geändert, 832 Zeilen hinzugefügt(+), 34 Zeilen entfernt(-) commit f554cf62848104d31518138ae85bc51acaafda67 Author: John (J5) Palmieri @@ -8675,7 +8880,7 @@ Date: Tue Jan 4 18:49:53 2011 -0500 gi/pygi-cache.c | 480 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ gi/pygi-cache.h | 104 ++++++++++++ - 2 files changed, 584 insertions(+), 0 deletions(-) + 2 Dateien geändert, 584 Zeilen hinzugefügt(+) commit 8d5a7857876669f56bb03bf618bcfdcc290721c0 Author: Eitan Isaacson @@ -8687,7 +8892,7 @@ Date: Wed Dec 22 12:34:10 2010 -0800 gi/pygi-closure.c | 66 +++++++++++++++++++++++++++++++++++++++++++++-------- - 1 files changed, 56 insertions(+), 10 deletions(-) + 1 Datei geändert, 56 Zeilen hinzugefügt(+), 10 Zeilen entfernt(-) commit f14976ffabec28f6cafe1e37dc81d207a947d4ca Author: Tomeu Vizoso @@ -8696,7 +8901,7 @@ Date: Tue Dec 28 18:34:25 2010 +0100 Fix stupid name clash gi/module.py | 7 +++++-- - 1 files changed, 5 insertions(+), 2 deletions(-) + 1 Datei geändert, 5 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit 01b2a193d403beb861eab524300b4f1af63157ce Author: Tomeu Vizoso @@ -8705,7 +8910,7 @@ Date: Tue Dec 28 13:49:18 2010 +0100 Add /usr/share to XDG_DATA_DIRS when running the tests tests/Makefile.am | 7 ++++++- - 1 files changed, 6 insertions(+), 1 deletions(-) + 1 Datei geändert, 6 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit efc186f692f9eac781cc47456be74a3da7f14dcd Author: Tomeu Vizoso @@ -8714,7 +8919,7 @@ Date: Tue Dec 28 13:25:34 2010 +0100 Comment out tests that require SRV lookups tests/test_gresolver.py | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) + 1 Datei geändert, 4 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit d2462cc1ab51d76fb4625c47c3d34de1d5d0dee8 Author: Tomeu Vizoso @@ -8725,7 +8930,7 @@ Date: Tue Dec 28 13:00:16 2010 +0100 tests/Makefile.am | 2 +- tests/python.supp | 387 +++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 388 insertions(+), 1 deletions(-) + 2 Dateien geändert, 388 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit 0ee58113ecbea72784c52de928c041fc8fc88984 Author: Ignacio Casal Quinteiro @@ -8739,7 +8944,7 @@ Date: Thu Dec 23 00:10:41 2010 +0100 glib/pyglib-python-compat.h | 3 +++ glib/pyglib.c | 2 +- glib/pygmainloop.c | 3 ++- - 6 files changed, 17 insertions(+), 25 deletions(-) + 6 Dateien geändert, 17 Zeilen hinzugefügt(+), 25 Zeilen entfernt(-) commit 78ea84cd91392400ebac5a361ef8793bfe928fd0 Author: Jesse van den Kieboom @@ -8751,7 +8956,7 @@ Date: Sun Dec 19 23:10:57 2010 +0100 gi/overrides/Gtk.py | 12 ++++++------ tests/test_overrides.py | 6 ++++++ - 2 files changed, 12 insertions(+), 6 deletions(-) + 2 Dateien geändert, 12 Zeilen hinzugefügt(+), 6 Zeilen entfernt(-) commit 046cc5915286e042d1040271a90676b77632409e Author: John (J5) Palmieri @@ -8771,7 +8976,7 @@ Date: Thu Dec 16 15:41:10 2010 -0500 gobject/pygtype.c | 35 ++++++++++++++++++++++++++--------- tests/test_properties.py | 16 ++++++++++++++++ - 2 files changed, 42 insertions(+), 9 deletions(-) + 2 Dateien geändert, 42 Zeilen hinzugefügt(+), 9 Zeilen entfernt(-) commit 7aa783d5cd674f34da318f826bd5f4a0e09d24cb Author: Dieter Verfaillie @@ -8781,7 +8986,7 @@ Date: Tue Dec 14 12:29:54 2010 +0100 is mingw32 dsextras.py | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) + 1 Datei geändert, 6 Zeilen hinzugefügt(+) commit cebf5f09a6c5018ced64f35e7747fc81b93b823e Author: Dieter Verfaillie @@ -8790,7 +8995,7 @@ Date: Tue Dec 14 12:29:01 2010 +0100 dsextras.py: be consistent in how distutils imports are done dsextras.py | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + 1 Datei geändert, 3 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-) commit 35e590d48c78f2e76c47c2b4eaf0f7e8d1ed5c93 Author: Dieter Verfaillie @@ -8799,7 +9004,7 @@ Date: Tue Dec 14 12:25:07 2010 +0100 dsextras.py: add have_gcc() function dsextras.py | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) + 1 Datei geändert, 5 Zeilen hinzugefügt(+) commit 637c2c287cfb0e89365026531c651111f5593ac7 Author: Dieter Verfaillie @@ -8808,7 +9013,7 @@ Date: Tue Dec 14 12:24:41 2010 +0100 dsextras.py: use distutils.spawn.find_executable for have_pkgconfig() dsextras.py | 8 ++------ - 1 files changed, 2 insertions(+), 6 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+), 6 Zeilen entfernt(-) commit 020d00bc0ce7b77006b4d4f42d63122d79bcbf89 Author: Dieter Verfaillie @@ -8817,7 +9022,7 @@ Date: Tue Dec 14 12:22:54 2010 +0100 setup.py: fix another case of use True/False instead of 1/0 setup.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit b03cc9e0d66d8caea3cd6a63db198c43de9267e9 Author: Paolo Borelli @@ -8826,7 +9031,7 @@ Date: Mon Dec 13 10:21:52 2010 +0100 pygi-convert.sh: improve GtkSourceView conversion pygi-convert.sh | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) + 1 Datei geändert, 7 Zeilen hinzugefügt(+) commit fbc12cd7c09a67de9e28b7b0b28de9dc0e0e3418 Author: Paolo Borelli @@ -8835,7 +9040,7 @@ Date: Mon Dec 13 10:27:56 2010 +0100 pygi-convert.sh: Gtk.DialogFlags conversion pygi-convert.sh | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+) commit 73e933d2429aea4d14e15350a538da1c5c3f71eb Author: José Alburquerque @@ -8852,7 +9057,7 @@ Date: Sun Dec 12 20:38:46 2010 -0500 recent commit. codegen/docextract_to_xml.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit db7ffa75b007074cb6b33b547c6d8140da300a3e Author: Paolo Borelli @@ -8861,7 +9066,7 @@ Date: Mon Dec 13 00:17:26 2010 +0100 pygi-convert.sh: add more Gtk conversions and sort pygi-convert.sh | 50 ++++++++++++++++++++++++++------------------------ - 1 files changed, 26 insertions(+), 24 deletions(-) + 1 Datei geändert, 26 Zeilen hinzugefügt(+), 24 Zeilen entfernt(-) commit f4bfe73d0ccedf7f671d3acd6d9e262d5383b733 Author: Paolo Borelli @@ -8870,7 +9075,7 @@ Date: Mon Dec 13 00:01:40 2010 +0100 pygi-convert.sh: convert Atk pygi-convert.sh | 12 ++++++++++++ - 1 files changed, 12 insertions(+), 0 deletions(-) + 1 Datei geändert, 12 Zeilen hinzugefügt(+) commit e55ce3667eb1d352bf96f265bf018ffe8aea75f9 Author: Paolo Borelli @@ -8879,7 +9084,7 @@ Date: Sun Dec 12 23:48:48 2010 +0100 pygi-convert.sh: convert a few more Gio types pygi-convert.sh | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) + 1 Datei geändert, 9 Zeilen hinzugefügt(+) commit acc9f84bc6e13d76c6516cefe393d4a4f868aa24 Author: Paolo Borelli @@ -8888,7 +9093,7 @@ Date: Sun Dec 12 14:19:00 2010 +0100 pygi-convert.sh: more GLib conversion pygi-convert.sh | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) + 1 Datei geändert, 7 Zeilen hinzugefügt(+) commit c903390814bebdc62d530472f6f94feecc59b8b3 Author: Paolo Borelli @@ -8897,7 +9102,7 @@ Date: Sun Dec 12 14:00:34 2010 +0100 pygi-convert.sh: remove two cases handled by overrides pygi-convert.sh | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) + 1 Datei geändert, 2 Zeilen entfernt(-) commit d33c987e505ec8ddffa2b8cb5526f05b9b5f62be Author: Paolo Borelli @@ -8907,7 +9112,7 @@ Date: Sun Dec 12 13:38:56 2010 +0100 gi/overrides/Gtk.py | 7 +++++++ tests/test_overrides.py | 7 +++++++ - 2 files changed, 14 insertions(+), 0 deletions(-) + 2 Dateien geändert, 14 Zeilen hinzugefügt(+) commit 1c24bb089fcd69e3104ae72a0e7560a8c5a3f05b Author: Paolo Borelli @@ -8916,7 +9121,7 @@ Date: Sun Dec 12 12:32:39 2010 +0100 pygi-convert.sh: Fix 'find' syntax pygi-convert.sh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit f0a1d6b6bb53d0fa2788d8b9027d737b0aef8dfc Author: Paolo Borelli @@ -8925,7 +9130,7 @@ Date: Sun Dec 12 12:29:38 2010 +0100 pygi-convert.sh: start handling Gio and GLib pygi-convert.sh | 8 ++++++++ - 1 files changed, 8 insertions(+), 0 deletions(-) + 1 Datei geändert, 8 Zeilen hinzugefügt(+) commit 365bf3251af3498dc797a58cce071805451b49b1 Author: Paolo Borelli @@ -8934,7 +9139,7 @@ Date: Sat Dec 11 23:05:31 2010 +0100 pygi-convert.sh: convert Gdk.ScrollDirection. pygi-convert.sh | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+) commit bca603de0f217fb290189a0ea330f82961c46d5d Author: Paolo Borelli @@ -8948,7 +9153,7 @@ Date: Sat Dec 11 15:03:21 2010 +0100 gi/overrides/Pango.py | 13 +++++++++++++ tests/test_overrides.py | 6 ++++++ - 2 files changed, 19 insertions(+), 0 deletions(-) + 2 Dateien geändert, 19 Zeilen hinzugefügt(+) commit df233301802e3f7f9ce338cde015ca2a2fc648ab Author: Paolo Borelli @@ -8959,7 +9164,7 @@ Date: Sat Dec 11 14:18:53 2010 +0100 It is now properly handled by an override. pygi-convert.sh | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile entfernt(-) commit d8abcc9463542af9cd43d71849d0ad4c183b570b Author: Paolo Borelli @@ -8969,7 +9174,7 @@ Date: Fri Dec 10 14:05:20 2010 +0100 gi/overrides/Gtk.py | 20 +++++++++++++++++--- tests/test_overrides.py | 18 ++++++++++++++++++ - 2 files changed, 35 insertions(+), 3 deletions(-) + 2 Dateien geändert, 35 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-) commit 7924b18a99a0680c04aca46be4b64a7aa507dfe5 Author: Dmitrijs Ledkovs @@ -8981,7 +9186,7 @@ Date: Sat Dec 4 22:13:28 2010 +0000 gi/overrides/Gtk.py | 7 +++++++ tests/test_overrides.py | 9 +++++++++ - 2 files changed, 16 insertions(+), 0 deletions(-) + 2 Dateien geändert, 16 Zeilen hinzugefügt(+) commit e76352dd83c8706e68ad57d00d185da9afea99c4 Author: John (J5) Palmieri @@ -8991,7 +9196,7 @@ Date: Thu Dec 9 13:23:10 2010 -0500 gi/overrides/Gtk.py | 8 ++++++++ tests/test_overrides.py | 8 ++++++++ - 2 files changed, 16 insertions(+), 0 deletions(-) + 2 Dateien geändert, 16 Zeilen hinzugefügt(+) commit de682b2d36c362140ab7d43c0743b01ec0865a74 Author: John (J5) Palmieri @@ -9000,7 +9205,7 @@ Date: Wed Dec 8 16:39:27 2010 -0500 [gi] get rid of some debug prints and fix error messages gi/overrides/Gtk.py | 7 +++---- - 1 files changed, 3 insertions(+), 4 deletions(-) + 1 Datei geändert, 3 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-) commit dbb16571803bf51f497768bf80944514f4290ee5 Author: Paolo Borelli @@ -9009,7 +9214,7 @@ Date: Wed Dec 8 18:25:15 2010 +0100 Fix demo for override changes. demos/gtk-demo/gtk-demo.py | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) + 1 Datei geändert, 3 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit 2adcd95762944a4e27123093d3c8d080e49be1ea Author: Paolo Borelli @@ -9022,7 +9227,7 @@ Date: Wed Dec 8 18:06:01 2010 +0100 gi/overrides/Pango.py | 40 ++++++++++++++++++++++++++++++++++++++++ tests/test_overrides.py | 7 +++++++ - 4 files changed, 49 insertions(+), 1 deletions(-) + 4 Dateien geändert, 49 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit 769da968c9187414d0420412d8fb8c833d12042a Author: Tomeu Vizoso @@ -9038,7 +9243,7 @@ Date: Wed Dec 8 17:38:11 2010 +0100 gi/gimodule.c | 4 +++- gi/types.py | 12 ++---------- tests/test_gi.py | 10 ---------- - 3 files changed, 5 insertions(+), 21 deletions(-) + 3 Dateien geändert, 5 Zeilen hinzugefügt(+), 21 Zeilen entfernt(-) commit 167a01c46b3fa0b3c8339502c875d32bd2bca974 Author: Paolo Borelli @@ -9047,7 +9252,7 @@ Date: Wed Dec 8 17:37:00 2010 +0100 Fix usage of TreeIter api that is now an override. demos/gtk-demo/gtk-demo.py | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + 1 Datei geändert, 3 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-) commit d2cfd6e9250d40de7c715ac74e299deddf137683 Author: Paolo Borelli @@ -9060,7 +9265,7 @@ Date: Wed Dec 8 17:34:54 2010 +0100 reserved keyword. gi/overrides/Gtk.py | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit c0c684c9bb4e2bc08d7cb6ac246705e8a3b77656 Author: Paolo Borelli @@ -9069,7 +9274,7 @@ Date: Wed Dec 8 14:16:39 2010 +0100 Fix typo when raising an exception gi/types.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 88c9a3ad49d9fcf779c3523672d8bf4767910301 Author: Sebastian Pölsterl @@ -9078,7 +9283,7 @@ Date: Wed Dec 8 10:46:27 2010 +0100 pygi-convert.sh: Added more conversions pygi-convert.sh | 14 ++++++++++++++ - 1 files changed, 14 insertions(+), 0 deletions(-) + 1 Datei geändert, 14 Zeilen hinzugefügt(+) commit 4d8d96326b2cac91e6d75e6601b92e202d1918ff Author: Paolo Borelli @@ -9088,7 +9293,7 @@ Date: Tue Dec 7 20:39:15 2010 +0100 gi/overrides/Gtk.py | 7 +++++++ tests/test_overrides.py | 6 ++++++ - 2 files changed, 13 insertions(+), 0 deletions(-) + 2 Dateien geändert, 13 Zeilen hinzugefügt(+) commit f4f7fb35af1b41598dc050f5df155a01c370a920 Author: Dmitry Morozov @@ -9098,7 +9303,7 @@ Date: Sat Dec 4 19:19:19 2010 +0600 gi/overrides/Gtk.py | 9 +++++++++ tests/test_overrides.py | 6 +++++- - 2 files changed, 14 insertions(+), 1 deletions(-) + 2 Dateien geändert, 14 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit d2ad05d6d8d53b941e0ad33fcb200f1245a2d308 Author: Paolo Borelli @@ -9107,7 +9312,7 @@ Date: Tue Dec 7 14:13:00 2010 +0100 No need to import Gdk gi/overrides/Gtk.py | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile entfernt(-) commit b6a40badf0b2b59e690ce818efb03c7c816b8a04 Author: Paolo Borelli @@ -9116,7 +9321,7 @@ Date: Tue Dec 7 14:07:53 2010 +0100 Remove semicolumns gi/overrides/Gtk.py | 7 +++---- - 1 files changed, 3 insertions(+), 4 deletions(-) + 1 Datei geändert, 3 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-) commit cdc9c26553bf47ea488676e7bdc5f8ab0a2c906b Author: John (J5) Palmieri @@ -9126,7 +9331,7 @@ Date: Mon Dec 6 16:05:30 2010 -0500 constructor gi/overrides/Gtk.py | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit cede81ad65db017e95543d8d35715751aa202fed Author: Paolo Borelli @@ -9135,7 +9340,7 @@ Date: Sun Dec 5 13:31:20 2010 +0100 Fix cut&paste error in the Label override gi/overrides/Gtk.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 607c59b74ebbc1e39cb4121c870b689e1888c106 Author: Paolo Borelli @@ -9144,7 +9349,7 @@ Date: Sat Dec 4 16:03:27 2010 +0100 pygi-convert.sh: handle TextWindowType pygi-convert.sh | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+) commit dfeabe0b68938e27da2e65903983b5113dc422f1 Author: Paolo Borelli @@ -9154,7 +9359,7 @@ Date: Sat Dec 4 15:49:15 2010 +0100 gi/overrides/Gtk.py | 7 +++++++ tests/test_overrides.py | 4 ++++ - 2 files changed, 11 insertions(+), 0 deletions(-) + 2 Dateien geändert, 11 Zeilen hinzugefügt(+) commit da4e045e5abbed2796cc4ed39df35a0dde2de31b Author: Paolo Borelli @@ -9164,7 +9369,7 @@ Date: Sat Dec 4 15:40:35 2010 +0100 gi/overrides/Gtk.py | 7 +++++++ tests/test_overrides.py | 12 ++++++++++++ - 2 files changed, 19 insertions(+), 0 deletions(-) + 2 Dateien geändert, 19 Zeilen hinzugefügt(+) commit 81452c23ab1befa59ff375692e582791432796a5 Author: Paolo Borelli @@ -9173,7 +9378,7 @@ Date: Sat Dec 4 12:59:43 2010 +0100 pygi-convert.sh: convert MovementStep pygi-convert.sh | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+) commit 4d097eea94258eda0c328711491fd456cbd6741b Author: Paolo Borelli @@ -9186,7 +9391,7 @@ Date: Sat Dec 4 11:57:02 2010 +0100 shuld just clean up the old stuff. gi/overrides/Gdk.py | 22 ++++++++++++++++------ - 1 files changed, 16 insertions(+), 6 deletions(-) + 1 Datei geändert, 16 Zeilen hinzugefügt(+), 6 Zeilen entfernt(-) commit cda317195566711d66190145b545e26ed7226172 Author: Johan Dahlin @@ -9205,7 +9410,7 @@ Date: Thu Dec 2 23:47:40 2010 -0200 gi/overrides/Gtk.py | 5 ++++- gi/overrides/__init__.py | 27 +++++++++++++++++++++++++-- - 2 files changed, 29 insertions(+), 3 deletions(-) + 2 Dateien geändert, 29 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-) commit 82689cbf53d92b1b951a459fe3de0e1d3a91791a Author: John (J5) Palmieri @@ -9231,7 +9436,7 @@ Date: Thu Dec 2 16:27:04 2010 -0500 gi/overrides/Gtk.py | 38 ++++++++++++++++++++++++++++++++++++-- tests/test_overrides.py | 8 +++++++- - 2 files changed, 43 insertions(+), 3 deletions(-) + 2 Dateien geändert, 43 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-) commit 677490e9402bad7b7c2a832345ef54f7f0c5fc7f Author: Paolo Borelli @@ -9243,7 +9448,7 @@ Date: Fri Dec 3 23:39:50 2010 +0100 gi/overrides/Gtk.py | 10 ++++++++++ tests/test_overrides.py | 29 +++++++++++++++++++++++++++++ - 2 files changed, 39 insertions(+), 0 deletions(-) + 2 Dateien geändert, 39 Zeilen hinzugefügt(+) commit dacfe618fa244445c979f1a5efa80c1f9a5a4ae9 Author: Paolo Borelli @@ -9257,7 +9462,7 @@ Date: Fri Dec 3 23:29:00 2010 +0100 gi/overrides/Gtk.py | 33 +++++++++++++++------------------ tests/test_overrides.py | 18 ++++++++++++++++++ - 2 files changed, 33 insertions(+), 18 deletions(-) + 2 Dateien geändert, 33 Zeilen hinzugefügt(+), 18 Zeilen entfernt(-) commit 7a8af9e220ee48aa28f6b025c5dae324b14fe128 Author: Paolo Borelli @@ -9267,7 +9472,7 @@ Date: Sun Nov 28 13:02:30 2010 +0100 gi/overrides/Gtk.py | 6 ++++++ tests/test_overrides.py | 11 +++++++++++ - 2 files changed, 17 insertions(+), 0 deletions(-) + 2 Dateien geändert, 17 Zeilen hinzugefügt(+) commit 94e8befc935d4a6c7f766e34195e10fc3fb3b93a Author: John (J5) Palmieri @@ -9281,7 +9486,7 @@ Date: Tue Nov 30 16:57:05 2010 -0500 gi/types.py | 55 +++++++++++++++++++++++++++++++++++++++++++++---------- - 1 files changed, 45 insertions(+), 10 deletions(-) + 1 Datei geändert, 45 Zeilen hinzugefügt(+), 10 Zeilen entfernt(-) commit 9c5aee4f06f92457f9ae987656c0c469f76d0ee8 Author: Jonathan Matthew @@ -9295,8 +9500,8 @@ Date: Thu Jul 22 23:19:51 2010 +1000 gi/gimodule.c | 130 +++++++++++++++++++++++++++++++++++++++--------------- - tests/test_gi.py | 37 +++++++++++++++ - 2 files changed, 131 insertions(+), 36 deletions(-) + tests/test_gi.py | 37 ++++++++++++++++ + 2 Dateien geändert, 131 Zeilen hinzugefügt(+), 36 Zeilen entfernt(-) commit 78358e1ab54d02317f397276adee03ecb2187588 Author: John (J5) Palmieri @@ -9306,7 +9511,7 @@ Date: Mon Nov 29 18:29:57 2010 -0500 tests/test_everything.py | 67 ++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 67 insertions(+), 0 deletions(-) + 1 Datei geändert, 67 Zeilen hinzugefügt(+) commit 792e679c06df4357843fd310c7953a931172fc99 Author: John (J5) Palmieri @@ -9332,7 +9537,7 @@ Date: Mon Nov 29 16:41:38 2010 -0500 gobject/Makefile.am | 2 +- tests/test_gi.py | 2 -- tests/test_overrides.py | 3 --- - 7 files changed, 5 insertions(+), 10 deletions(-) + 7 Dateien geändert, 5 Zeilen hinzugefügt(+), 10 Zeilen entfernt(-) commit c587e1ace7429195ac6fd4db03d2f33e2af09838 Author: John (J5) Palmieri @@ -9341,7 +9546,7 @@ Date: Mon Nov 29 15:11:46 2010 -0500 add test for inout argument count tests/test_gi.py | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+) commit 5de88b4bcffdafcf8c7c20033cdf95dc690199ce Author: John (J5) Palmieri @@ -9353,7 +9558,7 @@ Date: Mon Nov 22 19:17:23 2010 -0500 gi/pygi-argument.c | 27 ++++++++++++++++++++++++++- tests/test_everything.py | 17 +++++++++++++++-- - 2 files changed, 41 insertions(+), 3 deletions(-) + 2 Dateien geändert, 41 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-) commit f129b3db2c78d3cce3614993fdd1619fb9eb9c79 Author: Paolo Borelli @@ -9367,7 +9572,7 @@ Date: Sun Nov 21 12:16:53 2010 +0100 ++++++++++++++++++++++++++++++++++++++++++++++ gi/pygi-info.c | 5 ++++ tests/test_everything.py | 5 ++++ - 3 files changed, 70 insertions(+), 0 deletions(-) + 3 Dateien geändert, 70 Zeilen hinzugefügt(+) commit fd2c0288eb67823fca1265348a27a9f8f147ae50 Author: Paolo Borelli @@ -9376,7 +9581,7 @@ Date: Sat Nov 27 23:01:42 2010 +0100 pygi-convert.sh: gtk.accel_map -> Gtk.AccelMap._ pygi-convert.sh | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+) commit 13d0ff1d9c129bb458e234b630ebe920b50e2e0f Author: Paolo Borelli @@ -9385,7 +9590,7 @@ Date: Sat Nov 27 22:34:13 2010 +0100 pygi-convert.sh: handle "from gtk import gdk" pygi-convert.sh | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+) commit 63a97634031c3d159ad77fdaa1f6341d7656eb07 Author: Paolo Borelli @@ -9394,7 +9599,7 @@ Date: Sat Nov 27 22:23:24 2010 +0100 pygi-convert.sh: add some Pango special cases pygi-convert.sh | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) + 1 Datei geändert, 3 Zeilen hinzugefügt(+) commit 57e42bf4230d1aa20a47e3b0df2e509602333892 Author: Paolo Borelli @@ -9406,7 +9611,7 @@ Date: Sat Nov 27 19:51:38 2010 +0100 gi/overrides/Gtk.py | 9 +++++++++ tests/test_overrides.py | 17 +++++++++++++++++ - 2 files changed, 26 insertions(+), 0 deletions(-) + 2 Dateien geändert, 26 Zeilen hinzugefügt(+) commit 828b698e47ee819a60d24a772a3cc51ff9cd6601 Author: Paolo Borelli @@ -9416,7 +9621,7 @@ Date: Sat Nov 27 19:32:48 2010 +0100 gi/overrides/Gtk.py | 3 +++ tests/test_overrides.py | 11 ++++++++++- - 2 files changed, 13 insertions(+), 1 deletions(-) + 2 Dateien geändert, 13 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit bf55dc862755a57bb1b998702d284fc460e88a30 Author: Paolo Borelli @@ -9428,7 +9633,7 @@ Date: Sat Nov 27 16:46:40 2010 +0100 gi/overrides/Gtk.py | 3 +++ tests/test_overrides.py | 3 +++ - 2 files changed, 6 insertions(+), 0 deletions(-) + 2 Dateien geändert, 6 Zeilen hinzugefügt(+) commit 94c0e2f71636d055bdebe3ec378f3d339eea66c9 Author: Paolo Borelli @@ -9440,7 +9645,7 @@ Date: Sat Nov 27 16:10:33 2010 +0100 gi/overrides/Gtk.py | 8 +++++--- tests/test_overrides.py | 7 +++++++ - 2 files changed, 12 insertions(+), 3 deletions(-) + 2 Dateien geändert, 12 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-) commit 0cd717e3926276540b9145e58a4a3368136b00de Author: John (J5) Palmieri @@ -9450,7 +9655,7 @@ Date: Mon Nov 22 18:35:09 2010 -0500 to be set gi/overrides/Gtk.py | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit 226777cdb70fc72d206664ffd8b6737f7239d23f Author: John (J5) Palmieri @@ -9460,7 +9665,7 @@ Date: Mon Nov 22 18:32:28 2010 -0500 gi/overrides/Gtk.py | 3 +++ tests/test_overrides.py | 2 ++ - 2 files changed, 5 insertions(+), 0 deletions(-) + 2 Dateien geändert, 5 Zeilen hinzugefügt(+) commit d0049fa9982d13b3553b05569fb0a227e48b6647 Author: Paolo Borelli @@ -9472,7 +9677,7 @@ Date: Sun Nov 21 15:20:58 2010 +0100 gi/overrides/Gtk.py | 3 +++ tests/test_overrides.py | 34 +++++++++++++++++++++------------- - 2 files changed, 24 insertions(+), 13 deletions(-) + 2 Dateien geändert, 24 Zeilen hinzugefügt(+), 13 Zeilen entfernt(-) commit e1db544e46aeed984133896af34b671a6a5547df Author: Paolo Borelli @@ -9484,7 +9689,7 @@ Date: Sun Nov 21 23:03:25 2010 +0100 gi/overrides/Gtk.py | 15 +++++++++++++++ tests/test_overrides.py | 6 ++++++ - 2 files changed, 21 insertions(+), 0 deletions(-) + 2 Dateien geändert, 21 Zeilen hinzugefügt(+) commit a5e806ad8a8b279402ff7adb1c1cdc04f9f3da76 Author: Paolo Borelli @@ -9495,7 +9700,7 @@ Date: Sun Nov 21 21:57:40 2010 +0100 https://bugzilla.gnome.org/show_bug.cgi?id=635464 gi/overrides/Gtk.py | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) + 1 Datei geändert, 6 Zeilen hinzugefügt(+) commit 1c537bc67107948c92b51ba6ba749747e84263e2 Author: John (J5) Palmieri @@ -9511,8 +9716,8 @@ Date: Mon Nov 22 15:04:00 2010 -0500 should be accepted by pycairo for any API that takes a rect gi/pygi-foreign-cairo.c | 85 - +++++++++++++++++++++++++++++++++++----------- - 1 files changed, 64 insertions(+), 21 deletions(-) + +++++++++++++++++++++++++++++++++++------------ + 1 Datei geändert, 64 Zeilen hinzugefügt(+), 21 Zeilen entfernt(-) commit 4cede8f12321bed6c3b71813a62c01b61853ba69 Author: John (J5) Palmieri @@ -9524,7 +9729,7 @@ Date: Fri Nov 19 16:46:53 2010 -0500 gi/overrides/Gdk.py | 7 +++++++ gi/overrides/Gtk.py | 25 +++++++++++++++++++++++++ - 2 files changed, 32 insertions(+), 0 deletions(-) + 2 Dateien geändert, 32 Zeilen hinzugefügt(+) commit 3fd51bb903724b752f72f49c7cb35652b819791d Author: John (J5) Palmieri @@ -9538,9 +9743,9 @@ Date: Fri Nov 19 16:44:32 2010 -0500 https://bugzilla.gnome.org/show_bug.cgi?id=627367 gi/pygi-argument.c | 65 - ++++++++++++++++++++++++++++++++++++++++++--------- - tests/test_gi.py | 6 +++- - 2 files changed, 57 insertions(+), 14 deletions(-) + ++++++++++++++++++++++++++++++++++++++++++---------- + tests/test_gi.py | 6 +++-- + 2 Dateien geändert, 57 Zeilen hinzugefügt(+), 14 Zeilen entfernt(-) commit 7ddb0f7fd8b1b9e8f691c6d42a83cb16c6561d26 Author: Martin Pitt @@ -9549,7 +9754,7 @@ Date: Fri Nov 19 18:19:38 2010 +0100 pygi-convert.sh: Add pynotify -> Notify pygi-convert.sh | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) + 1 Datei geändert, 3 Zeilen hinzugefügt(+) commit bf03d4db03a7739ac16ddc4e614441557ede554d Author: Martin Pitt @@ -9569,7 +9774,7 @@ Date: Fri Nov 19 09:08:07 2010 +0100 https://bugzilla.gnome.org/show_bug.cgi?id=635244 pygi-convert.sh | 25 +++++-------------------- - 1 files changed, 5 insertions(+), 20 deletions(-) + 1 Datei geändert, 5 Zeilen hinzugefügt(+), 20 Zeilen entfernt(-) commit 18f5d229d3a4b9520c1c456be2635c8e36015c12 Author: Martin Pitt @@ -9580,7 +9785,7 @@ Date: Fri Nov 19 09:00:35 2010 +0100 https://bugzilla.gnome.org/show_bug.cgi?id=635244 pygi-convert.sh | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+) commit ef74273c2043944708515e59a654ebe4944b46ff Author: John (J5) Palmieri @@ -9593,7 +9798,7 @@ Date: Thu Nov 18 13:54:48 2010 -0500 since they reside in an unordered hash internally tests/test_overrides.py | 9 +++++---- - 1 files changed, 5 insertions(+), 4 deletions(-) + 1 Datei geändert, 5 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-) commit 2c25886bf6710568d0646f82dce4770faa44c40d Author: John (J5) Palmieri @@ -9607,7 +9812,7 @@ Date: Wed Nov 17 14:38:09 2010 -0500 gi/pygi-argument.c | 14 ++++++++++++-- glib/pyglib-python-compat.h | 5 +++++ tests/test_gi.py | 3 +++ - 3 files changed, 20 insertions(+), 2 deletions(-) + 3 Dateien geändert, 20 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit 8c2d32c8205b971b4353e3d5d2ed1efa6ef0e06c Author: Damien Caliste @@ -9622,7 +9827,7 @@ Date: Fri Nov 12 10:20:32 2010 +0100 https://bugzilla.gnome.org/show_bug.cgi?id=634671 gi/pygi-invoke.c | 25 ++++++++++++++----------- - 1 files changed, 14 insertions(+), 11 deletions(-) + 1 Datei geändert, 14 Zeilen hinzugefügt(+), 11 Zeilen entfernt(-) commit d9bab3b185bb59bd29e3c3f6225f3636f58ec45e Author: John (J5) Palmieri @@ -9632,7 +9837,7 @@ Date: Wed Nov 10 14:11:56 2010 -0500 NEWS | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 73 insertions(+), 0 deletions(-) + 1 Datei geändert, 73 Zeilen hinzugefügt(+) commit 1338a95339e21cc02b9df6d10166996c8b97a6bf Author: Jonathan Matthew @@ -9643,7 +9848,7 @@ Date: Tue Sep 28 13:44:13 2010 +1000 https://bugzilla.gnome.org/show_bug.cgi?id=625033 gi/pygi-info.c | 29 +++++++++++++++++++++++++++++ - 1 files changed, 29 insertions(+), 0 deletions(-) + 1 Datei geändert, 29 Zeilen hinzugefügt(+) commit 9ce3edf69824935aeca9e676eaa9782786c22a97 Author: John (J5) Palmieri @@ -9659,7 +9864,7 @@ Date: Tue Nov 9 22:57:41 2010 -0500 without the forign structs gi/pygi-foreign-cairo.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) + 1 Datei geändert, 4 Zeilen hinzugefügt(+) commit 68b8211d8b014cf26ca7e9ab751fb3f61f228290 Author: John (J5) Palmieri @@ -9685,8 +9890,8 @@ Date: Mon Oct 25 18:28:36 2010 -0400 gi/pygi-foreign-cairo.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++ - gi/pygi-invoke.c | 15 ++++++++++- - 2 files changed, 70 insertions(+), 2 deletions(-) + gi/pygi-invoke.c | 15 +++++++++++-- + 2 Dateien geändert, 70 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit ce8b948310220288e9eef904eef4ec8f4e24a376 Author: John (J5) Palmieri @@ -9696,7 +9901,7 @@ Date: Tue Nov 9 22:11:51 2010 -0500 gi/overrides/Gtk.py | 17 +++++++++++++++++ tests/test_overrides.py | 12 ++++++++++++ - 2 files changed, 29 insertions(+), 0 deletions(-) + 2 Dateien geändert, 29 Zeilen hinzugefügt(+) commit 87dbc716f26cefc0e9427c3d6e8befe8eabd3d1e Author: John (J5) Palmieri @@ -9715,7 +9920,7 @@ Date: Tue Nov 9 21:12:54 2010 -0500 gi/pygi-info.c | 16 ++++++++++++++++ gi/types.py | 2 +- - 2 files changed, 17 insertions(+), 1 deletions(-) + 2 Dateien geändert, 17 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit 540e9f1f349ba3625e28b7673c92210eb8974098 Author: John (J5) Palmieri @@ -9729,9 +9934,9 @@ Date: Tue Nov 9 12:17:05 2010 -0500 https://bugzilla.gnome.org/show_bug.cgi?id=634423 gi/overrides/Gtk.py | 80 - ++++++++++++++++++++++++++++++++++++---------- + ++++++++++++++++++++++++++++++++++++----------- tests/test_overrides.py | 53 ++++++++++++++++++++++++++++++- - 2 files changed, 114 insertions(+), 19 deletions(-) + 2 Dateien geändert, 114 Zeilen hinzugefügt(+), 19 Zeilen entfernt(-) commit 0bcb58b9541d9ae52e1d96e6239e9dbe0698872a Author: John (J5) Palmieri @@ -9741,7 +9946,7 @@ Date: Fri Nov 5 13:56:12 2010 -0400 behavior gi/overrides/Gtk.py | 14 ++++++++++++-- - 1 files changed, 12 insertions(+), 2 deletions(-) + 1 Datei geändert, 12 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit 89c104d17d79d7b935cd76101cba19d49390f7be Author: John (J5) Palmieri @@ -9770,9 +9975,9 @@ Date: Thu Nov 4 12:00:14 2010 -0400 gi/overrides/Gtk.py | 2 +- gi/overrides/__init__.py | 43 ++++++++++++++++++++++++++++++++++++ - gi/types.py | 8 ------ + gi/types.py | 8 ------- tests/test_overrides.py | 27 ++++++++++++++++++++++ - 7 files changed, 84 insertions(+), 12 deletions(-) + 7 Dateien geändert, 84 Zeilen hinzugefügt(+), 12 Zeilen entfernt(-) commit 878b8f630acd2146bee364054acd45cd33eea37a Merge: cdacaa9 e317838 @@ -9788,7 +9993,7 @@ Date: Thu Nov 4 11:16:43 2010 +0100 setup.py: ease maintenance burden for tests installation setup.py | 23 +++-------------------- - 1 files changed, 3 insertions(+), 20 deletions(-) + 1 Datei geändert, 3 Zeilen hinzugefügt(+), 20 Zeilen entfernt(-) commit cdacaa9572893796e0f3aa3730d0191911cb29ee Author: John (J5) Palmieri @@ -9798,7 +10003,7 @@ Date: Wed Nov 3 09:51:09 2010 -0400 gi/overrides/Gtk.py | 79 ++++++++++++++++++++++++++------------------------- - 1 files changed, 40 insertions(+), 39 deletions(-) + 1 Datei geändert, 40 Zeilen hinzugefügt(+), 39 Zeilen entfernt(-) commit 3d5955767d81f45e796ab2af0707533375681774 Author: Dieter Verfaillie @@ -9810,7 +10015,7 @@ Date: Wed Nov 3 09:38:56 2010 +0100 tests/runtests-windows.py | 47 +++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 47 insertions(+), 0 deletions(-) + 1 Datei geändert, 47 Zeilen hinzugefügt(+) commit 8cb3f2e78161639c568110aad6a807dcf59f3ae8 Author: Dieter Verfaillie @@ -9823,7 +10028,7 @@ Date: Wed Nov 3 09:35:52 2010 +0100 Signed-off-by: Dieter Verfaillie pygobject_postinstall.py | 26 +++----------------------- - 1 files changed, 3 insertions(+), 23 deletions(-) + 1 Datei geändert, 3 Zeilen hinzugefügt(+), 23 Zeilen entfernt(-) commit 63167574df53eb481cc11b6a097b2bfe7d5747f5 Author: Dieter Verfaillie @@ -9834,7 +10039,7 @@ Date: Wed Nov 3 09:34:38 2010 +0100 Signed-off-by: Dieter Verfaillie pygobject_postinstall.py | 35 +---------------------------------- - 1 files changed, 1 insertions(+), 34 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 34 Zeilen entfernt(-) commit f7b12611f94fd8c27fb67a03746c10149ce6e0ef Author: Dieter Verfaillie @@ -9845,7 +10050,7 @@ Date: Wed Nov 3 09:31:14 2010 +0100 Signed-off-by: Dieter Verfaillie setup.py | 56 ++++++++++++++++++++++++++------------------------------ - 1 files changed, 26 insertions(+), 30 deletions(-) + 1 Datei geändert, 26 Zeilen hinzugefügt(+), 30 Zeilen entfernt(-) commit a31b4196fbb4638a245430f2fdeafd7534b1d84d Author: Dieter Verfaillie @@ -9857,7 +10062,7 @@ Date: Wed Nov 3 09:28:36 2010 +0100 setup.py | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 61 insertions(+), 0 deletions(-) + 1 Datei geändert, 61 Zeilen hinzugefügt(+) commit 7c3b0c20b83c05833d73c240690dce3daf43fde8 Author: Dieter Verfaillie @@ -9868,7 +10073,7 @@ Date: Wed Nov 3 09:26:59 2010 +0100 Signed-off-by: Dieter Verfaillie setup.py | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) + 1 Datei geändert, 3 Zeilen hinzugefügt(+) commit 78533d851ee1314686f18cfa793613a9cf7d6686 Author: Dieter Verfaillie @@ -9879,7 +10084,7 @@ Date: Wed Nov 3 09:25:56 2010 +0100 Signed-off-by: Dieter Verfaillie setup.py | 25 +++++++++++++++++++++++++ - 1 files changed, 25 insertions(+), 0 deletions(-) + 1 Datei geändert, 25 Zeilen hinzugefügt(+) commit ad40688df533dda0b1f7be8ea37c542b8796a26b Author: Dieter Verfaillie @@ -9890,7 +10095,7 @@ Date: Wed Nov 3 09:24:45 2010 +0100 Signed-off-by: Dieter Verfaillie setup.py | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) + 1 Datei geändert, 3 Zeilen hinzugefügt(+) commit 21ddfc66e4e18c002a33154eb4ab81170ed71ecc Author: Dieter Verfaillie @@ -9901,7 +10106,7 @@ Date: Wed Nov 3 09:23:05 2010 +0100 Signed-off-by: Dieter Verfaillie setup.py | 37 ++++++++++++++++++++----------------- - 1 files changed, 20 insertions(+), 17 deletions(-) + 1 Datei geändert, 20 Zeilen hinzugefügt(+), 17 Zeilen entfernt(-) commit 7d353d04892de67265bf693f591f37fd393de639 Author: Dieter Verfaillie @@ -9913,7 +10118,7 @@ Date: Wed Nov 3 09:18:11 2010 +0100 Signed-off-by: Dieter Verfaillie setup.py | 18 ++++++++++-------- - 1 files changed, 10 insertions(+), 8 deletions(-) + 1 Datei geändert, 10 Zeilen hinzugefügt(+), 8 Zeilen entfernt(-) commit 286364ed39953e942e24d5911519bcac2f90975a Author: Dieter Verfaillie @@ -9925,7 +10130,7 @@ Date: Wed Nov 3 09:05:59 2010 +0100 Signed-off-by: Dieter Verfaillie setup.py | 29 +++++++++-------------------- - 1 files changed, 9 insertions(+), 20 deletions(-) + 1 Datei geändert, 9 Zeilen hinzugefügt(+), 20 Zeilen entfernt(-) commit 3f70f92904c123e6cc40929c0affd3f75d061828 Author: Dieter Verfaillie @@ -9936,7 +10141,7 @@ Date: Wed Nov 3 09:02:30 2010 +0100 Signed-off-by: Dieter Verfaillie setup.py | 31 ++++++++++++++++++++++--------- - 1 files changed, 22 insertions(+), 9 deletions(-) + 1 Datei geändert, 22 Zeilen hinzugefügt(+), 9 Zeilen entfernt(-) commit 9aa54b65f729c0f3b0e96ab7ff797f87dad6a455 Author: Dieter Verfaillie @@ -9947,7 +10152,7 @@ Date: Wed Nov 3 08:58:00 2010 +0100 Signed-off-by: Dieter Verfaillie README.win32 | 13 +++++-------- - 1 files changed, 5 insertions(+), 8 deletions(-) + 1 Datei geändert, 5 Zeilen hinzugefügt(+), 8 Zeilen entfernt(-) commit 5a33105f690ba84b2e4bb15d73d3467e92fa06e0 Author: Dieter Verfaillie @@ -9959,7 +10164,7 @@ Date: Wed Nov 3 07:59:18 2010 +0100 dsextras.py | 148 +++++++++++++++++++++++++++++++++++++---------------------- - 1 files changed, 93 insertions(+), 55 deletions(-) + 1 Datei geändert, 93 Zeilen hinzugefügt(+), 55 Zeilen entfernt(-) commit d03503d0412d173acb383926ab3c2d640dad3e3f Author: Dieter Verfaillie @@ -9970,7 +10175,7 @@ Date: Wed Nov 3 07:00:40 2010 +0100 Signed-off-by: Dieter Verfaillie dsextras.py | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit 8c62968e9f8467e24870b8c4f61112676eef4630 Author: Dieter Verfaillie @@ -9982,7 +10187,7 @@ Date: Wed Nov 3 06:56:32 2010 +0100 Signed-off-by: Dieter Verfaillie dsextras.py | 15 ++++++--------- - 1 files changed, 6 insertions(+), 9 deletions(-) + 1 Datei geändert, 6 Zeilen hinzugefügt(+), 9 Zeilen entfernt(-) commit b98277afc24886bbda400e0ad360992bffa77b7c Author: Dieter Verfaillie @@ -9993,7 +10198,7 @@ Date: Wed Nov 3 06:49:48 2010 +0100 Signed-off-by: Dieter Verfaillie dsextras.py | 10 ++++++++++ - 1 files changed, 10 insertions(+), 0 deletions(-) + 1 Datei geändert, 10 Zeilen hinzugefügt(+) commit a565558652ebc3fa49d7aea40d399b06bbe376c4 Author: Dieter Verfaillie @@ -10005,7 +10210,7 @@ Date: Wed Nov 3 06:45:05 2010 +0100 Signed-off-by: Dieter Verfaillie dsextras.py | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit 4b1ff0c7f9953f925d2178069263cca67ca7db02 Author: Dieter Verfaillie @@ -10016,7 +10221,7 @@ Date: Wed Nov 3 06:44:21 2010 +0100 Signed-off-by: Dieter Verfaillie dsextras.py | 25 +++++++++++++------------ - 1 files changed, 13 insertions(+), 12 deletions(-) + 1 Datei geändert, 13 Zeilen hinzugefügt(+), 12 Zeilen entfernt(-) commit 819a21cea831c3892040390e9446b78a91d1cbbe Author: Dieter Verfaillie @@ -10028,7 +10233,7 @@ Date: Wed Nov 3 06:28:04 2010 +0100 dsextras.py | 58 +++++++++++++++++++++++++++++++--------------------------- - 1 files changed, 31 insertions(+), 27 deletions(-) + 1 Datei geändert, 31 Zeilen hinzugefügt(+), 27 Zeilen entfernt(-) commit d20edbfdde2819f8d4fee8cb3170c126fcd31d5f Author: Dieter Verfaillie @@ -10040,7 +10245,7 @@ Date: Wed Nov 3 06:16:21 2010 +0100 Signed-off-by: Dieter Verfaillie .gitignore | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) + 1 Datei geändert, 7 Zeilen hinzugefügt(+) commit 268d6ed2b0b1d266c612da4453b6117d9e14437e Author: John (J5) Palmieri @@ -10049,7 +10254,7 @@ Date: Thu Oct 28 15:32:28 2010 -0400 [gi] add tests for calling dir on a dynamic module tests/test_gi.py | 24 ++++++++++++++++++++++++ - 1 files changed, 24 insertions(+), 0 deletions(-) + 1 Datei geändert, 24 Zeilen hinzugefügt(+) commit f6386a6e0d225c83cdbe1add4c4d3ea51d3ec2f0 Author: Deepankar Sharma @@ -10060,7 +10265,7 @@ Date: Wed Oct 27 18:28:11 2010 -0400 https://bugzilla.gnome.org/show_bug.cgi?id=625093 gi/module.py | 8 ++++++++ - 1 files changed, 8 insertions(+), 0 deletions(-) + 1 Datei geändert, 8 Zeilen hinzugefügt(+) commit 28ed01c34c503cfb4f14fe7af7912060ca70aba6 Author: Simón Pena @@ -10076,7 +10281,7 @@ Date: Mon Sep 20 23:10:14 2010 +0200 https://bugzilla.gnome.org/show_bug.cgi?id=629552 gobject/pygpointer.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 1731f89e4b5a20c33976963e12a1f39a21d33fde Author: John (J5) Palmieri @@ -10089,7 +10294,7 @@ Date: Thu Oct 28 14:21:12 2010 -0400 https://bugzilla.gnome.org/show_bug.cgi?id=629042 gi/pygi-invoke.c | 10 +++++++++- - 1 files changed, 9 insertions(+), 1 deletions(-) + 1 Datei geändert, 9 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit 783e2e351ec7470bda6b441e51f387dd61543c4b Author: José Aliste @@ -10100,9 +10305,9 @@ Date: Fri Oct 15 14:30:10 2010 -0300 https://bugzilla.gnome.org/show_bug.cgi?id=632185 gi/pygi-info.c | 91 - +++++++++++++++++++++++++++++++++++++++++++++++-------- - gi/pygi-info.h | 7 ++++ - 2 files changed, 84 insertions(+), 14 deletions(-) + +++++++++++++++++++++++++++++++++++++++++++++++--------- + gi/pygi-info.h | 7 +++++ + 2 Dateien geändert, 84 Zeilen hinzugefügt(+), 14 Zeilen entfernt(-) commit 2ca897273f52ae38f5e06e72c773a048e199eee5 Author: John (J5) Palmieri @@ -10111,7 +10316,7 @@ Date: Thu Oct 28 13:49:15 2010 -0400 include Python.h so that PY_VERSION_HEX gets defined gi/pygi-foreign-cairo.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+) commit 8b28b1d713df33931e255600ab98feda37a8e02a Author: John (J5) Palmieri @@ -10121,7 +10326,7 @@ Date: Thu Oct 28 13:47:34 2010 -0400 python 2.x gi/overrides/Gtk.py | 9 +++++++-- - 1 files changed, 7 insertions(+), 2 deletions(-) + 1 Datei geändert, 7 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit 3c09710d2f68af9c16ce39fd25656147656a486a Author: Sebastian Pölsterl @@ -10130,7 +10335,7 @@ Date: Sat Oct 23 14:24:24 2010 +0200 Override Gtk.Widget.translate_coordinates to not return success value gi/overrides/Gtk.py | 11 +++++++++++ - 1 files changed, 11 insertions(+), 0 deletions(-) + 1 Datei geändert, 11 Zeilen hinzugefügt(+) commit 9d4443b3de8c327d8645ddde0a7a6dc5b977d7b4 Author: Sebastian Pölsterl @@ -10140,7 +10345,7 @@ Date: Sat Oct 23 14:22:36 2010 +0200 value gi/overrides/Gtk.py | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) + 1 Datei geändert, 5 Zeilen hinzugefügt(+) commit 6679d39ace06294e98f9d6fc911ed6fb27656010 Author: Sebastian Pölsterl @@ -10150,7 +10355,7 @@ Date: Sat Oct 23 14:21:36 2010 +0200 not return success value gi/overrides/Gtk.py | 15 +++++++++++++++ - 1 files changed, 15 insertions(+), 0 deletions(-) + 1 Datei geändert, 15 Zeilen hinzugefügt(+) commit 80b1b266fa68a5c67106871502017166628f71e4 Author: Sebastian Pölsterl @@ -10160,7 +10365,7 @@ Date: Sat Oct 23 14:20:38 2010 +0200 value gi/overrides/Gtk.py | 12 ++++++++++++ - 1 files changed, 12 insertions(+), 0 deletions(-) + 1 Datei geändert, 12 Zeilen hinzugefügt(+) commit 17cd0fb3a2d2ca0c6109c41727ba0b8c42217cd5 Author: Sebastian Pölsterl @@ -10170,7 +10375,7 @@ Date: Sat Oct 23 14:19:20 2010 +0200 return success value gi/overrides/Gtk.py | 15 +++++++++++++++ - 1 files changed, 15 insertions(+), 0 deletions(-) + 1 Datei geändert, 15 Zeilen hinzugefügt(+) commit 95c86fa31da3d2fe84db0e2b5bc2a6dc896c9223 Author: Sebastian Pölsterl @@ -10180,7 +10385,7 @@ Date: Sat Oct 23 14:18:09 2010 +0200 value gi/overrides/Gtk.py | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) + 1 Datei geändert, 5 Zeilen hinzugefügt(+) commit da6d87460b9392c29d025a7eed9249fb604204bc Author: Sebastian Pölsterl @@ -10190,7 +10395,7 @@ Date: Sat Oct 23 14:17:04 2010 +0200 value gi/overrides/Gtk.py | 10 ++++++++++ - 1 files changed, 10 insertions(+), 0 deletions(-) + 1 Datei geändert, 10 Zeilen hinzugefügt(+) commit 0ed2e8772bdc405b0d0c7e0b2803e0e141abcb6a Author: Sebastian Pölsterl @@ -10199,7 +10404,7 @@ Date: Sat Oct 23 14:16:21 2010 +0200 Override Gtk.IMContext.get_surrounding to not return success value gi/overrides/Gtk.py | 10 ++++++++++ - 1 files changed, 10 insertions(+), 0 deletions(-) + 1 Datei geändert, 10 Zeilen hinzugefügt(+) commit b85b445f15421209c0b4adf676d7c8218d6437c5 Author: Sebastian Pölsterl @@ -10209,7 +10414,7 @@ Date: Sat Oct 23 14:15:24 2010 +0200 of Gtk.IconView to not return success value gi/overrides/Gtk.py | 19 +++++++++++++++++++ - 1 files changed, 19 insertions(+), 0 deletions(-) + 1 Datei geändert, 19 Zeilen hinzugefügt(+) commit 684d716192d58c972083e579e909bcd97f8a5025 Author: Sebastian Pölsterl @@ -10218,7 +10423,7 @@ Date: Sat Oct 23 14:13:47 2010 +0200 Override Gtk.Container.get_focus_chain to not return success value gi/overrides/Gtk.py | 10 ++++++++++ - 1 files changed, 10 insertions(+), 0 deletions(-) + 1 Datei geändert, 10 Zeilen hinzugefügt(+) commit 8ec830c57fafbfe50d9619c6caba3cb95a00d688 Author: Sebastian Pölsterl @@ -10227,7 +10432,7 @@ Date: Sat Oct 23 14:12:44 2010 +0200 Override Gtk.ComboBox.get_active_iter to not return success value gi/overrides/Gtk.py | 10 ++++++++++ - 1 files changed, 10 insertions(+), 0 deletions(-) + 1 Datei geändert, 10 Zeilen hinzugefügt(+) commit b483852904468722230903989e3451c7c6a24c0f Author: John (J5) Palmieri @@ -10246,15 +10451,15 @@ Date: Tue Oct 12 12:18:33 2010 -0400 https://bugzilla.gnome.org/show_bug.cgi?id=622987 - gi/pygi-argument.c | 17 +++++--------- - gobject/gobjectmodule.c | 4 +- + gi/pygi-argument.c | 17 ++++++--------- + gobject/gobjectmodule.c | 4 ++-- gobject/pygobject-private.h | 1 + - gobject/pygobject.h | 2 + - gobject/pygtype.c | 37 ++++++++++++++++++++++++++++--- + gobject/pygobject.h | 2 ++ + gobject/pygtype.c | 37 ++++++++++++++++++++++++++++---- tests/test_gi.py | 1 - tests/test_overrides.py | 50 - +++++++++++++++++++++++++++++++++++++++--- - 7 files changed, 90 insertions(+), 22 deletions(-) + +++++++++++++++++++++++++++++++++++++++---- + 7 Dateien geändert, 90 Zeilen hinzugefügt(+), 22 Zeilen entfernt(-) commit 8c87d622dcc6d76a981edfc5818fe67bb2e114e2 Author: John Stowers @@ -10263,7 +10468,7 @@ Date: Fri Oct 22 13:28:31 2010 +1300 Shortcut removal is not needed on post-uninstall pygobject_postinstall.py | 14 ++------------ - 1 files changed, 2 insertions(+), 12 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+), 12 Zeilen entfernt(-) commit a3ed97fe6f80548801739fe6b72771b9eb6d93f7 Author: John Stowers @@ -10272,7 +10477,7 @@ Date: Thu Oct 21 13:25:35 2010 +1300 Disable shortcut creation in windows installer pygobject_postinstall.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit a3d6212b0abccef58f05d454c091936776413d98 Author: John (J5) Palmieri @@ -10285,7 +10490,7 @@ Date: Thu Oct 7 11:43:27 2010 -0400 gi/overrides/Gtk.py | 94 ++++++++++++++++++++++++++++++++++++++++++++--- tests/test_overrides.py | 64 +++++++++++++++++++++++++++++++- - 2 files changed, 151 insertions(+), 7 deletions(-) + 2 Dateien geändert, 151 Zeilen hinzugefügt(+), 7 Zeilen entfernt(-) commit a87e3ba64b54e6df0b5b96af47c34e3be790b58f Author: Sebastian Pölsterl @@ -10314,8 +10519,8 @@ Date: Thu Oct 7 19:37:53 2010 +0200 gi/overrides/Gtk.py | 195 +++++++++++++++++++++++++++++++++++++++++++++++ - tests/test_overrides.py | 160 +++++++++++++++++++++++++++++++++++++-- - 2 files changed, 349 insertions(+), 6 deletions(-) + tests/test_overrides.py | 160 ++++++++++++++++++++++++++++++++++++-- + 2 Dateien geändert, 349 Zeilen hinzugefügt(+), 6 Zeilen entfernt(-) commit acfcc29af727fb67d0dfbbcc7cc14963ef21f1ea Author: John Stowers @@ -10324,7 +10529,7 @@ Date: Sat Oct 16 18:59:25 2010 +1300 Correctly build GIO on windows setup.py | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + 1 Datei geändert, 3 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-) commit 33b59fd7437009b6c3ed43412e171d2cc91ee317 Author: John Stowers @@ -10333,7 +10538,7 @@ Date: Sat Oct 16 18:17:28 2010 +1300 Require Python >= 2.6.0 for Windows build setup.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 544e0e4de4f5f97b0584eaf72ae8a081eca28ab6 Author: John Stowers @@ -10342,7 +10547,7 @@ Date: Sat Oct 16 17:41:01 2010 +1300 Fix depreciation warning in dsextras.py dsextras.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 239ff961778e4e1587404d8a70dfbe8630ab0623 Author: John Stowers @@ -10353,7 +10558,7 @@ Date: Sat Oct 16 17:34:50 2010 +1300 gi/pygi-foreign.c | 5 ++++- gi/pygi.h | 5 ++++- setup.py | 4 ++-- - 3 files changed, 10 insertions(+), 4 deletions(-) + 3 Dateien geändert, 10 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-) commit 9a2f81d63012fef23fdde2b4d903bd69601c07c6 Author: Michael Culbertson @@ -10362,7 +10567,7 @@ Date: Sat Oct 16 17:08:11 2010 +1300 Support for GCC4 in Windows distutils build - bug 626548 dsextras.py | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit 27367c8dc3a3a31fdd778505b319cd3f4afb9e27 Author: John Stowers @@ -10371,7 +10576,7 @@ Date: Fri Oct 15 09:39:02 2010 +1300 Remove obsolete comments in dsextras.py dsextras.py | 11 ++--------- - 1 files changed, 2 insertions(+), 9 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+), 9 Zeilen entfernt(-) commit b5f383f854fb8f72677828b029589320c59006d1 Author: John Stowers @@ -10382,7 +10587,7 @@ Date: Fri Oct 15 09:21:03 2010 +1300 * Fixes bug 631962 dsextras.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit e1981da105b574e273ae6500fc6d25caf6af6aae Author: John (J5) Palmieri @@ -10419,7 +10624,7 @@ Date: Tue Sep 28 15:31:03 2010 -0400 gobject/gobjectmodule.c | 2 +- gobject/pygobject.h | 6 ++++++ gobject/pygtype.c | 10 +++++----- - 9 files changed, 50 insertions(+), 13 deletions(-) + 9 Dateien geändert, 50 Zeilen hinzugefügt(+), 13 Zeilen entfernt(-) commit 03d2e2924e27a9d6cae89e5748f70e0a51be91c6 Author: Damien Caliste @@ -10433,7 +10638,7 @@ Date: Tue Sep 28 12:44:42 2010 +0200 https://bugzilla.gnome.org/show_bug.cgi?id=630807 gi/module.py | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+) commit 28f9366c9cb382801bad080864f667c867daa3c7 Author: Sebastian Pölsterl @@ -10444,7 +10649,7 @@ Date: Sat Oct 9 17:40:40 2010 +0200 https://bugzilla.gnome.org/show_bug.cgi?id=631765 gi/overrides/Gtk.py | 12 ++++++++++++ - 1 files changed, 12 insertions(+), 0 deletions(-) + 1 Datei geändert, 12 Zeilen hinzugefügt(+) commit f01a7d9e8222663ce52100e061033f2745a5e7af Author: Vincent Untz @@ -10455,7 +10660,7 @@ Date: Thu Oct 7 09:42:24 2010 +0200 https://bugzilla.gnome.org/show_bug.cgi?id=631548 gi/overrides/Gtk.py | 36 ++++++++++++++++++++++-------------- - 1 files changed, 22 insertions(+), 14 deletions(-) + 1 Datei geändert, 22 Zeilen hinzugefügt(+), 14 Zeilen entfernt(-) commit 1e1357f5fa1a034b0b707040d664ac46be6e23f7 Author: John (J5) Palmieri @@ -10476,7 +10681,7 @@ Date: Mon Oct 4 12:50:55 2010 -0400 gobject/gobjectmodule.c | 2 +- gobject/pygobject.h | 6 ------ gobject/pygtype.c | 10 +++++----- - 9 files changed, 13 insertions(+), 41 deletions(-) + 9 Dateien geändert, 13 Zeilen hinzugefügt(+), 41 Zeilen entfernt(-) commit 97774cb149c5b03d5ef82a5af3f19e2ce4d79d0b Author: John (J5) Palmieri @@ -10488,7 +10693,7 @@ Date: Mon Oct 4 12:43:31 2010 -0400 * see https://bugzilla.gnome.org/show_bug.cgi?id=631158 gi/pygi.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit f25e763d53e5cdd4de08e90b04aea4b4c4720ac0 Author: John (J5) Palmieri @@ -10509,7 +10714,7 @@ Date: Tue Sep 28 15:31:03 2010 -0400 gobject/gobjectmodule.c | 2 +- gobject/pygobject.h | 6 ++++++ gobject/pygtype.c | 10 +++++----- - 9 files changed, 41 insertions(+), 13 deletions(-) + 9 Dateien geändert, 41 Zeilen hinzugefügt(+), 13 Zeilen entfernt(-) commit 80b8ccd450fe4e3ea77b27e58bb63cabc2a2bb2b Author: John (J5) Palmieri @@ -10519,7 +10724,7 @@ Date: Tue Sep 28 15:28:16 2010 -0400 string handling glib/glibmodule.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 9562842907a9d94f6adae2c1bb20d6b1f189abda Author: John (J5) Palmieri @@ -10529,7 +10734,7 @@ Date: Tue Sep 28 13:15:57 2010 -0400 dsextras.py | 13 +++++++------ m4/python.m4 | 4 ++-- - 2 files changed, 9 insertions(+), 8 deletions(-) + 2 Dateien geändert, 9 Zeilen hinzugefügt(+), 8 Zeilen entfernt(-) commit 98f69957ee9e3037b0a05a037098e4d2133ca256 Author: John (J5) Palmieri @@ -10541,7 +10746,7 @@ Date: Mon Sep 27 14:01:31 2010 -0400 HACKING | 6 ++++-- configure.ac | 2 +- - 2 files changed, 5 insertions(+), 3 deletions(-) + 2 Dateien geändert, 5 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-) commit fd38010101411e6bc1ca9314657f418de660fa13 Author: John (J5) Palmieri @@ -10551,7 +10756,7 @@ Date: Mon Sep 27 12:03:10 2010 -0400 NEWS | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 93 insertions(+), 0 deletions(-) + 1 Datei geändert, 93 Zeilen hinzugefügt(+) commit 7072d56b6cba13da97a052c75d1ae0c2cc417fd1 Author: Tomeu Vizoso @@ -10560,7 +10765,7 @@ Date: Sun Sep 26 08:37:31 2010 +0200 Pre-release version bump 2.26.0 configure.ac | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit a549f429d2ced7a78d5baa5e2f28f6750b4788f2 Author: John Stowers @@ -10573,7 +10778,7 @@ Date: Fri Sep 24 22:44:03 2010 +1200 glib/glibmodule.c | 68 +++++++++++++++++++++++++++++++++++++++-------------- - 1 files changed, 50 insertions(+), 18 deletions(-) + 1 Datei geändert, 50 Zeilen hinzugefügt(+), 18 Zeilen entfernt(-) commit 328aca600714bdca89dfdb531c222ee561ede27e Author: John (J5) Palmieri @@ -10582,7 +10787,7 @@ Date: Fri Sep 24 12:16:22 2010 -0400 fixed make check and make dist tests/Makefile.am | 31 ++++++++++++++++++------------- - 1 files changed, 18 insertions(+), 13 deletions(-) + 1 Datei geändert, 18 Zeilen hinzugefügt(+), 13 Zeilen entfernt(-) commit 27023fd56148dd17b5576c1e81e0fe851d9b8727 Author: John Stowers @@ -10591,7 +10796,7 @@ Date: Fri Sep 24 21:20:53 2010 +1200 Disable GI tests when introspection disabled tests/Makefile.am | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+) commit 7fe831081cdd2e26f5d948326b9f89ea0694e752 Author: Tomeu Vizoso @@ -10603,7 +10808,7 @@ Date: Sat Jul 18 19:35:08 2009 +0200 gobject/__init__.py | 2 +- tests/Makefile.am | 3 ++- tests/test_uris.py | 15 +++++++++++++++ - 4 files changed, 56 insertions(+), 2 deletions(-) + 4 Dateien geändert, 56 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit d6721a59c294f2471142b8c32de2f647b7084bca Author: Paul Bolle @@ -10617,7 +10822,7 @@ Date: Thu Sep 23 15:38:40 2010 -0400 docs/reference/pyglib-mainloop.xml | 6 +++--- docs/reference/pygobject-functions.xml | 6 +++--- docs/reference/pygobject.xml | 4 ++-- - 6 files changed, 26 insertions(+), 25 deletions(-) + 6 Dateien geändert, 26 Zeilen hinzugefügt(+), 25 Zeilen entfernt(-) commit a08c9fffb4262ae678e17f90bbfb2d5f880cfad0 Author: Damien Caliste @@ -10642,9 +10847,9 @@ Date: Tue Sep 21 17:52:14 2010 +0200 https://bugzilla.gnome.org/show_bug.cgi?id=630271 gi/pygi-invoke.c | 83 - ++++++++++++++++++++------------------------- + +++++++++++++++++++++------------------------- tests/test_everything.py | 4 ++- - 2 files changed, 40 insertions(+), 47 deletions(-) + 2 Dateien geändert, 40 Zeilen hinzugefügt(+), 47 Zeilen entfernt(-) commit 9714d765a34e246899f11b6792eea3aecce0b7ec Author: Tomeu Vizoso @@ -10656,11 +10861,11 @@ Date: Mon Sep 13 16:36:47 2010 +0200 gi/gimodule.c | 20 +++++++ gi/overrides/GLib.py | 131 - +++++++++++++++++++++++++++++++++++++++++-- + +++++++++++++++++++++++++++++++++++++++++--- gi/pygi-foreign-gvariant.c | 2 +- - tests/test_everything.py | 16 ----- - tests/test_overrides.py | 25 ++++++++ - 5 files changed, 170 insertions(+), 24 deletions(-) + tests/test_everything.py | 16 ------ + tests/test_overrides.py | 25 +++++++++ + 5 Dateien geändert, 170 Zeilen hinzugefügt(+), 24 Zeilen entfernt(-) commit fc45abdd9b55ab63556798ab0f04715be79dba08 Author: John (J5) Palmieri @@ -10671,7 +10876,7 @@ Date: Thu Sep 23 10:49:36 2010 -0400 * https://bugzilla.gnome.org/show_bug.cgi?id=627449 glib/option.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 4ed100f3183c6325dd04461484e877bb7d4131b1 Author: John (J5) Palmieri @@ -10688,7 +10893,7 @@ Date: Fri Sep 17 12:08:09 2010 -0400 configure.ac | 32 +++++++++++++++++++++++++++++--- tests/Makefile.am | 35 ++++++++++++++++++++--------------- tests/runtests.py | 4 ++++ - 3 files changed, 53 insertions(+), 18 deletions(-) + 3 Dateien geändert, 53 Zeilen hinzugefügt(+), 18 Zeilen entfernt(-) commit 269ff8564eeb597dc06c27e293354b7ff7a71a82 Author: Tomeu Vizoso @@ -10702,7 +10907,7 @@ Date: Fri Sep 17 15:50:47 2010 +0200 let's fix the tests. tests/test_gi.py | 14 +++++++------- - 1 files changed, 7 insertions(+), 7 deletions(-) + 1 Datei geändert, 7 Zeilen hinzugefügt(+), 7 Zeilen entfernt(-) commit 2da8da589644d6125101210712defb1272a8abb1 Author: John (J5) Palmieri @@ -10715,7 +10920,7 @@ Date: Thu Sep 9 13:52:14 2010 -0400 gi/pygi-argument.c | 4 ++-- gi/pygi-struct.c | 2 +- gobject/gobjectmodule.c | 2 +- - 3 files changed, 4 insertions(+), 4 deletions(-) + 3 Dateien geändert, 4 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-) commit 6769a4704f0876ac3baacd4da03ff16d9f0906be Author: John (J5) Palmieri @@ -10728,7 +10933,7 @@ Date: Thu Sep 9 13:55:17 2010 -0400 https://bugzilla.gnome.org/show_bug.cgi?id=629198 gobject/pygtype.c | 9 --------- - 1 files changed, 0 insertions(+), 9 deletions(-) + 1 Datei geändert, 9 Zeilen entfernt(-) commit 98f54f9d33996baeaa8c8c1240310f5396d03a1d Author: John (J5) Palmieri @@ -10757,10 +10962,10 @@ Date: Tue Sep 14 14:10:49 2010 -0400 https://bugzilla.gnome.org/show_bug.cgi?id=615872 gi/pygi-argument.c | 182 - +++++++++++++++++++++++++++------------------------ + +++++++++++++++++++++++++++------------------------- gi/pygi-argument.h | 2 + gi/pygi-invoke.c | 14 ++++ - 3 files changed, 112 insertions(+), 86 deletions(-) + 3 Dateien geändert, 112 Zeilen hinzugefügt(+), 86 Zeilen entfernt(-) commit 5d79498d38b147b66ae72c1481e397160491e8d6 Author: John (J5) Palmieri @@ -10771,7 +10976,7 @@ Date: Wed Sep 15 10:26:20 2010 -0400 https://bugzilla.gnome.org/show_bug.cgi?id=615872 gi/pygi-foreign-cairo.c | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) + 1 Datei geändert, 6 Zeilen hinzugefügt(+) commit b855562e5c0019cd7e4982fe00c467ede9e3926d Author: John (J5) Palmieri @@ -10787,7 +10992,7 @@ Date: Thu Sep 9 22:16:58 2010 -0400 https://bugzilla.gnome.org/show_bug.cgi?id=615872 gi/pygi-argument.c | 10 +++------- - 1 files changed, 3 insertions(+), 7 deletions(-) + 1 Datei geändert, 3 Zeilen hinzugefügt(+), 7 Zeilen entfernt(-) commit 0e72e28c6c5502c7db5103cf1299c9f0e6689fdd Author: John (J5) Palmieri @@ -10800,7 +11005,7 @@ Date: Thu Sep 9 18:44:11 2010 -0400 https://bugzilla.gnome.org/show_bug.cgi?id=615872 gi/pygi-argument.c | 20 ++++++++++++-------- - 1 files changed, 12 insertions(+), 8 deletions(-) + 1 Datei geändert, 12 Zeilen hinzugefügt(+), 8 Zeilen entfernt(-) commit d5666d99a1c0396b7da0cb14f9f4ff8892da7e2e Author: John (J5) Palmieri @@ -10813,7 +11018,7 @@ Date: Thu Sep 9 17:35:10 2010 -0400 https://bugzilla.gnome.org/show_bug.cgi?id=615872 gobject/pygtype.c | 29 ++++++++++++++++------------- - 1 files changed, 16 insertions(+), 13 deletions(-) + 1 Datei geändert, 16 Zeilen hinzugefügt(+), 13 Zeilen entfernt(-) commit 3d431c7dd0de97db10cb0c00c39d9c1837bed2f2 Author: Tomeu Vizoso @@ -10822,7 +11027,7 @@ Date: Fri Sep 17 12:14:56 2010 +0200 Specify encoding of tests/test_gi.py tests/test_gi.py | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit a808bdabb9fa6f4a9b9ce42e1cce05fb37403f0f Author: John (J5) Palmieri @@ -10833,7 +11038,7 @@ Date: Thu Sep 9 13:24:30 2010 -0400 https://bugzilla.gnome.org/show_bug.cgi?id=615872 tests/test_gi.py | 6 +++++- - 1 files changed, 5 insertions(+), 1 deletions(-) + 1 Datei geändert, 5 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit 928f4485041d80d0c36ff2daeae4bcd09bd0bde4 Author: John (J5) Palmieri @@ -10851,7 +11056,7 @@ Date: Thu Sep 9 12:45:21 2010 -0400 glib/pygiochannel.c | 30 +++++++++++++++--------------- glib/pygsource.c | 4 ++-- gobject/pygobject.c | 2 +- - 3 files changed, 18 insertions(+), 18 deletions(-) + 3 Dateien geändert, 18 Zeilen hinzugefügt(+), 18 Zeilen entfernt(-) commit b5ee20afa4399c7689fbec8939fa20b927eeb782 Author: John (J5) Palmieri @@ -10862,7 +11067,7 @@ Date: Thu Sep 9 08:04:40 2010 -0400 https://bugzilla.gnome.org/show_bug.cgi?id=615872 glib/pygspawn.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit a499b2f0d622b671bd154544f66b73f1278e66ed Author: John (J5) Palmieri @@ -10879,7 +11084,7 @@ Date: Thu Sep 9 07:56:44 2010 -0400 gi/overrides/Gtk.py | 24 ++++++++++++++++-------- glib/option.py | 16 ++++++++++++---- - 2 files changed, 28 insertions(+), 12 deletions(-) + 2 Dateien geändert, 28 Zeilen hinzugefügt(+), 12 Zeilen entfernt(-) commit dec9001d26c97949e7b3578086cb35e98075c047 Author: John (J5) Palmieri @@ -10907,7 +11112,7 @@ Date: Thu Sep 9 07:36:04 2010 -0400 tests/test_option.py | 6 ++++-- tests/test_overrides.py | 4 ++-- tests/test_properties.py | 6 +++--- - 6 files changed, 32 insertions(+), 10 deletions(-) + 6 Dateien geändert, 32 Zeilen hinzugefügt(+), 10 Zeilen entfernt(-) commit 09a0daeedf49eaf376c1288be5743b57fbc76d51 Author: Colin Walters @@ -10916,7 +11121,7 @@ Date: Thu Sep 9 16:25:51 2010 -0400 compilation: Fix syntax error gi/pygi-info.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 9f7afd6d5afd8c1a5f36bf1295814757b71c8cbc Author: Tomeu Vizoso @@ -10926,7 +11131,7 @@ Date: Thu Sep 9 22:17:00 2010 +0200 gi/overrides/GLib.py | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 48 insertions(+), 0 deletions(-) + 1 Datei geändert, 48 Zeilen hinzugefügt(+) commit 306b792ac97a458ddee59fb86d66453495117f3e Author: Tomeu Vizoso @@ -10950,7 +11155,7 @@ Date: Thu Jul 22 13:48:51 2010 +0100 gi/pygi-type.h | 2 ++ gi/types.py | 1 + tests/test_everything.py | 9 +++++++++ - 6 files changed, 60 insertions(+), 6 deletions(-) + 6 Dateien geändert, 60 Zeilen hinzugefügt(+), 6 Zeilen entfernt(-) commit 22e53aa2ed9cf6173a877b0af6928d5ab8da2f4f Author: John (J5) Palmieri @@ -10959,7 +11164,7 @@ Date: Wed Sep 8 13:08:48 2010 -0400 fix for changes in the gi test libraries tests/test_everything.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 246877074617b0e9c3b2ba2a5395a73e0ed9cd5d Author: John (J5) Palmieri @@ -10968,7 +11173,7 @@ Date: Wed Sep 8 13:08:07 2010 -0400 Gtk.DialogFlags.NO_SEPARATOR has been removed in Gtk 3.0 gi/overrides/Gtk.py | 10 ++++++++-- - 1 files changed, 8 insertions(+), 2 deletions(-) + 1 Datei geändert, 8 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit f92fc48e7e2ec50996e994ccb7d08a61e7374f22 Author: John (J5) Palmieri @@ -10985,7 +11190,7 @@ Date: Wed Sep 8 12:35:09 2010 -0400 https://bugzilla.gnome.org/show_bug.cgi?id=629087 gi/pygi-callbacks.c | 5 +---- - 1 files changed, 1 insertions(+), 4 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 4 Zeilen entfernt(-) commit 8c517de2d278bdef641c72b8f2919a3924290ec1 Author: Tomeu Vizoso @@ -10998,7 +11203,7 @@ Date: Fri Aug 20 14:54:35 2010 +0200 gi/pygi-property.c | 156 +++++++++++++++++++++++++++++++++++----------- tests/test_everything.py | 34 ++++++++++ - 2 files changed, 154 insertions(+), 36 deletions(-) + 2 Dateien geändert, 154 Zeilen hinzugefügt(+), 36 Zeilen entfernt(-) commit 6d183d1fff55d54569ba3e1f90a10284df74fd40 Author: John (J5) Palmieri @@ -11029,7 +11234,7 @@ Date: Fri Sep 3 12:04:16 2010 -0400 https://bugzilla.gnome.org/show_bug.cgi?id=615872 gobject/gobjectmodule.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit b7bf4269682a3335f5e0a52b46fa721af134d09a Author: Tomeu Vizoso @@ -11039,18 +11244,18 @@ Date: Wed Sep 1 11:03:40 2010 +0200 gi/pygi-argument.c | 52 ++++++++++++++++++++++---------------------- - gi/pygi-argument.h | 10 ++++---- - gi/pygi-closure.c | 34 ++++++++++++++-------------- - gi/pygi-foreign-cairo.c | 8 +++--- - gi/pygi-foreign-gvariant.c | 4 +- - gi/pygi-foreign-gvariant.h | 4 +- + gi/pygi-argument.h | 10 ++++----- + gi/pygi-closure.c | 34 ++++++++++++++--------------- + gi/pygi-foreign-cairo.c | 8 +++---- + gi/pygi-foreign-gvariant.c | 4 ++-- + gi/pygi-foreign-gvariant.h | 4 ++-- gi/pygi-foreign.c | 12 +++++----- - gi/pygi-foreign.h | 8 +++--- - gi/pygi-info.c | 8 +++--- - gi/pygi-invoke.c | 28 +++++++++++----------- - gi/pygi-property.c | 4 +- - gi/pygi.h | 16 ++++++------ - 12 files changed, 94 insertions(+), 94 deletions(-) + gi/pygi-foreign.h | 8 +++---- + gi/pygi-info.c | 8 +++---- + gi/pygi-invoke.c | 28 ++++++++++++------------ + gi/pygi-property.c | 4 ++-- + gi/pygi.h | 16 +++++++------- + 12 Dateien geändert, 94 Zeilen hinzugefügt(+), 94 Zeilen entfernt(-) commit 7197f85c9be2b03636639ac909ca2c3170653509 Author: John (J5) Palmieri @@ -11071,7 +11276,7 @@ Date: Wed Aug 18 10:29:19 2010 -0400 tests/test_properties.py | 24 ++++++++++++++---------- tests/test_signal.py | 14 +++++++------- tests/test_source.py | 4 ++-- - 6 files changed, 72 insertions(+), 25 deletions(-) + 6 Dateien geändert, 72 Zeilen hinzugefügt(+), 25 Zeilen entfernt(-) commit 720e614acdbcf734d4bcccc403e639b5a5bcae24 Author: Colin Walters @@ -11097,12 +11302,12 @@ Date: Fri Aug 20 10:58:48 2010 -0400 configure.ac | 5 +- gi/pygi-argument.c | 9 +-- gi/pygi-invoke.c | 147 - +++++---------------------------------------- + +++++--------------------------------------- tests/Makefile.am | 42 ++++++++++++- tests/test_everything.py | 6 +- tests/test_gi.py | 151 +++++++++------------------------------------- - 6 files changed, 93 insertions(+), 267 deletions(-) + 6 Dateien geändert, 93 Zeilen hinzugefügt(+), 267 Zeilen entfernt(-) commit f6c4d9e58c8f05cb2d82e158c9eb8480308565bd Author: John (J5) Palmieri @@ -11114,7 +11319,7 @@ Date: Fri Aug 20 10:43:58 2010 -0400 gobject/pygenum.c | 1 + gobject/pygflags.c | 1 + - 2 files changed, 2 insertions(+), 0 deletions(-) + 2 Dateien geändert, 2 Zeilen hinzugefügt(+) commit c03e6b482548aee99362356807c804f8834fad2b Author: John Ehresman @@ -11124,11 +11329,11 @@ Date: Thu Apr 15 17:11:30 2010 -0400 https://bugzilla.gnome.org/show_bug.cgi?id=615872 - glib/pygspawn.c | 7 +++-- - gobject/pygenum.c | 61 ++++++++++++++++++++++++------------------ + glib/pygspawn.c | 7 ++--- + gobject/pygenum.c | 61 +++++++++++++++++++++++------------------ gobject/pygflags.c | 76 ++++++++++++++++++++++------------------------------ - 3 files changed, 71 insertions(+), 73 deletions(-) + 3 Dateien geändert, 71 Zeilen hinzugefügt(+), 73 Zeilen entfernt(-) commit 0db676fd2296750a46ba0fb069e472da06ecc53a Author: John (J5) Palmieri @@ -11148,7 +11353,7 @@ Date: Wed Aug 18 11:03:32 2010 -0400 https://bugzilla.gnome.org/show_bug.cgi?id=615872 gi/types.py | 12 ++++++++---- - 1 files changed, 8 insertions(+), 4 deletions(-) + 1 Datei geändert, 8 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-) commit 286dcd0c6455961d818ac7f05f80f82435abc1dc Author: John (J5) Palmieri @@ -11160,7 +11365,7 @@ Date: Tue Aug 17 15:43:42 2010 -0400 gi/Makefile.am | 2 +- gi/pygi-foreign-cairo.c | 17 +++++++---------- - 2 files changed, 8 insertions(+), 11 deletions(-) + 2 Dateien geändert, 8 Zeilen hinzugefügt(+), 11 Zeilen entfernt(-) commit bda58ec34fc443fe1108afc8532bec50f6fd0b44 Author: John (J5) Palmieri @@ -11172,7 +11377,7 @@ Date: Tue Aug 17 02:33:45 2010 -0400 gi/module.py | 2 +- gi/types.py | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) + 2 Dateien geändert, 2 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit 427a3c8053feca35ccd746575760ac8a0ed50a12 Author: John (J5) Palmieri @@ -11188,7 +11393,7 @@ Date: Tue Aug 17 02:24:44 2010 -0400 gi/Makefile.am | 2 +- gi/gimodule.c | 24 +++++++++--------------- - 2 files changed, 10 insertions(+), 16 deletions(-) + 2 Dateien geändert, 10 Zeilen hinzugefügt(+), 16 Zeilen entfernt(-) commit 1dee5dcd2b1747b4a4af438c0443d7930e4802db Author: John (J5) Palmieri @@ -11206,7 +11411,7 @@ Date: Tue Aug 17 02:14:14 2010 -0400 tests/Makefile.am | 2 +- tests/testhelpermodule.c | 221 ++++++---------------------------------------- - 2 files changed, 28 insertions(+), 195 deletions(-) + 2 Dateien geändert, 28 Zeilen hinzugefügt(+), 195 Zeilen entfernt(-) commit 1ff83a2ccb7301c8f675913f1c4f6118ea50b9c7 Author: John (J5) Palmieri @@ -11219,9 +11424,9 @@ Date: Mon Aug 16 21:14:27 2010 -0400 gi/pygi-boxed.c | 43 ++----------- gi/pygi-info.c | 171 ++++++++++++++++++++------------------------------ - gi/pygi-repository.c | 39 ++--------- - gi/pygi-struct.c | 45 ++----------- - 4 files changed, 88 insertions(+), 210 deletions(-) + gi/pygi-repository.c | 39 +++--------- + gi/pygi-struct.c | 45 +++---------- + 4 Dateien geändert, 88 Zeilen hinzugefügt(+), 210 Zeilen entfernt(-) commit 1efa2b12913b194d433c17014bc1077271a6ca32 Author: John (J5) Palmieri @@ -11241,12 +11446,12 @@ Date: Mon Aug 16 13:51:05 2010 -0400 gi/pygi-argument.c | 96 ++++++++++++++++++++++++++----------------- gi/pygi-boxed.c | 1 + - gi/pygi-info.c | 13 ++++-- - gi/pygi-private.h | 23 ++++++++++ - gi/pygi-repository.c | 8 ++- + gi/pygi-info.c | 13 +++--- + gi/pygi-private.h | 23 +++++++++++ + gi/pygi-repository.c | 8 ++-- gi/pygi-struct.c | 1 + glib/pyglib-python-compat.h | 6 +++ - 8 files changed, 103 insertions(+), 47 deletions(-) + 8 Dateien geändert, 103 Zeilen hinzugefügt(+), 47 Zeilen entfernt(-) commit 6b902c66200c1684513a9ef31bdef3f2ff64e4fa Author: Tomeu Vizoso @@ -11257,7 +11462,7 @@ Date: Fri Aug 20 09:28:57 2010 +0200 https://bugzilla.gnome.org/show_bug.cgi?id=627408 glib/option.py | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit 3cefffecc1317b6ad77a5ed936bfb990d16bf9d3 Author: Gustavo Noronha Silva @@ -11271,7 +11476,7 @@ Date: Thu Aug 19 18:45:05 2010 -0300 https://bugzilla.gnome.org/show_bug.cgi?id=627440 glib/pyglib-python-compat.h | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+) commit d45c7031876f355e15409f00f3e50e77d18f8f4b Author: Colin Walters @@ -11280,7 +11485,7 @@ Date: Thu Aug 19 17:50:35 2010 -0400 pyglib: Fix a compiler warning glib/pyglib.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+) commit 0fe6828ddce187ac1897a1f02ca1c5480796d5b9 Author: Tomeu Vizoso @@ -11289,7 +11494,7 @@ Date: Wed Aug 18 20:36:51 2010 +0200 Don't force gtk 2.0 pygi-convert.sh | 11 +++++++---- - 1 files changed, 7 insertions(+), 4 deletions(-) + 1 Datei geändert, 7 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-) commit ac59c18a4f2bfff47c862b763aaf1d1cf136a4f5 Author: Steve Frécinaux @@ -11300,7 +11505,7 @@ Date: Tue Aug 17 14:49:30 2010 +0200 https://bugzilla.gnome.org/show_bug.cgi?id=627143 gi/gimodule.c | 9 +++++++-- - 1 files changed, 7 insertions(+), 2 deletions(-) + 1 Datei geändert, 7 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit 18ee0db673c2fa42244ab85950bbf4840edb674b Author: John (J5) Palmieri @@ -11310,7 +11515,7 @@ Date: Thu Aug 12 12:16:31 2010 -0400 gio/gappinfo.override | 5 +++++ gio/pygio-utils.c | 42 +++++++++++++++++++++++++++++++++++------- - 2 files changed, 40 insertions(+), 7 deletions(-) + 2 Dateien geändert, 40 Zeilen hinzugefügt(+), 7 Zeilen entfernt(-) commit 45ab0c03110c911b47519941dfd753326891b5e0 Author: John (J5) Palmieri @@ -11322,7 +11527,7 @@ Date: Wed Aug 11 16:13:59 2010 -0400 gio/giomodule.c | 153 ++++++++++++++++++++++++++++--------------------------- - 1 files changed, 78 insertions(+), 75 deletions(-) + 1 Datei geändert, 78 Zeilen hinzugefügt(+), 75 Zeilen entfernt(-) commit c52f8ed3ae8cb66a03b5695e980770c3f467f755 Author: John (J5) Palmieri @@ -11334,7 +11539,7 @@ Date: Wed Aug 11 16:04:48 2010 -0400 https://bugzilla.gnome.org/show_bug.cgi?id=615872 gi/pygi-argument.c | 31 +++++++++++++++++++++++++++---- - 1 files changed, 27 insertions(+), 4 deletions(-) + 1 Datei geändert, 27 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-) commit de9eae4dfcce856a42cc5c569a5b9683c28d0eeb Author: John (J5) Palmieri @@ -11345,7 +11550,7 @@ Date: Wed Aug 11 15:03:55 2010 -0400 https://bugzilla.gnome.org/show_bug.cgi?id=615872 glib/pygiochannel.c | 30 ++++++++++++++++++++++++------ - 1 files changed, 24 insertions(+), 6 deletions(-) + 1 Datei geändert, 24 Zeilen hinzugefügt(+), 6 Zeilen entfernt(-) commit 5824ff98175b749dbcfa72d24b994230b6e05377 Author: John (J5) Palmieri @@ -11363,25 +11568,25 @@ Date: Mon Aug 9 15:16:51 2010 -0400 https://bugzilla.gnome.org/show_bug.cgi?id=615872 glib/glibmodule.c | 48 +++++----- - glib/pygiochannel.c | 46 +++++----- - glib/pyglib-python-compat.h | 153 +++++++++++++++++++++++------- - glib/pyglib.c | 22 ++-- + glib/pygiochannel.c | 46 ++++----- + glib/pyglib-python-compat.h | 153 ++++++++++++++++++++++-------- + glib/pyglib.c | 22 ++--- glib/pyglib.h | 14 --- glib/pygoptioncontext.c | 4 +- glib/pygsource.c | 16 ++-- - glib/pygspawn.c | 32 +++--- + glib/pygspawn.c | 32 +++---- gobject/gobjectmodule.c | 216 - +++++++++++++++++++++--------------------- + +++++++++++++++++++++---------------------- gobject/pygboxed.c | 2 +- - gobject/pygenum.c | 84 +++++++++--------- + gobject/pygenum.c | 84 ++++++++--------- gobject/pygflags.c | 122 ++++++++++++------------ - gobject/pygobject-private.h | 12 +- - gobject/pygobject.c | 46 +++++----- + gobject/pygobject-private.h | 12 +-- + gobject/pygobject.c | 46 ++++----- gobject/pygobject.h | 23 +++++ - gobject/pygparamspec.c | 24 +++--- + gobject/pygparamspec.c | 24 ++--- gobject/pygpointer.c | 2 +- gobject/pygtype.c | 170 +++++++++++++++++----------------- - 18 files changed, 563 insertions(+), 473 deletions(-) + 18 Dateien geändert, 563 Zeilen hinzugefügt(+), 473 Zeilen entfernt(-) commit 231e934cc01d061e81bb60d35127a133cd0e1793 Author: John (J5) Palmieri @@ -11392,7 +11597,7 @@ Date: Mon Aug 16 10:14:04 2010 +0200 https://bugzilla.gnome.org/show_bug.cgi?id=622606 tests/test_overrides.py | 10 ++++++++++ - 1 files changed, 10 insertions(+), 0 deletions(-) + 1 Datei geändert, 10 Zeilen hinzugefügt(+) commit f07cfde377e42686c6b80f56cac62338ee333e61 Author: Johan Dahlin @@ -11403,7 +11608,7 @@ Date: Mon Aug 16 10:08:38 2010 +0200 https://bugzilla.gnome.org/show_bug.cgi?id=622606 gi/overrides/Gtk.py | 13 +++++++++++++ - 1 files changed, 13 insertions(+), 0 deletions(-) + 1 Datei geändert, 13 Zeilen hinzugefügt(+) commit 65a06a7216163c7e65b32c5b5f3388faa7fda5d6 Author: Simon van der Linden @@ -11417,7 +11622,7 @@ Date: Thu Aug 12 16:18:58 2010 +0200 configure.ac | 15 ++++++++++++--- gi/Makefile.am | 20 ++++++++++++-------- - 2 files changed, 24 insertions(+), 11 deletions(-) + 2 Dateien geändert, 24 Zeilen hinzugefügt(+), 11 Zeilen entfernt(-) commit b83507263231d9bf47f6c8450583e3d03f0a3b5b Author: Tomeu Vizoso @@ -11428,7 +11633,7 @@ Date: Mon Aug 16 09:55:35 2010 +0200 https://bugzilla.gnome.org/show_bug.cgi?id=626996 gi/pygi.h | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+) commit 0dc3656070f496431829c6e8441ca17129c569f8 Author: John (J5) Palmieri @@ -11438,20 +11643,20 @@ Date: Mon Aug 9 16:11:55 2010 -0400 https://bugzilla.gnome.org/show_bug.cgi?id=615872 - glib/pygiochannel.c | 18 +++++++--- + glib/pygiochannel.c | 18 ++++++---- glib/pyglib.c | 85 +++++++++++++++++++++++++++++++++++++++++++++++ glib/pyglib.h | 3 ++ - glib/pygmaincontext.c | 17 ++++++--- - glib/pygmainloop.c | 17 ++++++--- + glib/pygmaincontext.c | 17 ++++++---- + glib/pygmainloop.c | 17 ++++++---- glib/pygoptioncontext.c | 18 ++++++---- - glib/pygoptiongroup.c | 22 +++++++----- - gobject/pygboxed.c | 18 +++++++--- + glib/pygoptiongroup.c | 22 ++++++------ + gobject/pygboxed.c | 18 ++++++---- gobject/pygobject.c | 44 +++++++++++++++++------- - gobject/pygparamspec.c | 19 +++++++--- - gobject/pygpointer.c | 17 ++++++--- - gobject/pygtype.c | 26 +++++++++++--- - 12 files changed, 233 insertions(+), 71 deletions(-) + gobject/pygparamspec.c | 19 +++++++---- + gobject/pygpointer.c | 17 ++++++---- + gobject/pygtype.c | 26 +++++++++++---- + 12 Dateien geändert, 233 Zeilen hinzugefügt(+), 71 Zeilen entfernt(-) commit b426e531dc53d4b50e572a2da19733479635e662 Author: Simon van der Linden @@ -11466,7 +11671,7 @@ Date: Thu Aug 12 18:09:33 2010 +0200 autogen.sh | 506 +++++++----------------------------------------------------- - 1 files changed, 58 insertions(+), 448 deletions(-) + 1 Datei geändert, 58 Zeilen hinzugefügt(+), 448 Zeilen entfernt(-) commit 769645e00d6d055a4cd802454dbfc1bbfcbee691 Author: Simon van der Linden @@ -11489,7 +11694,7 @@ Date: Thu Aug 12 14:11:55 2010 +0200 gio/gio.override | 2 +- glib/pyglib.c | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) + 2 Dateien geändert, 3 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-) commit e4c4cccb588b258dbcd21702e6cddcfe9ebe4ffc Author: Simon van der Linden @@ -11507,7 +11712,7 @@ Date: Thu Aug 12 11:09:37 2010 +0200 https://bugzilla.gnome.org/show_bug.cgi?id=626684 gi/pygi-invoke.c | 9 ++++++++- - 1 files changed, 8 insertions(+), 1 deletions(-) + 1 Datei geändert, 8 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit 0ab967ca40ddcffc2834d4e656bb2010c6b9bdda Author: Simon van der Linden @@ -11521,7 +11726,7 @@ Date: Thu Aug 12 10:46:17 2010 +0200 https://bugzilla.gnome.org/show_bug.cgi?id=626684 gi/pygi-invoke.c | 14 +++----------- - 1 files changed, 3 insertions(+), 11 deletions(-) + 1 Datei geändert, 3 Zeilen hinzugefügt(+), 11 Zeilen entfernt(-) commit e17be9cd288fee5d7cb174d9d577eb9279044c67 Author: Tomeu Vizoso @@ -11530,7 +11735,7 @@ Date: Tue Aug 10 17:40:16 2010 +0200 Call valgrind with G_SLICE=always-malloc G_DEBUG=gc-friendly tests/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 8be59c37dd57acc51875c7189ca09d728b729013 Author: Ignacio Casal Quinteiro @@ -11541,7 +11746,7 @@ Date: Wed Aug 4 13:43:17 2010 +0200 gi/pygi-argument.c | 2 -- gi/pygi-invoke.c | 2 +- gi/pygi-struct.c | 1 - - 3 files changed, 1 insertions(+), 4 deletions(-) + 3 Dateien geändert, 1 Zeile hinzugefügt(+), 4 Zeilen entfernt(-) commit 529eca6054e9a7e2267f1529e317c2373932762f Author: Simon van der Linden @@ -11550,7 +11755,7 @@ Date: Fri Jul 30 22:39:40 2010 +0200 Add myself as a maintainer MAINTAINERS | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) + 1 Datei geändert, 4 Zeilen hinzugefügt(+) commit caac75a6ed6f671b37e38a78e71b87906a00ac1b Author: Tomeu Vizoso @@ -11567,10 +11772,10 @@ Date: Fri Jul 30 14:14:16 2010 +0200 gi/pygi-boxed.c | 50 +++++++++++++++++++++++++++++++---------------- - gi/pygi-boxed.h | 10 +++++--- - gi/pygi-invoke.c | 16 +++++--------- - tests/test_overrides.py | 39 +++++++++++++++++------------------ - 4 files changed, 64 insertions(+), 51 deletions(-) + gi/pygi-boxed.h | 10 ++++++---- + gi/pygi-invoke.c | 16 ++++++--------- + tests/test_overrides.py | 39 ++++++++++++++++++------------------ + 4 Dateien geändert, 64 Zeilen hinzugefügt(+), 51 Zeilen entfernt(-) commit 99c7322898c00a576c7319ea0a7c808446253133 Author: Toms Baugis @@ -11582,9 +11787,9 @@ Date: Fri Jul 30 15:44:21 2010 +0200 gi/overrides/Gdk.py | 48 +++++++++++++++++++++++++++++++++++++++++++++++ - gi/pygi-invoke.c | 4 --- - tests/test_overrides.py | 10 +++++++++ - 3 files changed, 58 insertions(+), 4 deletions(-) + gi/pygi-invoke.c | 4 ---- + tests/test_overrides.py | 10 ++++++++++ + 3 Dateien geändert, 58 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-) commit 55814e722c2ae11310f346790c9221e4fad92b50 Author: John (J5) Palmieri @@ -11595,7 +11800,7 @@ Date: Fri Jul 30 06:30:48 2010 -0400 https://bugzilla.gnome.org/show_bug.cgi?id=625438 gio/gio.override | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) + 1 Datei geändert, 5 Zeilen hinzugefügt(+) commit 477315465d0a6d84b51e146e86e254873bc564ff Author: John (J5) Palmieri @@ -11610,7 +11815,7 @@ Date: Fri Jul 30 06:43:06 2010 -0400 https://bugzilla.gnome.org/show_bug.cgi?id=625438 gio/gfile.override | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) + 1 Datei geändert, 4 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-) commit faa7d4eece7ddb698725098970c2478a3b45c4d5 Author: Paul Bolle @@ -11627,7 +11832,7 @@ Date: Fri Jul 30 10:56:01 2010 +0200 demos/gtk-demo/gtk-demo.py | 2 ++ examples/cairo-demo.py | 2 ++ - 2 files changed, 4 insertions(+), 0 deletions(-) + 2 Dateien geändert, 4 Zeilen hinzugefügt(+) commit c9da5782e6c633d9af43ee85075e9ee65db09780 Author: John (J5) Palmieri @@ -11650,7 +11855,7 @@ Date: Fri Jul 9 13:14:42 2010 -0400 gi/pygi-argument.c | 13 +++++-------- gi/pygi-invoke.c | 46 ++++++++++++++++++++++++++++++++++++++++------ - 2 files changed, 45 insertions(+), 14 deletions(-) + 2 Dateien geändert, 45 Zeilen hinzugefügt(+), 14 Zeilen entfernt(-) commit e0a85305cd107aae5902e524afd074cd8c329927 Author: Tomeu Vizoso @@ -11664,7 +11869,7 @@ Date: Fri Jul 30 10:35:33 2010 +0200 This reverts commit e7bb3954880568884ca66e7751ede689dc2f24f6. gi/overrides/Gdk.py | 44 -------------------------------------------- - 1 files changed, 0 insertions(+), 44 deletions(-) + 1 Datei geändert, 44 Zeilen entfernt(-) commit 61ffb8d6d08fcfe638f71ea97ceac3a366e5536d Author: Paul Bolle @@ -11677,7 +11882,7 @@ Date: Thu Jul 29 22:55:28 2010 +0200 https://bugzilla.gnome.org/show_bug.cgi?id=625619 examples/cairo-demo.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit e7bb3954880568884ca66e7751ede689dc2f24f6 Author: Toms Baugis @@ -11688,7 +11893,7 @@ Date: Tue Jul 27 21:37:16 2010 +0200 https://bugzilla.gnome.org/show_bug.cgi?id=620593 gi/overrides/Gdk.py | 44 ++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 44 insertions(+), 0 deletions(-) + 1 Datei geändert, 44 Zeilen hinzugefügt(+) commit 0a9f1da052fd33dcef81d0e267fc7972f02c7888 Author: Simon van der Linden @@ -11703,26 +11908,26 @@ Date: Wed Jul 28 14:56:00 2010 +0200 https://bugzilla.gnome.org/show_bug.cgi?id=625488 - Makefile.am | 5 --- + Makefile.am | 5 ---- tests/Makefile.am | 65 - ++++++++++++++++++++----------------------- - tests/common.py | 47 ------------------------------- + ++++++++++++++++++++------------------------ + tests/common.py | 47 -------------------------------- tests/runtests.py | 43 +++++++++++------------------ - tests/test_gcancellable.py | 4 +- + tests/test_gcancellable.py | 4 +-- tests/test_gi.py | 3 -- tests/test_gicon.py | 3 +- tests/test_gio.py | 3 +- tests/test_gobject.py | 3 +- - tests/test_gresolver.py | 4 +- + tests/test_gresolver.py | 4 +-- tests/test_gsocket.py | 4 ++- tests/test_interface.py | 6 +++- tests/test_mainloop.py | 11 +++----- tests/test_signal.py | 4 ++- - tests/test_source.py | 4 +- + tests/test_source.py | 4 +-- tests/test_subprocess.py | 5 +--- tests/test_thread.py | 5 +++- tests/test_unknown.py | 5 +++- - 18 files changed, 82 insertions(+), 142 deletions(-) + 18 Dateien geändert, 82 Zeilen hinzugefügt(+), 142 Zeilen entfernt(-) commit 82f4cb5ebf5d992493b7a2f74cfd5f175e19eb76 Author: Tomeu Vizoso @@ -11731,7 +11936,7 @@ Date: Thu Jul 29 12:34:19 2010 +0200 Add some more transformations to pygi-convert.sh pygi-convert.sh | 37 +++++++++++++++++++++++++++++-------- - 1 files changed, 29 insertions(+), 8 deletions(-) + 1 Datei geändert, 29 Zeilen hinzugefügt(+), 8 Zeilen entfernt(-) commit de519adcd21947a0aef7932cdecb78cef200c85e Author: Tomeu Vizoso @@ -11741,7 +11946,7 @@ Date: Wed Jul 28 14:42:36 2010 +0200 gi/importer.py | 2 +- gi/pygi-repository.c | 12 ++++++------ - 2 files changed, 7 insertions(+), 7 deletions(-) + 2 Dateien geändert, 7 Zeilen hinzugefügt(+), 7 Zeilen entfernt(-) commit 01cd9abb43f93f9a57a5a05b6dc9560614e666e3 Author: Tomeu Vizoso @@ -11750,7 +11955,7 @@ Date: Wed Jul 28 12:26:48 2010 +0200 Add GValue<->GArgument marshalling for some more types gi/pygi-property.c | 37 ++++++++++++++++++++++++++++++++++++- - 1 files changed, 36 insertions(+), 1 deletions(-) + 1 Datei geändert, 36 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit ddffa70c3ee0e837070f390632bc692430f79171 Author: Tomeu Vizoso @@ -11760,7 +11965,7 @@ Date: Wed Jul 28 11:10:42 2010 +0200 if needed gobject/pygobject.c | 7 ++++++- - 1 files changed, 6 insertions(+), 1 deletions(-) + 1 Datei geändert, 6 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit 045433a1f8167205dc8eae613dcb8835d02c8916 Author: Tomeu Vizoso @@ -11770,7 +11975,7 @@ Date: Wed Jul 28 10:59:49 2010 +0200 modules gi/module.py | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit 6655a79b2f13fe417aefdf6aebab0f2d6162ba00 Author: Tomeu Vizoso @@ -11794,7 +11999,7 @@ Date: Tue Jul 27 21:52:49 2010 +0200 gi/pygi.h | 41 +++++++++ gobject/pygobject.c | 9 ++ tests/test_everything.py | 19 ++++ - 9 files changed, 341 insertions(+), 0 deletions(-) + 9 Dateien geändert, 341 Zeilen hinzugefügt(+) commit 85f4572b3ffbfa364ebb2e470eab759edc557b36 Author: Tomeu Vizoso @@ -11803,7 +12008,7 @@ Date: Tue Jul 27 21:32:41 2010 +0200 Readd Gdk.Rectangle override for Gtk-2.0 gi/overrides/Gdk.py | 19 +++++++++++++++++++ - 1 files changed, 19 insertions(+), 0 deletions(-) + 1 Datei geändert, 19 Zeilen hinzugefügt(+) commit 2082ee35e2a33f52bf1e8ec49cb4a43398e91989 Author: Tomeu Vizoso @@ -11817,15 +12022,15 @@ Date: Tue Jul 27 18:25:27 2010 +0200 * gi/pygi-repository.c: Add wrappers for g_irepository_enumerate and g_irepository_get_version. - gi/importer.py | 26 +++++---------- + gi/importer.py | 26 ++++++---------- gi/module.py | 58 - +++++++++++++++++++++++------------ + +++++++++++++++++++++++------------- gi/overrides/GIMarshallingTests.py | 2 +- gi/overrides/Gdk.py | 2 +- gi/overrides/Gtk.py | 2 +- gi/pygi-repository.c | 56 - ++++++++++++++++++++++++++++++++++- - 6 files changed, 105 insertions(+), 41 deletions(-) + +++++++++++++++++++++++++++++++++- + 6 Dateien geändert, 105 Zeilen hinzugefügt(+), 41 Zeilen entfernt(-) commit 6d7ed6c322234c240b1063a1dfaadd17157432a9 Author: Jonathan Matthew @@ -11837,7 +12042,7 @@ Date: Tue Jul 13 20:27:28 2010 +1000 https://bugzilla.gnome.org/show_bug.cgi?id=624232 gi/pygi-callbacks.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit 7e9cbd5601ad548b78d106bac1a1576d33b91c65 Author: Simon van der Linden @@ -11850,7 +12055,7 @@ Date: Mon Jul 26 17:00:23 2010 +0200 https://bugzilla.gnome.org/show_bug.cgi?id=625326 tests/testhelpermodule.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 5ca2a41f16f4a5fcc3ab4d00bec46b077c7eb384 Author: Tomeu Vizoso @@ -11862,7 +12067,7 @@ Date: Thu Jul 8 11:36:12 2010 +0200 gi/pygi-argument.c | 23 +++++++++++++++++++++-- tests/test_gi.py | 6 ++++-- - 2 files changed, 25 insertions(+), 4 deletions(-) + 2 Dateien geändert, 25 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-) commit 890c3233f8a9f884b045a294bf0122bb3afcd54a Author: Tomeu Vizoso @@ -11873,7 +12078,7 @@ Date: Sun Jul 25 17:30:40 2010 +0100 https://bugzilla.gnome.org/show_bug.cgi?id=625095 gi/pygi-callbacks.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit 1162e436273ff8e9e4e24bd8ba74615fd4624753 Author: John (J5) Palmieri @@ -11891,7 +12096,7 @@ Date: Thu Jun 24 10:07:12 2010 -0400 gi/pygi-argument.c | 8 +------- tests/test_everything.py | 27 +++++++++++++++++++++++++++ tests/test_overrides.py | 6 ++---- - 3 files changed, 30 insertions(+), 11 deletions(-) + 3 Dateien geändert, 30 Zeilen hinzugefügt(+), 11 Zeilen entfernt(-) commit 8becd32fc042445d62b885bac12dac326b2dc1fa Author: Tomeu Vizoso @@ -11900,7 +12105,7 @@ Date: Mon Jul 26 11:54:47 2010 +0200 Increase a bit verbosity of tests so people know which test failed tests/runtests.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 3b3c63514f311592e6769a373d37a2bde7ea6b38 Author: Tomeu Vizoso @@ -11911,7 +12116,7 @@ Date: Thu Jul 15 15:17:53 2010 +0200 gi/pygi-foreign-gvariant.c | 63 ++++++++++++++++++++++++++++++++++++++++++++ gi/pygi-foreign-gvariant.h | 41 ++++++++++++++++++++++++++++ - 2 files changed, 104 insertions(+), 0 deletions(-) + 2 Dateien geändert, 104 Zeilen hinzugefügt(+) commit e65275bc57f345c111eb12a6b4476ff1ddc3bc24 Author: Tomeu Vizoso @@ -11930,15 +12135,15 @@ Date: Thu Jul 15 13:31:33 2010 +0200 gi/Makefile.am | 2 + gi/pygi-argument.c | 2 +- - gi/pygi-foreign-cairo.c | 16 +++--- + gi/pygi-foreign-cairo.c | 16 +++---- gi/pygi-foreign.c | 107 - ++++++++++++++++++++++++++++----------------- - gi/pygi-foreign.h | 7 +-- + ++++++++++++++++++++++++++++------------------ + gi/pygi-foreign.h | 7 ++- gi/pygi-invoke.c | 18 ++++---- gi/pygi-struct.c | 10 ++++- gi/pygi.h | 9 ++-- - tests/test_everything.py | 8 +++ - 9 files changed, 110 insertions(+), 69 deletions(-) + tests/test_everything.py | 8 ++++ + 9 Dateien geändert, 110 Zeilen hinzugefügt(+), 69 Zeilen entfernt(-) commit 3b3bd4da3fbc993fa7f7cfb46ed4e67671c94cc0 Author: Tomeu Vizoso @@ -11947,7 +12152,7 @@ Date: Mon Jul 12 11:19:06 2010 +0200 Add HACKING to MANIFEST.in MANIFEST.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 40bf08ff001b119c7daf709197005ef6480216c5 Author: Tomeu Vizoso @@ -11956,7 +12161,7 @@ Date: Mon Jul 12 11:18:04 2010 +0200 Add HACKING file with instructions for releasing HACKING | 14 ++++++++++++++ - 1 files changed, 14 insertions(+), 0 deletions(-) + 1 Datei geändert, 14 Zeilen hinzugefügt(+) commit 3b9dffe7cc3820dfb84fd968fc604899601c5dc4 Author: Tomeu Vizoso @@ -11965,7 +12170,7 @@ Date: Mon Jul 12 11:09:58 2010 +0200 Post release version bump to 2.21.6 configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 42a5a0897b38156ae010c396ea254abf502f35de Author: Tomeu Vizoso @@ -11974,7 +12179,7 @@ Date: Mon Jul 12 11:00:29 2010 +0200 Update NEWS and release PyGObject-2.21.5 NEWS | 17 +++++++++++++++++ - 1 files changed, 17 insertions(+), 0 deletions(-) + 1 Datei geändert, 17 Zeilen hinzugefügt(+) commit 5857f25c1c6e25b79e6134558bd7151bc6c30ef7 Author: Tomeu Vizoso @@ -11983,7 +12188,7 @@ Date: Mon Jul 12 11:00:20 2010 +0200 Pre-release version bump to 2.21.5 configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit e500adc3ac19ef6f436809e5a8828ac7e8db28f6 Author: Florian Müllner @@ -11998,7 +12203,7 @@ Date: Sat Jul 10 22:35:13 2010 +0200 gi/pygi-callbacks.c | 1 - gi/pygi-closure.c | 2 +- gi/pygi-invoke.c | 1 - - 3 files changed, 1 insertions(+), 3 deletions(-) + 3 Dateien geändert, 1 Zeile hinzugefügt(+), 3 Zeilen entfernt(-) commit 2efa18afbcc2fac1c90958535b2f80e6e730ee56 Author: =?UTF-8?q?Florian=20M=C3=BCllner?= @@ -12019,13 +12224,13 @@ Date: Mon Jul 12 10:31:42 2010 +0200 https://bugzilla.gnome.org/show_bug.cgi?id=624065 configure.ac | 2 +- - gi/importer.py | 7 ++- + gi/importer.py | 7 +-- gi/pygi-argument.c | 146 ---------------------------------------------------- gi/pygi-closure.c | 10 ---- gi/pygi-info.c | 37 ------------- tests/test_gi.py | 21 -------- - 6 files changed, 5 insertions(+), 218 deletions(-) + 6 Dateien geändert, 5 Zeilen hinzugefügt(+), 218 Zeilen entfernt(-) commit 27a417c71f8c122e46c7472663bb25c17413f103 Author: John (J5) Palmieri @@ -12046,7 +12251,7 @@ Date: Thu Jul 8 16:01:25 2010 -0400 demos/gtk-demo/demos/drawingarea.py | 2 +- demos/gtk-demo/demos/test.py | 2 +- demos/gtk-demo/gtk-demo.py | 6 +++--- - 12 files changed, 37 insertions(+), 26 deletions(-) + 12 Dateien geändert, 37 Zeilen hinzugefügt(+), 26 Zeilen entfernt(-) commit e7daae919c2c6ae35d3927f0006252aacd49ea86 Author: John (J5) Palmieri @@ -12061,7 +12266,7 @@ Date: Thu Jul 8 15:38:07 2010 -0400 demos/gtk-demo/demos/appwindow.py | 10 +++++++--- demos/gtk-demo/demos/combobox.py | 24 ++++++++++++------------ demos/gtk-demo/gtk-demo.py | 13 +++++-------- - 3 files changed, 24 insertions(+), 23 deletions(-) + 3 Dateien geändert, 24 Zeilen hinzugefügt(+), 23 Zeilen entfernt(-) commit 3d9fd6391710cc33058394d6821e4d4e11f09b22 Author: John (J5) Palmieri @@ -12070,7 +12275,7 @@ Date: Thu Jul 8 12:54:43 2010 -0400 override test fixes for new GTK+ annotations tests/test_overrides.py | 23 +++++++++++++---------- - 1 files changed, 13 insertions(+), 10 deletions(-) + 1 Datei geändert, 13 Zeilen hinzugefügt(+), 10 Zeilen entfernt(-) commit 7a400f8139b70ddfe7c949035e0851689951c647 Author: Ignacio Casal Quinteiro @@ -12079,7 +12284,7 @@ Date: Thu Jul 8 12:42:25 2010 +0200 Fix warning. gi/pygi-argument.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit 39fd0a85a3de06b1b877d1125f91036409886373 Author: John (J5) Palmieri @@ -12094,7 +12299,7 @@ Date: Wed Jul 7 15:48:36 2010 -0400 gi/overrides/Gtk.py | 7 +++---- tests/test_overrides.py | 21 +++++++++++---------- - 2 files changed, 14 insertions(+), 14 deletions(-) + 2 Dateien geändert, 14 Zeilen hinzugefügt(+), 14 Zeilen entfernt(-) commit 4d970b75dc5c75c1bec04cb2954c9985b476070c Author: John (J5) Palmieri @@ -12104,7 +12309,7 @@ Date: Tue Jul 6 17:50:10 2010 -0400 demos/gtk-demo/demos/Entry/entry_completion.py | 87 ++++++++++++++++++++++++ - 1 files changed, 87 insertions(+), 0 deletions(-) + 1 Datei geändert, 87 Zeilen hinzugefügt(+) commit f3531eaa1bfa4e01651d35cd587384d30a398ba8 Author: John (J5) Palmieri @@ -12113,7 +12318,7 @@ Date: Tue Jul 6 17:49:18 2010 -0400 string changes demos/gtk-demo/demos/Entry/entry_buffer.py | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit baf1e9bb550c7bf45e2ac0b70ba29c434ef1ccc6 Author: John (J5) Palmieri @@ -12123,7 +12328,7 @@ Date: Tue Jul 6 17:27:04 2010 -0400 demos/gtk-demo/demos/Entry/entry_buffer.py | 73 ++++++++++++++++++++++++++++ - 1 files changed, 73 insertions(+), 0 deletions(-) + 1 Datei geändert, 73 Zeilen hinzugefügt(+) commit f2b1d222120f055bec9339cca55c9cc90f538c00 Author: John (J5) Palmieri @@ -12132,7 +12337,7 @@ Date: Tue Jul 6 17:26:03 2010 -0400 fix loading of demo modules to support sub modules demos/gtk-demo/gtk-demo.py | 9 +++++++-- - 1 files changed, 7 insertions(+), 2 deletions(-) + 1 Datei geändert, 7 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit 4f9390fb1892b13ab2ea00ed66c5000a40f09029 Author: John (J5) Palmieri @@ -12142,7 +12347,7 @@ Date: Tue Jul 6 15:56:34 2010 -0400 demos/gtk-demo/gtk-demo.py | 76 +++++++++++++++++++++++++++++++------------- - 1 files changed, 54 insertions(+), 22 deletions(-) + 1 Datei geändert, 54 Zeilen hinzugefügt(+), 22 Zeilen entfernt(-) commit dc2249a3ecf339008351316217191d0551ccc588 Author: Jose Aliste @@ -12153,7 +12358,7 @@ Date: Mon Jul 5 14:36:59 2010 -0400 Fixes bug #623486. gi/module.py | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+) commit 2357bca8d14539894b6bd0acfdc18d30b4bb4db6 Author: Ignacio Casal Quinteiro @@ -12166,7 +12371,7 @@ Date: Mon Jul 5 16:11:07 2010 +0200 it anymore. gi/overrides/Gdk.py | 19 ------------------- - 1 files changed, 0 insertions(+), 19 deletions(-) + 1 Datei geändert, 19 Zeilen entfernt(-) commit daca09dc2c2306d4fa82a68bbdd147d4b170a1e7 Author: Philip Withnall @@ -12178,7 +12383,7 @@ Date: Tue Jun 29 16:37:36 2010 +0100 gi/overrides/Gtk.py | 11 +++++++++-- tests/test_overrides.py | 5 +++++ - 2 files changed, 14 insertions(+), 2 deletions(-) + 2 Dateien geändert, 14 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit bb8adb7f02f0c5494df2cb6e535e44d23902e8f5 Author: Tomeu Vizoso @@ -12187,7 +12392,7 @@ Date: Tue Jun 29 11:27:13 2010 +0200 Update NEWS and release PyGObject-2.21.4 NEWS | 27 +++++++++++++++++++++++++-- - 1 files changed, 25 insertions(+), 2 deletions(-) + 1 Datei geändert, 25 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit 2d473ee17be4671244bb4a2a0953a21ccf2a0df6 Author: Tomeu Vizoso @@ -12197,7 +12402,7 @@ Date: Tue Jun 29 10:55:03 2010 +0200 gi/Makefile.am | 4 +--- gobject/Makefile.am | 3 +-- - 2 files changed, 2 insertions(+), 5 deletions(-) + 2 Dateien geändert, 2 Zeilen hinzugefügt(+), 5 Zeilen entfernt(-) commit 89827314fd183eac07443c8e9d275ca9d4ce59df Author: Tomeu Vizoso @@ -12210,15 +12415,15 @@ Date: Tue Jun 29 10:27:39 2010 +0200 configure.ac | 2 + gi/Makefile.am | 38 +++++++++----- - gi/gimodule.c | 8 +--- + gi/gimodule.c | 8 +-- gi/pygi-argument.c | 10 +--- - gi/pygi-foreign-cairo.c | 56 ++++++++++++++++----- + gi/pygi-foreign-cairo.c | 56 +++++++++++++++------ gi/pygi-foreign-cairo.h | 55 --------------------- gi/pygi-foreign.c | 125 ++++++++++++++++++++++++++++------------------- - gi/pygi-foreign.h | 31 +++++------ + gi/pygi-foreign.h | 31 ++++++------ gi/pygi.h | 40 +++++++++++++-- - 9 files changed, 196 insertions(+), 169 deletions(-) + 9 Dateien geändert, 196 Zeilen hinzugefügt(+), 169 Zeilen entfernt(-) commit a6a90551311bc64f037cbd442e13f70c30060871 Author: Tomeu Vizoso @@ -12229,10 +12434,10 @@ Date: Mon Jun 28 14:20:43 2010 +0200 https://bugzilla.gnome.org/show_bug.cgi?id=623021 gi/gimodule.c | 8 +++--- - gi/pygi-type.c | 4 +- + gi/pygi-type.c | 4 +-- gi/pygi-type.h | 2 +- - gi/pygi.h | 54 +++++++++++++++---------------------- - gobject/Makefile.am | 6 ++++ + gi/pygi.h | 54 ++++++++++++++++---------------------- + gobject/Makefile.am | 6 +++++ gobject/pygboxed.c | 2 +- gobject/pygenum.c | 2 +- gobject/pygflags.c | 2 +- @@ -12240,7 +12445,7 @@ Date: Mon Jun 28 14:20:43 2010 +0200 ----------------------------------------------- gobject/pygobject.c | 2 +- gobject/pygpointer.c | 2 +- - 11 files changed, 40 insertions(+), 111 deletions(-) + 11 Dateien geändert, 40 Zeilen hinzugefügt(+), 111 Zeilen entfernt(-) commit 8b3a3baacb45cb3f9112f7597607602fa89c6634 Author: Tomeu Vizoso @@ -12257,7 +12462,7 @@ Date: Fri Jun 25 13:54:57 2010 +0200 gi/gimodule.c | 13 ------------- tests/test_everything.py | 3 ++- - 2 files changed, 2 insertions(+), 14 deletions(-) + 2 Dateien geändert, 2 Zeilen hinzugefügt(+), 14 Zeilen entfernt(-) commit 0f2a09d7eae63abb71723b7cd8fb290dcba33426 Author: Tomeu Vizoso @@ -12271,7 +12476,7 @@ Date: Fri Jun 25 13:49:04 2010 +0200 gi/pygi-argument.c | 1 + gi/pygi-info.c | 2 ++ gi/pygi-invoke.c | 8 ++++++-- - 3 files changed, 9 insertions(+), 2 deletions(-) + 3 Dateien geändert, 9 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit 63afe55906c8637e913783e65b82b540b81bed65 Author: John (J5) Palmieri @@ -12281,7 +12486,7 @@ Date: Thu Jun 24 16:13:37 2010 -0400 demos/gtk-demo/demos/drawingarea.py | 249 +++++++++++++++++++++++++++++++++++ - 1 files changed, 249 insertions(+), 0 deletions(-) + 1 Datei geändert, 249 Zeilen hinzugefügt(+) commit 8bba5f842393a284367cdd15f3d32a8c7745516a Author: John (J5) Palmieri @@ -12290,7 +12495,7 @@ Date: Thu Jun 24 14:11:00 2010 -0400 sort the demo list demos/gtk-demo/gtk-demo.py | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+) commit b9da82742701ed276b01dee39626cd71cbef8556 Author: John (J5) Palmieri @@ -12299,7 +12504,7 @@ Date: Thu Jun 24 13:56:18 2010 -0400 rename iter to treeiter so we aren't using a python reserved word demos/gtk-demo/gtk-demo.py | 12 ++++++------ - 1 files changed, 6 insertions(+), 6 deletions(-) + 1 Datei geändert, 6 Zeilen hinzugefügt(+), 6 Zeilen entfernt(-) commit c93935621f2fb1ff5e8c424ae884bd684ea68e50 Author: John (J5) Palmieri @@ -12311,7 +12516,7 @@ Date: Thu Jun 24 13:47:54 2010 -0400 caller-allocates) demos/gtk-demo/gtk-demo.py | 10 ++++------ - 1 files changed, 4 insertions(+), 6 deletions(-) + 1 Datei geändert, 4 Zeilen hinzugefügt(+), 6 Zeilen entfernt(-) commit 8d9516a593a515290109401a9db7aa259b5aa35c Author: John (J5) Palmieri @@ -12337,7 +12542,7 @@ Date: Wed Jun 23 17:04:33 2010 -0400 gi/overrides/Gtk.py | 59 ++++++++++++++++++++++++++++++++++++++++ tests/test_overrides.py | 69 +++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 128 insertions(+), 0 deletions(-) + 2 Dateien geändert, 128 Zeilen hinzugefügt(+) commit c305fbeb7bdb44623d5198f4a8f0a374d529fdf4 Author: Johan Dahlin @@ -12349,7 +12554,7 @@ Date: Wed Jun 23 14:34:28 2010 -0300 add this to be able to include pygobject.h gi/Makefile.am | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) + 1 Datei geändert, 3 Zeilen hinzugefügt(+) commit 53a093198851e3ba5abd1f6c3314737decd401d8 Author: Ignacio Casal Quinteiro @@ -12358,7 +12563,7 @@ Date: Wed Jun 23 18:09:19 2010 +0200 Add unit test for add_actions user data. tests/test_overrides.py | 20 +++++++++++++++----- - 1 files changed, 15 insertions(+), 5 deletions(-) + 1 Datei geändert, 15 Zeilen hinzugefügt(+), 5 Zeilen entfernt(-) commit 7f829af620cba768de619dd9f228d5d2ebf7fee4 Author: Paolo Borelli @@ -12367,7 +12572,7 @@ Date: Wed Jun 23 18:06:46 2010 +0200 Pass user_data param when adding actions gi/overrides/Gtk.py | 12 ++++++------ - 1 files changed, 6 insertions(+), 6 deletions(-) + 1 Datei geändert, 6 Zeilen hinzugefügt(+), 6 Zeilen entfernt(-) commit 8f537ccd62f41ebe0db3853e2ae08080666f598f Author: John (J5) Palmieri @@ -12378,7 +12583,7 @@ Date: Wed Jun 23 12:02:04 2010 -0400 * we should always specify what exception types we are expecting gi/overrides/Gtk.py | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + 1 Datei geändert, 3 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-) commit f140a8ebf59347162b67b550bd6f62d2eafad29a Author: Johan Dahlin @@ -12392,7 +12597,7 @@ Date: Wed Jun 23 12:31:51 2010 -0300 https://bugzilla.gnome.org/show_bug.cgi?id=622503 configure.ac | 9 +++++---- - 1 files changed, 5 insertions(+), 4 deletions(-) + 1 Datei geändert, 5 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-) commit e8bd25355fbe7de38a28b7a0583167a2c0ffc31f Author: John (J5) Palmieri @@ -12410,7 +12615,7 @@ Date: Tue Jun 22 15:03:08 2010 -0400 tests/test_everything.py | 5 ++- tests/test_gi.py | 84 +++++++++++++++++++++++----------------------- - 3 files changed, 49 insertions(+), 47 deletions(-) + 3 Dateien geändert, 49 Zeilen hinzugefügt(+), 47 Zeilen entfernt(-) commit f312e6a49505eca07815146cfbdb0e48e5b3b8a8 Author: Tomeu Vizoso @@ -12433,7 +12638,7 @@ Date: Wed Jun 23 15:42:29 2010 +0200 tests/Makefile.am | 17 ++--------------- tests/common.py | 3 +-- tests/runtests.py | 12 +++++------- - 8 files changed, 15 insertions(+), 26 deletions(-) + 8 Dateien geändert, 15 Zeilen hinzugefügt(+), 26 Zeilen entfernt(-) commit 5f82e7d2909cbbbecbf5dbee2342f516c0d1f371 Author: Tomeu Vizoso @@ -12447,7 +12652,7 @@ Date: Wed Jun 23 13:59:14 2010 +0200 gobject/pygi-external.h | 4 ++-- tests/Makefile.am | 8 ++++++-- tests/runtests.py | 21 +++++++-------------- - 5 files changed, 28 insertions(+), 26 deletions(-) + 5 Dateien geändert, 28 Zeilen hinzugefügt(+), 26 Zeilen entfernt(-) commit cc3ea77318ee572673d2a044deca9001366b0f08 Author: Tomeu Vizoso @@ -12459,7 +12664,7 @@ Date: Wed Jun 23 12:26:51 2010 +0200 only be done with list. gi/overrides/Gtk.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 3d72b8248cc534a689dee5679a729b2fba56c528 Author: Tomeu Vizoso @@ -12469,7 +12674,7 @@ Date: Wed Jun 23 12:26:02 2010 +0200 for base classes such as GInitiallyUnowned. gi/__init__.py | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) + 1 Datei geändert, 3 Zeilen hinzugefügt(+) commit c7c94ef349c30597f2f10d90f74718d678ec7add Author: John (J5) Palmieri @@ -12480,7 +12685,7 @@ Date: Tue Jun 22 14:45:48 2010 -0400 https://bugzilla.gnome.org/show_bug.cgi?id=622425 gi/pygi-info.c | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) + 1 Datei geändert, 3 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit fb1ee243493616d7a7e4f6924c574db39f5a423d Merge: acf7b43 5f9cb91 @@ -12496,7 +12701,7 @@ Date: Tue Jun 22 15:39:46 2010 -0400 remove unneeded TextIter creation in the tests tests/test_overrides.py | 3 --- - 1 files changed, 0 insertions(+), 3 deletions(-) + 1 Datei geändert, 3 Zeilen entfernt(-) commit 53c355d2cc0894e7f551e9b4eb719b89188a978e Author: John (J5) Palmieri @@ -12516,7 +12721,7 @@ Date: Mon Jun 21 11:42:12 2010 -0400 gi/overrides/Gtk.py | 51 +++++++++++++++++++++++++++++++++++++++++++++++ tests/test_overrides.py | 25 +++++++++++++++++++++++ - 2 files changed, 76 insertions(+), 0 deletions(-) + 2 Dateien geändert, 76 Zeilen hinzugefügt(+) commit 1d89a88b212c7411ad28e74eda80ae751de92e50 Author: John (J5) Palmieri @@ -12533,7 +12738,7 @@ Date: Tue Jun 22 12:46:39 2010 -0400 configure.ac | 2 +- tests/Makefile.am | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) + 2 Dateien geändert, 2 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit 4fe0d94c219deb69a2309693202309c53a0e5e69 Author: John (J5) Palmieri @@ -12558,7 +12763,7 @@ Date: Tue Jun 22 11:50:30 2010 -0400 gi/overrides/GIMarshallingTests.py | 10 ++++------ gi/overrides/Gdk.py | 8 ++++---- gi/overrides/Gtk.py | 7 +++++-- - 3 files changed, 13 insertions(+), 12 deletions(-) + 3 Dateien geändert, 13 Zeilen hinzugefügt(+), 12 Zeilen entfernt(-) commit 49321b934603e1ec69fb04082c63902970907d2b Author: Paolo Borelli @@ -12569,7 +12774,7 @@ Date: Sun Jun 20 13:27:34 2010 +0200 gi/overrides/Gtk.py | 46 +++++++++++++++++++++++++++++++++++++++++++++- tests/test_overrides.py | 16 ++++++++++++++++ - 2 files changed, 61 insertions(+), 1 deletions(-) + 2 Dateien geändert, 61 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit acf7b43a41ce814f0c57ce609a090826f04771db Author: Tomeu Vizoso @@ -12578,7 +12783,7 @@ Date: Mon Jun 21 18:17:38 2010 +0200 Post release version bump to 2.21.4 configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit a7fa8b80406227a06cf18f8675dbc1f471283829 Author: Tomeu Vizoso @@ -12587,7 +12792,7 @@ Date: Mon Jun 21 18:10:32 2010 +0200 Update NEWS and release PyGObject-2.21.3 NEWS | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) + 1 Datei geändert, 7 Zeilen hinzugefügt(+) commit 79acac7b86ec52cd3681d94d7f116314c3f00167 Author: Ludovic L'Hours @@ -12599,7 +12804,7 @@ Date: Tue Jul 21 16:28:34 2009 +0200 codegen/codegen.py | 2 ++ codegen/reversewrapper.py | 18 +++++++++++++++--- - 2 files changed, 17 insertions(+), 3 deletions(-) + 2 Dateien geändert, 17 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-) commit 259a4b08f009aa01451caed20dbb6e68b402da2a Author: Tomeu Vizoso @@ -12608,7 +12813,7 @@ Date: Mon Jun 21 17:34:54 2010 +0200 Add *~ and *.orig to .gitignore .gitignore | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) + 1 Datei geändert, 4 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit 00a85f6a844714d1715e2f67431747d1a4cdacb1 Author: Tomeu Vizoso @@ -12626,15 +12831,15 @@ Date: Mon Jun 21 17:33:56 2010 +0200 https://bugzilla.gnome.org/show_bug.cgi?id=583909 gobject/gobjectmodule.c | 2 - - gobject/pygobject.c | 50 +++++++++++++-------- + gobject/pygobject.c | 50 ++++++++++++--------- gobject/pygobject.h | 1 + tests/Makefile.am | 2 + tests/test-floating.c | 95 ++++++++++++++++++++++++++++++++++++++++ tests/test-floating.h | 60 +++++++++++++++++++++++++ - tests/test_gobject.py | 19 ++++++++- + tests/test_gobject.py | 19 +++++++- tests/testhelpermodule.c | 109 ++++++++++++++++++++++++++++++++++++++++++++++ - 8 files changed, 315 insertions(+), 23 deletions(-) + 8 Dateien geändert, 315 Zeilen hinzugefügt(+), 23 Zeilen entfernt(-) commit e71238a699ae783fd1a59c8a76e3555d8066cf82 Author: Tomeu Vizoso @@ -12647,7 +12852,7 @@ Date: Mon Jun 21 13:06:13 2010 +0200 gobject/gobjectmodule.c | 3 ++- gobject/pygobject.c | 42 ++++++++++++++++++++++++++++++++++-------- gobject/pygobject.h | 1 - - 3 files changed, 36 insertions(+), 10 deletions(-) + 3 Dateien geändert, 36 Zeilen hinzugefügt(+), 10 Zeilen entfernt(-) commit b2661054d6bde673484eab472e69ca021124528d Author: Johan Dahlin @@ -12730,7 +12935,8 @@ Date: Sun Jun 20 11:09:57 2010 -0300 tests/test_gi.py | 1624 ++++++++++++++++++++ tests/test_overrides.py | 132 ++ - 66 files changed, 4124 insertions(+), 4186 deletions(-) + 66 Dateien geändert, 4124 Zeilen hinzugefügt(+), 4186 Zeilen + entfernt(-) commit 597bd64319d7966045b5b8613ca6fc85668c3f56 Merge: ec8d148 fa91dfd @@ -12822,7 +13028,8 @@ Date: Sun Jun 20 10:53:36 2010 -0300 tests/test_gi.py | 1624 -------------------- tests/test_overrides.py | 132 -- - 71 files changed, 4248 insertions(+), 4414 deletions(-) + 71 Dateien geändert, 4248 Zeilen hinzugefügt(+), 4414 Zeilen + entfernt(-) commit ec8d148eccbb3714093f21b595ea77ae4c7c3bce Author: Johan Dahlin @@ -12831,7 +13038,7 @@ Date: Sun Jun 20 10:49:55 2010 -0300 [giounix] Make it possible to compile on glib 2.20 gio/unix.override | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+) commit 606018a2c551d890fc2bb987d99683f777598bda Author: John (J5) Palmieri @@ -12852,7 +13059,7 @@ Date: Mon Jun 7 16:32:29 2010 -0400 gi/pygi-argument.c | 9 ++++++++- gi/pygi-invoke.c | 11 +++++++++-- - 2 files changed, 17 insertions(+), 3 deletions(-) + 2 Dateien geändert, 17 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-) commit 433ee2aa029a1482961f478252a06492bd3498e6 Author: Sjoerd Simons @@ -12866,7 +13073,7 @@ Date: Tue Jun 15 11:42:28 2010 +0200 https://bugzilla.gnome.org/show_bug.cgi?id=530935 gobject/pygobject.c | 11 ++++++++++- - 1 files changed, 10 insertions(+), 1 deletions(-) + 1 Datei geändert, 10 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit aa1e82c7eb87620bd73e1edb486f5b9e0d49aa96 Author: John (J5) Palmieri @@ -12876,7 +13083,7 @@ Date: Mon Jun 14 18:36:57 2010 -0400 demos/gtk-demo/demos/combobox.py | 282 ++++++++++++++++++++++++++++++++++++++ - 1 files changed, 282 insertions(+), 0 deletions(-) + 1 Datei geändert, 282 Zeilen hinzugefügt(+) commit a8668694da59c2dd959c875f13337e64ca22f7e9 Author: John (J5) Palmieri @@ -12885,7 +13092,7 @@ Date: Mon Jun 14 13:43:53 2010 -0400 fix leak in the allow None callbacks patch gi/pygi-callbacks.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit 729072e73d65e7fd5b5197ebe5a8c53a449d0ec0 Author: John (J5) Palmieri @@ -12909,7 +13116,7 @@ Date: Mon Jun 7 17:12:09 2010 -0400 gi/pygi-callbacks.c | 7 +++++++ gi/pygi-invoke.c | 14 +++++++++++--- tests/test_everything.py | 4 ++++ - 3 files changed, 22 insertions(+), 3 deletions(-) + 3 Dateien geändert, 22 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-) commit a3eb5c7de5836c37aa7ae01dbe98996ec2632c17 Author: Paolo Borelli @@ -12918,7 +13125,7 @@ Date: Mon Jun 14 19:06:45 2010 +0200 Fix to match latest gtk annotations demos/gtk-demo/demos/appwindow.py | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 2 Zeilen entfernt(-) commit 6306dd73cc74aa9202569eac0eaaa5f825c8dc59 Author: John (J5) Palmieri @@ -12934,7 +13141,7 @@ Date: Tue Jun 8 15:03:49 2010 -0400 gi/overrides/Gdk.py | 10 +++++----- tests/test_overrides.py | 6 +++--- - 2 files changed, 8 insertions(+), 8 deletions(-) + 2 Dateien geändert, 8 Zeilen hinzugefügt(+), 8 Zeilen entfernt(-) commit d182630e1128fef6f1c2aea28ccd8da4bddd2c8f Author: Tomeu Vizoso @@ -12943,7 +13150,7 @@ Date: Thu Jun 10 20:23:13 2010 +0200 Post release version bump to 2.21.3 configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit c4e64d5d264593051b9a3131e4985a58e8e76f8b Author: Tomeu Vizoso @@ -12952,7 +13159,7 @@ Date: Thu Jun 10 20:21:13 2010 +0200 Update NEWS and release PyGObject-2.21.2 NEWS | 26 ++++++++++++++++++++++++++ - 1 files changed, 26 insertions(+), 0 deletions(-) + 1 Datei geändert, 26 Zeilen hinzugefügt(+) commit e0fe844d5fe8f7e26316f197444fd4143ed36adf Author: Tomeu Vizoso @@ -12966,7 +13173,7 @@ Date: Thu Jun 10 20:09:07 2010 +0200 test_subtype.py tests/Makefile.am | 4 ---- - 1 files changed, 0 insertions(+), 4 deletions(-) + 1 Datei geändert, 4 Zeilen entfernt(-) commit 495a301cb81c5e914bcef905999265604faa27fc Author: Tomeu Vizoso @@ -12975,7 +13182,7 @@ Date: Thu Jun 10 19:39:09 2010 +0200 Add myself to the maintainers list in the README README | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+) commit 04627488220b4f2a16e11f8982af7866fea9f7eb Author: Tomeu Vizoso @@ -12998,7 +13205,7 @@ Date: Thu Jun 10 19:24:31 2010 +0200 gobject/gobjectmodule.c | 3 +-- gobject/pygobject.c | 42 ++++++++---------------------------------- gobject/pygobject.h | 1 + - 3 files changed, 10 insertions(+), 36 deletions(-) + 3 Dateien geändert, 10 Zeilen hinzugefügt(+), 36 Zeilen entfernt(-) commit 07df124dc06cf506634e95d08397f50a2d07fce2 Author: Steve Frécinaux @@ -13019,7 +13226,7 @@ Date: Mon Jun 7 09:47:23 2010 +0200 gi/pygi-invoke.c | 3 ++- tests/test_everything.py | 6 ++++++ - 2 files changed, 8 insertions(+), 1 deletions(-) + 2 Dateien geändert, 8 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit b435319fe830a909cc4d414533b3b66574931e24 Author: Steve Frécinaux @@ -13034,7 +13241,7 @@ Date: Mon Jun 7 09:54:06 2010 +0200 https://bugzilla.gnome.org/show_bug.cgi?id=620805 pre-commit.hook | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit e9ee2916494eb7654004925c1ee1e94f99b14f1a Author: John (J5) Palmieri @@ -13044,7 +13251,7 @@ Date: Tue Jun 8 16:55:26 2010 -0400 demos/gtk-demo/demos/colorselector.py | 121 +++++++++++++++++++++++++++++++++ - 1 files changed, 121 insertions(+), 0 deletions(-) + 1 Datei geändert, 121 Zeilen hinzugefügt(+) commit ec598128de9e90dccab662ed2f5511c8d659e156 Author: Tomeu Vizoso @@ -13053,7 +13260,7 @@ Date: Tue Jun 8 15:48:33 2010 +0200 Update PyGObject dependency to 2.21.1 configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 87774a17bd607724a56e18c2eb1ac71b04b7079d Author: Tomeu Vizoso @@ -13063,7 +13270,7 @@ Date: Tue Jun 8 10:40:39 2010 +0200 MAINTAINERS | 4 ++++ pygobject.doap | 7 +++++++ - 2 files changed, 11 insertions(+), 0 deletions(-) + 2 Dateien geändert, 11 Zeilen hinzugefügt(+) commit 46c91a11d448e5e11d142d3362aff1483226bca4 Author: Colin Walters @@ -13079,7 +13286,7 @@ Date: Wed May 5 13:54:27 2010 -0400 https://bugzilla.gnome.org/show_bug.cgi?id=617796 gobject/pygi-external.h | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+) commit c1c41576d053cc1cdd8366d8cd1e59fff1c3a9c6 Author: John (J5) Palmieri @@ -13088,7 +13295,7 @@ Date: Mon Jun 7 17:19:30 2010 -0400 fix some typos and add a link to a patch which fixes a FIXME demos/gtk-demo/demos/clipboard.py | 7 +++++-- - 1 files changed, 5 insertions(+), 2 deletions(-) + 1 Datei geändert, 5 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit e7fabb5024d94a3166766e5fca740741bc50380a Author: John (J5) Palmieri @@ -13098,7 +13305,7 @@ Date: Mon Jun 7 16:21:42 2010 -0400 demos/gtk-demo/demos/clipboard.py | 235 +++++++++++++++++++++++++++++++++++++ - 1 files changed, 235 insertions(+), 0 deletions(-) + 1 Datei geändert, 235 Zeilen hinzugefügt(+) commit e0f1dce5ec58d071759f886697501da6eeea549d Author: John (J5) Palmieri @@ -13107,7 +13314,7 @@ Date: Sun Jun 6 13:27:46 2010 -0400 set is_fully_bound to false demos/gtk-demo/demos/button_box.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 986db1c73746d3a8ad7d8d5141c7eed194e7b948 Author: John (J5) Palmieri @@ -13117,7 +13324,7 @@ Date: Sat Jun 5 23:53:36 2010 -0400 demos/gtk-demo/demos/button_box.py | 121 ++++++++++++++++++++++++++++++++++++ - 1 files changed, 121 insertions(+), 0 deletions(-) + 1 Datei geändert, 121 Zeilen hinzugefügt(+) commit e9f5f8a829121e59367bae690442150f144946ad Author: John (J5) Palmieri @@ -13126,7 +13333,7 @@ Date: Sat Jun 5 23:26:03 2010 -0400 set is_fully_bound to True fro builder example demos/gtk-demo/demos/builder.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit d9968c3a4dea1d4a73a9376009cf486c80ea3da6 Author: John (J5) Palmieri @@ -13137,7 +13344,7 @@ Date: Sat Jun 5 23:24:36 2010 -0400 demos/gtk-demo/demos/appwindow.py | 16 ++++++++-------- demos/gtk-demo/demos/assistant.py | 24 ++++++++++++------------ demos/gtk-demo/demos/builder.py | 2 +- - 3 files changed, 21 insertions(+), 21 deletions(-) + 3 Dateien geändert, 21 Zeilen hinzugefügt(+), 21 Zeilen entfernt(-) commit ffca02536bafb55e8c3bce31cd992365207429f6 Author: John (J5) Palmieri @@ -13147,7 +13354,7 @@ Date: Sat Jun 5 14:54:47 2010 -0400 demos/gtk-demo/demos/builder.py | 57 +++++++++++++++++++++++++++++++++++++++ - 1 files changed, 57 insertions(+), 0 deletions(-) + 1 Datei geändert, 57 Zeilen hinzugefügt(+) commit a96dbafdf562a2ac6bde4df27919d3628689dbdb Author: John (J5) Palmieri @@ -13157,7 +13364,7 @@ Date: Fri Jun 4 17:48:24 2010 -0400 demos/gtk-demo/demos/assistant.py | 134 +++++++++++++++++++++++++++++++++++++ - 1 files changed, 134 insertions(+), 0 deletions(-) + 1 Datei geändert, 134 Zeilen hinzugefügt(+) commit 7e1b8cf32f33d45603aaec76afb0d14be84ffd94 Author: John (J5) Palmieri @@ -13166,7 +13373,7 @@ Date: Fri Jun 4 16:56:46 2010 -0400 add formatting rules and copyright notice demos/gtk-demo/demos/appwindow.py | 19 +++++++++++++++++++ - 1 files changed, 19 insertions(+), 0 deletions(-) + 1 Datei geändert, 19 Zeilen hinzugefügt(+) commit 03b99692b81631d397ab62dcd263341465bcee88 Author: John (J5) Palmieri @@ -13199,7 +13406,7 @@ Date: Fri Jun 4 16:26:54 2010 -0400 demos/gtk-demo/demos/data/gtk-logo-rgb.gif | Bin 0 -> 6427 bytes demos/gtk-demo/demos/test.py | 14 + demos/gtk-demo/gtk-demo.py | 266 +++++++++++++++ - 18 files changed, 931 insertions(+), 0 deletions(-) + 18 Dateien geändert, 931 Zeilen hinzugefügt(+) commit b3b1f029d8d16cf9bd74160009808147d07e3b3f Author: Tomeu Vizoso @@ -13208,7 +13415,7 @@ Date: Fri Jun 4 11:25:08 2010 +0200 Update gobject-introspection dependency to 0.6.14 configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 45c4e46ae93bd83a0e3f3550df6c64ce96bbedb4 Author: Tomeu Vizoso @@ -13217,7 +13424,7 @@ Date: Fri Jun 4 11:23:41 2010 +0200 Post-release version bump to 0.6.1 configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 7a94270dac48b67aabc7dbad156cf1180db9cb5e Author: Tomeu Vizoso @@ -13226,7 +13433,7 @@ Date: Fri Jun 4 08:29:42 2010 +0200 Pre-release version bump 0.6.0 configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 1e42ee6eb25a07a5201f24ffeac18d298a98477e Author: John (J5) Palmieri @@ -13254,9 +13461,9 @@ Date: Fri May 28 10:03:11 2010 -0400 https://bugzilla.gnome.org/show_bug.cgi?id=620406 gi/pygi-invoke.c | 73 - +++++++++++++++++++++++++++++++++++++++++++-- - tests/test_everything.py | 28 +++++++++++++++++ - 2 files changed, 97 insertions(+), 4 deletions(-) + +++++++++++++++++++++++++++++++++++++++++++--- + tests/test_everything.py | 28 ++++++++++++++++++ + 2 Dateien geändert, 97 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-) commit c3f467e0ae99aa78c2fdb91b973a272d2fe970bd Author: John (J5) Palmieri @@ -13267,7 +13474,7 @@ Date: Wed Jun 2 14:14:16 2010 -0400 * use from gi.repository import GObject tests/test_overrides.py | 5 ++--- - 1 files changed, 2 insertions(+), 3 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-) commit 46b5133fea4cd5db57a360b3cbe9ee923e27560c Author: Tomeu Vizoso @@ -13279,7 +13486,7 @@ Date: Tue Jun 1 14:28:57 2010 +0200 gi/pygi-info.c | 11 +++++++++++ tests/test_gi.py | 17 +++++++++++++++++ - 2 files changed, 28 insertions(+), 0 deletions(-) + 2 Dateien geändert, 28 Zeilen hinzugefügt(+) commit 5f0f9a9c9145a129a063b041424c3109a24d9ead Author: Tomeu Vizoso @@ -13290,7 +13497,7 @@ Date: Wed May 26 13:20:27 2010 +0200 autogen.sh | 7 +++++++ pre-commit.hook | 39 +++++++++++++++++++++++++++++++++++++++ - 2 files changed, 46 insertions(+), 0 deletions(-) + 2 Dateien geändert, 46 Zeilen hinzugefügt(+) commit 1319da5b7f483e48a90b0b7489f77236ba26f479 Author: Tomeu Vizoso @@ -13302,26 +13509,27 @@ Date: Wed May 26 12:19:17 2010 +0200 This won't affect git blame nor git diff if the switch -w is used. - gi/gimodule.c | 138 ++++---- + gi/gimodule.c | 138 +++---- gi/pygi-argument.c | 960 - +++++++++++++++++++++++----------------------- + +++++++++++++++++++++++------------------------ gi/pygi-boxed.c | 108 +++--- gi/pygi-callbacks.c | 154 ++++---- gi/pygi-callbacks.h | 8 +- - gi/pygi-closure.c | 270 +++++++------- + gi/pygi-closure.c | 270 ++++++------- gi/pygi-closure.h | 18 +- gi/pygi-foreign-cairo.c | 36 +- gi/pygi-foreign-cairo.h | 36 +- - gi/pygi-foreign.c | 54 ++-- + gi/pygi-foreign.c | 54 +-- gi/pygi-foreign.h | 10 +- - gi/pygi-info.c | 646 ++++++++++++++++---------------- - gi/pygi-invoke.c | 380 ++++++++++---------- + gi/pygi-info.c | 646 +++++++++++++++---------------- + gi/pygi-invoke.c | 380 +++++++++---------- gi/pygi-repository.c | 114 +++--- - gi/pygi-struct.c | 88 +++--- + gi/pygi-struct.c | 88 ++--- gi/pygi-type.c | 32 +- gi/pygi.h | 20 +- gi/pygobject-external.h | 14 +- - 18 files changed, 1544 insertions(+), 1542 deletions(-) + 18 Dateien geändert, 1544 Zeilen hinzugefügt(+), 1542 Zeilen + entfernt(-) commit 6156f15cb15b4c20e975527227135d49207c520a Author: Tomeu Vizoso @@ -13333,7 +13541,7 @@ Date: Tue May 25 14:08:51 2010 +0200 gi/module.py | 4 ++-- tests/test_gi.py | 4 +++- - 2 files changed, 5 insertions(+), 3 deletions(-) + 2 Dateien geändert, 5 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-) commit 097b92983b7a322c58fecb1e691ba6ddf5035548 Author: Tomeu Vizoso @@ -13348,7 +13556,7 @@ Date: Tue May 25 14:17:13 2010 +0200 https://bugzilla.gnome.org/show_bug.cgi?id=619604 gi/types.py | 15 +++++++++++---- - 1 files changed, 11 insertions(+), 4 deletions(-) + 1 Datei geändert, 11 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-) commit 686e10fcdb108af9758eb025a3447813c3513a93 Author: Tomeu Vizoso @@ -13359,7 +13567,7 @@ Date: Thu Apr 29 10:55:13 2010 +0200 https://bugzilla.gnome.org/show_bug.cgi?id=617153 gi/types.py | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit 9f34d120845d936b04546a5cea599ec67e9181a7 Author: John (J5) Palmieri @@ -13375,10 +13583,10 @@ Date: Mon May 24 16:16:50 2010 -0400 * add test that loads objects from strings and connects them to signals - gi/overrides/Gtk.py | 19 +++++++++++- + gi/overrides/Gtk.py | 19 +++++++++++-- tests/test_overrides.py | 72 +++++++++++++++++++++++++++++++++++++++++++++-- - 2 files changed, 86 insertions(+), 5 deletions(-) + 2 Dateien geändert, 86 Zeilen hinzugefügt(+), 5 Zeilen entfernt(-) commit 1561d2977691f1cb8684f183a2e274c47960d931 Author: Tomeu Vizoso @@ -13392,7 +13600,7 @@ Date: Mon May 24 18:48:10 2010 +0200 gi/gimodule.c | 9 +++++++++ tests/test_gi.py | 13 ++++++++++++- - 2 files changed, 21 insertions(+), 1 deletions(-) + 2 Dateien geändert, 21 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit c9d44d4d46c3da3a445000b1db592baa9c378a92 Author: Tomeu Vizoso @@ -13405,7 +13613,7 @@ Date: Fri Apr 30 18:17:50 2010 +0200 gi/pygi-invoke.c | 11 +++++++---- tests/test_gi.py | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 57 insertions(+), 4 deletions(-) + 2 Dateien geändert, 57 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-) commit c171579ee22681e1ee4ad33441c89f1053bdc3d1 Author: John (J5) Palmieri @@ -13414,7 +13622,7 @@ Date: Mon May 24 11:48:16 2010 -0400 check refcounting of callback userdata in unit tests tests/test_everything.py | 18 ++++++++++++++++++ - 1 files changed, 18 insertions(+), 0 deletions(-) + 1 Datei geändert, 18 Zeilen hinzugefügt(+) commit 8eb809468fe3e1f8e4f92bd7f25d96f9cf802cd4 Author: Tomeu Vizoso @@ -13432,7 +13640,7 @@ Date: Sat May 22 15:12:37 2010 +0200 gi/pygi-closure.c | 335 +++++++++++++++++++++++++++++++++++++++++------------ tests/test_gi.py | 4 + - 2 files changed, 263 insertions(+), 76 deletions(-) + 2 Dateien geändert, 263 Zeilen hinzugefügt(+), 76 Zeilen entfernt(-) commit 0df0c956bb2476392c9d81f0a243a7e84c067166 Author: Tomeu Vizoso @@ -13452,7 +13660,7 @@ Date: Sun May 23 10:59:27 2010 +0200 gi/pygi-argument.c | 5 +++++ tests/test_everything.py | 6 ++++++ - 2 files changed, 11 insertions(+), 0 deletions(-) + 2 Dateien geändert, 11 Zeilen hinzugefügt(+) commit 60fdf4b8f738dd0f5c190bc18ddf010032d3c5ca Author: John (J5) Palmieri @@ -13472,7 +13680,7 @@ Date: Sat May 22 14:06:37 2010 +0200 gi/gimodule.c | 12 ++++++++++++ tests/test_everything.py | 3 +++ - 2 files changed, 15 insertions(+), 0 deletions(-) + 2 Dateien geändert, 15 Zeilen hinzugefügt(+) commit 4b369f8aca980fc6a582094d6648f40fe4af5e9f Author: John (J5) Palmieri @@ -13498,7 +13706,7 @@ Date: Sat May 22 13:21:30 2010 +0200 gi/pygi-argument.c | 6 ------ tests/test_everything.py | 4 ++-- - 2 files changed, 2 insertions(+), 8 deletions(-) + 2 Dateien geändert, 2 Zeilen hinzugefügt(+), 8 Zeilen entfernt(-) commit 71a2148b00dfdda99e0d961ae39b901608724e59 Author: Steve Frécinaux @@ -13512,7 +13720,7 @@ Date: Fri May 21 19:05:03 2010 +0200 https://bugzilla.gnome.org/show_bug.cgi?id=619311 configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit aa0357e468eb91e0f3707346e9b32f312fbf51d3 Author: Tomeu Vizoso @@ -13523,7 +13731,7 @@ Date: Thu Apr 29 13:06:15 2010 +0200 https://bugzilla.gnome.org/show_bug.cgi?id=617159 gi/gimodule.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) + 1 Datei geändert, 3 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit ab1aaff108d23aabd28c3634edfb67236eb55460 Author: John (J5) Palmieri @@ -13565,7 +13773,7 @@ Date: Sat May 22 13:09:48 2010 +0200 gi/pygi-invoke.c | 6 +++++- tests/test_everything.py | 4 ++-- - 2 files changed, 7 insertions(+), 3 deletions(-) + 2 Dateien geändert, 7 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-) commit e928ea9b1df9d87314ff8e93479530e26be9bd87 Author: John (J5) Palmieri @@ -13581,7 +13789,7 @@ Date: Fri May 14 14:57:27 2010 -0400 early GTK development gi/pygi-argument.c | 14 +++++++++++--- - 1 files changed, 11 insertions(+), 3 deletions(-) + 1 Datei geändert, 11 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-) commit d963007aab123f4e53a944a66a935db2d22907c2 Author: John (J5) Palmieri @@ -13600,7 +13808,7 @@ Date: Mon May 17 11:54:34 2010 -0400 * fixes https://bugzilla.gnome.org/show_bug.cgi?id=618889 gi/overrides/Gtk.py | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+) commit 897420ed97cc4a7b8a806894df5e76ed72617614 Author: John (J5) Palmieri @@ -13613,7 +13821,7 @@ Date: Wed May 12 14:25:32 2010 -0400 gi/overrides/Gtk.py | 167 ++++++++++++++++++++++++++++++++++++++++++++++- tests/test_overrides.py | 45 +++++++++++++ - 2 files changed, 211 insertions(+), 1 deletions(-) + 2 Dateien geändert, 211 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit 865939d29c1e9d69dbe6b9cf89477b5516dbff1f Author: Zach Goldberg @@ -13622,7 +13830,7 @@ Date: Thu May 13 01:02:24 2010 -0400 Bump version for development to 0.5.2 (hopefully 0.6) configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 2674a9546b0246d4a75d71cf1708df77dc0173f9 Author: Tomeu Vizoso @@ -13635,7 +13843,7 @@ Date: Wed May 5 15:54:39 2010 +0200 gi/overrides/Gdk.py | 2 +- tests/Makefile.am | 3 ++- tests/test_overrides.py | 22 ++++++++++++++++++++++ - 3 files changed, 25 insertions(+), 2 deletions(-) + 3 Dateien geändert, 25 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit c20b9f632a35bada1320ccc10fb7d5b2c06b9a88 Author: John (J5) Palmieri @@ -13655,12 +13863,12 @@ Date: Thu Apr 29 14:55:33 2010 -0400 * add DynamicGObjectModule tests and make tests use the new module - change import gobject to from gi.repository import GObject - gi/importer.py | 6 +- + gi/importer.py | 6 +-- gi/module.py | 30 +++++++++++++++ - tests/test_everything.py | 6 +- + tests/test_everything.py | 6 +-- tests/test_gi.py | 93 +++++++++++++++++++++++++--------------------- - 4 files changed, 87 insertions(+), 48 deletions(-) + 4 Dateien geändert, 87 Zeilen hinzugefügt(+), 48 Zeilen entfernt(-) commit 64324a4c629432b2e688299b6edbfd5da4439a2a Author: John (J5) Palmieri @@ -13669,7 +13877,7 @@ Date: Fri Apr 30 14:11:55 2010 -0400 override Gdk.Drawable to add cairo_create convinience method gi/overrides/Gdk.py | 7 ++++++- - 1 files changed, 6 insertions(+), 1 deletions(-) + 1 Datei geändert, 6 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit 17fa1289b1e2ed841dd5de09a2ec7c25d401886e Author: Tomeu Vizoso @@ -13683,7 +13891,7 @@ Date: Mon May 3 19:13:46 2010 +0200 gi/pygi-callbacks.h | 1 + gi/pygi-invoke.c | 7 +++++-- tests/test_everything.py | 21 +++++++++++++++++++++ - 4 files changed, 29 insertions(+), 3 deletions(-) + 4 Dateien geändert, 29 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-) commit f9fff978d56ddf2c012b906169ae16abb7fdc2a5 Author: Tomeu Vizoso @@ -13692,7 +13900,7 @@ Date: Wed May 5 08:06:03 2010 +0200 Avoid freeing garbage gi/pygi-invoke.c | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) + 1 Datei geändert, 4 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit 5e20c018ae09a936f5ff140df5d1c133c98e98ba Author: Tomeu Vizoso @@ -13704,7 +13912,7 @@ Date: Thu Apr 29 13:09:03 2010 +0200 gi/types.py | 10 +++++++++- tests/test_gi.py | 10 ++++++++++ - 2 files changed, 19 insertions(+), 1 deletions(-) + 2 Dateien geändert, 19 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit 3e61e7d4450a2bb133c7f3862e0962a35339ce8d Author: Tomeu Vizoso @@ -13716,7 +13924,7 @@ Date: Mon May 3 18:35:13 2010 +0200 gi/pygi-invoke.c | 3 ++- tests/test_everything.py | 10 ++++++++++ - 2 files changed, 12 insertions(+), 1 deletions(-) + 2 Dateien geändert, 12 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit 9669acd0fad193013ef3505ae231588307f9834c Author: Tomeu Vizoso @@ -13733,7 +13941,7 @@ Date: Mon May 3 12:23:58 2010 +0200 +++++++++++++++++++++++++++++++++++++++++++++++++++++ gi/pygi-invoke.h | 37 +++ gi/pygi-private.h | 1 + - 5 files changed, 949 insertions(+), 884 deletions(-) + 5 Dateien geändert, 949 Zeilen hinzugefügt(+), 884 Zeilen entfernt(-) commit 9b923a68dfde06fc2df6321b3f1e53f1c57b3666 Author: John (J5) Palmieri @@ -13742,7 +13950,7 @@ Date: Tue Apr 27 19:13:08 2010 -0400 Add the Gtk.Builder override gi/overrides/Gtk.py | 37 ++++++++++++++++++++++++++++++++++++- - 1 files changed, 36 insertions(+), 1 deletions(-) + 1 Datei geändert, 36 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit 9fc6783406b8263ebd67ceae2730b4e86689b43e Author: Tomeu Vizoso @@ -13754,7 +13962,7 @@ Date: Fri Apr 30 15:00:52 2010 +0200 gi/pygi-closure.c | 8 +++++++- tests/test_everything.py | 16 ++++++++++++++++ - 2 files changed, 23 insertions(+), 1 deletions(-) + 2 Dateien geändert, 23 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit 5657ccaaec09e2a3194ea2e9a923724bcc66759e Author: Tomeu Vizoso @@ -13765,7 +13973,7 @@ Date: Thu Apr 29 18:32:50 2010 +0200 https://bugzilla.gnome.org/show_bug.cgi?id=617162 gi/overrides/Gdk.py | 20 +++++++++++++++++++- - 1 files changed, 19 insertions(+), 1 deletions(-) + 1 Datei geändert, 19 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit 4410abd589a2f64cfbd7bbcb4013fae9e4aa734f Author: John (J5) Palmieri @@ -13784,7 +13992,7 @@ Date: Wed Apr 28 13:19:48 2010 -0400 gi/module.py | 9 ++++----- gi/overrides/GIMarshallingTests.py | 2 +- gi/overrides/Gdk.py | 2 +- - 3 files changed, 6 insertions(+), 7 deletions(-) + 3 Dateien geändert, 6 Zeilen hinzugefügt(+), 7 Zeilen entfernt(-) commit 64fa8f936bad9a90628df446e690d67d947a0a22 Author: Tomeu Vizoso @@ -13798,7 +14006,7 @@ Date: Mon Apr 26 11:41:06 2010 +0200 gi/pygi-callbacks.h | 4 +- gi/pygi-info.c | 582 +++++++++++++++++++++++++++++---------------------- - 3 files changed, 346 insertions(+), 262 deletions(-) + 3 Dateien geändert, 346 Zeilen hinzugefügt(+), 262 Zeilen entfernt(-) commit 7fc5528273edae5ecdd5d8bdf0e5b898eec7a624 Author: Zach Goldberg @@ -13814,7 +14022,7 @@ Date: Tue Apr 20 23:23:38 2010 -0400 gi/pygi-info.c | 417 +++++++++++++++++++++++++++++--------------------------- - 1 files changed, 214 insertions(+), 203 deletions(-) + 1 Datei geändert, 214 Zeilen hinzugefügt(+), 203 Zeilen entfernt(-) commit 1d9c6b6d76a3e27f66e6f0cfc7b16c5191e4fc22 Author: Tomeu Vizoso @@ -13826,7 +14034,7 @@ Date: Tue Apr 27 10:24:35 2010 +0200 gi/types.py | 4 ++-- tests/test_gi.py | 15 +++++++++++++++ - 2 files changed, 17 insertions(+), 2 deletions(-) + 2 Dateien geändert, 17 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit 8a0c48f4dd512797e5cf132f8ec6fb6d4d1e7aaa Author: Zach Goldberg @@ -13842,7 +14050,7 @@ Date: Sun Apr 25 15:09:08 2010 -0400 gi/pygi-closure.c | 3 +++ tests/test_everything.py | 13 +++++++++++++ - 2 files changed, 16 insertions(+), 0 deletions(-) + 2 Dateien geändert, 16 Zeilen hinzugefügt(+) commit 2b12049306bf57513c43d08017185468bf897a4a Author: Zach Goldberg @@ -13856,7 +14064,7 @@ Date: Tue Apr 20 22:57:14 2010 -0400 https://bugzilla.gnome.org/show_bug.cgi?id=616356 gi/pygi-closure.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit 8240320d0b67074ce91bdf7aadcf5951c5a8c45a Author: Zach Goldberg @@ -13877,7 +14085,7 @@ Date: Tue Apr 20 23:53:57 2010 -0400 gi/pygi-info.c | 1 + tests/test_gi.py | 3 +++ - 2 files changed, 4 insertions(+), 0 deletions(-) + 2 Dateien geändert, 4 Zeilen hinzugefügt(+) commit 10e558ca283cdd06725bb0d24b5071ccbecc7d13 Author: Zach Goldberg @@ -13894,7 +14102,7 @@ Date: Tue Apr 20 22:57:14 2010 -0400 https://bugzilla.gnome.org/show_bug.cgi?id=616356 gi/pygi-closure.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit d3b5fae9d609dbcd83deb0fa9102b24faf76787c Author: Zach Goldberg @@ -13908,7 +14116,7 @@ Date: Tue Apr 20 22:43:20 2010 -0400 gi/pygi-closure.c | 10 +++++----- gi/pygi-info.c | 9 +++++++-- tests/test_everything.py | 9 +++++++++ - 3 files changed, 21 insertions(+), 7 deletions(-) + 3 Dateien geändert, 21 Zeilen hinzugefügt(+), 7 Zeilen entfernt(-) commit 3ba666b7ab9c393963922c272e7d87bff50a93f9 Author: Tomeu Vizoso @@ -13919,13 +14127,13 @@ Date: Sat Jan 2 16:31:55 2010 +0100 https://bugzilla.gnome.org/show_bug.cgi?id=603598 gi/module.py | 3 +- - gi/pygi-argument.c | 24 +++---------- - gi/pygi-boxed.c | 18 +++++++++- + gi/pygi-argument.c | 24 +++----------- + gi/pygi-boxed.c | 18 ++++++++-- gi/pygi-info.c | 94 +++++++++++++++++++++++++++++++++++++++++++++++----- gi/pygi-info.h | 1 + tests/test_gi.py | 56 +++++++++++++++++++++++++++++++ - 6 files changed, 165 insertions(+), 31 deletions(-) + 6 Dateien geändert, 165 Zeilen hinzugefügt(+), 31 Zeilen entfernt(-) commit af9e4e086d160fe7fb24758ed81753e784b198a8 Author: Simon van der Linden @@ -13939,7 +14147,7 @@ Date: Fri Jan 22 22:16:32 2010 +0100 configure.ac | 2 +- gi/pygi-private.h | 20 -------------------- - 2 files changed, 1 insertions(+), 21 deletions(-) + 2 Dateien geändert, 1 Zeile hinzugefügt(+), 21 Zeilen entfernt(-) commit c0f40de5648e2ebc556c449342a0025ffce2e33b Author: Tomeu Vizoso @@ -13951,7 +14159,7 @@ Date: Sun Apr 18 11:50:14 2010 -0400 gi/pygi-info.c | 360 ++++++++++++++++++++++++++------------------------------ - 1 files changed, 168 insertions(+), 192 deletions(-) + 1 Datei geändert, 168 Zeilen hinzugefügt(+), 192 Zeilen entfernt(-) commit 24bb89f1310dc2fc8ee6ddaf945342ebf80055cd Author: Tomeu Vizoso @@ -13962,7 +14170,7 @@ Date: Tue Apr 20 15:12:47 2010 +0200 https://bugzilla.gnome.org/show_bug.cgi?id=616279 gi/pygi-closure.c | 9 +++++---- - 1 files changed, 5 insertions(+), 4 deletions(-) + 1 Datei geändert, 5 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-) commit d1ba23cdd05686ea721425f233371d573a2e9cce Author: Tomeu Vizoso @@ -13971,7 +14179,7 @@ Date: Thu Apr 22 19:57:17 2010 +0200 Rename variable with a very generic name gi/module.py | 28 ++++++++++++++-------------- - 1 files changed, 14 insertions(+), 14 deletions(-) + 1 Datei geändert, 14 Zeilen hinzugefügt(+), 14 Zeilen entfernt(-) commit 391640b30ede50af3667b1019edb72bd79f2c68c Author: Tomeu Vizoso @@ -13985,7 +14193,7 @@ Date: Thu Apr 22 19:53:06 2010 +0200 gi/pygi-argument.c | 22 +++++++++++++++++++++- gi/types.py | 14 ++++++++++++++ tests/test_gi.py | 30 ++++++++++++++++++++++++++++-- - 4 files changed, 68 insertions(+), 4 deletions(-) + 4 Dateien geändert, 68 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-) commit 89704f60ddae0c81f1383d86491ef2785590a353 Author: Zach Goldberg @@ -14000,7 +14208,7 @@ Date: Tue Apr 20 22:20:42 2010 -0400 bumping to the next development version. configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit e203dc7c8f524c16aa52e15758dc3a2b09fbac75 Author: John Ehresman @@ -14009,7 +14217,7 @@ Date: Tue Apr 20 20:40:02 2010 -0400 Added missing , to keyword list of gio.GFile.set_attribute gio/gresolver.override | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 0b222f01ac9ceea1d127083623ad532ecc75bf7e Author: John Ehresman @@ -14018,8 +14226,8 @@ Date: Tue Apr 20 20:37:12 2010 -0400 Fix arg conversion in gio.GFile.set_attribute gio/gfile.override | 232 - ++++++++++++++++++++++++++++++++++++++++++++++++++- - 1 files changed, 227 insertions(+), 5 deletions(-) + ++++++++++++++++++++++++++++++++++++++++++++++++++-- + 1 Datei geändert, 227 Zeilen hinzugefügt(+), 5 Zeilen entfernt(-) commit a579ccc8bea90937bf970be3d461e2b650b0c7d6 Author: John Ehresman @@ -14028,7 +14236,7 @@ Date: Tue Apr 20 20:01:53 2010 -0400 Set constants under python 2.5 or before gobject/gobjectmodule.c | 8 ++++++++ - 1 files changed, 8 insertions(+), 0 deletions(-) + 1 Datei geändert, 8 Zeilen hinzugefügt(+) commit 11fa39a861abf679e01b5f0da97be93ae0adf0f0 Author: José Alburquerque @@ -14044,7 +14252,7 @@ Date: Sun Apr 18 20:22:21 2010 -0400 not make the parsing crash. codegen/docextract_to_xml.py | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit 8dbc2cb016acef7b364804cd9bc8f0b1da37e84b Author: Zach Goldberg @@ -14054,7 +14262,7 @@ Date: Sun Apr 18 14:32:06 2010 -0400 HACKING | 7 +++++++ configure.ac | 4 ++-- - 2 files changed, 9 insertions(+), 2 deletions(-) + 2 Dateien geändert, 9 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit 3293c91d90c5c497b45e42a527d7f79f7435823e Author: Tomeu Vizoso @@ -14063,7 +14271,7 @@ Date: Sun Apr 18 14:28:13 2010 -0400 One more missing file... examples/Makefile.am | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+) commit 1dc575af19fe985cc3fa3ec0cf18aeab1f43c16d Author: Tomeu Vizoso @@ -14073,7 +14281,7 @@ Date: Sun Apr 18 14:18:44 2010 -0400 Makefile.am | 8 +++++++- configure.ac | 1 + - 2 files changed, 8 insertions(+), 1 deletions(-) + 2 Dateien geändert, 8 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit 8a9bb04755057e934b7f46c917af6ef281a2fedd Author: Tomeu Vizoso @@ -14082,7 +14290,7 @@ Date: Sun Apr 18 13:48:45 2010 -0400 Add one more missing file to tarballs gi/overrides/Makefile.am | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+) commit 979e01852fc7f830ee91093accdc387fa535075f Author: Tomeu Vizoso @@ -14091,7 +14299,7 @@ Date: Sun Apr 18 13:45:29 2010 -0400 Add missing file to tarballs tests/Makefile.am | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+) commit 8b70faa7a9a32b9ea8862f28a503e38f496cfd89 Author: Tomeu Vizoso @@ -14105,14 +14313,14 @@ Date: Sun Apr 18 13:11:11 2010 -0400 +++++++++++++++++++++++++++++++++++++++++++++++++++ gi/pygi-argument.c | 1 + gi/pygi-callbacks.c | 3 +- - gi/pygi-closure.c | 4 +- + gi/pygi-closure.c | 4 +-- gi/pygi-closure.h | 2 +- gi/pygi-info.c | 86 - ++++++++++++++++++++++++++++++++++++++++++++++++- + +++++++++++++++++++++++++++++++++++++++++++++++-- gi/pygi-info.h | 1 + gi/types.py | 44 +++++++++++++++++-------- - tests/test_gi.py | 18 ++++++++++ - 9 files changed, 227 insertions(+), 21 deletions(-) + tests/test_gi.py | 18 +++++++++++ + 9 Dateien geändert, 227 Zeilen hinzugefügt(+), 21 Zeilen entfernt(-) commit e239faacb4798fe2d166233ca1a19a843a6225e3 Author: Zach Goldberg @@ -14121,7 +14329,7 @@ Date: Sun Apr 18 11:59:06 2010 -0400 Fix a typo in pygi-callbacks.c header gi/pygi-callbacks.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 79aa416ae8632b123da61d79fb820d9e2704209c Author: Zach Goldberg @@ -14136,7 +14344,7 @@ Date: Sat Apr 17 12:00:05 2010 -0400 gi/pygi-argument.h | 3 ++- gi/pygi-info.c | 19 +++++++++++++------ tests/test_everything.py | 28 ++++++++++++++++++++++++++++ - 4 files changed, 80 insertions(+), 13 deletions(-) + 4 Dateien geändert, 80 Zeilen hinzugefügt(+), 13 Zeilen entfernt(-) commit 7d533b8893bc4a8a82fd9708278fa1dce5d3551e Author: Zach Goldberg @@ -14148,7 +14356,7 @@ Date: Sat Apr 17 12:56:19 2010 -0400 ++++++++++++++++++++++++++++++++++++++++++++ tests/test_gi.py | 62 +--------------------------------------------- - 2 files changed, 61 insertions(+), 61 deletions(-) + 2 Dateien geändert, 61 Zeilen hinzugefügt(+), 61 Zeilen entfernt(-) commit a90298cc9e6c0f336f887a71d80b1efd07ec2811 Author: Tomeu Vizoso @@ -14158,7 +14366,7 @@ Date: Sun Apr 18 10:44:35 2010 -0400 pygi-convert.sh | 193 +++++++++++++++++++++++++++++++++++++++---------------- - 1 files changed, 137 insertions(+), 56 deletions(-) + 1 Datei geändert, 137 Zeilen hinzugefügt(+), 56 Zeilen entfernt(-) commit 34a39318c674737c6d64f2430456daef86ba1626 Author: Colin Walters @@ -14168,7 +14376,7 @@ Date: Sun Apr 18 10:40:44 2010 -0400 pygi-convert.sh | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 71 insertions(+), 0 deletions(-) + 1 Datei geändert, 71 Zeilen hinzugefügt(+) commit a3afdb5fd33de0bf11d63857a245a8f5edec242c Author: Olav Vitters @@ -14177,7 +14385,7 @@ Date: Sun Apr 18 13:01:58 2010 +0200 Fix doap file pygi.doap | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) + 1 Datei geändert, 4 Zeilen hinzugefügt(+) commit 0de73d0bba79f92af22f43693f3575c596712416 Author: Zach Goldberg @@ -14186,7 +14394,7 @@ Date: Sat Apr 17 16:01:31 2010 -0400 Add Zach Goldberg as a pygi maintainer pygi.doap | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) + 1 Datei geändert, 5 Zeilen hinzugefügt(+) commit a0e22e36e8cf0c1e0da3c0ec48c821fdb5a07ccd Author: Tomeu Vizoso @@ -14195,7 +14403,7 @@ Date: Sat Apr 17 11:47:54 2010 -0400 Require PyCairo configure.ac | 7 +------ - 1 files changed, 1 insertions(+), 6 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 6 Zeilen entfernt(-) commit 2778f8a1bf6379a46beec6546c8efcb0fec2d7ad Author: Tomeu Vizoso @@ -14205,7 +14413,7 @@ Date: Sat Apr 17 11:40:14 2010 -0400 examples/cairo-demo.py | 121 ++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 121 insertions(+), 0 deletions(-) + 1 Datei geändert, 121 Zeilen hinzugefügt(+) commit 610dd1eec87fab5c8c3badb4d104cba74477c745 Author: Zach Goldberg @@ -14236,10 +14444,10 @@ Date: Sat Apr 17 09:17:14 2010 -0400 gi/pygi-closure.c | 205 ++++++++++++++++++++++++++++++++++++++++++++++++ gi/pygi-closure.h | 57 ++++++++++++++ - gi/pygi-info.c | 49 +++++++++++- + gi/pygi-info.c | 49 ++++++++++-- gi/pygi-private.h | 2 + - tests/test_gi.py | 64 +++++++++++++++- - 10 files changed, 648 insertions(+), 10 deletions(-) + tests/test_gi.py | 64 ++++++++++++++- + 10 Dateien geändert, 648 Zeilen hinzugefügt(+), 10 Zeilen entfernt(-) commit a34cb9f0038a6c89e5e6c5f7761d48a5a833044f Author: Tomeu Vizoso @@ -14249,18 +14457,18 @@ Date: Sat Apr 17 10:54:45 2010 -0400 https://bugzilla.gnome.org/show_bug.cgi?id=603712 - configure.ac | 6 ++ + configure.ac | 6 +++ gi/Makefile.am | 10 +++- gi/gimodule.c | 7 +++ gi/pygi-argument.c | 27 +++++++++- gi/pygi-foreign-cairo.c | 103 ++++++++++++++++++++++++++++++++++++++ - gi/pygi-foreign-cairo.h | 55 ++++++++++++++++++++ + gi/pygi-foreign-cairo.h | 55 +++++++++++++++++++++ gi/pygi-foreign.c | 123 ++++++++++++++++++++++++++++++++++++++++++++++ - gi/pygi-foreign.h | 52 +++++++++++++++++++ + gi/pygi-foreign.h | 52 ++++++++++++++++++++ gi/pygi-private.h | 1 + tests/test_everything.py | 48 ++++++++++++++++++ - 10 files changed, 428 insertions(+), 4 deletions(-) + 10 Dateien geändert, 428 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-) commit e73b6f6fe8b5f23a2a390ae0a6bbced593ded155 Author: Tomeu Vizoso @@ -14272,7 +14480,7 @@ Date: Fri Apr 16 14:35:13 2010 -0400 gi/pygi-struct.c | 6 ------ tests/test_gi.py | 3 ++- - 2 files changed, 2 insertions(+), 7 deletions(-) + 2 Dateien geändert, 2 Zeilen hinzugefügt(+), 7 Zeilen entfernt(-) commit fc9ff02e53aacf9e77625c70985e99813544912a Author: Tomeu Vizoso @@ -14283,7 +14491,7 @@ Date: Fri Apr 16 10:40:40 2010 -0400 HACKING | 19 +++++++++++++++++++ Makefile.am | 12 ++++++++++++ tests/Makefile.am | 14 +++++++++++++- - 3 files changed, 44 insertions(+), 1 deletions(-) + 3 Dateien geändert, 44 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit 695ac7bc5c60371a32538d690c7a15509f3c9637 Author: John Stowers @@ -14293,7 +14501,7 @@ Date: Fri Apr 16 14:36:11 2010 +1200 Makefile.am | 1 + README.win32 | 24 ++++++++++++++++++++++++ - 2 files changed, 25 insertions(+), 0 deletions(-) + 2 Dateien geändert, 25 Zeilen hinzugefügt(+) commit e580da87f0b2fd36cb5d8008fb2fb0c3b01f456a Author: John Stowers @@ -14307,7 +14515,7 @@ Date: Thu Apr 15 13:40:39 2010 +1200 pygobject_postinstall.py | 43 ++++++++++++++++++++++++++----------------- setup.py | 39 ++++++++++++++------------------------- - 2 files changed, 40 insertions(+), 42 deletions(-) + 2 Dateien geändert, 40 Zeilen hinzugefügt(+), 42 Zeilen entfernt(-) commit 69ecd506c83ddf180c6cc9a2a8dc753a02543959 Author: John Stowers @@ -14320,7 +14528,7 @@ Date: Sat Jul 25 14:12:30 2009 +1200 are OK gio/giomodule.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) + 1 Datei geändert, 3 Zeilen hinzugefügt(+) commit 5d159a13d89587cba189a0ca3203ac003e2f1f2b Author: John Stowers @@ -14332,7 +14540,7 @@ Date: Thu Apr 15 22:52:48 2010 +1200 largely unneeded. Just add the G_XXX constants to the module directly - gobject/Makefile.am | 16 +-------- + gobject/Makefile.am | 16 +------- gobject/constants.py | 83 ++++++++++++++++++++++++++++++++++++++++++ gobject/constants.py.in | 50 ------------------------- @@ -14340,7 +14548,7 @@ Date: Thu Apr 15 22:52:48 2010 +1200 gobject/gobjectmodule.c | 35 ++++++++++++++++++ setup.py | 2 +- tests/runtests.py | 3 +- - 7 files changed, 121 insertions(+), 112 deletions(-) + 7 Dateien geändert, 121 Zeilen hinzugefügt(+), 112 Zeilen entfernt(-) commit 6d7a3ab9ce352692d0faccbf106974d264fa953d Author: John Stowers @@ -14353,10 +14561,10 @@ Date: Thu Apr 15 22:49:17 2010 +1200 * Modernise setup.py and add more util functions to dsextras - dsextras.py | 32 ++++++++++++++++-- + dsextras.py | 32 ++++++++++++++++--- setup.py | 102 - ++++++++++++++++++++++++++++++++++++++++++++++++++-------- - 2 files changed, 116 insertions(+), 18 deletions(-) + +++++++++++++++++++++++++++++++++++++++++++++++++++-------- + 2 Dateien geändert, 116 Zeilen hinzugefügt(+), 18 Zeilen entfernt(-) commit d11ef47072acae5801ce25c68d1289e425eb9fc2 Author: John Stowers @@ -14365,7 +14573,7 @@ Date: Thu Apr 15 22:48:28 2010 +1200 Include pygsource.h glib/pygiochannel.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+) commit c5f6af4844c74354abc508d17969d9d45153acf2 Author: Tomeu Vizoso @@ -14374,7 +14582,7 @@ Date: Thu Apr 15 14:25:59 2010 -0400 Add metadata to the .doap file pygi.doap | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) + 1 Datei geändert, 3 Zeilen hinzugefügt(+) commit 81796cb77cbe6b9598a652bd63c047af93e747ee Author: John (J5) Palmieri @@ -14384,7 +14592,7 @@ Date: Wed Apr 14 12:01:43 2010 -0400 gi/overrides/GIMarshallingTests.py | 69 ++++++++++++++++++++++++++++++++++++ - 1 files changed, 69 insertions(+), 0 deletions(-) + 1 Datei geändert, 69 Zeilen hinzugefügt(+) commit de5d2ea1584b01af809346316c7fbd4955a9db1d Author: Colin Walters @@ -14401,7 +14609,7 @@ Date: Wed Apr 14 10:06:07 2010 -0400 the end of the normal build. gi/Makefile.am | 15 +++++++++------ - 1 files changed, 9 insertions(+), 6 deletions(-) + 1 Datei geändert, 9 Zeilen hinzugefügt(+), 6 Zeilen entfernt(-) commit 5a47e96e3f580c973e6880dafa747f54c144c760 Author: Tomeu Vizoso @@ -14415,7 +14623,7 @@ Date: Tue Apr 13 19:15:49 2010 -0400 ------------------------------------------------ tests/libtestgi.h | 628 ----------- tests/test_gi.py | 832 +++++++------- - 5 files changed, 416 insertions(+), 4077 deletions(-) + 5 Dateien geändert, 416 Zeilen hinzugefügt(+), 4077 Zeilen entfernt(-) commit 681832c3cd040433a488a400693b68f213bf7078 Author: José Alburquerque @@ -14427,7 +14635,7 @@ Date: Tue Apr 13 13:33:12 2010 -0400 errors with a regular space. codegen/docextract_to_xml.py | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+) commit bd4e7f2459e34957aaae59b9be807d6dff5ec1eb Author: José Alburquerque @@ -14439,7 +14647,7 @@ Date: Tue Apr 13 12:28:10 2010 -0400 expressions that cause errors with more appropriate output. codegen/docextract_to_xml.py | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) + 1 Datei geändert, 4 Zeilen hinzugefügt(+) commit f00b9ce91fc9c3aabd4af4132fc112d9e415e12e Author: José Alburquerque @@ -14455,7 +14663,7 @@ Date: Sun Apr 11 17:46:40 2010 -0400 multi-line comments are used in Doxygen blocks. codegen/docextract_to_xml.py | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) + 1 Datei geändert, 9 Zeilen hinzugefügt(+) commit a2fcdecbb5e109da5568084d7acb2332af83b6f5 Author: José Alburquerque @@ -14472,7 +14680,7 @@ Date: Sun Apr 11 16:15:01 2010 -0400 errors. codegen/docextract.py | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) + 1 Datei geändert, 4 Zeilen hinzugefügt(+) commit 825fd305f03b726665edca34963978ce27448182 Author: José Alburquerque @@ -14567,8 +14775,8 @@ Date: Sun Apr 11 15:45:09 2010 -0400 codegen/docextract.py | 439 +++++++++++++++++++++++++++++++++--------- - codegen/docextract_to_xml.py | 87 ++++++-- - 2 files changed, 414 insertions(+), 112 deletions(-) + codegen/docextract_to_xml.py | 87 ++++++--- + 2 Dateien geändert, 414 Zeilen hinzugefügt(+), 112 Zeilen entfernt(-) commit 9fef1acb42cd900d4a814a7378f60bc189121785 Author: Tomeu Vizoso @@ -14577,7 +14785,7 @@ Date: Fri Apr 9 13:47:03 2010 +0200 Always create the .so link gi/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit e9f7fd414e94595e40eb1ba0fc471ca69136d82f Author: Paul Bolle @@ -14589,9 +14797,9 @@ Date: Thu Apr 8 11:52:25 2010 +0200 docs/reference/pygio-file.xml | 58 +++++++++++++++++----------------- - docs/reference/pygio-inputstream.xml | 22 ++++++------ + docs/reference/pygio-inputstream.xml | 22 ++++++------- docs/reference/pygio-mount.xml | 10 +++--- - 3 files changed, 45 insertions(+), 45 deletions(-) + 3 Dateien geändert, 45 Zeilen hinzugefügt(+), 45 Zeilen entfernt(-) commit 4cbd9941c5705970a9f7a429e236e1203d3155a1 Author: Gian Mario Tagliaretti @@ -14607,7 +14815,7 @@ Date: Mon Apr 5 18:10:42 2010 +0200 tests/test_gtype.py | 112 ------------------ tests/test_subtype.py | 289 ---------------------------------------------- - 4 files changed, 0 insertions(+), 718 deletions(-) + 4 Dateien geändert, 718 Zeilen entfernt(-) commit ef0ceb266a45715ece58642fb0042e3376416755 Author: Simon van der Linden @@ -14618,7 +14826,7 @@ Date: Wed Feb 3 20:33:03 2010 +0100 gi/overrides/Gdk.py | 21 +++++++++++++++++++++ gi/overrides/Gtk.py | 21 +++++++++++++++++++++ gi/overrides/TestGI.py | 20 ++++++++++++++++++++ - 3 files changed, 62 insertions(+), 0 deletions(-) + 3 Dateien geändert, 62 Zeilen hinzugefügt(+) commit 5106523a4b8378997a1e6cb0488398aa73e7d9d5 Author: Simon van der Linden @@ -14632,8 +14840,8 @@ Date: Wed Feb 3 20:29:55 2010 +0100 gi/overrides/TestGI.py | 49 ++++++++++++++++++++++++++++++++++++++++++++++++ - tests/test_gi.py | 8 ++++++- - 2 files changed, 56 insertions(+), 1 deletions(-) + tests/test_gi.py | 8 +++++++- + 2 Dateien geändert, 56 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit 23fc0f615d87994acafd9d39e92dd92b587fc2eb Author: Simon van der Linden @@ -14647,7 +14855,7 @@ Date: Thu Jan 21 17:30:51 2010 +0100 gobject/pygi-external.h | 1 - gobject/pygobject.c | 6 +----- gobject/pygpointer.c | 6 +----- - 4 files changed, 3 insertions(+), 16 deletions(-) + 4 Dateien geändert, 3 Zeilen hinzugefügt(+), 16 Zeilen entfernt(-) commit aefac8c5f64bf059dd6652f8a843d17b34fa0854 Author: Simon van der Linden @@ -14669,7 +14877,7 @@ Date: Fri Jan 22 22:22:37 2010 +0100 ---------------------------------------------------- tests/libtestgi.h | 86 ------- tests/test_gi.py | 144 ------------ - 6 files changed, 47 insertions(+), 1438 deletions(-) + 6 Dateien geändert, 47 Zeilen hinzugefügt(+), 1438 Zeilen entfernt(-) commit eaf7cb8ebb7e34f9493ac83b2f04af4dcf45f40f Author: Simon van der Linden @@ -14693,14 +14901,14 @@ Date: Fri Jan 22 13:41:21 2010 +0100 gi/importer.py | 40 +++++++------------- gi/module.py | 43 ++++++++++++++------- - gi/overrides/Gdk.py | 42 +++++++++++++------- - gi/overrides/Gtk.py | 16 +++---- + gi/overrides/Gdk.py | 42 +++++++++++++-------- + gi/overrides/Gtk.py | 16 ++++---- gi/types.py | 6 +++ tests/libtestgi.c | 105 +++++++++++++++++++++++++++++++++++++++++++++++++++ tests/libtestgi.h | 49 ++++++++++++++++++++++++ - tests/test_gi.py | 36 +++++++++++++++++ - 8 files changed, 273 insertions(+), 64 deletions(-) + tests/test_gi.py | 36 ++++++++++++++++++ + 8 Dateien geändert, 273 Zeilen hinzugefügt(+), 64 Zeilen entfernt(-) commit 289d641775d1ea52d2a5379126b70b7fcee46683 Author: Tomeu Vizoso @@ -14711,7 +14919,7 @@ Date: Sun Jan 10 21:01:59 2010 +0100 https://bugzilla.gnome.org/show_bug.cgi?id=606582 gio/gcancellable.override | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+) commit b11cf2595987c1f0fc4ffd834f07c98b92aa2355 Author: Simon van der Linden @@ -14721,7 +14929,7 @@ Date: Fri Jan 8 21:10:28 2010 +0100 gi/pygi-struct.c | 2 +- tests/test_gi.py | 5 +++++ - 2 files changed, 6 insertions(+), 1 deletions(-) + 2 Dateien geändert, 6 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit b4189be2b2d3c350fdf33e27309bee5a72e4f72a Author: Simon van der Linden @@ -14743,7 +14951,7 @@ Date: Fri Jan 8 20:33:44 2010 +0100 tests/libtestgi.c | 33 --------------------------------- tests/libtestgi.h | 7 ------- tests/test_gi.py | 21 ++++++++++----------- - 4 files changed, 17 insertions(+), 79 deletions(-) + 4 Dateien geändert, 17 Zeilen hinzugefügt(+), 79 Zeilen entfernt(-) commit 4db68b958ea11bd2c3a88067cae03fd6bdd1d24b Author: Simon van der Linden @@ -14754,7 +14962,7 @@ Date: Tue Jan 5 13:36:44 2010 +0100 gi/pygi-argument.c | 3 ++- gi/pygi-boxed.c | 2 -- gi/pygobject-external.h | 2 +- - 3 files changed, 3 insertions(+), 4 deletions(-) + 3 Dateien geändert, 3 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-) commit 4e2efa91d101bf755739e1cca8eee41eb0ad20fd Author: Gian Mario Tagliaretti @@ -14765,7 +14973,7 @@ Date: Mon Jan 4 08:35:14 2010 +0100 Committed a patch from Kevin Pyle Makefile.am | 27 +++++++++++++-------------- - 1 files changed, 13 insertions(+), 14 deletions(-) + 1 Datei geändert, 13 Zeilen hinzugefügt(+), 14 Zeilen entfernt(-) commit 8ddcbca0e98e0b0c082170a2b2b6cfcbd7864b40 Author: Simon van der Linden @@ -14779,7 +14987,7 @@ Date: Fri Dec 11 22:24:30 2009 +0100 tests/runtests.py | 1 - tests/test_gi.py | 3 +++ - 2 files changed, 3 insertions(+), 1 deletions(-) + 2 Dateien geändert, 3 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit 284a1e1c0143c95d3007cf58e6c248b5d11fb4d1 Author: Gian Mario Tagliaretti @@ -14791,7 +14999,7 @@ Date: Sun Jan 3 11:02:57 2010 +0100 gio/gcancellable.override | 37 +++++++++++++++++++++++++++++++++++++ gio/gio.override | 3 +++ tests/test_gcancellable.py | 15 +++++++++++++++ - 4 files changed, 56 insertions(+), 0 deletions(-) + 4 Dateien geändert, 56 Zeilen hinzugefügt(+) commit 82d7bcbf37200ee2ef5892dd12bebd2f39965c56 Author: Gian Mario Tagliaretti @@ -14801,7 +15009,7 @@ Date: Sat Jan 2 23:15:56 2010 +0100 gio/gio.defs | 102 +++++++++++++++++++++++++++++----------------------------- - 1 files changed, 51 insertions(+), 51 deletions(-) + 1 Datei geändert, 51 Zeilen hinzugefügt(+), 51 Zeilen entfernt(-) commit 49a078cd22d55dc33a03ecfda235d63955edc741 Author: Gian Mario Tagliaretti @@ -14810,7 +15018,7 @@ Date: Sat Jan 2 23:15:21 2010 +0100 Post release version bump to 2.21.2 configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 4f9f1f43ab4e2cfb204ffa0e257a34cfd95d84e2 Author: Gian Mario Tagliaretti @@ -14819,7 +15027,7 @@ Date: Sat Jan 2 22:58:36 2010 +0100 Update NEWS and release PyGObject-2.21.1 NEWS | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 55 insertions(+), 0 deletions(-) + 1 Datei geändert, 55 Zeilen hinzugefügt(+) commit c1f34be73bd186d7b4682dfef133da2c4229d213 Author: Gian Mario Tagliaretti @@ -14829,7 +15037,7 @@ Date: Fri Jan 1 20:25:35 2010 +0100 gio/gvolume.override | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 54 insertions(+), 0 deletions(-) + 1 Datei geändert, 54 Zeilen hinzugefügt(+) commit 9b76fbff6f6897aaf26ed4644c1f19efc2826917 Author: Gian Mario Tagliaretti @@ -14838,7 +15046,7 @@ Date: Fri Jan 1 20:22:21 2010 +0100 gio.Mount.unmount_with_operation() fix a copy/paste leftover gio/gmount.override | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit 6f459786dd641cd49d81eba403d940620f961cab Author: Gian Mario Tagliaretti @@ -14848,7 +15056,7 @@ Date: Fri Jan 1 20:21:05 2010 +0100 gio/gmount.override | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 54 insertions(+), 0 deletions(-) + 1 Datei geändert, 54 Zeilen hinzugefügt(+) commit d4b5d1b4839364e5676eb2da28f1d21db7e2552d Author: Gian Mario Tagliaretti @@ -14858,7 +15066,7 @@ Date: Fri Jan 1 20:15:38 2010 +0100 gio/gmount.override | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 54 insertions(+), 0 deletions(-) + 1 Datei geändert, 54 Zeilen hinzugefügt(+) commit e919d47c2430451b436cec955e9b99237f97028c Author: Gian Mario Tagliaretti @@ -14868,7 +15076,7 @@ Date: Fri Jan 1 18:22:46 2010 +0100 gio/gfile.override | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 54 insertions(+), 0 deletions(-) + 1 Datei geändert, 54 Zeilen hinzugefügt(+) commit 5a614df9c5507d67f240462f7bf71b4cd411addf Author: Gian Mario Tagliaretti @@ -14878,7 +15086,7 @@ Date: Fri Jan 1 18:14:11 2010 +0100 gio/gfile.override | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 52 insertions(+), 0 deletions(-) + 1 Datei geändert, 52 Zeilen hinzugefügt(+) commit 6af506647f36f2b825bc6556df5ee57fa7721906 Author: Gian Mario Tagliaretti @@ -14888,7 +15096,7 @@ Date: Fri Jan 1 18:10:49 2010 +0100 gio/gfile.override | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 52 insertions(+), 0 deletions(-) + 1 Datei geändert, 52 Zeilen hinzugefügt(+) commit e700efc839fc0b651fc9794a1611190bffa80263 Author: Gian Mario Tagliaretti @@ -14898,7 +15106,7 @@ Date: Fri Jan 1 18:02:46 2010 +0100 gio/gfile.override | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 55 insertions(+), 0 deletions(-) + 1 Datei geändert, 55 Zeilen hinzugefügt(+) commit 92662f129fc728258fd5e34f53dcb081e3715017 Author: Gian Mario Tagliaretti @@ -14907,7 +15115,7 @@ Date: Fri Jan 1 17:00:26 2010 +0100 Wrap gio.File.poll_mountable() gio/gfile.override | 41 +++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 41 insertions(+), 0 deletions(-) + 1 Datei geändert, 41 Zeilen hinzugefügt(+) commit 99902b786500948c3278779841e4db54223b9256 Author: Gian Mario Tagliaretti @@ -14916,7 +15124,7 @@ Date: Fri Jan 1 16:56:26 2010 +0100 Wrap gio.File.open_readwrite_async() gio/gfile.override | 44 ++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 44 insertions(+), 0 deletions(-) + 1 Datei geändert, 44 Zeilen hinzugefügt(+) commit 8cff5d53183ae81364ac74a34a1d52e55e082eb4 Author: Gian Mario Tagliaretti @@ -14926,7 +15134,7 @@ Date: Fri Jan 1 16:50:15 2010 +0100 gio/gfile.override | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 54 insertions(+), 0 deletions(-) + 1 Datei geändert, 54 Zeilen hinzugefügt(+) commit ca436fe7785fd24b0f0e65f2f8c9fa6478277682 Author: Gian Mario Tagliaretti @@ -14937,7 +15145,7 @@ Date: Fri Jan 1 13:30:24 2010 +0100 gio/gfile.override | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ tests/test_gio.py | 24 ++++++++++++++++++++++++ - 2 files changed, 75 insertions(+), 0 deletions(-) + 2 Dateien geändert, 75 Zeilen hinzugefügt(+) commit f72c5e451dfaeb01b3c3d9243fed2732d3620462 Author: Gian Mario Tagliaretti @@ -14947,7 +15155,7 @@ Date: Fri Jan 1 13:20:11 2010 +0100 gio/gdrive.override | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 52 insertions(+), 0 deletions(-) + 1 Datei geändert, 52 Zeilen hinzugefügt(+) commit 29043bade408338cefa13fb4b0c875aabd3ef05e Author: Gian Mario Tagliaretti @@ -14957,7 +15165,7 @@ Date: Fri Jan 1 13:00:42 2010 +0100 gio/gdrive.override | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 52 insertions(+), 0 deletions(-) + 1 Datei geändert, 52 Zeilen hinzugefügt(+) commit dff374287bbecc8af782bbc726fad86c6c867754 Author: Gian Mario Tagliaretti @@ -14966,7 +15174,7 @@ Date: Fri Jan 1 12:45:29 2010 +0100 Add more remainders on missing methods of gio.Socket and related types gio/gsocket.override | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) + 1 Datei geändert, 3 Zeilen hinzugefügt(+) commit b8c7e996498bd72df551011af85ff05ef7335b4f Author: Gian Mario Tagliaretti @@ -14975,9 +15183,9 @@ Date: Fri Jan 1 12:41:08 2010 +0100 Wrap gio.SocketListener.accept_socket_async|finish() and add a test gio/gsocket.override | 86 - +++++++++++++++++++++++++++++++++++++++++++++++- - tests/test_gsocket.py | 24 +++++++++++++ - 2 files changed, 108 insertions(+), 2 deletions(-) + +++++++++++++++++++++++++++++++++++++++++++++++-- + tests/test_gsocket.py | 24 ++++++++++++++ + 2 Dateien geändert, 108 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit a5ae2d5ba3db34967fe07a3cc97b75df2793988c Author: Gian Mario Tagliaretti @@ -14987,7 +15195,7 @@ Date: Fri Jan 1 12:28:53 2010 +0100 gio/gsocket.override | 44 ++++++++++++++++++++++++++++++++++++++++++-- tests/test_gsocket.py | 24 ++++++++++++++++++++++++ - 2 files changed, 66 insertions(+), 2 deletions(-) + 2 Dateien geändert, 66 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit a5ab26cc1bb3e9dd57e2fdb26ef5c02e8066d097 Author: Gian Mario Tagliaretti @@ -14996,7 +15204,7 @@ Date: Fri Jan 1 11:19:34 2010 +0100 Wrap gio.SocketListener.accept_async() gio/gsocket.override | 42 ++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 42 insertions(+), 0 deletions(-) + 1 Datei geändert, 42 Zeilen hinzugefügt(+) commit c9496b29ef9ef232020a4044577d2947353953a5 Author: Gian Mario Tagliaretti @@ -15007,7 +15215,7 @@ Date: Fri Jan 1 11:14:35 2010 +0100 gio/gsocket.override | 48 +++++++++++++++++++++++++++++++++++++++++++++++- tests/test_gsocket.py | 13 +++++++++++++ - 2 files changed, 60 insertions(+), 1 deletions(-) + 2 Dateien geändert, 60 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit 1aa5e301c49f11e1c5ef58de44b4b03f714d1a70 Author: Gian Mario Tagliaretti @@ -15018,7 +15226,7 @@ Date: Thu Dec 31 16:35:18 2009 +0100 gio/gsocket.override | 46 +++++++++++++++++++++++++++++++++++++++++++++- tests/test_gsocket.py | 13 +++++++++++++ - 2 files changed, 58 insertions(+), 1 deletions(-) + 2 Dateien geändert, 58 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit aaedcf166c78baf5449ef59d0ade4a29077fedc7 Author: Gian Mario Tagliaretti @@ -15027,7 +15235,7 @@ Date: Thu Dec 31 16:25:33 2009 +0100 Make cancellable optional in gio.SocketClient.connect_to_host() gio/gio.defs | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 3829d7667b19126fb74562b28d271e616b154c99 Author: Gian Mario Tagliaretti @@ -15037,8 +15245,8 @@ Date: Thu Dec 31 15:25:10 2009 +0100 gio/gsocket.override | 57 ++++++++++++++++++++++++++++++++++++++++++++++++- - tests/test_gsocket.py | 9 +++++++ - 2 files changed, 65 insertions(+), 1 deletions(-) + tests/test_gsocket.py | 9 ++++++++ + 2 Dateien geändert, 65 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit 5bec72f34ea75bc56158cae5c39d61a2a4e7e601 Author: Gian Mario Tagliaretti @@ -15047,7 +15255,7 @@ Date: Thu Dec 31 10:19:47 2009 +0100 Add more remainders on missing methods of gio.Socket and related types gio/gsocket.override | 8 ++++++++ - 1 files changed, 8 insertions(+), 0 deletions(-) + 1 Datei geändert, 8 Zeilen hinzugefügt(+) commit b08b20f2b1a57bcbf400d6fe8e87cf052bdb719d Author: Gian Mario Tagliaretti @@ -15057,7 +15265,7 @@ Date: Thu Dec 31 10:16:18 2009 +0100 gio/gsocket.override | 47 +++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 47 insertions(+), 0 deletions(-) + 1 Datei geändert, 47 Zeilen hinzugefügt(+) commit 116ea1bfe32946e67aa54eb8dc7b977e57f254c2 Author: Gian Mario Tagliaretti @@ -15067,7 +15275,7 @@ Date: Thu Dec 31 10:10:43 2009 +0100 gio/gsocket.override | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 48 insertions(+), 0 deletions(-) + 1 Datei geändert, 48 Zeilen hinzugefügt(+) commit 9c930910505d5b9001b8cec17ff98fadeaa799e2 Author: Gian Mario Tagliaretti @@ -15076,7 +15284,7 @@ Date: Thu Dec 31 09:59:46 2009 +0100 Wrap gio.SocketClient.connect_async() gio/gsocket.override | 45 +++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 45 insertions(+), 0 deletions(-) + 1 Datei geändert, 45 Zeilen hinzugefügt(+) commit dff024256295c15e49888ad9d5fef74a7746edd7 Author: Gian Mario Tagliaretti @@ -15086,7 +15294,7 @@ Date: Wed Dec 30 23:44:25 2009 +0100 gio/gsocket.override | 42 ++++++++++++++++++++++++++++++++++++++++++ tests/test_gsocket.py | 16 ++++++++++++++++ - 2 files changed, 58 insertions(+), 0 deletions(-) + 2 Dateien geändert, 58 Zeilen hinzugefügt(+) commit e2330bd0d6cbc49b0ecb27b30e3b0593935ce229 Author: Gian Mario Tagliaretti @@ -15096,7 +15304,7 @@ Date: Wed Dec 30 23:43:14 2009 +0100 gio/gio-types.defs | 7 +++++++ gio/gio.defs | 31 +++++++++++++++++++++++++++++++ - 2 files changed, 38 insertions(+), 0 deletions(-) + 2 Dateien geändert, 38 Zeilen hinzugefügt(+) commit 6040b33467ea381c6cb02f6a5efc0745fa8fa47b Author: Gian Mario Tagliaretti @@ -15105,7 +15313,7 @@ Date: Wed Dec 30 22:54:47 2009 +0100 Make cancellable optional for gio.SocketAddressEnumerator.next() gio/gio.defs | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit b19f59790b9de943d69b6c5e483928e0443c3d20 Author: Gian Mario Tagliaretti @@ -15114,7 +15322,7 @@ Date: Wed Dec 30 22:17:44 2009 +0100 Add a remainder of the Socket methods that needs manual wrapping still gio/gsocket.override | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) + 1 Datei geändert, 5 Zeilen hinzugefügt(+) commit 771a7c3fdef7b2e98e509293a8376a81c1282286 Author: Gian Mario Tagliaretti @@ -15124,7 +15332,7 @@ Date: Wed Dec 30 17:20:35 2009 +0100 gio/gsocket.override | 27 +++++++++++++++++++++++++++ tests/test_gsocket.py | 6 +++++- - 2 files changed, 32 insertions(+), 1 deletions(-) + 2 Dateien geändert, 32 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit 50960656815b0897a5ebe5f011537b8dcbdc857e Author: Gian Mario Tagliaretti @@ -15136,7 +15344,7 @@ Date: Wed Dec 30 16:21:49 2009 +0100 gio/gio.override | 1 + gio/gsocket.override | 41 +++++++++++++++++++++++++++++++++++++++++ tests/test_gsocket.py | 21 +++++++++++++++++++++ - 4 files changed, 64 insertions(+), 0 deletions(-) + 4 Dateien geändert, 64 Zeilen hinzugefügt(+) commit de7a359e81792ae8573ac944455ea289985449ed Author: Gian Mario Tagliaretti @@ -15146,7 +15354,7 @@ Date: Wed Dec 30 14:07:52 2009 +0100 gio/gresolver.override | 37 +++++++++++++++++++++++++++++++++++++ tests/test_gresolver.py | 13 +++++++++++++ - 2 files changed, 50 insertions(+), 0 deletions(-) + 2 Dateien geändert, 50 Zeilen hinzugefügt(+) commit 308421789ce849040d645077c41c80b6e2e65e83 Author: Gian Mario Tagliaretti @@ -15156,7 +15364,7 @@ Date: Wed Dec 30 14:00:22 2009 +0100 gio/gresolver.override | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 48 insertions(+), 0 deletions(-) + 1 Datei geändert, 48 Zeilen hinzugefügt(+) commit 9d56ce775f56fff1b1ef3c75843c0583e39f75c3 Author: Gian Mario Tagliaretti @@ -15166,7 +15374,7 @@ Date: Wed Dec 30 11:11:32 2009 +0100 gio/gresolver.override | 42 ++++++++++++++++++++++++++++++++++++++++++ tests/test_gresolver.py | 5 +++++ - 2 files changed, 47 insertions(+), 0 deletions(-) + 2 Dateien geändert, 47 Zeilen hinzugefügt(+) commit 7fc71f490494dae73a5264869a97a9d30814930e Author: Gian Mario Tagliaretti @@ -15177,7 +15385,7 @@ Date: Tue Dec 29 22:12:50 2009 +0100 gio/gresolver.override | 46 ++++++++++++++++++++++++++++++++++++++++++++++ tests/test_gresolver.py | 14 ++++++++++++++ - 2 files changed, 60 insertions(+), 0 deletions(-) + 2 Dateien geändert, 60 Zeilen hinzugefügt(+) commit c91656dbe56f07d3ebbad5113467c22427cf212a Author: Gian Mario Tagliaretti @@ -15187,8 +15395,8 @@ Date: Tue Dec 29 21:41:30 2009 +0100 gio/gresolver.override | 82 +++++++++++++++++++++++++++++++++++++++++++++++ - tests/test_gresolver.py | 16 ++++++++- - 2 files changed, 96 insertions(+), 2 deletions(-) + tests/test_gresolver.py | 16 +++++++-- + 2 Dateien geändert, 96 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit 45b477342fa1c2435917c6d97745ad57665c4734 Author: Gian Mario Tagliaretti @@ -15198,7 +15406,7 @@ Date: Tue Dec 29 17:15:44 2009 +0100 gio/gdrive.override | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 54 insertions(+), 0 deletions(-) + 1 Datei geändert, 54 Zeilen hinzugefügt(+) commit 635227480f9659a1f91ab1ec12536d3ed012a976 Author: Gian Mario Tagliaretti @@ -15208,7 +15416,7 @@ Date: Tue Dec 29 17:06:52 2009 +0100 gio/gdrive.override | 7 ++++++- gio/gio.defs | 1 + - 2 files changed, 7 insertions(+), 1 deletions(-) + 2 Dateien geändert, 7 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit 3c0cbc95af29b1e192ed4b5963e96e39c70b349c Author: Gian Mario Tagliaretti @@ -15217,7 +15425,7 @@ Date: Tue Dec 29 13:51:54 2009 +0100 Small fix in the header gio/gdrive.override | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 7589128515b79d836365247dc876538c6352da23 Author: Gian Mario Tagliaretti @@ -15230,7 +15438,7 @@ Date: Tue Dec 29 12:40:50 2009 +0100 gio/gresolver.override | 57 +++++++++++++++++++++++++++++++++++++++++++++++ tests/test_gresolver.py | 21 +++++++++++++++++ - 4 files changed, 80 insertions(+), 0 deletions(-) + 4 Dateien geändert, 80 Zeilen hinzugefügt(+) commit 604d2bf220b1fefa415baaedbdb2882dbaf9e07e Author: Gian Mario Tagliaretti @@ -15240,7 +15448,7 @@ Date: Tue Dec 29 12:39:13 2009 +0100 gio.Resolver.lookup_by_address() gio/gio.defs | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 00029145f4cd10759b37b38fb9f72435bf26b28b Author: Gian Mario Tagliaretti @@ -15250,7 +15458,7 @@ Date: Tue Dec 29 10:15:14 2009 +0100 gio/gio.defs | 94 +++++++++++++++++++++++++++++----------------------------- - 1 files changed, 47 insertions(+), 47 deletions(-) + 1 Datei geändert, 47 Zeilen hinzugefügt(+), 47 Zeilen entfernt(-) commit 56d5dfc4fd862e32c19f944a0feb7a00a9154f06 Author: Gian Mario Tagliaretti @@ -15259,7 +15467,7 @@ Date: Tue Dec 29 10:12:53 2009 +0100 Strip g_prefix from InetAddress functions gio/gio.defs | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) + 1 Datei geändert, 4 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-) commit 1d360301d51a587a36a59f5d62e354484bbd2b31 Author: Gian Mario Tagliaretti @@ -15270,7 +15478,7 @@ Date: Tue Dec 29 10:03:59 2009 +0100 Strip the g_ prefix from function name gio/gio.defs | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 0fe00109c4f6fc27cbaae9b0a24ecfac71355d2f Author: Gian Mario Tagliaretti @@ -15282,8 +15490,8 @@ Date: Tue Dec 29 09:54:05 2009 +0100 gio/gfileiostream.override | 68 ++++++++++++++++++++++++++++++++++++++++++++ gio/gio.override | 1 + - tests/test_gio.py | 18 +++++++++++ - 4 files changed, 88 insertions(+), 0 deletions(-) + tests/test_gio.py | 18 ++++++++++++ + 4 Dateien geändert, 88 Zeilen hinzugefügt(+) commit 86783c695f3641b9491962e8f95a4dcb91f4017c Author: Tomeu Vizoso @@ -15295,7 +15503,7 @@ Date: Tue Dec 29 13:08:29 2009 +0100 gobject/pygenum.c | 20 ++++++++++++++------ gobject/pygflags.c | 19 +++++++++++++------ - 2 files changed, 27 insertions(+), 12 deletions(-) + 2 Dateien geändert, 27 Zeilen hinzugefügt(+), 12 Zeilen entfernt(-) commit b90c01cff5ff5cb2796182f2ffd7b5248eaeed6a Author: Gian Mario Tagliaretti @@ -15308,7 +15516,7 @@ Date: Mon Dec 28 22:41:54 2009 +0100 gio/giostream.override | 68 ++++++++++++++++++++++++++++++++++++++++++++++++ tests/test_gio.py | 21 +++++++++++++++ - 4 files changed, 91 insertions(+), 0 deletions(-) + 4 Dateien geändert, 91 Zeilen hinzugefügt(+) commit 0bff01bcee73a0e0d18342331136119c4e8bf151 Author: Gian Mario Tagliaretti @@ -15317,7 +15525,7 @@ Date: Mon Dec 28 22:39:09 2009 +0100 Make cancellable an optional parameter in GFile.create_readwrite() gio/gio.defs | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 1cabd733cde269ce3164834933f4a226673ecb0b Author: Gian Mario Tagliaretti @@ -15326,7 +15534,7 @@ Date: Mon Dec 28 21:39:50 2009 +0100 Remove a duplicate entry in gio.defs gio/gio.defs | 9 --------- - 1 files changed, 0 insertions(+), 9 deletions(-) + 1 Datei geändert, 9 Zeilen entfernt(-) commit 9ac372ad0bcfdec4bb1c96bc152246542a59a9b1 Author: Gian Mario Tagliaretti @@ -15336,7 +15544,7 @@ Date: Mon Dec 28 21:37:49 2009 +0100 gio/gfileinfo.override | 33 ++++++++++++++++++++++++++++++++- tests/test_gio.py | 7 ++++++- - 2 files changed, 38 insertions(+), 2 deletions(-) + 2 Dateien geändert, 38 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit 7bc2673f92138b1804d8eba091942d14d8884f90 Author: Gian Mario Tagliaretti @@ -15346,7 +15554,7 @@ Date: Mon Dec 28 18:28:03 2009 +0100 gio/gicon.override | 14 ++++++++++++++ tests/test_gicon.py | 7 +++++++ - 2 files changed, 21 insertions(+), 0 deletions(-) + 2 Dateien geändert, 21 Zeilen hinzugefügt(+) commit 3d5056ad766d6856d8d6459fe9b377de2f0fd172 Author: Gian Mario Tagliaretti @@ -15356,7 +15564,7 @@ Date: Sat Dec 26 22:27:48 2009 +0100 gio/gio-types.defs | 153 ++++++++++++++++++++++++++++++++++++++++++++++++++-- - 1 files changed, 149 insertions(+), 4 deletions(-) + 1 Datei geändert, 149 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-) commit 62a9d660a4a2d5fab1d57c6c96c984ff02d25ccd Author: Gian Mario Tagliaretti @@ -15365,7 +15573,7 @@ Date: Fri Dec 25 18:06:39 2009 +0100 Post release version bump to 2.21.1 configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 2bd92cba5b028f0f78c35ecb34e648e95248f9d3 Author: Bastian Winkler @@ -15377,7 +15585,7 @@ Date: Fri Aug 14 15:10:26 2009 +0200 from python. gobject/pygtype.c | 15 +++++++++++---- - 1 files changed, 11 insertions(+), 4 deletions(-) + 1 Datei geändert, 11 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-) commit 828d0f042b59ea0319f33a23803c179af34ef2f1 Author: Tomeu Vizoso @@ -15389,7 +15597,7 @@ Date: Tue Dec 22 18:05:47 2009 +0100 gi/overrides/Makefile.am | 1 + gi/overrides/keysyms.py | 1499 ++++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 1502 insertions(+), 0 deletions(-) + 3 Dateien geändert, 1502 Zeilen hinzugefügt(+) commit 24fa1224ff00b9da177e0bfaa1e14e1b899e4976 Author: Tomeu Vizoso @@ -15400,14 +15608,14 @@ Date: Wed Nov 25 10:33:56 2009 +0100 https://bugzilla.gnome.org/show_bug.cgi?id=602640 - gi/pygi-argument.c | 11 ++++++++- - gi/pygi-argument.h | 3 +- - gi/pygi-info.c | 14 ++++++++++- + gi/pygi-argument.c | 11 +++++++++- + gi/pygi-argument.h | 3 ++- + gi/pygi-info.c | 14 ++++++++++-- tests/libtestgi.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++ - tests/libtestgi.h | 4 +++ + tests/libtestgi.h | 4 ++++ tests/test_gi.py | 15 +++++++++++++ - 6 files changed, 103 insertions(+), 4 deletions(-) + 6 Dateien geändert, 103 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-) commit 867536c6734e606d045760837ed22583da06566e Author: Gian Mario Tagliaretti @@ -15417,7 +15625,7 @@ Date: Fri Dec 18 10:50:09 2009 +0100 NEWS | 18 ++++++++++++++++++ README | 6 +++--- - 2 files changed, 21 insertions(+), 3 deletions(-) + 2 Dateien geändert, 21 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-) commit f50fbd24fa61863aaefa4ae1e12e0b314ecd43ae Author: Gian Mario Tagliaretti @@ -15426,7 +15634,7 @@ Date: Fri Dec 18 10:31:48 2009 +0100 Add pygi-external.h into Makefile SOURCES gobject/Makefile.am | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit 108c03b78f04b4bcfe066a6cb4d941e172bd32fe Author: Gian Mario Tagliaretti @@ -15435,7 +15643,7 @@ Date: Fri Dec 18 01:20:34 2009 +0100 Bug 598435 - No wrapping for g_find_program_in_path () glib/glibmodule.c | 20 ++++++++++++++++++++ - 1 files changed, 20 insertions(+), 0 deletions(-) + 1 Datei geändert, 20 Zeilen hinzugefügt(+) commit d3d5cb3a4a2c2cb2bd0c2571304d59e19bc08452 Author: Gian Mario Tagliaretti @@ -15447,7 +15655,7 @@ Date: Thu Dec 17 21:54:36 2009 +0100 gio/unix.defs | 115 ++++++++++++++++++++++++++++++++++++++++++++++++++- gio/unix.override | 8 ++++ - 3 files changed, 144 insertions(+), 1 deletions(-) + 3 Dateien geändert, 144 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit c87c8a81947a68507e8f3bcaf8e0e969b3e5331b Author: Gian Mario Tagliaretti @@ -15460,7 +15668,7 @@ Date: Thu Dec 17 21:52:11 2009 +0100 Without the patch the unix module will fail, so I'm forced to bump. configure.ac | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + 1 Datei geändert, 3 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-) commit b630c8d4b1e55938dac89729768c4a877b305215 Author: Gian Mario Tagliaretti @@ -15469,7 +15677,7 @@ Date: Thu Dec 17 02:24:45 2009 +0100 Properly define Connectable as interface type and not object type gio/gio-types.defs | 12 ++++++------ - 1 files changed, 6 insertions(+), 6 deletions(-) + 1 Datei geändert, 6 Zeilen hinzugefügt(+), 6 Zeilen entfernt(-) commit e955b931b07113c7432f7a85f882f69f12d263ad Author: Anderson Lizardo @@ -15483,7 +15691,7 @@ Date: Mon Nov 30 22:01:25 2009 +0100 configure.ac | 2 +- gi/pygi-private.h | 19 +++++++++++++++++++ - 2 files changed, 20 insertions(+), 1 deletions(-) + 2 Dateien geändert, 20 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit 542fdf6da4ad8f2d28d0d50152bd93cb4d8ee39a Author: Tomeu Vizoso @@ -15496,7 +15704,7 @@ Date: Sat Nov 28 18:48:19 2009 +0000 gi/pygi-argument.c | 14 +++++++------- tests/test_gi.py | 18 +++++++++--------- - 2 files changed, 16 insertions(+), 16 deletions(-) + 2 Dateien geändert, 16 Zeilen hinzugefügt(+), 16 Zeilen entfernt(-) commit 38e89942d29f2a1dba47ab4a8d5edc84322707cd Author: Simon van der Linden @@ -15507,7 +15715,7 @@ Date: Mon Nov 30 00:10:56 2009 +0100 https://bugzilla.gnome.org/show_bug.cgi?id=603355 gobject/generate-constants.c | 32 ++++++++++++++++---------------- - 1 files changed, 16 insertions(+), 16 deletions(-) + 1 Datei geändert, 16 Zeilen hinzugefügt(+), 16 Zeilen entfernt(-) commit cfa7d005487e17e8f7c1ceb14282d3a5baadb736 Author: Simon van der Linden @@ -15519,7 +15727,7 @@ Date: Sat Nov 28 00:22:21 2009 +0100 gi/pygi-argument.c | 516 ++++++++++++++++++++++++++++++++++++++++++---------- gi/pygi-info.c | 333 +++++++++++++++++---------------- - 2 files changed, 596 insertions(+), 253 deletions(-) + 2 Dateien geändert, 596 Zeilen hinzugefügt(+), 253 Zeilen entfernt(-) commit d1ae73f3cf7cebdb74c9ec56b08928a2a53b9de6 Author: Johan Dahlin @@ -15530,7 +15738,7 @@ Date: Mon Nov 23 15:58:17 2009 -0200 https://bugzilla.gnome.org/show_bug.cgi?id=602830 gi/types.py | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) + 1 Datei geändert, 4 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-) commit a8660621679c629fc81320a8ddf5bf2c7ee1f177 Author: Johan Dahlin @@ -15541,7 +15749,7 @@ Date: Tue Nov 24 10:36:18 2009 -0200 https://bugzilla.gnome.org/show_bug.cgi?id=602830 gi/module.py | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit 66c34805223af9e63c7d61f21a3dbd7505a8f256 Author: Tomeu Vizoso @@ -15554,18 +15762,18 @@ Date: Mon Nov 30 10:03:34 2009 +0000 gi/Makefile.am | 2 + gi/gimodule.c | 1 + gi/module.py | 2 +- - gi/pygi-argument.c | 14 ++++- + gi/pygi-argument.c | 14 +++- gi/pygi-boxed.c | 184 ++++++++++++++++++++++++++++++++++++++++++++++++++++ - gi/pygi-boxed.h | 40 +++++++++++ + gi/pygi-boxed.h | 40 ++++++++++++ gi/pygi-info.c | 2 +- gi/pygi-private.h | 1 + gi/pygi.h | 6 ++ gi/types.py | 18 ----- tests/libtestgi.c | 72 ++++++++++---------- - tests/libtestgi.h | 18 +++--- + tests/libtestgi.h | 18 ++--- tests/test_gi.py | 47 ++++++++------ - 13 files changed, 321 insertions(+), 86 deletions(-) + 13 Dateien geändert, 321 Zeilen hinzugefügt(+), 86 Zeilen entfernt(-) commit e7e2fccae36c28c7e9f288fcd4c90a001140e307 Author: Tomeu Vizoso @@ -15578,7 +15786,7 @@ Date: Mon Nov 30 10:53:57 2009 +0000 gi/pygi-argument.c | 14 +++++++------- tests/test_gi.py | 18 +++++++++--------- - 2 files changed, 16 insertions(+), 16 deletions(-) + 2 Dateien geändert, 16 Zeilen hinzugefügt(+), 16 Zeilen entfernt(-) commit 05a2ed55f3e5d2620de8b3b6b0d99e928ef3b041 Author: Tomeu Vizoso @@ -15591,7 +15799,7 @@ Date: Sat Nov 28 18:48:19 2009 +0000 gi/pygi-argument.c | 14 +++++++------- tests/test_gi.py | 18 +++++++++--------- - 2 files changed, 16 insertions(+), 16 deletions(-) + 2 Dateien geändert, 16 Zeilen hinzugefügt(+), 16 Zeilen entfernt(-) commit e24d155dd7b4a5b9c25c054137d1370c369d3192 Author: Tomeu Vizoso @@ -15602,7 +15810,7 @@ Date: Sat Nov 28 18:45:54 2009 +0000 https://bugzilla.gnome.org/show_bug.cgi?id=603244 gobject/generate-constants.c | 17 ++++++++++++++++- - 1 files changed, 16 insertions(+), 1 deletions(-) + 1 Datei geändert, 16 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit 3a295cb7ffaaaf29c71b8833cf0ee5ec7ceaa909 Author: Gian Mario Tagliaretti @@ -15611,7 +15819,7 @@ Date: Sat Nov 28 18:48:49 2009 +0100 Fix bad name when rebuilding the unix source module gio/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit a8cbb6fb72dbe6630d1265b18095c9a96f496b86 Author: Gian Mario Tagliaretti @@ -15622,7 +15830,7 @@ Date: Sat Nov 28 18:47:26 2009 +0100 gio/gio-types.defs | 138 +++ gio/gio.defs | 2444 +++++++++++++++++++++++++++++++++++++++++++++++----- - 2 files changed, 2360 insertions(+), 222 deletions(-) + 2 Dateien geändert, 2360 Zeilen hinzugefügt(+), 222 Zeilen entfernt(-) commit 96f6c638709636d7e2ddf560b877879691da3314 Author: Tomeu Vizoso @@ -15635,7 +15843,7 @@ Date: Sat Nov 28 11:03:51 2009 +0000 tests/libtestgi.c | 23 +++++++++++++++++++++++ tests/libtestgi.h | 16 ++++++++++++++++ tests/test_gi.py | 21 +++++++++++++++++++++ - 3 files changed, 60 insertions(+), 0 deletions(-) + 3 Dateien geändert, 60 Zeilen hinzugefügt(+) commit 076ba3156c13375a75983cef7a409c8c8afea119 Author: Simon van der Linden @@ -15660,7 +15868,7 @@ Date: Thu Nov 26 23:50:54 2009 +0100 gi/types.py | 5 +++-- tests/test_gi.py | 19 +++++++++++++++++++ - 2 files changed, 22 insertions(+), 2 deletions(-) + 2 Dateien geändert, 22 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit ac80e64c9f7d257865aa820753e52d56cf2871c8 Author: Tomeu Vizoso @@ -15674,7 +15882,7 @@ Date: Fri Nov 27 12:06:59 2009 +0000 tests/libtestgi.c | 23 ++++++++++++++++++++++- tests/libtestgi.h | 7 +++++-- tests/test_gi.py | 8 ++++++++ - 4 files changed, 59 insertions(+), 8 deletions(-) + 4 Dateien geändert, 59 Zeilen hinzugefügt(+), 8 Zeilen entfernt(-) commit 4a373b8ad6ec137e911b92a3e745e0fd76541292 Author: Simon van der Linden @@ -15683,7 +15891,7 @@ Date: Wed Nov 25 16:53:55 2009 +0100 Use the right variable when looking up in sys.modules gi/importer.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit fc3dca018e85aee34ade79d104ebd8cdd1dd5968 Author: Tomeu Vizoso @@ -15697,7 +15905,7 @@ Date: Tue Nov 24 15:52:47 2009 +0100 tests/libtestgi.c | 6 ++++++ tests/libtestgi.h | 1 + tests/test_gi.py | 1 + - 4 files changed, 26 insertions(+), 1 deletions(-) + 4 Dateien geändert, 26 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit 33081c29a1c2fdec2b8bfe17ae0a72b8db7a8d84 Author: Tomeu Vizoso @@ -15706,7 +15914,7 @@ Date: Tue Nov 24 13:10:11 2009 +0100 Add stuff to .gitignore .gitignore | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) + 1 Datei geändert, 7 Zeilen hinzugefügt(+) commit 5c010fe673d9bd01c27c8d7d312064665275888c Author: Simon van der Linden @@ -15731,7 +15939,7 @@ Date: Mon Nov 23 22:39:12 2009 +0100 girepository/overrides/Gtk.py | 8 - girepository/repository.py | 51 -- tests/test_girepository.py | 386 ------------- - 16 files changed, 1 insertions(+), 3174 deletions(-) + 16 Dateien geändert, 1 Zeile hinzugefügt(+), 3174 Zeilen entfernt(-) commit a644edf0515c26ed027522891ccf02aceac764e8 Author: Johan Dahlin @@ -15751,7 +15959,7 @@ Date: Mon Nov 23 15:32:16 2009 -0200 ones. gi/importer.py | 34 +++++++++++++++++++++------------- - 1 files changed, 21 insertions(+), 13 deletions(-) + 1 Datei geändert, 21 Zeilen hinzugefügt(+), 13 Zeilen entfernt(-) commit fad89e12a744b57e6348968f351d25d167de8248 Author: Tomeu Vizoso @@ -15765,7 +15973,7 @@ Date: Sun Nov 22 17:56:20 2009 +0100 tests/libtestgi.c | 5 +++++ tests/libtestgi.h | 5 +++++ tests/test_gi.py | 5 +++++ - 4 files changed, 27 insertions(+), 8 deletions(-) + 4 Dateien geändert, 27 Zeilen hinzugefügt(+), 8 Zeilen entfernt(-) commit 1dc62a998dd8d2a0a397f8309011a8d79cb56034 Author: Tomeu Vizoso @@ -15777,7 +15985,7 @@ Date: Sun Nov 22 17:25:04 2009 +0100 gi/gimodule.c | 33 +++++++++++++++++++++++++++++++++ gi/types.py | 5 ++++- - 2 files changed, 37 insertions(+), 1 deletions(-) + 2 Dateien geändert, 37 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit d67d5afb5115c1d8294415b2e1a82af2c737ba17 Author: Paul Pogonyshev @@ -15786,7 +15994,7 @@ Date: Sun Nov 22 18:23:02 2009 +0200 Ignore one more file. .gitignore | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+) commit 408b2186aea58a41ec26b9d0ca29ecd42df5ef7e Author: Paul Pogonyshev @@ -15798,7 +16006,7 @@ Date: Sun Nov 22 18:22:23 2009 +0200 gobject/propertyhelper.py | 5 +++-- tests/test_properties.py | 6 ++++++ - 2 files changed, 9 insertions(+), 2 deletions(-) + 2 Dateien geändert, 9 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit 6ccf58afcf58e118903ced0135f0fe69b00e09ad Author: Tomeu Vizoso @@ -15807,7 +16015,7 @@ Date: Mon Oct 26 18:06:06 2009 +0000 Treat GI_INFO_TYPE_INTERFACE same as GI_INFO_TYPE_OBJECT gi/pygi-argument.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) + 1 Datei geändert, 3 Zeilen hinzugefügt(+) commit e6f730d6e1431e36bd5f6b503a1038617f8d1e7d Author: Simon van der Linden @@ -15816,7 +16024,7 @@ Date: Sat Nov 14 21:42:43 2009 +0100 Import pygtk properly to avoid failure on some setups tests/test_gi.py | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) + 1 Datei geändert, 3 Zeilen hinzugefügt(+) commit e604a89e9dc1a79687ef5fb94af7a2182be07dfb Author: Alex Dedul @@ -15832,7 +16040,7 @@ Date: Sat Nov 14 21:39:15 2009 +0100 Signed-off-by: Simon van der Linden configure.ac | 7 +++++-- - 1 files changed, 5 insertions(+), 2 deletions(-) + 1 Datei geändert, 5 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit 4a887cfabb326cb99dc65073d592c03f59e2f141 Author: Simon van der Linden @@ -15841,7 +16049,7 @@ Date: Sat Nov 14 21:36:19 2009 +0100 Fix silent rules setup configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 602afea88c338a38327cd84e08703c5daa384ec6 Author: Paul Pogonyshev @@ -15853,9 +16061,9 @@ Date: Tue Nov 10 22:32:33 2009 +0200 from the docs. docs/reference/pygobject-functions.xml | 36 - ++++++------------------------- + +++++++------------------------- glib/glibmodule.c | 16 ++++++++++++++ - 2 files changed, 23 insertions(+), 29 deletions(-) + 2 Dateien geändert, 23 Zeilen hinzugefügt(+), 29 Zeilen entfernt(-) commit 734755912fff11332dc0e96317b7d6b7c4014e6a Author: Simon van der Linden @@ -15869,7 +16077,7 @@ Date: Mon Nov 9 22:44:12 2009 +0100 ...capabilities-to-import-wrappers-from-pygi.patch | 200 -------------------- ...ances-by-calling-tp_alloc-rather-than-PyO.patch | 29 --- - 4 files changed, 0 insertions(+), 493 deletions(-) + 4 Dateien geändert, 493 Zeilen entfernt(-) commit 6a69288941e65312fe82649ec72d2f21b2dc618f Author: Simon van der Linden @@ -15885,7 +16093,7 @@ Date: Sat Nov 7 23:42:07 2009 +0100 called instead. gobject/pygboxed.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit 000f7c36e667c6e078e3370769ea868e56a1b4ee Author: Simon van der Linden @@ -15903,13 +16111,13 @@ Date: Sat Nov 7 16:43:35 2009 +0100 function and API definition had to be copied in this tree. - configure.ac | 8 +++++ + configure.ac | 8 ++++++ gobject/pygboxed.c | 10 +++++++ gobject/pygi-external.h | 66 +++++++++++++++++++++++++++++++++++++++++++++++ gobject/pygobject.c | 10 +++++++ gobject/pygpointer.c | 11 ++++++++ - 5 files changed, 105 insertions(+), 0 deletions(-) + 5 Dateien geändert, 105 Zeilen hinzugefügt(+) commit fdfbc90dbc9e305646b62d73de506b5e0e99cc91 Author: Simon van der Linden @@ -15922,7 +16130,7 @@ Date: Sun Nov 8 20:03:58 2009 +0100 ...capabilities-to-import-wrappers-from-pygi.patch | 74 ++++++++++++++++++-- ...ances-by-calling-tp_alloc-rather-than-PyO.patch | 2 +- - 2 files changed, 69 insertions(+), 7 deletions(-) + 2 Dateien geändert, 69 Zeilen hinzugefügt(+), 7 Zeilen entfernt(-) commit 8f53ca8a72f9958711765281dd5c5bdfb7042d7d Author: Tomeu Vizoso @@ -15931,7 +16139,7 @@ Date: Sun Nov 8 16:52:18 2009 +0100 Add myself to pygi.doap pygi.doap | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) + 1 Datei geändert, 5 Zeilen hinzugefügt(+) commit 6f50d5102aec9288e1851f12e9d232b9c141d524 Author: Simon van der Linden @@ -15940,7 +16148,7 @@ Date: Sun Nov 8 15:40:51 2009 +0100 Add a doap file pygi.doap | 17 +++++++++++++++++ - 1 files changed, 17 insertions(+), 0 deletions(-) + 1 Datei geändert, 17 Zeilen hinzugefügt(+) commit ce673b9027868e6add4eeb438bc707eb40bfd046 Author: Simon van der Linden @@ -15953,7 +16161,7 @@ Date: Sun Nov 8 13:06:54 2009 +0100 ++++++++++++++++++++ ...capabilities-to-import-wrappers-from-pygi.patch | 138 +++++++++++++++ ...ances-by-calling-tp_alloc-rather-than-PyO.patch | 29 +++ - 4 files changed, 431 insertions(+), 0 deletions(-) + 4 Dateien geändert, 431 Zeilen hinzugefügt(+) commit b24fd9633cabe1d95cde173a04e9a49833b06a26 Author: Simon van der Linden @@ -15995,7 +16203,7 @@ Date: Sun Nov 8 12:35:08 2009 +0100 tests/libtestgi.h | 643 +++++++++ tests/runtests.py | 22 + tests/test_gi.py | 1416 +++++++++++++++++++ - 33 files changed, 11566 insertions(+), 0 deletions(-) + 33 Dateien geändert, 11566 Zeilen hinzugefügt(+) commit bfd3100a580b8bea9db25b8bb7443fb8c3dbe1cc Author: Simon van der Linden @@ -16003,11 +16211,11 @@ Date: Sat Nov 7 13:23:53 2009 +0100 Fix girpository build setup - configure.ac | 21 ++++++---- - girepository/Makefile.am | 13 +++--- + configure.ac | 21 +++++++---- + girepository/Makefile.am | 13 +++---- m4/introspection.m4 | 92 ++++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 111 insertions(+), 15 deletions(-) + 3 Dateien geändert, 111 Zeilen hinzugefügt(+), 15 Zeilen entfernt(-) commit 421c03b1c5b69f90c778663df901b45ca3ee8ba5 Author: Simon van der Linden @@ -16017,7 +16225,7 @@ Date: Fri Nov 6 19:17:36 2009 +0100 boxed wrappers gobject/pygtype.c | 39 +++++++++++++++++++++++++++++++++------ - 1 files changed, 33 insertions(+), 6 deletions(-) + 1 Datei geändert, 33 Zeilen hinzugefügt(+), 6 Zeilen entfernt(-) commit a9c168c58cc6a449b51653417bf3f58bdd41457c Author: Philippe Normad @@ -16028,8 +16236,8 @@ Date: Wed Oct 21 18:01:16 2009 +0200 Fixes bug #481569 glib/pygmainloop.c | 95 - +++++++++++++++++++++++++++------------------------ - 1 files changed, 50 insertions(+), 45 deletions(-) + +++++++++++++++++++++++++++------------------------- + 1 Datei geändert, 50 Zeilen hinzugefügt(+), 45 Zeilen entfernt(-) commit c6a5750379354c12e2599b3c73b4f9a23fd39114 Author: Gian Mario Tagliaretti @@ -16038,7 +16246,7 @@ Date: Fri Sep 25 20:12:21 2009 +0200 Post release version bump to 2.21.0 configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 33920eb013628a5e22b7b32403fb965ae3210f47 Author: Gian Mario Tagliaretti @@ -16047,7 +16255,7 @@ Date: Wed Sep 23 21:52:04 2009 +0200 Update NEWS and release 2.20.0 NEWS | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) + 1 Datei geändert, 6 Zeilen hinzugefügt(+) commit 66b12f7d2f54143ea80b4f8aec863b26800363d6 Author: Gian Mario Tagliaretti @@ -16056,7 +16264,7 @@ Date: Wed Sep 23 21:51:43 2009 +0200 Bump version to 2.20.0 configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 7bf87338a026ac82f908aa5fddf2bfea2daf6617 Author: Brian Cameron @@ -16066,7 +16274,7 @@ Date: Wed Sep 23 12:11:50 2009 -0500 defsdir files and codegen files. See bug #596023. pygobject-2.0-uninstalled.pc.in | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit d042402b7c649b2bed7f20038eb82518ec7cc9b3 Author: Paul Pogonyshev @@ -16077,7 +16285,7 @@ Date: Tue Sep 22 22:02:27 2009 +0300 Bug #579406, second change. glib/pygmainloop.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+) commit 640be8109d066e85ed77c810830a5f73c750415b Author: Frédéric Péters @@ -16090,7 +16298,7 @@ Date: Sun Aug 30 16:46:02 2009 +0200 file that is produced when using ref-html-style.xsl. docs/xsl/devhelp.xsl | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit c888b5ca722fcad6a03de585606c677c2969ebd6 Author: Paolo Borelli @@ -16099,7 +16307,7 @@ Date: Thu Aug 13 21:32:07 2009 +0200 Allow to use automake 1.11 autogen.sh | 13 +++++++------ - 1 files changed, 7 insertions(+), 6 deletions(-) + 1 Datei geändert, 7 Zeilen hinzugefügt(+), 6 Zeilen entfernt(-) commit 30deaba4bd1e199aab75cb346ee9237237807fbd Author: Gian Mario Tagliaretti @@ -16108,7 +16316,7 @@ Date: Tue Aug 11 22:19:50 2009 +0200 Update README README | 10 ++++++++-- - 1 files changed, 8 insertions(+), 2 deletions(-) + 1 Datei geändert, 8 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit af165d350d0d1bb493be5140bf84376d3da1e4d8 Author: Gian Mario Tagliaretti @@ -16117,7 +16325,7 @@ Date: Tue Aug 11 22:16:52 2009 +0200 Update AUTHORS AUTHORS | 8 +++++--- - 1 files changed, 5 insertions(+), 3 deletions(-) + 1 Datei geändert, 5 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-) commit 5f9f87f276b97964b525a501d8584ea8b4d8bfd2 Author: Gian Mario Tagliaretti @@ -16127,7 +16335,7 @@ Date: Tue Aug 11 22:11:43 2009 +0200 MAINTAINERS | 8 ++++++++ pygobject.doap | 14 ++++++++++++++ - 2 files changed, 22 insertions(+), 0 deletions(-) + 2 Dateien geändert, 22 Zeilen hinzugefügt(+) commit 3bfae47fbcb5523d91fb2d1ed7ea347eeddd1775 Author: Gian Mario Tagliaretti @@ -16136,7 +16344,7 @@ Date: Tue Aug 11 20:52:44 2009 +0200 Update NEWS release 2.19.0 NEWS | 29 +++++++++++++++++++++++++++++ - 1 files changed, 29 insertions(+), 0 deletions(-) + 1 Datei geändert, 29 Zeilen hinzugefügt(+) commit e82a1841f31ad54dd50569d0d45290713409e0bf Author: John Finlay @@ -16146,7 +16354,7 @@ Date: Tue Aug 11 00:04:31 2009 -0700 gobject/pygobject.h | 242 ++++++++++++++++++++++++++++++++++++++++++++++++++- - 1 files changed, 241 insertions(+), 1 deletions(-) + 1 Datei geändert, 241 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit f1fad96da2c531fbd3218923baa4fe806a2942d4 Author: Gian Mario Tagliaretti @@ -16155,7 +16363,7 @@ Date: Sat Aug 8 21:37:54 2009 +0200 Bug 590063 – GFileInfo.list_attributes should accept None/NULL gio/gfileinfo.override | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit b7907cf6ff6ccf8d38b5206f09f5c864c205e5de Author: Johan Dahlin @@ -16165,7 +16373,7 @@ Date: Fri Jul 24 14:30:37 2009 -0300 MAINTAINERS | 4 ---- pygobject.doap | 7 ------- - 2 files changed, 0 insertions(+), 11 deletions(-) + 2 Dateien geändert, 11 Zeilen entfernt(-) commit be6eb21320b4688bcfcd8cbea33f7be29a76f2a2 Author: John Finlay @@ -16175,7 +16383,7 @@ Date: Wed Jul 8 15:47:44 2009 -0700 DLL API macros. codegen/defsgen.py | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + 1 Datei geändert, 3 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-) commit 2214cad3529979e29342a7e1fdc2915b90ce9c10 Author: Gian Mario Tagliaretti @@ -16191,7 +16399,7 @@ Date: Tue Jun 23 21:18:23 2009 +0200 +++++++++++++------------- docs/reference/pygiounix-classes.xml | 13 +++++++++++++ docs/reference/pygobject-ref.xml | 1 + - 6 files changed, 42 insertions(+), 28 deletions(-) + 6 Dateien geändert, 42 Zeilen hinzugefügt(+), 28 Zeilen entfernt(-) commit c0acaedfe7f4e488a490e07e3184f0709e1fadc2 Author: Gian Mario Tagliaretti @@ -16203,7 +16411,7 @@ Date: Mon Jun 22 23:13:36 2009 +0200 docs/reference/pygio-classes.xml | 1 + docs/reference/pygio-functions.xml | 395 ++++++++++++++++++++++++++++++++++++ - 3 files changed, 398 insertions(+), 0 deletions(-) + 3 Dateien geändert, 398 Zeilen hinzugefügt(+) commit ebddee47fb7f3e06f9e0a7a14b9532d5cf8a3881 Author: Gian Mario Tagliaretti @@ -16217,7 +16425,7 @@ Date: Sun Jun 21 18:35:56 2009 +0200 +++++++++++++++++++++++++++++ docs/reference/pygio-unixoutputstream.xml | 202 +++++++++++++++++++++++++++++ - 4 files changed, 410 insertions(+), 0 deletions(-) + 4 Dateien geändert, 410 Zeilen hinzugefügt(+) commit 5b71e58117c85634d95d08449eb54079b246e5be Author: Paul Pogonyshev @@ -16226,7 +16434,7 @@ Date: Sun Jun 21 16:50:03 2009 +0300 Document that many functions got moved gobject -> glib docs/reference/pygobject-functions.xml | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) + 1 Datei geändert, 7 Zeilen hinzugefügt(+) commit b270dc43f2cef5260b0bbc71356fd8e6a2b7f754 Author: Gian Mario Tagliaretti @@ -16238,7 +16446,7 @@ Date: Sat Jun 20 19:23:25 2009 +0200 docs/reference/pygio-classes.xml | 1 + docs/reference/pygio-dataoutputstream.xml | 504 +++++++++++++++++++++++++++++ - 3 files changed, 507 insertions(+), 0 deletions(-) + 3 Dateien geändert, 507 Zeilen hinzugefügt(+) commit 549313fc4886fa3deb31761de6f5400708165d86 Author: Murray Cumming @@ -16248,7 +16456,7 @@ Date: Thu Jun 18 18:48:37 2009 +0200 the struct keyword. codegen/h2def.py | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) + 1 Datei geändert, 4 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-) commit 5c36ef20dca8cd1793f2d3e88949675299097f40 Author: Gian Mario Tagliaretti @@ -16261,7 +16469,7 @@ Date: Mon Jun 15 23:02:34 2009 +0200 docs/reference/pygio-constants.xml | 66 +++ docs/reference/pygio-datainputstream.xml | 799 ++++++++++++++++++++++++++++++ - 4 files changed, 868 insertions(+), 0 deletions(-) + 4 Dateien geändert, 868 Zeilen hinzugefügt(+) commit a8b36c343c6850af929c1d5a930f923831b4e637 Author: Theppitak Karoonboonyanan @@ -16272,7 +16480,7 @@ Date: Mon Jun 15 23:25:01 2009 +0300 Bug #585817. girepository/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 9d9ae97b8a49836ec1f3b8d6529bafe1cc06d4d7 Author: Paul Pogonyshev @@ -16284,9 +16492,9 @@ Date: Mon Jun 15 23:19:47 2009 +0300 mark gio.emblem_new_with_origin as sort-of-deprecated. docs/reference/pygio-emblem.xml | 51 - +++++++++++++++++++++++++++++++++++++- - gio/gio.defs | 5 ++- - 2 files changed, 52 insertions(+), 4 deletions(-) + +++++++++++++++++++++++++++++++++++++-- + gio/gio.defs | 5 ++-- + 2 Dateien geändert, 52 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-) commit 268e1681fd5b46e6412d3a8db84f3f1cb02fdbde Author: Gian Mario Tagliaretti @@ -16294,11 +16502,11 @@ Date: Sat Jun 13 14:44:47 2009 +0200 Add docs for gio.BufferedOutputStream class - docs/Makefile.am | 96 +++++----- + docs/Makefile.am | 96 ++++----- docs/reference/pygio-bufferedoutputstream.xml | 275 +++++++++++++++++++++++++ docs/reference/pygio-classes.xml | 1 + - 3 files changed, 325 insertions(+), 47 deletions(-) + 3 Dateien geändert, 325 Zeilen hinzugefügt(+), 47 Zeilen entfernt(-) commit a6e25aaa7c8f27d62f2917b06728d7ccfcd46416 Author: Gian Mario Tagliaretti @@ -16309,8 +16517,8 @@ Date: Sat Jun 13 14:38:34 2009 +0200 Added the constructor reference and fixed a typo in properties header docs/reference/pygio-bufferedinputstream.xml | 34 - ++++++++++++++++++++++++- - 1 files changed, 32 insertions(+), 2 deletions(-) + ++++++++++++++++++++++++-- + 1 Datei geändert, 32 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit a9b13b60a5aad726d7d7dd7fdc5153b1561fb591 Author: Gian Mario Tagliaretti @@ -16322,7 +16530,7 @@ Date: Sat Jun 13 01:25:06 2009 +0200 docs/reference/pygio-bufferedinputstream.xml | 431 ++++++++++++++++++++++++++ docs/reference/pygio-classes.xml | 1 + - 3 files changed, 434 insertions(+), 0 deletions(-) + 3 Dateien geändert, 434 Zeilen hinzugefügt(+) commit 7766daa59b0e2b85413cee368bf2ebd2afe198e1 Author: Paul Pogonyshev @@ -16333,14 +16541,14 @@ Date: Sun May 31 18:25:47 2009 +0300 Also move several gio.Mount overrides over from 'gio.override' to existing 'gmount.override'. Part of bug #584289. - gio/gfile.override | 20 ++-- + gio/gfile.override | 20 ++--- gio/gfileenumerator.override | 6 +- gio/ginputstream.override | 2 +- gio/gio.override | 204 ------------------------------------------ gio/gmount.override | 204 ++++++++++++++++++++++++++++++++++++++++++ - 5 files changed, 218 insertions(+), 218 deletions(-) + 5 Dateien geändert, 218 Zeilen hinzugefügt(+), 218 Zeilen entfernt(-) commit 07e9c18dc092f6546230168b6b69c1b3454e120a Author: Paul Pogonyshev @@ -16352,7 +16560,7 @@ Date: Sun May 31 18:56:55 2009 +0300 codegen/codegen.py | 9 +++++---- codegen/definitions.py | 10 +++++++++- - 2 files changed, 14 insertions(+), 5 deletions(-) + 2 Dateien geändert, 14 Zeilen hinzugefügt(+), 5 Zeilen entfernt(-) commit 235fde85d015382f2ba38b21968e82b3ac0b6612 Author: Gian Mario Tagliaretti @@ -16361,7 +16569,7 @@ Date: Fri Jun 12 00:12:17 2009 +0200 Fix object type in gio.BufferedInputStream_fill_async gio/gbufferedinputstream.override | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 407b0e909056f15960e6a4e549896d786ce0a0b2 Author: Gian Mario Tagliaretti @@ -16376,7 +16584,7 @@ Date: Tue Jun 9 00:08:21 2009 +0200 +++++++++++++++++++++++++++++++++++++ gio/gio.override | 1 + tests/test_gio.py | 25 +++++++++++++ - 4 files changed, 97 insertions(+), 0 deletions(-) + 4 Dateien geändert, 97 Zeilen hinzugefügt(+) commit b7c96b41b287685fe57504e0add3a6f16e649975 Author: Gian Mario Tagliaretti @@ -16386,7 +16594,7 @@ Date: Mon Jun 8 15:42:40 2009 +0200 definition gio/gio-types.defs | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) + 1 Datei geändert, 7 Zeilen hinzugefügt(+) commit 3666f75af4ef2c8e038116aee5afada59d59f689 Author: Gian Mario Tagliaretti @@ -16398,7 +16606,7 @@ Date: Mon Jun 8 14:20:02 2009 +0200 docs/reference/pygio-classes.xml | 1 + docs/reference/pygio-memoryoutputstream.xml | 175 +++++++++++++++++++++++++++ - 3 files changed, 178 insertions(+), 0 deletions(-) + 3 Dateien geändert, 178 Zeilen hinzugefügt(+) commit 6eb5e3988cbddb4afb3d5747364d6eb80370bb78 Author: Gian Mario Tagliaretti @@ -16411,7 +16619,7 @@ Date: Mon Jun 8 13:30:15 2009 +0200 gio/gmemoryoutputstream.override | 45 ++++++++++++++++++++++++++++++++++++++ gio/goutputstream.override | 24 -------------------- - 4 files changed, 47 insertions(+), 24 deletions(-) + 4 Dateien geändert, 47 Zeilen hinzugefügt(+), 24 Zeilen entfernt(-) commit dfbdf23633a772e78b47b0e7b0c3e3b87855d9ff Author: Gian Mario Tagliaretti @@ -16427,11 +16635,11 @@ Date: Mon Jun 8 11:45:11 2009 +0200 docs/reference/pygio-memoryinputstream.xml | 151 ++++++++++++++++++++++++++++ gio/Makefile.am | 1 + - gio/ginputstream.override | 34 ------ + gio/ginputstream.override | 34 ------- gio/gio.override | 1 + gio/gmemoryinputstream.override | 91 +++++++++++++++++ tests/test_gio.py | 4 + - 8 files changed, 252 insertions(+), 35 deletions(-) + 8 Dateien geändert, 252 Zeilen hinzugefügt(+), 35 Zeilen entfernt(-) commit fcc3cb0e167789746a1a9db0cba54ea7a97c7259 Author: Simon van der Linden @@ -16441,11 +16649,11 @@ Date: Mon Jun 8 19:15:24 2009 +0200 girepository/Makefile.am | 2 +- girepository/bank-repository.c | 67 - +++++++++++++++++++-------------------- + ++++++++++++++++++++-------------------- girepository/bank.h | 2 +- girepository/btypes.py | 6 ++-- girepository/module.py | 2 +- - 5 files changed, 39 insertions(+), 40 deletions(-) + 5 Dateien geändert, 39 Zeilen hinzugefügt(+), 40 Zeilen entfernt(-) commit fb4b2c8cdad2853e6bfe9526529e3a3ab052c5e0 Author: Simon van der Linden @@ -16454,7 +16662,7 @@ Date: Fri Jun 5 19:03:59 2009 +0200 Removes the header but the modeline in test_girepository.py. tests/test_girepository.py | 26 +------------------------- - 1 files changed, 1 insertions(+), 25 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 25 Zeilen entfernt(-) commit abe4828f52c7eb3a08f5b592e7ced1e97a58ef5c Author: Simon van der Linden @@ -16466,7 +16674,7 @@ Date: Wed Jun 3 10:47:58 2009 +0200 girepository/importer.py | 3 +-- girepository/overrides/Gdk.py | 14 ++++++++++++++ girepository/overrides/Gtk.py | 8 ++++++++ - 4 files changed, 26 insertions(+), 2 deletions(-) + 4 Dateien geändert, 26 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit c12964e6a3354d8063355225c94e6d21d621e08b Author: Simon van der Linden @@ -16476,7 +16684,7 @@ Date: Tue Jun 2 23:40:41 2009 +0200 tests/test_girepository.py | 242 +++++++++++++++++++++++++++++++++----------- - 1 files changed, 182 insertions(+), 60 deletions(-) + 1 Datei geändert, 182 Zeilen hinzugefügt(+), 60 Zeilen entfernt(-) commit a4469a3f7d32a25156bae5e7aef9ec4ae5f6e140 Author: Simon van der Linden @@ -16487,7 +16695,7 @@ Date: Tue Jun 2 23:03:26 2009 +0200 tests/test_girepository.py | 288 ++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 288 insertions(+), 0 deletions(-) + 1 Datei geändert, 288 Zeilen hinzugefügt(+) commit e4f2a5ef8734cf40cf8345d442612db1f6c62d5a Author: Simon van der Linden @@ -16495,7 +16703,7 @@ Date: Thu May 28 17:45:11 2009 +0200 Introduces the girepository module from the former PyBank. - INSTALL | 69 ++- + INSTALL | 69 +-- Makefile.am | 2 +- configure.ac | 12 + girepository/Makefile.am | 52 ++ @@ -16510,7 +16718,7 @@ Date: Thu May 28 17:45:11 2009 +0200 girepository/importer.py | 52 ++ girepository/module.py | 224 ++++++++ girepository/repository.py | 51 ++ - 14 files changed, 2799 insertions(+), 32 deletions(-) + 14 Dateien geändert, 2799 Zeilen hinzugefügt(+), 32 Zeilen entfernt(-) commit f5ab5046fe9b67ec5e8fc64679e1a3d01787af7e Author: Gian Mario Tagliaretti @@ -16519,7 +16727,7 @@ Date: Tue Jun 2 18:28:22 2009 +0200 Fix the docs for gio.FilterOutputStream docs/reference/pygio-filteroutputstream.xml | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + 1 Datei geändert, 3 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-) commit fded60d8376fc45d19bf6cd8be6b927cc3f2e8c6 Author: Gian Mario Tagliaretti @@ -16531,7 +16739,7 @@ Date: Tue Jun 2 18:27:00 2009 +0200 docs/reference/pygio-classes.xml | 1 + docs/reference/pygio-filteroutputstream.xml | 152 +++++++++++++++++++++++++++ - 3 files changed, 155 insertions(+), 0 deletions(-) + 3 Dateien geändert, 155 Zeilen hinzugefügt(+) commit e2c31f916967229b6547e68013628ce0082cf875 Author: Gian Mario Tagliaretti @@ -16543,7 +16751,7 @@ Date: Tue Jun 2 13:29:59 2009 +0200 docs/reference/pygio-classes.xml | 1 + docs/reference/pygio-filterinputstream.xml | 152 ++++++++++++++++++++++++++++ - 3 files changed, 155 insertions(+), 0 deletions(-) + 3 Dateien geändert, 155 Zeilen hinzugefügt(+) commit 49a467eee445bc75554db0374006722ac075194b Author: Gian Mario Tagliaretti @@ -16552,7 +16760,7 @@ Date: Tue Jun 2 11:33:20 2009 +0200 Add API appeared in 2.20 but not marked as such in gio docs gio/gio.defs | 30 ++++++++++++++++++++++++++++++ - 1 files changed, 30 insertions(+), 0 deletions(-) + 1 Datei geändert, 30 Zeilen hinzugefügt(+) commit 180c157f2a20b7d2dd9af05bfb5f515fd23870a0 Author: Gian Mario Tagliaretti @@ -16571,7 +16779,7 @@ Date: Tue Jun 2 10:41:26 2009 +0200 gio/gfileoutputstream.override | 68 ++++++++ gio/gio.override | 1 + tests/test_gio.py | 27 +++ - 7 files changed, 358 insertions(+), 1 deletions(-) + 7 Dateien geändert, 358 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit 4673577d1f6c3d54423808dd575987092fb05ad2 Author: Gian Mario Tagliaretti @@ -16582,7 +16790,7 @@ Date: Tue Jun 2 10:17:41 2009 +0200 Add implemented interface section and remove a method description docs/reference/pygio-fileinputstream.xml | 25 +++++++++---------------- - 1 files changed, 9 insertions(+), 16 deletions(-) + 1 Datei geändert, 9 Zeilen hinzugefügt(+), 16 Zeilen entfernt(-) commit 1e1cad02879d514745b5233658654cbe944530a5 Author: Gian Mario Tagliaretti @@ -16591,7 +16799,7 @@ Date: Mon Jun 1 22:54:26 2009 +0200 Fix the method name gio/gfileinputstream.override | 14 +++++++------- - 1 files changed, 7 insertions(+), 7 deletions(-) + 1 Datei geändert, 7 Zeilen hinzugefügt(+), 7 Zeilen entfernt(-) commit f605811afe8c91f121e89b6f9ec28c70b62f4110 Author: Gian Mario Tagliaretti @@ -16610,7 +16818,7 @@ Date: Mon Jun 1 22:40:56 2009 +0200 gio/gfileinputstream.override | 68 +++++++++ gio/gio.override | 1 + tests/test_gio.py | 27 ++++ - 7 files changed, 321 insertions(+), 0 deletions(-) + 7 Dateien geändert, 321 Zeilen hinzugefügt(+) commit 08623e54a426377c1504b5c364aabae5a17f8ad8 Author: Paul Pogonyshev @@ -16624,7 +16832,7 @@ Date: Sun May 31 17:43:16 2009 +0300 codegen/code-coverage.py | 2 ++ codegen/codegen.py | 2 ++ codegen/defsconvert.py | 2 ++ - 4 files changed, 18 insertions(+), 11 deletions(-) + 4 Dateien geändert, 18 Zeilen hinzugefügt(+), 11 Zeilen entfernt(-) commit 833d4da202bcfcb01a414f8aec4b751ec8e1ccb2 Author: Paul Pogonyshev @@ -16644,7 +16852,7 @@ Date: Sat May 30 16:57:49 2009 +0300 gio/gio.defs | 4 +- gio/gio.override | 1 + tests/test_gio.py | 51 ++++++++- - 6 files changed, 300 insertions(+), 72 deletions(-) + 6 Dateien geändert, 300 Zeilen hinzugefügt(+), 72 Zeilen entfernt(-) commit 2cb569c0ced49f9ed5ca83292d5f15c837066688 Author: Paul Pogonyshev @@ -16655,7 +16863,7 @@ Date: Sat May 30 17:24:15 2009 +0300 Bug #584290. gio/goutputstream.override | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) + 1 Datei geändert, 4 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-) commit e43fa429f6b4019a432acb481bbc07c8201cc46d Author: Paul Pogonyshev @@ -16664,7 +16872,7 @@ Date: Wed May 27 21:19:27 2009 +0300 Code maintenance: ignore one more file created by unit tests tests/.gitignore | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+) commit 76e9dc74ac706a9207f9d31f887d6e38df2a678f Author: Gian Mario Tagliaretti @@ -16676,7 +16884,7 @@ Date: Mon May 25 20:20:38 2009 +0200 docs/reference/pygio-icon.xml | 99 +++++++++++++++++++++++- docs/reference/pygio-mount.xml | 156 ++++++++++++++++++++++++++++++++++++++ - 3 files changed, 367 insertions(+), 3 deletions(-) + 3 Dateien geändert, 367 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-) commit 8e40d71ac23deb7d91789486ee8cad440a6be1dd Author: Gian Mario Tagliaretti @@ -16688,8 +16896,8 @@ Date: Mon May 25 01:33:08 2009 +0200 gio/gio.defs | 106 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - gio/unix.defs | 48 +++++++++++++++++++++---- - 2 files changed, 146 insertions(+), 8 deletions(-) + gio/unix.defs | 48 +++++++++++++++++++++----- + 2 Dateien geändert, 146 Zeilen hinzugefügt(+), 8 Zeilen entfernt(-) commit 0d08df42514fba6abc896814abfee0d2d083c29e Author: Gian Mario Tagliaretti @@ -16698,7 +16906,7 @@ Date: Mon May 25 00:14:21 2009 +0200 Post release version bump 2.19.0 configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit edfb09e3de7baf294b3beba84b4ecb94e1f16764 Author: Gian Mario Tagliaretti @@ -16708,7 +16916,7 @@ Date: Sun May 24 23:56:29 2009 +0200 NEWS | 14 ++++++++++++++ configure.ac | 4 ++-- - 2 files changed, 16 insertions(+), 2 deletions(-) + 2 Dateien geändert, 16 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit e0648ea435e0b309cdd5bb0ebe56d4534efd26e4 Author: Gian Mario Tagliaretti @@ -16726,7 +16934,7 @@ Date: Sun May 24 22:18:40 2009 +0200 docs/reference/pygio-classes.xml | 3 +- docs/reference/pygio-outputstream.xml | 140 +++++++++++++++++++++++++++++++++ - 3 files changed, 144 insertions(+), 1 deletions(-) + 3 Dateien geändert, 144 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit 11524cdf6472d9115a812ce431f6767aec5627bc Author: Gian Mario Tagliaretti @@ -16739,7 +16947,7 @@ Date: Sun May 24 22:12:04 2009 +0200 gio/goutputstream.override | 58 +++++++++++++++++++++++++++++++++++++++++++- tests/test_gio.py | 20 +++++++++++++++ - 2 files changed, 77 insertions(+), 1 deletions(-) + 2 Dateien geändert, 77 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit 82ad6b8c8ea4d6694126f5e0e67b826717e38f19 Author: Emilio Pozuelo Monfort @@ -16754,7 +16962,7 @@ Date: Sun May 24 22:55:16 2009 +0300 gio/Makefile.am | 2 +- glib/Makefile.am | 10 +++++----- gobject/Makefile.am | 2 +- - 4 files changed, 9 insertions(+), 7 deletions(-) + 4 Dateien geändert, 9 Zeilen hinzugefügt(+), 7 Zeilen entfernt(-) commit 59da8cd24ea390b6c983995833ec6b0e5d028b35 Author: Gian Mario Tagliaretti @@ -16766,8 +16974,8 @@ Date: Sun May 24 11:44:24 2009 +0200 gio/goutputstream.override | 47 +++++++++++++++++++++++++++++++++++++++++++- - tests/test_gio.py | 11 ++++++++++ - 2 files changed, 57 insertions(+), 1 deletions(-) + tests/test_gio.py | 11 +++++++++++ + 2 Dateien geändert, 57 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit 84ab6178ed0033f69932df5bc73c86bdff80c953 Author: Gian Mario Tagliaretti @@ -16785,7 +16993,7 @@ Date: Sun May 17 17:29:37 2009 +0200 docs/reference/pygio-classes.xml | 1 + docs/reference/pygio-filemonitor.xml | 128 ++++++++++++++++++++++++++++++++++ - 3 files changed, 131 insertions(+), 0 deletions(-) + 3 Dateien geändert, 131 Zeilen hinzugefügt(+) commit 629496a5617d30e4dfa494b05a62c85a6af77b9a Author: Josselin Mouette @@ -16797,7 +17005,7 @@ Date: Sun May 17 18:03:44 2009 +0300 pygobject-2.0-uninstalled.pc.in | 3 ++- pygobject-2.0.pc.in | 3 ++- - 2 files changed, 4 insertions(+), 2 deletions(-) + 2 Dateien geändert, 4 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit 90cd8b7c4a25cd2ecb751f8337b401c98538272b Author: Gian Mario Tagliaretti @@ -16812,7 +17020,7 @@ Date: Wed May 13 21:54:39 2009 +0200 gio/gfileinfo.override | 24 ++++++++++++++++++++++-- gio/gio-types.defs | 7 +++++++ gio/gio.override | 2 ++ - 3 files changed, 31 insertions(+), 2 deletions(-) + 3 Dateien geändert, 31 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) commit e707447d9313f2f2ecba395cfe3682d5a5e859f4 Author: Paul Pogonyshev @@ -16824,8 +17032,8 @@ Date: Wed May 13 22:06:25 2009 +0300 METH_NOARGS but actually accepted arguments. Fixes bug #582427. glib/pygiochannel.c | 83 - ++++++++++++-------------------------------------- - 1 files changed, 20 insertions(+), 63 deletions(-) + +++++++++++++-------------------------------------- + 1 Datei geändert, 20 Zeilen hinzugefügt(+), 63 Zeilen entfernt(-) commit 002915e5f458fec5a89766a54e8119a70a80caa7 Author: Gian Mario Tagliaretti @@ -16843,7 +17051,7 @@ Date: Tue May 12 20:37:24 2009 +0200 docs/reference/pygio-classes.xml | 1 + docs/reference/pygio-fileinfo.xml | 346 +++++++++++++++++++++++++++++++++++++ - 3 files changed, 349 insertions(+), 0 deletions(-) + 3 Dateien geändert, 349 Zeilen hinzugefügt(+) commit 8cd25c871609580425c6c4c9e5bc6ec8d40862a1 Author: Paul Pogonyshev @@ -16858,7 +17066,7 @@ Date: Sat May 9 16:46:04 2009 +0300 ChangeLog.pre-2.18 | 3608 ++++++++++++++++++++++++++++++++++++++++++++++++++++ Makefile.am | 32 + - 3 files changed, 3640 insertions(+), 3606 deletions(-) + 3 Dateien geändert, 3640 Zeilen hinzugefügt(+), 3606 Zeilen entfernt(-) commit 23556bdbcf9cf06db866901fb822dd78a9043648 Author: Gian Mario Tagliaretti @@ -16869,7 +17077,7 @@ Date: Sat May 9 00:03:05 2009 +0200 use the count argument instead of buffer_size which is always zero gio/ginputstream.override | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) + 1 Datei geändert, 2 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit ed6b06315c17441b41c001d38537c904b8fe18de Author: Gian Mario Tagliaretti @@ -16881,7 +17089,7 @@ Date: Sat May 9 00:02:33 2009 +0200 docs/reference/pygio-classes.xml | 1 + docs/reference/pygio-inputstream.xml | 730 ++++++++++++++++++++++++++++++++++ - 3 files changed, 733 insertions(+), 0 deletions(-) + 3 Dateien geändert, 733 Zeilen hinzugefügt(+) commit d58322b84d47da7905f95b43e9e0daf9f7c4b507 Author: Gian Mario Tagliaretti @@ -16894,7 +17102,7 @@ Date: Mon May 4 23:40:28 2009 +0200 gio/ginputstream.override | 50 ++++++++++++++++++++++++++++++++++++++++++++- tests/test_gio.py | 20 ++++++++++++++++++ - 2 files changed, 69 insertions(+), 1 deletions(-) + 2 Dateien geändert, 69 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) commit 2311187824d1b48a996ee2620fd3c9a63e3edd66 Author: Siavash Safi @@ -16905,10 +17113,10 @@ Date: Mon May 4 15:46:49 2009 +0430 Patch from bug #579275 - ChangeLog | 8 +++ + ChangeLog | 8 ++++ codegen/h2def.py | 133 ++++++++++++++++++++++++++++++++++++++++++++---------- - 2 files changed, 117 insertions(+), 24 deletions(-) + 2 Dateien geändert, 117 Zeilen hinzugefügt(+), 24 Zeilen entfernt(-) commit 442ec5bb997bb7dab55baeea6e54e79d3ce0d3c1 Author: Paul Pogonyshev @@ -16919,7 +17127,7 @@ Date: Sat May 2 23:54:52 2009 +0300 Fixes bug #581082. glib/glibmodule.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit f466dca880cc6ea68b9fe236943eea7a07d33520 Author: Gian Mario Tagliaretti @@ -16931,7 +17139,7 @@ Date: Sun May 3 11:03:25 2009 +0200 docs/reference/pygio-classes.xml | 1 + docs/reference/pygio-loadableicon.xml | 198 +++++++++++++++++++++++++++++++++ - 3 files changed, 201 insertions(+), 0 deletions(-) + 3 Dateien geändert, 201 Zeilen hinzugefügt(+) commit eab4ebf7f6c82580b61205f34e1cfe535aeada60 Author: Gian Mario Tagliaretti @@ -16943,7 +17151,7 @@ Date: Sun May 3 01:21:55 2009 +0200 docs/reference/pygio-classes.xml | 1 + docs/reference/pygio-themedicon.xml | 204 +++++++++++++++++++++++++++++++++++ - 3 files changed, 207 insertions(+), 0 deletions(-) + 3 Dateien geändert, 207 Zeilen hinzugefügt(+) commit 22d7de8b620055f14b30f9c3c99160c8b4ebe672 Author: Gian Mario Tagliaretti @@ -16952,7 +17160,7 @@ Date: Sat May 2 12:25:19 2009 +0200 post release version bump to 2.17.1 configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit 282ac3c76e1e3513bd76f819f320ec56aba15d9e Author: Gian Mario Tagliaretti @@ -16961,7 +17169,7 @@ Date: Fri May 1 23:40:31 2009 +0200 Fix the class title docs/reference/pygio-mountoperation.xml | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-) commit d8b70dec1e5c09b73ae277f4f5b246315841fb8e Author: Gian Mario Tagliaretti @@ -16974,7 +17182,7 @@ Date: Fri May 1 22:24:33 2009 +0200 docs/reference/pygio-constants.xml | 107 +++++ docs/reference/pygio-mountoperation.xml | 726 +++++++++++++++++++++++++++++++ - 4 files changed, 836 insertions(+), 0 deletions(-) + 4 Dateien geändert, 836 Zeilen hinzugefügt(+) commit fceea8e843e880f0469e454df23141e7dd2bc0cf Author: Gian Mario Tagliaretti @@ -16984,7 +17192,7 @@ Date: Thu Apr 30 22:13:06 2009 +0200 NEWS | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 93 insertions(+), 0 deletions(-) + 1 Datei geändert, 93 Zeilen hinzugefügt(+) commit 47389217d1a65a8e3f404d486c508cf5d3164756 Author: Paul Pogonyshev @@ -16996,4 +17204,4 @@ Date: Thu Apr 30 22:47:19 2009 +0300 order was used. Properly decref the objects. gio/gfile.override | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) + 1 Datei geändert, 4 Zeilen hinzugefügt(+) diff --git a/Makefile.am b/Makefile.am index 17cfc71..4007768 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,7 +5,9 @@ SUBDIRS = examples gi tests PLATFORM_VERSION = 3.0 -CLEANFILES = +CLEANFILES = \ + `find "$(builddir)" -type f -name "*.pyc" -print` + EXTRA_DIST = \ ChangeLog.pre-2.18 \ pygobject-$(PLATFORM_VERSION).pc.in \ @@ -40,7 +42,7 @@ MAINTAINERCLEANFILES = \ $(srcdir)/m4/ltversion.m4 \ $(srcdir)/m4/lt~obsolete.m4 \ `find "$(srcdir)" -type f -name Makefile.in -print` \ - `find "$(srcdir)" -type f -name "*.pyc" -print` + `find "$(builddir)" -type f -name "*.pyc" -print` BUILT_EXTRA_DIST = \ ChangeLog diff --git a/Makefile.in b/Makefile.in index 5391c1f..10ef592 100644 --- a/Makefile.in +++ b/Makefile.in @@ -211,7 +211,6 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -256,7 +255,6 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ @@ -289,6 +287,7 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -311,7 +310,9 @@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = 1.7 SUBDIRS = examples gi tests PLATFORM_VERSION = 3.0 -CLEANFILES = +CLEANFILES = \ + `find "$(builddir)" -type f -name "*.pyc" -print` + EXTRA_DIST = \ ChangeLog.pre-2.18 \ pygobject-$(PLATFORM_VERSION).pc.in \ @@ -346,7 +347,7 @@ MAINTAINERCLEANFILES = \ $(srcdir)/m4/ltversion.m4 \ $(srcdir)/m4/lt~obsolete.m4 \ `find "$(srcdir)" -type f -name Makefile.in -print` \ - `find "$(srcdir)" -type f -name "*.pyc" -print` + `find "$(builddir)" -type f -name "*.pyc" -print` BUILT_EXTRA_DIST = \ ChangeLog diff --git a/NEWS b/NEWS index 31f8ca3..184f1da 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,16 @@ +3.2.1 10-May-2012 + - Reindent files in tests to use 4-space indentation (Sebastian Pölsterl + - Add missing override for TreeModel.iter_previous() (Martin Pitt) + - GSettings: allow extra keyword arguments (Giovanni Campagna) + - pygtkcompat: Correct Userlist module use (Jose Rostagno) + - test_gdbus: Call GetConnectionUnixProcessID() with correct signature ( + - GTK overrides: Add missing keyword arguments (Martin Pitt) + - pygi-convert.py: Drop obsolete drag method conversions (Martin Pitt) + - Fix len_arg_index for array arguments (Bastian Winkler) + - Add missing GObject.TYPE_GTYPE (Martin Pitt) + - Fix "distcheck" and tests with out-of-tree builds (Martin Pitt) + - Add GtkComboBoxEntry compatibility (Paolo Borelli) + 3.2.0 26-Mar-2012 - No changes since 3.1.93 except version number. diff --git a/PKG-INFO b/PKG-INFO index 3cc24ae..51abd8e 100644 --- a/PKG-INFO +++ b/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: PyGObject -Version: 3.2.0 +Version: 3.2.1 Summary: Python bindings for GObject Home-page: http://www.pygtk.org/ Author: James Henstridge @@ -8,7 +8,7 @@ Author-email: james@daa.com.au Maintainer: Johan Dahlin Maintainer-email: johan@gnome.org License: GNU LGPL -Download-url: ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/3.2/pygobject-3.2.0.tar.gz +Download-url: ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/3.2/pygobject-3.2.1.tar.gz Description: Python bindings for GLib and GObject Platform: POSIX, Windows Classifier: Development Status :: 5 - Production/Stable diff --git a/aclocal.m4 b/aclocal.m4 index 3c67c39..51ae5f9 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -20,608 +20,233 @@ You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) -# Configure paths for GLIB -# Owen Taylor 1997-2001 +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software +# Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) -dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject, -dnl gthread, or gio is specified in MODULES, pass to pkg-config -dnl -AC_DEFUN([AM_PATH_GLIB_2_0], -[dnl -dnl Get the cflags and libraries from pkg-config -dnl -AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program], - , enable_glibtest=yes) +# serial 1 - pkg_config_args=glib-2.0 - for module in . $4 - do - case "$module" in - gmodule) - pkg_config_args="$pkg_config_args gmodule-2.0" - ;; - gmodule-no-export) - pkg_config_args="$pkg_config_args gmodule-no-export-2.0" - ;; - gobject) - pkg_config_args="$pkg_config_args gobject-2.0" - ;; - gthread) - pkg_config_args="$pkg_config_args gthread-2.0" - ;; - gio*) - pkg_config_args="$pkg_config_args $module-2.0" - ;; - esac - done +# AM_AUTOMAKE_VERSION(VERSION) +# ---------------------------- +# Automake X.Y traces this macro to ensure aclocal.m4 has been +# generated from the m4 files accompanying Automake X.Y. +# (This private macro should not be called outside this file.) +AC_DEFUN([AM_AUTOMAKE_VERSION], +[am__api_version='1.11' +dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to +dnl require some minimum version. Point them to the right macro. +m4_if([$1], [1.11.3], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl +]) - PKG_PROG_PKG_CONFIG([0.16]) +# _AM_AUTOCONF_VERSION(VERSION) +# ----------------------------- +# aclocal traces this macro to find the Autoconf version. +# This is a private macro too. Using m4_define simplifies +# the logic in aclocal, which can simply ignore this definition. +m4_define([_AM_AUTOCONF_VERSION], []) - no_glib="" +# AM_SET_CURRENT_AUTOMAKE_VERSION +# ------------------------------- +# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. +# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. +AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +[AM_AUTOMAKE_VERSION([1.11.3])dnl +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) - if test "x$PKG_CONFIG" = x ; then - no_glib=yes - PKG_CONFIG=no - fi +# AM_AUX_DIR_EXPAND -*- Autoconf -*- - min_glib_version=ifelse([$1], ,2.0.0,$1) - AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. - if test x$PKG_CONFIG != xno ; then - ## don't try to run the test against uninstalled libtool libs - if $PKG_CONFIG --uninstalled $pkg_config_args; then - echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH" - enable_glibtest=no - fi +# serial 1 - if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then - : - else - no_glib=yes - fi - fi +# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets +# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to +# `$srcdir', `$srcdir/..', or `$srcdir/../..'. +# +# Of course, Automake must honor this variable whenever it calls a +# tool from the auxiliary directory. The problem is that $srcdir (and +# therefore $ac_aux_dir as well) can be either absolute or relative, +# depending on how configure is run. This is pretty annoying, since +# it makes $ac_aux_dir quite unusable in subdirectories: in the top +# source directory, any form will work fine, but in subdirectories a +# relative path needs to be adjusted first. +# +# $ac_aux_dir/missing +# fails when called from a subdirectory if $ac_aux_dir is relative +# $top_srcdir/$ac_aux_dir/missing +# fails if $ac_aux_dir is absolute, +# fails when called from a subdirectory in a VPATH build with +# a relative $ac_aux_dir +# +# The reason of the latter failure is that $top_srcdir and $ac_aux_dir +# are both prefixed by $srcdir. In an in-source build this is usually +# harmless because $srcdir is `.', but things will broke when you +# start a VPATH build or use an absolute $srcdir. +# +# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, +# iff we strip the leading $srcdir from $ac_aux_dir. That would be: +# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` +# and then we would define $MISSING as +# MISSING="\${SHELL} $am_aux_dir/missing" +# This will work as long as MISSING is not called from configure, because +# unfortunately $(top_srcdir) has no meaning in configure. +# However there are other variables, like CC, which are often used in +# configure, and could therefore not use this "fixed" $ac_aux_dir. +# +# Another solution, used here, is to always expand $ac_aux_dir to an +# absolute PATH. The drawback is that using absolute paths prevent a +# configured tree to be moved without reconfiguration. - if test x"$no_glib" = x ; then - GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` - GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0` - GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` - GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable=glib_compile_resources gio-2.0` +AC_DEFUN([AM_AUX_DIR_EXPAND], +[dnl Rely on autoconf to set up CDPATH properly. +AC_PREREQ([2.50])dnl +# expand $ac_aux_dir to an absolute path +am_aux_dir=`cd $ac_aux_dir && pwd` +]) - GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` - GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` - glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - if test "x$enable_glibtest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GLIB_CFLAGS" - LIBS="$GLIB_LIBS $LIBS" -dnl -dnl Now check if the installed GLIB is sufficiently new. (Also sanity -dnl checks the results of pkg-config to some extent) -dnl - rm -f conf.glibtest - AC_TRY_RUN([ -#include -#include -#include -int -main () -{ - unsigned int major, minor, micro; - char *tmp_version; +# Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. - fclose (fopen ("conf.glibtest", "w")); +# serial 4 - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = g_strdup("$min_glib_version"); - if (sscanf(tmp_version, "%u.%u.%u", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_glib_version"); - exit(1); - } +# This was merged into AC_PROG_CC in Autoconf. - if ((glib_major_version != $glib_config_major_version) || - (glib_minor_version != $glib_config_minor_version) || - (glib_micro_version != $glib_config_micro_version)) - { - printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", - $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, - glib_major_version, glib_minor_version, glib_micro_version); - printf ("*** was found! If pkg-config was correct, then it is best\n"); - printf ("*** to remove the old version of GLib. You may also be able to fix the error\n"); - printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); - printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); - printf("*** required on your system.\n"); - printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); - printf("*** to point to the correct configuration files\n"); - } - else if ((glib_major_version != GLIB_MAJOR_VERSION) || - (glib_minor_version != GLIB_MINOR_VERSION) || - (glib_micro_version != GLIB_MICRO_VERSION)) - { - printf("*** GLIB header files (version %d.%d.%d) do not match\n", - GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); - printf("*** library (version %d.%d.%d)\n", - glib_major_version, glib_minor_version, glib_micro_version); - } - else - { - if ((glib_major_version > major) || - ((glib_major_version == major) && (glib_minor_version > minor)) || - ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) - { - return 0; - } - else - { - printf("\n*** An old version of GLIB (%u.%u.%u) was found.\n", - glib_major_version, glib_minor_version, glib_micro_version); - printf("*** You need a version of GLIB newer than %u.%u.%u. The latest version of\n", - major, minor, micro); - printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); - printf("***\n"); - printf("*** If you have already installed a sufficiently new version, this error\n"); - printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); - printf("*** being found. The easiest way to fix this is to remove the old version\n"); - printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n"); - printf("*** correct copy of pkg-config. (In this case, you will have to\n"); - printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); - printf("*** so that the correct libraries are found at run-time))\n"); - } - } - return 1; -} -],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_glib" = x ; then - AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)) - ifelse([$2], , :, [$2]) - else - AC_MSG_RESULT(no) - if test "$PKG_CONFIG" = "no" ; then - echo "*** A new enough version of pkg-config was not found." - echo "*** See http://www.freedesktop.org/software/pkgconfig/" - else - if test -f conf.glibtest ; then - : - else - echo "*** Could not run GLIB test program, checking why..." - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GLIB_CFLAGS" - LIBS="$LIBS $GLIB_LIBS" - AC_TRY_LINK([ -#include -#include -], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding GLIB or finding the wrong" - echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means GLIB is incorrectly installed."]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - GLIB_CFLAGS="" - GLIB_LIBS="" - GLIB_GENMARSHAL="" - GOBJECT_QUERY="" - GLIB_MKENUMS="" - GLIB_COMPILE_RESOURCES="" - ifelse([$3], , :, [$3]) - fi - AC_SUBST(GLIB_CFLAGS) - AC_SUBST(GLIB_LIBS) - AC_SUBST(GLIB_GENMARSHAL) - AC_SUBST(GOBJECT_QUERY) - AC_SUBST(GLIB_MKENUMS) - AC_SUBST(GLIB_COMPILE_RESOURCES) - rm -f conf.glibtest +AU_DEFUN([AM_PROG_CC_STDC], +[AC_PROG_CC +AC_DIAGNOSE([obsolete], [$0: + your code should no longer depend upon `am_cv_prog_cc_stdc', but upon + `ac_cv_prog_cc_stdc'. Remove this warning and the assignment when + you adjust the code. You can also remove the above call to + AC_PROG_CC if you already called it elsewhere.]) +am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc ]) +AU_DEFUN([fp_PROG_CC_STDC]) -# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# serial 1 (pkg-config-0.24) -# -# Copyright © 2004 Scott James Remnant . -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program 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 -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# AM_CONDITIONAL -*- Autoconf -*- + +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 +# Free Software Foundation, Inc. # -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# PKG_PROG_PKG_CONFIG([MIN-VERSION]) -# ---------------------------------- -AC_DEFUN([PKG_PROG_PKG_CONFIG], -[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) -m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) -AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) -AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) -AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) +# serial 9 -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) +# AM_CONDITIONAL(NAME, SHELL-CONDITION) +# ------------------------------------- +# Define a conditional. +AC_DEFUN([AM_CONDITIONAL], +[AC_PREREQ(2.52)dnl + ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +AC_SUBST([$1_TRUE])dnl +AC_SUBST([$1_FALSE])dnl +_AM_SUBST_NOTMAKE([$1_TRUE])dnl +_AM_SUBST_NOTMAKE([$1_FALSE])dnl +m4_define([_AM_COND_VALUE_$1], [$2])dnl +if $2; then + $1_TRUE= + $1_FALSE='#' +else + $1_TRUE='#' + $1_FALSE= fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=m4_default([$1], [0.9.0]) - AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - PKG_CONFIG="" - fi -fi[]dnl -])# PKG_PROG_PKG_CONFIG +AC_CONFIG_COMMANDS_PRE( +[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then + AC_MSG_ERROR([[conditional "$1" was never defined. +Usually this means the macro was only invoked conditionally.]]) +fi])]) -# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# -# Check to see whether a particular set of modules exists. Similar -# to PKG_CHECK_MODULES(), but does not set variables or print errors. +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, +# 2010, 2011 Free Software Foundation, Inc. # -# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -# only at the first occurence in configure.ac, so if the first place -# it's called might be skipped (such as if it is within an "if", you -# have to call PKG_CHECK_EXISTS manually -# -------------------------------------------------------------- -AC_DEFUN([PKG_CHECK_EXISTS], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -if test -n "$PKG_CONFIG" && \ - AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then - m4_default([$2], [:]) -m4_ifvaln([$3], [else - $3])dnl -fi]) +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) -# --------------------------------------------- -m4_define([_PKG_CONFIG], -[if test -n "$$1"; then - pkg_cv_[]$1="$$1" - elif test -n "$PKG_CONFIG"; then - PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes ], - [pkg_failed=yes]) - else - pkg_failed=untried -fi[]dnl -])# _PKG_CONFIG +# serial 12 -# _PKG_SHORT_ERRORS_SUPPORTED -# ----------------------------- -AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi[]dnl -])# _PKG_SHORT_ERRORS_SUPPORTED +# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +# written in clear, in which case automake, when reading aclocal.m4, +# will think it sees a *use*, and therefore will trigger all it's +# C support machinery. Also note that it means that autoscan, seeing +# CC etc. in the Makefile, will ask for an AC_PROG_CC use... -# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -# [ACTION-IF-NOT-FOUND]) -# -# -# Note that if there is a possibility the first call to -# PKG_CHECK_MODULES might not happen, you should be sure to include an -# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac -# +# _AM_DEPENDENCIES(NAME) +# ---------------------- +# See how the compiler implements dependency checking. +# NAME is "CC", "CXX", "GCJ", or "OBJC". +# We try a few techniques and use that to set a single cache variable. # -# -------------------------------------------------------------- -AC_DEFUN([PKG_CHECK_MODULES], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl -AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl - -pkg_failed=no -AC_MSG_CHECKING([for $1]) - -_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) -_PKG_CONFIG([$1][_LIBS], [libs], [$2]) - -m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS -and $1[]_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details.]) +# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was +# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular +# dependency, and given that the user is not expected to run this macro, +# just rely on AC_PROG_CC. +AC_DEFUN([_AM_DEPENDENCIES], +[AC_REQUIRE([AM_SET_DEPDIR])dnl +AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl +AC_REQUIRE([AM_MAKE_INCLUDE])dnl +AC_REQUIRE([AM_DEP_TRACK])dnl -if test $pkg_failed = yes; then - AC_MSG_RESULT([no]) - _PKG_SHORT_ERRORS_SUPPORTED - if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` - else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD +ifelse([$1], CC, [depcc="$CC" am_compiler_list=], + [$1], CXX, [depcc="$CXX" am_compiler_list=], + [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], UPC, [depcc="$UPC" am_compiler_list=], + [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) - m4_default([$4], [AC_MSG_ERROR( -[Package requirements ($2) were not met: +AC_CACHE_CHECK([dependency style of $depcc], + [am_cv_$1_dependencies_compiler_type], +[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named `D' -- because `-MD' means `put the output + # in D'. + rm -rf conftest.dir + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub -$$1_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -_PKG_TEXT])[]dnl - ]) -elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) - m4_default([$4], [AC_MSG_FAILURE( -[The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -_PKG_TEXT - -To get pkg-config, see .])[]dnl - ]) -else - $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS - $1[]_LIBS=$pkg_cv_[]$1[]_LIBS - AC_MSG_RESULT([yes]) - $3 -fi[]dnl -])# PKG_CHECK_MODULES - -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software -# Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 1 - -# AM_AUTOMAKE_VERSION(VERSION) -# ---------------------------- -# Automake X.Y traces this macro to ensure aclocal.m4 has been -# generated from the m4 files accompanying Automake X.Y. -# (This private macro should not be called outside this file.) -AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.11' -dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to -dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.3], [], - [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl -]) - -# _AM_AUTOCONF_VERSION(VERSION) -# ----------------------------- -# aclocal traces this macro to find the Autoconf version. -# This is a private macro too. Using m4_define simplifies -# the logic in aclocal, which can simply ignore this definition. -m4_define([_AM_AUTOCONF_VERSION], []) - -# AM_SET_CURRENT_AUTOMAKE_VERSION -# ------------------------------- -# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. -# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. -AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.3])dnl -m4_ifndef([AC_AUTOCONF_VERSION], - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) - -# AM_AUX_DIR_EXPAND -*- Autoconf -*- - -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 1 - -# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. -# -# Of course, Automake must honor this variable whenever it calls a -# tool from the auxiliary directory. The problem is that $srcdir (and -# therefore $ac_aux_dir as well) can be either absolute or relative, -# depending on how configure is run. This is pretty annoying, since -# it makes $ac_aux_dir quite unusable in subdirectories: in the top -# source directory, any form will work fine, but in subdirectories a -# relative path needs to be adjusted first. -# -# $ac_aux_dir/missing -# fails when called from a subdirectory if $ac_aux_dir is relative -# $top_srcdir/$ac_aux_dir/missing -# fails if $ac_aux_dir is absolute, -# fails when called from a subdirectory in a VPATH build with -# a relative $ac_aux_dir -# -# The reason of the latter failure is that $top_srcdir and $ac_aux_dir -# are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is `.', but things will broke when you -# start a VPATH build or use an absolute $srcdir. -# -# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, -# iff we strip the leading $srcdir from $ac_aux_dir. That would be: -# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` -# and then we would define $MISSING as -# MISSING="\${SHELL} $am_aux_dir/missing" -# This will work as long as MISSING is not called from configure, because -# unfortunately $(top_srcdir) has no meaning in configure. -# However there are other variables, like CC, which are often used in -# configure, and could therefore not use this "fixed" $ac_aux_dir. -# -# Another solution, used here, is to always expand $ac_aux_dir to an -# absolute PATH. The drawback is that using absolute paths prevent a -# configured tree to be moved without reconfiguration. - -AC_DEFUN([AM_AUX_DIR_EXPAND], -[dnl Rely on autoconf to set up CDPATH properly. -AC_PREREQ([2.50])dnl -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` -]) - - -# Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2005 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 4 - -# This was merged into AC_PROG_CC in Autoconf. - -AU_DEFUN([AM_PROG_CC_STDC], -[AC_PROG_CC -AC_DIAGNOSE([obsolete], [$0: - your code should no longer depend upon `am_cv_prog_cc_stdc', but upon - `ac_cv_prog_cc_stdc'. Remove this warning and the assignment when - you adjust the code. You can also remove the above call to - AC_PROG_CC if you already called it elsewhere.]) -am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc -]) -AU_DEFUN([fp_PROG_CC_STDC]) - -# AM_CONDITIONAL -*- Autoconf -*- - -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 9 - -# AM_CONDITIONAL(NAME, SHELL-CONDITION) -# ------------------------------------- -# Define a conditional. -AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ(2.52)dnl - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl -AC_SUBST([$1_TRUE])dnl -AC_SUBST([$1_FALSE])dnl -_AM_SUBST_NOTMAKE([$1_TRUE])dnl -_AM_SUBST_NOTMAKE([$1_FALSE])dnl -m4_define([_AM_COND_VALUE_$1], [$2])dnl -if $2; then - $1_TRUE= - $1_FALSE='#' -else - $1_TRUE='#' - $1_FALSE= -fi -AC_CONFIG_COMMANDS_PRE( -[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then - AC_MSG_ERROR([[conditional "$1" was never defined. -Usually this means the macro was only invoked conditionally.]]) -fi])]) - -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, -# 2010, 2011 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 12 - -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be -# written in clear, in which case automake, when reading aclocal.m4, -# will think it sees a *use*, and therefore will trigger all it's -# C support machinery. Also note that it means that autoscan, seeing -# CC etc. in the Makefile, will ask for an AC_PROG_CC use... - - -# _AM_DEPENDENCIES(NAME) -# ---------------------- -# See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "GCJ", or "OBJC". -# We try a few techniques and use that to set a single cache variable. -# -# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was -# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular -# dependency, and given that the user is not expected to run this macro, -# just rely on AC_PROG_CC. -AC_DEFUN([_AM_DEPENDENCIES], -[AC_REQUIRE([AM_SET_DEPDIR])dnl -AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl -AC_REQUIRE([AM_MAKE_INCLUDE])dnl -AC_REQUIRE([AM_DEP_TRACK])dnl - -ifelse([$1], CC, [depcc="$CC" am_compiler_list=], - [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], UPC, [depcc="$UPC" am_compiler_list=], - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) - -AC_CACHE_CHECK([dependency style of $depcc], - [am_cv_$1_dependencies_compiler_type], -[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. - rm -rf conftest.dir - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub - - am_cv_$1_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` - fi - am__universal=false - m4_case([$1], [CC], - [case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac], - [CXX], - [case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac]) + am_cv_$1_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` + fi + am__universal=false + m4_case([$1], [CC], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac], + [CXX], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac]) for depmode in $am_compiler_list; do # Setup a source with many dependencies, because some compilers @@ -1577,161 +1202,633 @@ else AM_V=$AM_DEFAULT_VERBOSITY AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY fi -AC_SUBST([AM_V])dnl -AM_SUBST_NOTMAKE([AM_V])dnl -AC_SUBST([AM_DEFAULT_V])dnl -AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl -AC_SUBST([AM_DEFAULT_VERBOSITY])dnl -AM_BACKSLASH='\' -AC_SUBST([AM_BACKSLASH])dnl -_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl -]) +AC_SUBST([AM_V])dnl +AM_SUBST_NOTMAKE([AM_V])dnl +AC_SUBST([AM_DEFAULT_V])dnl +AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl +AC_SUBST([AM_DEFAULT_VERBOSITY])dnl +AM_BACKSLASH='\' +AC_SUBST([AM_BACKSLASH])dnl +_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl +]) + +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 1 + +# AM_PROG_INSTALL_STRIP +# --------------------- +# One issue with vendor `install' (even GNU) is that you can't +# specify the program used to strip binaries. This is especially +# annoying in cross-compiling environments, where the build's strip +# is unlikely to handle the host's binaries. +# Fortunately install-sh will honor a STRIPPROG variable, so we +# always use install-sh in `make install-strip', and initialize +# STRIPPROG with the value of the STRIP variable (set by the user). +AC_DEFUN([AM_PROG_INSTALL_STRIP], +[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +# Installed binaries are usually stripped using `strip' when the user +# run `make install-strip'. However `strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the `STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +if test "$cross_compiling" != no; then + AC_CHECK_TOOL([STRIP], [strip], :) +fi +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" +AC_SUBST([INSTALL_STRIP_PROGRAM])]) + +# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 3 + +# _AM_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. +# This macro is traced by Automake. +AC_DEFUN([_AM_SUBST_NOTMAKE]) + +# AM_SUBST_NOTMAKE(VARIABLE) +# -------------------------- +# Public sister of _AM_SUBST_NOTMAKE. +AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) + +# Check how to create a tarball. -*- Autoconf -*- + +# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 2 + +# _AM_PROG_TAR(FORMAT) +# -------------------- +# Check how to create a tarball in format FORMAT. +# FORMAT should be one of `v7', `ustar', or `pax'. +# +# Substitute a variable $(am__tar) that is a command +# writing to stdout a FORMAT-tarball containing the directory +# $tardir. +# tardir=directory && $(am__tar) > result.tar +# +# Substitute a variable $(am__untar) that extract such +# a tarball read from stdin. +# $(am__untar) < result.tar +AC_DEFUN([_AM_PROG_TAR], +[# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AC_SUBST([AMTAR], ['$${TAR-tar}']) +m4_if([$1], [v7], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], + [m4_case([$1], [ustar],, [pax],, + [m4_fatal([Unknown tar format])]) +AC_MSG_CHECKING([how to create a $1 tar archive]) +# Loop over all known methods to create a tar archive until one works. +_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' +_am_tools=${am_cv_prog_tar_$1-$_am_tools} +# Do not fold the above two line into one, because Tru64 sh and +# Solaris sh will not grok spaces in the rhs of `-'. +for _am_tool in $_am_tools +do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; + do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi +done +rm -rf conftest.dir + +AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) +AC_MSG_RESULT([$am_cv_prog_tar_$1])]) +AC_SUBST([am__tar]) +AC_SUBST([am__untar]) +]) # _AM_PROG_TAR + +# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- +# +# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc. +# Written by Scott James Remnant, 2004. +# +# This file is free software; the Free Software Foundation gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. + +# serial 5 lt~obsolete.m4 + +# These exist entirely to fool aclocal when bootstrapping libtool. +# +# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN) +# which have later been changed to m4_define as they aren't part of the +# exported API, or moved to Autoconf or Automake where they belong. +# +# The trouble is, aclocal is a bit thick. It'll see the old AC_DEFUN +# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us +# using a macro with the same name in our local m4/libtool.m4 it'll +# pull the old libtool.m4 in (it doesn't see our shiny new m4_define +# and doesn't know about Autoconf macros at all.) +# +# So we provide this file, which has a silly filename so it's always +# included after everything else. This provides aclocal with the +# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything +# because those macros already exist, or will be overwritten later. +# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. +# +# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here. +# Yes, that means every name once taken will need to remain here until +# we give up compatibility with versions before 1.7, at which point +# we need to keep only those names which we still refer to. + +# This is to help aclocal find these macros, as it can't see m4_define. +AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])]) + +m4_ifndef([AC_LIBTOOL_LINKER_OPTION], [AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])]) +m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP])]) +m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])]) +m4_ifndef([_LT_AC_SHELL_INIT], [AC_DEFUN([_LT_AC_SHELL_INIT])]) +m4_ifndef([_LT_AC_SYS_LIBPATH_AIX], [AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])]) +m4_ifndef([_LT_PROG_LTMAIN], [AC_DEFUN([_LT_PROG_LTMAIN])]) +m4_ifndef([_LT_AC_TAGVAR], [AC_DEFUN([_LT_AC_TAGVAR])]) +m4_ifndef([AC_LTDL_ENABLE_INSTALL], [AC_DEFUN([AC_LTDL_ENABLE_INSTALL])]) +m4_ifndef([AC_LTDL_PREOPEN], [AC_DEFUN([AC_LTDL_PREOPEN])]) +m4_ifndef([_LT_AC_SYS_COMPILER], [AC_DEFUN([_LT_AC_SYS_COMPILER])]) +m4_ifndef([_LT_AC_LOCK], [AC_DEFUN([_LT_AC_LOCK])]) +m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE], [AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])]) +m4_ifndef([_LT_AC_TRY_DLOPEN_SELF], [AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])]) +m4_ifndef([AC_LIBTOOL_PROG_CC_C_O], [AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])]) +m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])]) +m4_ifndef([AC_LIBTOOL_OBJDIR], [AC_DEFUN([AC_LIBTOOL_OBJDIR])]) +m4_ifndef([AC_LTDL_OBJDIR], [AC_DEFUN([AC_LTDL_OBJDIR])]) +m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])]) +m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP], [AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])]) +m4_ifndef([AC_PATH_MAGIC], [AC_DEFUN([AC_PATH_MAGIC])]) +m4_ifndef([AC_PROG_LD_GNU], [AC_DEFUN([AC_PROG_LD_GNU])]) +m4_ifndef([AC_PROG_LD_RELOAD_FLAG], [AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])]) +m4_ifndef([AC_DEPLIBS_CHECK_METHOD], [AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])]) +m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])]) +m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])]) +m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])]) +m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS], [AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])]) +m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP], [AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])]) +m4_ifndef([LT_AC_PROG_EGREP], [AC_DEFUN([LT_AC_PROG_EGREP])]) +m4_ifndef([LT_AC_PROG_SED], [AC_DEFUN([LT_AC_PROG_SED])]) +m4_ifndef([_LT_CC_BASENAME], [AC_DEFUN([_LT_CC_BASENAME])]) +m4_ifndef([_LT_COMPILER_BOILERPLATE], [AC_DEFUN([_LT_COMPILER_BOILERPLATE])]) +m4_ifndef([_LT_LINKER_BOILERPLATE], [AC_DEFUN([_LT_LINKER_BOILERPLATE])]) +m4_ifndef([_AC_PROG_LIBTOOL], [AC_DEFUN([_AC_PROG_LIBTOOL])]) +m4_ifndef([AC_LIBTOOL_SETUP], [AC_DEFUN([AC_LIBTOOL_SETUP])]) +m4_ifndef([_LT_AC_CHECK_DLFCN], [AC_DEFUN([_LT_AC_CHECK_DLFCN])]) +m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER], [AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])]) +m4_ifndef([_LT_AC_TAGCONFIG], [AC_DEFUN([_LT_AC_TAGCONFIG])]) +m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])]) +m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])]) +m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])]) +m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])]) +m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])]) +m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])]) +m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])]) +m4_ifndef([_LT_AC_LANG_CXX_CONFIG], [AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])]) +m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])]) +m4_ifndef([_LT_AC_LANG_F77_CONFIG], [AC_DEFUN([_LT_AC_LANG_F77_CONFIG])]) +m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])]) +m4_ifndef([_LT_AC_LANG_GCJ_CONFIG], [AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])]) +m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])]) +m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])]) +m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])]) +m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) +m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])]) +m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])]) +m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])]) +m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])]) +m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])]) +m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) +m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) + +# Configure paths for GLIB +# Owen Taylor 1997-2001 + +dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) +dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject, +dnl gthread, or gio is specified in MODULES, pass to pkg-config +dnl +AC_DEFUN([AM_PATH_GLIB_2_0], +[dnl +dnl Get the cflags and libraries from pkg-config +dnl +AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program], + , enable_glibtest=yes) + + pkg_config_args=glib-2.0 + for module in . $4 + do + case "$module" in + gmodule) + pkg_config_args="$pkg_config_args gmodule-2.0" + ;; + gmodule-no-export) + pkg_config_args="$pkg_config_args gmodule-no-export-2.0" + ;; + gobject) + pkg_config_args="$pkg_config_args gobject-2.0" + ;; + gthread) + pkg_config_args="$pkg_config_args gthread-2.0" + ;; + gio*) + pkg_config_args="$pkg_config_args $module-2.0" + ;; + esac + done + + PKG_PROG_PKG_CONFIG([0.16]) + + no_glib="" + + if test "x$PKG_CONFIG" = x ; then + no_glib=yes + PKG_CONFIG=no + fi + + min_glib_version=ifelse([$1], ,2.0.0,$1) + AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) + + if test x$PKG_CONFIG != xno ; then + ## don't try to run the test against uninstalled libtool libs + if $PKG_CONFIG --uninstalled $pkg_config_args; then + echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH" + enable_glibtest=no + fi + + if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then + : + else + no_glib=yes + fi + fi + + if test x"$no_glib" = x ; then + GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` + GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0` + GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` + GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable=glib_compile_resources gio-2.0` + + GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` + GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` + glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` + glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` + glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` + if test "x$enable_glibtest" = "xyes" ; then + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $GLIB_CFLAGS" + LIBS="$GLIB_LIBS $LIBS" +dnl +dnl Now check if the installed GLIB is sufficiently new. (Also sanity +dnl checks the results of pkg-config to some extent) +dnl + rm -f conf.glibtest + AC_TRY_RUN([ +#include +#include +#include + +int +main () +{ + unsigned int major, minor, micro; + char *tmp_version; + + fclose (fopen ("conf.glibtest", "w")); + + /* HP/UX 9 (%@#!) writes to sscanf strings */ + tmp_version = g_strdup("$min_glib_version"); + if (sscanf(tmp_version, "%u.%u.%u", &major, &minor, µ) != 3) { + printf("%s, bad version string\n", "$min_glib_version"); + exit(1); + } + + if ((glib_major_version != $glib_config_major_version) || + (glib_minor_version != $glib_config_minor_version) || + (glib_micro_version != $glib_config_micro_version)) + { + printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", + $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, + glib_major_version, glib_minor_version, glib_micro_version); + printf ("*** was found! If pkg-config was correct, then it is best\n"); + printf ("*** to remove the old version of GLib. You may also be able to fix the error\n"); + printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); + printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); + printf("*** required on your system.\n"); + printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); + printf("*** to point to the correct configuration files\n"); + } + else if ((glib_major_version != GLIB_MAJOR_VERSION) || + (glib_minor_version != GLIB_MINOR_VERSION) || + (glib_micro_version != GLIB_MICRO_VERSION)) + { + printf("*** GLIB header files (version %d.%d.%d) do not match\n", + GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); + printf("*** library (version %d.%d.%d)\n", + glib_major_version, glib_minor_version, glib_micro_version); + } + else + { + if ((glib_major_version > major) || + ((glib_major_version == major) && (glib_minor_version > minor)) || + ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) + { + return 0; + } + else + { + printf("\n*** An old version of GLIB (%u.%u.%u) was found.\n", + glib_major_version, glib_minor_version, glib_micro_version); + printf("*** You need a version of GLIB newer than %u.%u.%u. The latest version of\n", + major, minor, micro); + printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); + printf("***\n"); + printf("*** If you have already installed a sufficiently new version, this error\n"); + printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); + printf("*** being found. The easiest way to fix this is to remove the old version\n"); + printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n"); + printf("*** correct copy of pkg-config. (In this case, you will have to\n"); + printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); + printf("*** so that the correct libraries are found at run-time))\n"); + } + } + return 1; +} +],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + if test "x$no_glib" = x ; then + AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)) + ifelse([$2], , :, [$2]) + else + AC_MSG_RESULT(no) + if test "$PKG_CONFIG" = "no" ; then + echo "*** A new enough version of pkg-config was not found." + echo "*** See http://www.freedesktop.org/software/pkgconfig/" + else + if test -f conf.glibtest ; then + : + else + echo "*** Could not run GLIB test program, checking why..." + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $GLIB_CFLAGS" + LIBS="$LIBS $GLIB_LIBS" + AC_TRY_LINK([ +#include +#include +], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ], + [ echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding GLIB or finding the wrong" + echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" + echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" + echo "*** to the installed location Also, make sure you have run ldconfig if that" + echo "*** is required on your system" + echo "***" + echo "*** If you have an old version installed, it is best to remove it, although" + echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], + [ echo "*** The test program failed to compile or link. See the file config.log for the" + echo "*** exact error that occured. This usually means GLIB is incorrectly installed."]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + GLIB_CFLAGS="" + GLIB_LIBS="" + GLIB_GENMARSHAL="" + GOBJECT_QUERY="" + GLIB_MKENUMS="" + GLIB_COMPILE_RESOURCES="" + ifelse([$3], , :, [$3]) + fi + AC_SUBST(GLIB_CFLAGS) + AC_SUBST(GLIB_LIBS) + AC_SUBST(GLIB_GENMARSHAL) + AC_SUBST(GOBJECT_QUERY) + AC_SUBST(GLIB_MKENUMS) + AC_SUBST(GLIB_COMPILE_RESOURCES) + rm -f conf.glibtest +]) + +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 1 (pkg-config-0.24) +# +# Copyright © 2004 Scott James Remnant . +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program 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 +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# PKG_PROG_PKG_CONFIG([MIN-VERSION]) +# ---------------------------------- +AC_DEFUN([PKG_PROG_PKG_CONFIG], +[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) +m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) +AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) +AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=m4_default([$1], [0.9.0]) + AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + PKG_CONFIG="" + fi +fi[]dnl +])# PKG_PROG_PKG_CONFIG -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. +# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) # -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# Check to see whether a particular set of modules exists. Similar +# to PKG_CHECK_MODULES(), but does not set variables or print errors. +# +# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +# only at the first occurence in configure.ac, so if the first place +# it's called might be skipped (such as if it is within an "if", you +# have to call PKG_CHECK_EXISTS manually +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_EXISTS], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +if test -n "$PKG_CONFIG" && \ + AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then + m4_default([$2], [:]) +m4_ifvaln([$3], [else + $3])dnl +fi]) -# serial 1 +# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +# --------------------------------------------- +m4_define([_PKG_CONFIG], +[if test -n "$$1"; then + pkg_cv_[]$1="$$1" + elif test -n "$PKG_CONFIG"; then + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], + [pkg_failed=yes]) + else + pkg_failed=untried +fi[]dnl +])# _PKG_CONFIG -# AM_PROG_INSTALL_STRIP -# --------------------- -# One issue with vendor `install' (even GNU) is that you can't -# specify the program used to strip binaries. This is especially -# annoying in cross-compiling environments, where the build's strip -# is unlikely to handle the host's binaries. -# Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in `make install-strip', and initialize -# STRIPPROG with the value of the STRIP variable (set by the user). -AC_DEFUN([AM_PROG_INSTALL_STRIP], -[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right -# tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. -if test "$cross_compiling" != no; then - AC_CHECK_TOOL([STRIP], [strip], :) -fi -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" -AC_SUBST([INSTALL_STRIP_PROGRAM])]) +# _PKG_SHORT_ERRORS_SUPPORTED +# ----------------------------- +AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi[]dnl +])# _PKG_SHORT_ERRORS_SUPPORTED -# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. + +# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +# [ACTION-IF-NOT-FOUND]) # -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# +# Note that if there is a possibility the first call to +# PKG_CHECK_MODULES might not happen, you should be sure to include an +# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac +# +# +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_MODULES], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl +AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl -# serial 3 +pkg_failed=no +AC_MSG_CHECKING([for $1]) -# _AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- -# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. -# This macro is traced by Automake. -AC_DEFUN([_AM_SUBST_NOTMAKE]) +_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) +_PKG_CONFIG([$1][_LIBS], [libs], [$2]) -# AM_SUBST_NOTMAKE(VARIABLE) -# -------------------------- -# Public sister of _AM_SUBST_NOTMAKE. -AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) +m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS +and $1[]_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details.]) -# Check how to create a tarball. -*- Autoconf -*- +if test $pkg_failed = yes; then + AC_MSG_RESULT([no]) + _PKG_SHORT_ERRORS_SUPPORTED + if test $_pkg_short_errors_supported = yes; then + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` + else + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD -# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. + m4_default([$4], [AC_MSG_ERROR( +[Package requirements ($2) were not met: -# serial 2 +$$1_PKG_ERRORS -# _AM_PROG_TAR(FORMAT) -# -------------------- -# Check how to create a tarball in format FORMAT. -# FORMAT should be one of `v7', `ustar', or `pax'. -# -# Substitute a variable $(am__tar) that is a command -# writing to stdout a FORMAT-tarball containing the directory -# $tardir. -# tardir=directory && $(am__tar) > result.tar -# -# Substitute a variable $(am__untar) that extract such -# a tarball read from stdin. -# $(am__untar) < result.tar -AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. Yes, it's still used -# in the wild :-( We should find a proper way to deprecate it ... -AC_SUBST([AMTAR], ['$${TAR-tar}']) -m4_if([$1], [v7], - [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], - [m4_case([$1], [ustar],, [pax],, - [m4_fatal([Unknown tar format])]) -AC_MSG_CHECKING([how to create a $1 tar archive]) -# Loop over all known methods to create a tar archive until one works. -_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -_am_tools=${am_cv_prog_tar_$1-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break +_PKG_TEXT])dnl + ]) +elif test $pkg_failed = untried; then + AC_MSG_RESULT([no]) + m4_default([$4], [AC_MSG_FAILURE( +[The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) - rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar /dev/null 2>&1 && break - fi -done -rm -rf conftest.dir +_PKG_TEXT -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) -AC_SUBST([am__tar]) -AC_SUBST([am__untar]) -]) # _AM_PROG_TAR +To get pkg-config, see .])dnl + ]) +else + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS + AC_MSG_RESULT([yes]) + $3 +fi[]dnl +])# PKG_CHECK_MODULES m4_include([m4/as-ac-expand.m4]) m4_include([m4/jhflags.m4]) diff --git a/config.guess b/config.guess index d622a44..49ba16f 100755 --- a/config.guess +++ b/config.guess @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, # 2011, 2012 Free Software Foundation, Inc. -timestamp='2012-02-10' +timestamp='2012-01-01' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -17,7 +17,9 @@ timestamp='2012-02-10' # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, see . +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +# 02110-1301, USA. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -861,13 +863,6 @@ EOF i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; - aarch64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - aarch64_be:Linux:*:*) - UNAME_MACHINE=aarch64_be - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in EV5) UNAME_MACHINE=alphaev5 ;; @@ -1325,9 +1320,6 @@ EOF i*86:AROS:*:*) echo ${UNAME_MACHINE}-pc-aros exit ;; - x86_64:VMkernel:*:*) - echo ${UNAME_MACHINE}-unknown-esx - exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 diff --git a/config.sub b/config.sub index c894da4..d6b6b3c 100755 --- a/config.sub +++ b/config.sub @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, # 2011, 2012 Free Software Foundation, Inc. -timestamp='2012-02-10' +timestamp='2012-01-01' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -21,7 +21,9 @@ timestamp='2012-02-10' # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, see . +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +# 02110-1301, USA. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -130,10 +132,6 @@ case $maybe_os in os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; - android-linux) - os=-linux-android - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown - ;; *) basic_machine=`echo $1 | sed 's/-[^-]*$//'` if [ $basic_machine != $1 ] @@ -249,7 +247,6 @@ case $basic_machine in # Some are omitted here because they have special meanings below. 1750a | 580 \ | a29k \ - | aarch64 | aarch64_be \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ @@ -322,7 +319,7 @@ case $basic_machine in c6x) basic_machine=tic6x-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) + m6811 | m68hc11 | m6812 | m68hc12 | picochip) basic_machine=$basic_machine-unknown os=-none ;; @@ -335,10 +332,7 @@ case $basic_machine in strongarm | thumb | xscale) basic_machine=arm-unknown ;; - xgate) - basic_machine=$basic_machine-unknown - os=-none - ;; + xscaleeb) basic_machine=armeb-unknown ;; @@ -361,7 +355,6 @@ case $basic_machine in # Recognize the basic CPU types with company name. 580-* \ | a29k-* \ - | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ diff --git a/configure b/configure index 17e874a..f23a9d9 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for pygobject 3.2.0. +# Generated by GNU Autoconf 2.68 for pygobject 3.2.1. # # Report bugs to . # @@ -174,14 +174,6 @@ test x\$exitcode = x0 || exit 1" as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 - - test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || ( - ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' - ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO - ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO - PATH=/empty FPATH=/empty; export PATH FPATH - test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\ - || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1 test \$(( 1 + 1 )) = 2 || exit 1" if (eval "$as_required") 2>/dev/null; then : as_have_required=yes @@ -545,8 +537,155 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" # Sed expression to map a string onto a valid variable name. as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" + + +# Check that we are running under the correct shell. SHELL=${CONFIG_SHELL-/bin/sh} +case X$lt_ECHO in +X*--fallback-echo) + # Remove one level of quotation (which was required for Make). + ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','` + ;; +esac + +ECHO=${lt_ECHO-echo} +if test "X$1" = X--no-reexec; then + # Discard the --no-reexec flag, and continue. + shift +elif test "X$1" = X--fallback-echo; then + # Avoid inline document here, it may be left over + : +elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then + # Yippee, $ECHO works! + : +else + # Restart under the correct shell. + exec $SHELL "$0" --no-reexec ${1+"$@"} +fi + +if test "X$1" = X--fallback-echo; then + # used as fallback echo + shift + cat <<_LT_EOF +$* +_LT_EOF + exit 0 +fi + +# The HP-UX ksh and POSIX shell print the target directory to stdout +# if CDPATH is set. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +if test -z "$lt_ECHO"; then + if test "X${echo_test_string+set}" != Xset; then + # find a string as large as possible, as long as the shell can cope with it + for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do + # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... + if { echo_test_string=`eval $cmd`; } 2>/dev/null && + { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null + then + break + fi + done + fi + + if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && + echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + : + else + # The Solaris, AIX, and Digital Unix default echo programs unquote + # backslashes. This makes it impossible to quote backslashes using + # echo "$something" | sed 's/\\/\\\\/g' + # + # So, first we look for a working echo in the user's PATH. + + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for dir in $PATH /usr/ucb; do + IFS="$lt_save_ifs" + if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && + test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && + echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + ECHO="$dir/echo" + break + fi + done + IFS="$lt_save_ifs" + + if test "X$ECHO" = Xecho; then + # We didn't find a better echo, so look for alternatives. + if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' && + echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + # This shell has a builtin print -r that does the trick. + ECHO='print -r' + elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && + test "X$CONFIG_SHELL" != X/bin/ksh; then + # If we have ksh, try running configure again with it. + ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} + export ORIGINAL_CONFIG_SHELL + CONFIG_SHELL=/bin/ksh + export CONFIG_SHELL + exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"} + else + # Try using printf. + ECHO='printf %s\n' + if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && + echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + # Cool, printf works + : + elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && + test "X$echo_testing_string" = 'X\t' && + echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL + export CONFIG_SHELL + SHELL="$CONFIG_SHELL" + export SHELL + ECHO="$CONFIG_SHELL $0 --fallback-echo" + elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && + test "X$echo_testing_string" = 'X\t' && + echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + ECHO="$CONFIG_SHELL $0 --fallback-echo" + else + # maybe with a smaller string... + prev=: + + for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do + if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null + then + break + fi + prev="$cmd" + done + + if test "$prev" != 'sed 50q "$0"'; then + echo_test_string=`eval $prev` + export echo_test_string + exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"} + else + # Oops. We lost completely, so just stick with echo. + ECHO=echo + fi + fi + fi + fi + fi +fi + +# Copy echo and quote the copy suitably for passing to libtool from +# the Makefile, instead of quoting the original, which is used later. +lt_ECHO=$ECHO +if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then + lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo" +fi + + + test -n "$DJDIR" || exec 7<&0 &1 @@ -571,8 +710,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='pygobject' PACKAGE_TARNAME='pygobject' -PACKAGE_VERSION='3.2.0' -PACKAGE_STRING='pygobject 3.2.0' +PACKAGE_VERSION='3.2.1' +PACKAGE_STRING='pygobject 3.2.1' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=pygobject' PACKAGE_URL='' @@ -664,9 +803,8 @@ OTOOL LIPO NMEDIT DSYMUTIL -MANIFEST_TOOL +lt_ECHO RANLIB -ac_ct_AR AR LN_S NM @@ -793,7 +931,6 @@ with_pic enable_fast_install enable_dependency_tracking with_gnu_ld -with_sysroot enable_libtool_lock enable_thread enable_glibtest @@ -1363,7 +1500,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures pygobject 3.2.0 to adapt to many kinds of systems. +\`configure' configures pygobject 3.2.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1433,7 +1570,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of pygobject 3.2.0:";; + short | recursive ) echo "Configuration of pygobject 3.2.1:";; esac cat <<\_ACEOF @@ -1460,11 +1597,9 @@ Optional Features: Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use + --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-sysroot=DIR Search for dependent libraries within DIR - (or the compiler's sysroot if not specified). --without-ffi Disable libffi support Some influential environment variables: @@ -1559,7 +1694,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -pygobject configure 3.2.0 +pygobject configure 3.2.1 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1837,7 +1972,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by pygobject $as_me 3.2.0, which was +It was created by pygobject $as_me 3.2.1, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2201,9 +2336,9 @@ $as_echo "#define PYGOBJECT_MINOR_VERSION 2" >>confdefs.h PYGOBJECT_MINOR_VERSION=2 -$as_echo "#define PYGOBJECT_MICRO_VERSION 0" >>confdefs.h +$as_echo "#define PYGOBJECT_MICRO_VERSION 1" >>confdefs.h -PYGOBJECT_MICRO_VERSION=0 +PYGOBJECT_MICRO_VERSION=1 ac_config_headers="$ac_config_headers config.h" @@ -2714,7 +2849,7 @@ fi # Define the identity of the package. PACKAGE='pygobject' - VERSION='3.2.0' + VERSION='3.2.1' cat >>confdefs.h <<_ACEOF @@ -2930,7 +3065,7 @@ fi enable_win32_dll=yes case $host in -*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) +*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*) if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. set dummy ${ac_tool_prefix}as; ac_word=$2 @@ -3238,8 +3373,8 @@ esac -macro_version='2.4.2' -macro_revision='1.3337' +macro_version='2.2.6' +macro_revision='1.3012' @@ -3255,75 +3390,6 @@ macro_revision='1.3337' ltmain="$ac_aux_dir/ltmain.sh" -# Backslashify metacharacters that are still active within -# double-quoted strings. -sed_quote_subst='s/\(["`$\\]\)/\\\1/g' - -# Same as above, but do not quote variable references. -double_quote_subst='s/\(["`\\]\)/\\\1/g' - -# Sed substitution to delay expansion of an escaped shell variable in a -# double_quote_subst'ed string. -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' - -# Sed substitution to delay expansion of an escaped single quote. -delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' - -# Sed substitution to avoid accidental globbing in evaled expressions -no_glob_subst='s/\*/\\\*/g' - -ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO -ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 -$as_echo_n "checking how to print strings... " >&6; } -# Test print first, because it will be a builtin if present. -if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='print -r --' -elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='printf %s\n' -else - # Use this function as a fallback that always works. - func_fallback_echo () - { - eval 'cat <<_LTECHO_EOF -$1 -_LTECHO_EOF' - } - ECHO='func_fallback_echo' -fi - -# func_echo_all arg... -# Invoke $ECHO with all args, space-separated. -func_echo_all () -{ - $ECHO "" -} - -case "$ECHO" in - printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5 -$as_echo "printf" >&6; } ;; - print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 -$as_echo "print -r" >&6; } ;; - *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5 -$as_echo "cat" >&6; } ;; -esac - - - - - - - - - - - - - - DEPDIR="${am__leading_dot}deps" ac_config_commands="$ac_config_commands depfiles" @@ -4770,11 +4836,8 @@ if test "$lt_cv_path_NM" != "no"; then NM="$lt_cv_path_NM" else # Didn't find any BSD compatible name lister, look for dumpbin. - if test -n "$DUMPBIN"; then : - # Let the user override the test. - else - if test -n "$ac_tool_prefix"; then - for ac_prog in dumpbin "link -dump" + if test -n "$ac_tool_prefix"; then + for ac_prog in "dumpbin -symbols" "link -dump -symbols" do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 @@ -4818,7 +4881,7 @@ fi fi if test -z "$DUMPBIN"; then ac_ct_DUMPBIN=$DUMPBIN - for ac_prog in dumpbin "link -dump" + for ac_prog in "dumpbin -symbols" "link -dump -symbols" do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -4873,15 +4936,6 @@ esac fi fi - case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in - *COFF*) - DUMPBIN="$DUMPBIN -symbols" - ;; - *) - DUMPBIN=: - ;; - esac - fi if test "$DUMPBIN" != ":"; then NM="$DUMPBIN" @@ -4901,13 +4955,13 @@ if ${lt_cv_nm_interface+:} false; then : else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5) + (eval echo "\"\$as_me:4958: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:4961: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:$LINENO: output\"" >&5) + (eval echo "\"\$as_me:4964: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -4964,11 +5018,6 @@ else lt_cv_sys_max_cmd_len=8192; ;; - mint*) - # On MiNT this can take a long time and run out of memory. - lt_cv_sys_max_cmd_len=8192; - ;; - amigaos*) # On AmigaOS with pdksh, this test takes hours, literally. # So we just punt and use a minimum line length of 8192. @@ -4994,11 +5043,6 @@ else lt_cv_sys_max_cmd_len=196608 ;; - os2*) - # The test takes a long time on OS/2. - lt_cv_sys_max_cmd_len=8192 - ;; - osf*) # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not @@ -5038,8 +5082,8 @@ else # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ - = "X$teststring$teststring"; } >/dev/null 2>&1 && + while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ + = "XX$teststring$teststring"; } >/dev/null 2>&1 && test $i != 17 # 1/2 MB should be enough do i=`expr $i + 1` @@ -5081,8 +5125,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" - test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ - = c,a/b,b/c, \ + test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ + = c,a/b,, \ && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes @@ -5131,80 +5175,6 @@ esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 -$as_echo_n "checking how to convert $build file names to $host format... " >&6; } -if ${lt_cv_to_host_file_cmd+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $host in - *-*-mingw* ) - case $build in - *-*-mingw* ) # actually msys - lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 - ;; - *-*-cygwin* ) - lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 - ;; - * ) # otherwise, assume *nix - lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 - ;; - esac - ;; - *-*-cygwin* ) - case $build in - *-*-mingw* ) # actually msys - lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin - ;; - *-*-cygwin* ) - lt_cv_to_host_file_cmd=func_convert_file_noop - ;; - * ) # otherwise, assume *nix - lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin - ;; - esac - ;; - * ) # unhandled hosts (and "normal" native builds) - lt_cv_to_host_file_cmd=func_convert_file_noop - ;; -esac - -fi - -to_host_file_cmd=$lt_cv_to_host_file_cmd -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 -$as_echo "$lt_cv_to_host_file_cmd" >&6; } - - - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 -$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } -if ${lt_cv_to_tool_file_cmd+:} false; then : - $as_echo_n "(cached) " >&6 -else - #assume ordinary cross tools, or native build. -lt_cv_to_tool_file_cmd=func_convert_file_noop -case $host in - *-*-mingw* ) - case $build in - *-*-mingw* ) # actually msys - lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 - ;; - esac - ;; -esac - -fi - -to_tool_file_cmd=$lt_cv_to_tool_file_cmd -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 -$as_echo "$lt_cv_to_tool_file_cmd" >&6; } - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 $as_echo_n "checking for $LD option to reload object files... " >&6; } if ${lt_cv_ld_reload_flag+:} false; then : @@ -5221,11 +5191,6 @@ case $reload_flag in esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in - cygwin* | mingw* | pw32* | cegcc*) - if test "$GCC" != yes; then - reload_cmds=false - fi - ;; darwin*) if test "$GCC" = yes; then reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' @@ -5386,18 +5351,16 @@ mingw* | pw32*) # Base MSYS/MinGW do not provide the 'file' command needed by # func_win32_libid shell function, so use a weaker test based on 'objdump', # unless we find 'file', for example because we are cross-compiling. - # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. - if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then + if ( file / ) >/dev/null 2>&1; then lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else - # Keep this pattern in sync with the one in func_win32_libid. - lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' + lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' lt_cv_file_magic_cmd='$OBJDUMP -f' fi ;; -cegcc*) +cegcc) # use the weaker test based on 'objdump'. See mingw*. lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' lt_cv_file_magic_cmd='$OBJDUMP -f' @@ -5427,10 +5390,6 @@ gnu*) lt_cv_deplibs_check_method=pass_all ;; -haiku*) - lt_cv_deplibs_check_method=pass_all - ;; - hpux10.20* | hpux11*) lt_cv_file_magic_cmd=/usr/bin/file case $host_cpu in @@ -5439,11 +5398,11 @@ hpux10.20* | hpux11*) lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so ;; hppa*64*) - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]' + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]' lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl ;; *) - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library' + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library' lt_cv_file_magic_test_file=/usr/lib/libc.sl ;; esac @@ -5464,12 +5423,12 @@ irix5* | irix6* | nonstopux*) lt_cv_deplibs_check_method=pass_all ;; -# This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +# This must be Linux ELF. +linux* | k*bsd*-gnu) lt_cv_deplibs_check_method=pass_all ;; -netbsd* | netbsdelf*-gnu) +netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' else @@ -5546,21 +5505,6 @@ esac fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 $as_echo "$lt_cv_deplibs_check_method" >&6; } - -file_magic_glob= -want_nocaseglob=no -if test "$build" = "$host"; then - case $host_os in - mingw* | pw32*) - if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then - want_nocaseglob=yes - else - file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` - fi - ;; - esac -fi - file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -5576,26 +5520,16 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown - - - - - - - - - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. -set dummy ${ac_tool_prefix}dlltool; ac_word=$2 + # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. +set dummy ${ac_tool_prefix}ar; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_DLLTOOL+:} false; then : +if ${ac_cv_prog_AR+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$DLLTOOL"; then - ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. + if test -n "$AR"; then + ac_cv_prog_AR="$AR" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -5604,7 +5538,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" + ac_cv_prog_AR="${ac_tool_prefix}ar" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -5614,10 +5548,10 @@ IFS=$as_save_IFS fi fi -DLLTOOL=$ac_cv_prog_DLLTOOL -if test -n "$DLLTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 -$as_echo "$DLLTOOL" >&6; } +AR=$ac_cv_prog_AR +if test -n "$AR"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 +$as_echo "$AR" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -5625,17 +5559,17 @@ fi fi -if test -z "$ac_cv_prog_DLLTOOL"; then - ac_ct_DLLTOOL=$DLLTOOL - # Extract the first word of "dlltool", so it can be a program name with args. -set dummy dlltool; ac_word=$2 +if test -z "$ac_cv_prog_AR"; then + ac_ct_AR=$AR + # Extract the first word of "ar", so it can be a program name with args. +set dummy ar; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : +if ${ac_cv_prog_ac_ct_AR+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$ac_ct_DLLTOOL"; then - ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. + if test -n "$ac_ct_AR"; then + ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -5644,7 +5578,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_DLLTOOL="dlltool" + ac_cv_prog_ac_ct_AR="ar" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -5654,17 +5588,17 @@ IFS=$as_save_IFS fi fi -ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL -if test -n "$ac_ct_DLLTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 -$as_echo "$ac_ct_DLLTOOL" >&6; } +ac_ct_AR=$ac_cv_prog_ac_ct_AR +if test -n "$ac_ct_AR"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 +$as_echo "$ac_ct_AR" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - if test "x$ac_ct_DLLTOOL" = x; then - DLLTOOL="false" + if test "x$ac_ct_AR" = x; then + AR="false" else case $cross_compiling:$ac_tool_warned in yes:) @@ -5672,51 +5606,17 @@ yes:) $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac - DLLTOOL=$ac_ct_DLLTOOL + AR=$ac_ct_AR fi else - DLLTOOL="$ac_cv_prog_DLLTOOL" + AR="$ac_cv_prog_AR" fi -test -z "$DLLTOOL" && DLLTOOL=dlltool - - - - +test -z "$AR" && AR=ar +test -z "$AR_FLAGS" && AR_FLAGS=cru -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 -$as_echo_n "checking how to associate runtime and link libraries... " >&6; } -if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_sharedlib_from_linklib_cmd='unknown' - -case $host_os in -cygwin* | mingw* | pw32* | cegcc*) - # two different shell functions defined in ltmain.sh - # decide which to use based on capabilities of $DLLTOOL - case `$DLLTOOL --help 2>&1` in - *--identify-strict*) - lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib - ;; - *) - lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback - ;; - esac - ;; -*) - # fallback: assume linklib IS sharedlib - lt_cv_sharedlib_from_linklib_cmd="$ECHO" - ;; -esac - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 -$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } -sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd -test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO @@ -5726,17 +5626,15 @@ test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO if test -n "$ac_tool_prefix"; then - for ac_prog in ar - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. +set dummy ${ac_tool_prefix}strip; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_AR+:} false; then : +if ${ac_cv_prog_STRIP+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$AR"; then - ac_cv_prog_AR="$AR" # Let the user override the test. + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -5745,7 +5643,7 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_AR="$ac_tool_prefix$ac_prog" + ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -5755,179 +5653,10 @@ IFS=$as_save_IFS fi fi -AR=$ac_cv_prog_AR -if test -n "$AR"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 -$as_echo "$AR" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$AR" && break - done -fi -if test -z "$AR"; then - ac_ct_AR=$AR - for ac_prog in ar -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_AR+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_AR"; then - ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_AR="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_AR=$ac_cv_prog_ac_ct_AR -if test -n "$ac_ct_AR"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 -$as_echo "$ac_ct_AR" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$ac_ct_AR" && break -done - - if test "x$ac_ct_AR" = x; then - AR="false" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - AR=$ac_ct_AR - fi -fi - -: ${AR=ar} -: ${AR_FLAGS=cru} - - - - - - - - - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 -$as_echo_n "checking for archiver @FILE support... " >&6; } -if ${lt_cv_ar_at_file+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_ar_at_file=no - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - echo conftest.$ac_objext > conftest.lst - lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' - { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 - (eval $lt_ar_try) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - if test "$ac_status" -eq 0; then - # Ensure the archiver fails upon bogus file names. - rm -f conftest.$ac_objext libconftest.a - { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 - (eval $lt_ar_try) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - if test "$ac_status" -ne 0; then - lt_cv_ar_at_file=@ - fi - fi - rm -f conftest.* libconftest.a - -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 -$as_echo "$lt_cv_ar_at_file" >&6; } - -if test "x$lt_cv_ar_at_file" = xno; then - archiver_list_spec= -else - archiver_list_spec=$lt_cv_ar_at_file -fi - - - - - - - -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. -set dummy ${ac_tool_prefix}strip; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_STRIP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$STRIP"; then - ac_cv_prog_STRIP="$STRIP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_STRIP="${ac_tool_prefix}strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -STRIP=$ac_cv_prog_STRIP -if test -n "$STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 -$as_echo "$STRIP" >&6; } +STRIP=$ac_cv_prog_STRIP +if test -n "$STRIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +$as_echo "$STRIP" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -6102,27 +5831,15 @@ old_postuninstall_cmds= if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" ;; *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" ;; esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" + old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" fi -case $host_os in - darwin*) - lock_old_archive_extraction=yes ;; - *) - lock_old_archive_extraction=no ;; -esac - - - - - - @@ -6230,8 +5947,8 @@ esac lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" # Handle CRLF in mingw tool chain opt_cr= @@ -6255,7 +5972,6 @@ for ac_symprfx in "" "_"; do # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK '"\ " {last_section=section; section=\$ 3};"\ -" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ @@ -6268,7 +5984,6 @@ for ac_symprfx in "" "_"; do else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi - lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" # Check to see that the pipe works correctly. pipe_works=no @@ -6294,8 +6009,8 @@ _LT_EOF test $ac_status = 0; }; then # Now try to grab the symbols. nlist=conftest.nm - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5 - (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5 + (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && test -s "$nlist"; then @@ -6310,18 +6025,6 @@ _LT_EOF if $GREP ' nm_test_var$' "$nlist" >/dev/null; then if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext -/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -/* DATA imports from DLLs on WIN32 con't be const, because runtime - relocations are performed -- see ld's documentation on pseudo-relocs. */ -# define LT_DLSYM_CONST -#elif defined(__osf__) -/* This system does not cope well with relocations in const data. */ -# define LT_DLSYM_CONST -#else -# define LT_DLSYM_CONST const -#endif - #ifdef __cplusplus extern "C" { #endif @@ -6333,7 +6036,7 @@ _LT_EOF cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ -LT_DLSYM_CONST struct { +const struct { const char *name; void *address; } @@ -6359,8 +6062,8 @@ static const void *lt_preloaded_setup() { _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext - lt_globsym_save_LIBS=$LIBS - lt_globsym_save_CFLAGS=$CFLAGS + lt_save_LIBS="$LIBS" + lt_save_CFLAGS="$CFLAGS" LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 @@ -6370,8 +6073,8 @@ _LT_EOF test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi - LIBS=$lt_globsym_save_LIBS - CFLAGS=$lt_globsym_save_CFLAGS + LIBS="$lt_save_LIBS" + CFLAGS="$lt_save_CFLAGS" else echo "cannot find nm_test_func in $nlist" >&5 fi @@ -6408,19 +6111,6 @@ else $as_echo "ok" >&6; } fi -# Response file support. -if test "$lt_cv_nm_interface" = "MS dumpbin"; then - nm_file_list_spec='@' -elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then - nm_file_list_spec='@' -fi - - - - - - - @@ -6441,41 +6131,6 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 -$as_echo_n "checking for sysroot... " >&6; } - -# Check whether --with-sysroot was given. -if test "${with_sysroot+set}" = set; then : - withval=$with_sysroot; -else - with_sysroot=no -fi - - -lt_sysroot= -case ${with_sysroot} in #( - yes) - if test "$GCC" = yes; then - lt_sysroot=`$CC --print-sysroot 2>/dev/null` - fi - ;; #( - /*) - lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` - ;; #( - no|'') - ;; #( - *) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 -$as_echo "${with_sysroot}" >&6; } - as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 - ;; -esac - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 -$as_echo "${lt_sysroot:-no}" >&6; } - - - # Check whether --enable-libtool-lock was given. @@ -6509,7 +6164,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line '$LINENO' "configure"' > conftest.$ac_ext + echo '#line 6167 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -6644,7 +6299,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; } CFLAGS="$SAVE_CFLAGS" fi ;; -*-*solaris*) +sparc*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 @@ -6655,20 +6310,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; } case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in - yes*) - case $host in - i?86-*-solaris*) - LD="${LD-ld} -m elf_x86_64" - ;; - sparc*-*-solaris*) - LD="${LD-ld} -m elf64_sparc" - ;; - esac - # GNU ld 2.21 introduced _sol2 emulations. Use them if available. - if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then - LD="${LD-ld}_sol2" - fi - ;; + yes*) LD="${LD-ld} -m elf64_sparc" ;; *) if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then LD="${LD-ld} -64" @@ -6684,123 +6326,6 @@ esac need_locks="$enable_libtool_lock" -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. -set dummy ${ac_tool_prefix}mt; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$MANIFEST_TOOL"; then - ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL -if test -n "$MANIFEST_TOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 -$as_echo "$MANIFEST_TOOL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_MANIFEST_TOOL"; then - ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL - # Extract the first word of "mt", so it can be a program name with args. -set dummy mt; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_MANIFEST_TOOL"; then - ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL -if test -n "$ac_ct_MANIFEST_TOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 -$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_MANIFEST_TOOL" = x; then - MANIFEST_TOOL=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL - fi -else - MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" -fi - -test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 -$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } -if ${lt_cv_path_mainfest_tool+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_path_mainfest_tool=no - echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 - $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out - cat conftest.err >&5 - if $GREP 'Manifest Tool' conftest.out > /dev/null; then - lt_cv_path_mainfest_tool=yes - fi - rm -f conftest* -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 -$as_echo "$lt_cv_path_mainfest_tool" >&6; } -if test "x$lt_cv_path_mainfest_tool" != xyes; then - MANIFEST_TOOL=: -fi - - - - - case $host_os in rhapsody* | darwin*) @@ -7308,13 +6833,7 @@ else $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err _lt_result=$? - # If there is a non-empty error log, and "single_module" - # appears in it, assume the flag caused a linker warning - if test -s conftest.err && $GREP single_module conftest.err; then - cat conftest.err >&5 - # Otherwise, if the output was created with a 0 exit code from - # the compiler, it worked. - elif test -f libconftest.dylib && test $_lt_result -eq 0; then + if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&5 @@ -7325,7 +6844,6 @@ else fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 $as_echo "$lt_cv_apple_cc_single_mod" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } if ${lt_cv_ld_exported_symbols_list+:} false; then : @@ -7358,41 +6876,6 @@ rm -f core conftest.err conftest.$ac_objext \ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 -$as_echo_n "checking for -force_load linker flag... " >&6; } -if ${lt_cv_ld_force_load+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_ld_force_load=no - cat > conftest.c << _LT_EOF -int forced_loaded() { return 2;} -_LT_EOF - echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5 - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 - echo "$AR cru libconftest.a conftest.o" >&5 - $AR cru libconftest.a conftest.o 2>&5 - echo "$RANLIB libconftest.a" >&5 - $RANLIB libconftest.a 2>&5 - cat > conftest.c << _LT_EOF -int main() { return 0;} -_LT_EOF - echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 - $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err - _lt_result=$? - if test -s conftest.err && $GREP force_load conftest.err; then - cat conftest.err >&5 - elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then - lt_cv_ld_force_load=yes - else - cat conftest.err >&5 - fi - rm -f conftest.err libconftest.a conftest conftest.c - rm -rf conftest.dSYM - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5 -$as_echo "$lt_cv_ld_force_load" >&6; } case $host_os in rhapsody* | darwin1.[012]) _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; @@ -7420,7 +6903,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; } else _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' fi - if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then + if test "$DSYMUTIL" != ":"; then _lt_dsymutil='~$DSYMUTIL $lib || :' else _lt_dsymutil= @@ -7710,8 +7193,6 @@ done - - # Set options @@ -7755,22 +7236,7 @@ fi # Check whether --with-pic was given. if test "${with_pic+set}" = set; then : - withval=$with_pic; lt_p=${PACKAGE-default} - case $withval in - yes|no) pic_mode=$withval ;; - *) - pic_mode=default - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for lt_pkg in $withval; do - IFS="$lt_save_ifs" - if test "X$lt_pkg" = "X$lt_p"; then - pic_mode=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac + withval=$with_pic; pic_mode="$withval" else pic_mode=default fi @@ -7847,11 +7313,6 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool' - - - - - test -z "$LN_S" && LN_S="ln -s" @@ -7901,6 +7362,19 @@ _ACEOF + + + + + + + + + + + + + case $host_os in aix3*) # AIX sometimes has problems with the GCC collect2 program. For some @@ -7913,6 +7387,23 @@ aix3*) ;; esac +# Sed substitution that helps us do robust quoting. It backslashifies +# metacharacters that are still active within double-quoted strings. +sed_quote_subst='s/\(["`$\\]\)/\\\1/g' + +# Same as above, but do not quote variable references. +double_quote_subst='s/\(["`\\]\)/\\\1/g' + +# Sed substitution to delay expansion of an escaped shell variable in a +# double_quote_subst'ed string. +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' + +# Sed substitution to delay expansion of an escaped single quote. +delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' + +# Sed substitution to avoid accidental globbing in evaled expressions +no_glob_subst='s/\*/\\\*/g' + # Global variables: ofile=libtool can_build_shared=yes @@ -7941,7 +7432,7 @@ for cc_temp in $compiler""; do *) break;; esac done -cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` # Only perform the check for file, if the check method requires it @@ -8150,12 +7641,7 @@ if test -n "$compiler"; then lt_prog_compiler_no_builtin_flag= if test "$GCC" = yes; then - case $cc_basename in - nvcc*) - lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;; - *) - lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;; - esac + lt_prog_compiler_no_builtin_flag=' -fno-builtin' { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } @@ -8175,15 +7661,15 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7664: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:7668: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp + $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then lt_cv_prog_compiler_rtti_exceptions=yes @@ -8212,6 +7698,8 @@ fi lt_prog_compiler_pic= lt_prog_compiler_static= +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' @@ -8259,12 +7747,6 @@ lt_prog_compiler_static= lt_prog_compiler_pic='-fno-common' ;; - haiku*) - # PIC is the default for Haiku. - # The "-static" flag exists, but is broken. - lt_prog_compiler_static= - ;; - hpux*) # PIC is the default for 64-bit PA HP-UX, but not for 32-bit # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag @@ -8307,15 +7789,6 @@ lt_prog_compiler_static= lt_prog_compiler_pic='-fPIC' ;; esac - - case $cc_basename in - nvcc*) # Cuda Compiler Driver 2.2 - lt_prog_compiler_wl='-Xlinker ' - if test -n "$lt_prog_compiler_pic"; then - lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic" - fi - ;; - esac else # PORTME Check for flag to pass linker flags through the system compiler. case $host_os in @@ -8357,7 +7830,7 @@ lt_prog_compiler_static= lt_prog_compiler_static='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -8378,13 +7851,7 @@ lt_prog_compiler_static= lt_prog_compiler_pic='--shared' lt_prog_compiler_static='--static' ;; - nagfor*) - # NAG Fortran compiler - lt_prog_compiler_wl='-Wl,-Wl,,' - lt_prog_compiler_pic='-PIC' - lt_prog_compiler_static='-Bstatic' - ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) + pgcc* | pgf77* | pgf90* | pgf95*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) lt_prog_compiler_wl='-Wl,' @@ -8396,40 +7863,25 @@ lt_prog_compiler_static= # All Alpha code is PIC. lt_prog_compiler_static='-non_shared' ;; - xl* | bgxl* | bgf* | mpixl*) - # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene + xl*) + # IBM XL C 8.0/Fortran 10.1 on PPC lt_prog_compiler_wl='-Wl,' lt_prog_compiler_pic='-qpic' lt_prog_compiler_static='-qstaticlink' ;; *) case `$CC -V 2>&1 | sed 5q` in - *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) - # Sun Fortran 8.3 passes all unrecognized flags to the linker - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - lt_prog_compiler_wl='' - ;; - *Sun\ F* | *Sun*Fortran*) - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - lt_prog_compiler_wl='-Qoption ld ' - ;; *Sun\ C*) # Sun C 5.9 lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' lt_prog_compiler_wl='-Wl,' ;; - *Intel*\ [CF]*Compiler*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-fPIC' - lt_prog_compiler_static='-static' - ;; - *Portland\ Group*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-fpic' + *Sun\ F*) + # Sun Fortran 8.3 passes all unrecognized flags to the linker + lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='' ;; esac ;; @@ -8461,7 +7913,7 @@ lt_prog_compiler_static= lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' case $cc_basename in - f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) + f77* | f90* | f95*) lt_prog_compiler_wl='-Qoption ld ';; *) lt_prog_compiler_wl='-Wl,';; @@ -8518,17 +7970,13 @@ case $host_os in lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" ;; esac +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5 +$as_echo "$lt_prog_compiler_pic" >&6; } + + + + -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -if ${lt_cv_prog_compiler_pic+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_pic=$lt_prog_compiler_pic -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 -$as_echo "$lt_cv_prog_compiler_pic" >&6; } -lt_prog_compiler_pic=$lt_cv_prog_compiler_pic # # Check to make sure the PIC flag actually works. @@ -8552,15 +8000,15 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8003: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:8007: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp + $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then lt_cv_prog_compiler_pic_works=yes @@ -8589,11 +8037,6 @@ fi - - - - - # # Check to make sure the static flag actually works. # @@ -8613,7 +8056,7 @@ else if test -s conftest.err; then # Append any errors to the config.log. cat conftest.err 1>&5 - $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp + $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if diff conftest.exp conftest.er2 >/dev/null; then lt_cv_prog_compiler_static_works=yes @@ -8662,16 +8105,16 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8108: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:8112: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp + $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then lt_cv_prog_compiler_c_o=yes @@ -8717,16 +8160,16 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8163: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:8167: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp + $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then lt_cv_prog_compiler_c_o=yes @@ -8792,6 +8235,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie hardcode_direct=no hardcode_direct_absolute=no hardcode_libdir_flag_spec= + hardcode_libdir_flag_spec_ld= hardcode_libdir_separator= hardcode_minus_L=no hardcode_shlibpath_var=unsupported @@ -8835,39 +8279,10 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie openbsd*) with_gnu_ld=no ;; - linux* | k*bsd*-gnu | gnu*) - link_all_deplibs=no - ;; esac ld_shlibs=yes - - # On some targets, GNU ld is compatible enough with the native linker - # that we're better off using the native interface for both. - lt_use_gnu_ld_interface=no if test "$with_gnu_ld" = yes; then - case $host_os in - aix*) - # The AIX port of GNU ld has always aspired to compatibility - # with the native linker. However, as the warning in the GNU ld - # block says, versions before 2.19.5* couldn't really create working - # shared libraries, regardless of the interface used. - case `$LD -v 2>&1` in - *\ \(GNU\ Binutils\)\ 2.19.5*) ;; - *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;; - *\ \(GNU\ Binutils\)\ [3-9]*) ;; - *) - lt_use_gnu_ld_interface=yes - ;; - esac - ;; - *) - lt_use_gnu_ld_interface=yes - ;; - esac - fi - - if test "$lt_use_gnu_ld_interface" = yes; then # If archive_cmds runs LD, not CC, wlarc should be empty wlarc='${wl}' @@ -8885,7 +8300,6 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie fi supports_anon_versioning=no case `$LD -v 2>&1` in - *GNU\ gold*) supports_anon_versioning=yes ;; *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... @@ -8901,12 +8315,11 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie ld_shlibs=no cat <<_LT_EOF 1>&2 -*** Warning: the GNU linker, at least up to release 2.19, is reported +*** Warning: the GNU linker, at least up to release 2.9.1, is reported *** to be unable to reliably create shared libraries on AIX. *** Therefore, libtool is disabling shared libraries support. If you -*** really care for shared libraries, you may want to install binutils -*** 2.20 or above, or modify your PATH so that a non-GNU linker is found. -*** You will then need to restart the configuration process. +*** really care for shared libraries, you may want to modify your PATH +*** so that a non-GNU linker is found, and then restart. _LT_EOF fi @@ -8942,12 +8355,10 @@ _LT_EOF # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, # as there is no search path for DLLs. hardcode_libdir_flag_spec='-L$libdir' - export_dynamic_flag_spec='${wl}--export-all-symbols' allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' - exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' @@ -8965,11 +8376,6 @@ _LT_EOF fi ;; - haiku*) - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - link_all_deplibs=yes - ;; - interix[3-9]*) hardcode_direct=no hardcode_shlibpath_var=no @@ -8985,7 +8391,7 @@ _LT_EOF archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; - gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) + gnu* | linux* | tpf* | k*bsd*-gnu) tmp_diet=no if test "$host_os" = linux-dietlibc; then case $cc_basename in @@ -8995,16 +8401,15 @@ _LT_EOF if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ && test "$tmp_diet" = no then - tmp_addflag=' $pic_flag' + tmp_addflag= tmp_sharedflag='-shared' case $cc_basename,$host_cpu in pgcc*) # Portland Group C compiler - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' tmp_addflag=' $pic_flag' ;; - pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group f77 and f90 compilers - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers + whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' tmp_addflag=' $pic_flag -Mnomain' ;; ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 tmp_addflag=' -i_dynamic' ;; @@ -9015,17 +8420,13 @@ _LT_EOF lf95*) # Lahey Fortran 8.1 whole_archive_flag_spec= tmp_sharedflag='--shared' ;; - xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) + xl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) tmp_sharedflag='-qmkshrobj' tmp_addflag= ;; - nvcc*) # Cuda Compiler Driver 2.2 - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - compiler_needs_object=yes - ;; esac case `$CC -V 2>&1 | sed 5q` in *Sun\ C*) # Sun C 5.9 - whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' compiler_needs_object=yes tmp_sharedflag='-G' ;; *Sun\ F*) # Sun Fortran 8.3 @@ -9041,16 +8442,17 @@ _LT_EOF fi case $cc_basename in - xlf* | bgf* | bgxlf* | mpixlf*) + xlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' + hardcode_libdir_flag_spec= + hardcode_libdir_flag_spec_ld='-rpath $libdir' + archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' if test "x$supports_anon_versioning" = xyes; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ - $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' fi ;; esac @@ -9059,13 +8461,13 @@ _LT_EOF fi ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' fi ;; @@ -9083,8 +8485,8 @@ _LT_EOF _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi @@ -9130,8 +8532,8 @@ _LT_EOF *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi @@ -9171,10 +8573,8 @@ _LT_EOF else # If we're using GNU nm, then we don't want the "-C" option. # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global - # defined symbols, whereas GNU nm marks them as "W". if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' else export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' fi @@ -9236,7 +8636,6 @@ _LT_EOF if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi - link_all_deplibs=no else # not using gcc if test "$host_cpu" = ia64; then @@ -9262,13 +8661,7 @@ _LT_EOF allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. - if test "${lt_cv_aix_libpath+set}" = set; then - aix_libpath=$lt_cv_aix_libpath -else - if ${lt_cv_aix_libpath_+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -9281,32 +8674,25 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : - lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\([^ ]*\) *$/\1/ - p - } - }' - lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - # Check for a 64-bit object if we didn't find anything. - if test -z "$lt_cv_aix_libpath_"; then - lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - fi +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +# Check for a 64-bit object if we didn't find anything. +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - if test -z "$lt_cv_aix_libpath_"; then - lt_cv_aix_libpath_="/usr/lib:/lib" - fi - -fi - - aix_libpath=$lt_cv_aix_libpath_ -fi +if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' @@ -9315,13 +8701,7 @@ fi else # Determine the default libpath from the value encoded in an # empty executable. - if test "${lt_cv_aix_libpath+set}" = set; then - aix_libpath=$lt_cv_aix_libpath -else - if ${lt_cv_aix_libpath_+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -9334,42 +8714,30 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : - lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\([^ ]*\) *$/\1/ - p - } - }' - lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - # Check for a 64-bit object if we didn't find anything. - if test -z "$lt_cv_aix_libpath_"; then - lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - fi +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +# Check for a 64-bit object if we didn't find anything. +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - if test -z "$lt_cv_aix_libpath_"; then - lt_cv_aix_libpath_="/usr/lib:/lib" - fi - -fi - - aix_libpath=$lt_cv_aix_libpath_ -fi +if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. no_undefined_flag=' ${wl}-bernotok' allow_undefined_flag=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then - # We only use this code for GNU lds that support --whole-archive. - whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - else - # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec='$convenience' - fi + # Exported symbols can be pulled into shared objects from archives + whole_archive_flag_spec='$convenience' archive_cmds_need_lc=yes # This is similar to how AIX traditionally builds its shared libraries. archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' @@ -9401,64 +8769,20 @@ fi # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. - case $cc_basename in - cl*) - # Native MSVC - hardcode_libdir_flag_spec=' ' - allow_undefined_flag=unsupported - always_export_symbols=yes - file_list_spec='@' - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' - archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; - else - sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' - # The linker will not automatically build a static lib if we build a DLL. - # _LT_TAGVAR(old_archive_from_new_cmds, )='true' - enable_shared_with_static_runtimes=yes - exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' - # Don't use ranlib - old_postinstall_cmds='chmod 644 $oldlib' - postlink_cmds='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' - ;; - *) - # Assume MSVC wrapper - hardcode_libdir_flag_spec=' ' - allow_undefined_flag=unsupported - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - old_archive_from_new_cmds='true' - # FIXME: Should let the user specify the lib program. - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' - enable_shared_with_static_runtimes=yes - ;; - esac + hardcode_libdir_flag_spec=' ' + allow_undefined_flag=unsupported + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames=' + # The linker will automatically build a .lib file if we build a DLL. + old_archive_from_new_cmds='true' + # FIXME: Should let the user specify the lib program. + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' + fix_srcfile_path='`cygpath -w "$srcfile"`' + enable_shared_with_static_runtimes=yes ;; darwin* | rhapsody*) @@ -9468,12 +8792,7 @@ fi hardcode_direct=no hardcode_automatic=yes hardcode_shlibpath_var=unsupported - if test "$lt_cv_ld_force_load" = "yes"; then - whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' - - else - whole_archive_flag_spec='' - fi + whole_archive_flag_spec='' link_all_deplibs=yes allow_undefined_flag="$_lt_dar_allow_undefined" case $cc_basename in @@ -9481,7 +8800,7 @@ fi *) _lt_dar_can_shared=$GCC ;; esac if test "$_lt_dar_can_shared" = "yes"; then - output_verbose_link_cmd=func_echo_all + output_verbose_link_cmd=echo archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" @@ -9499,6 +8818,10 @@ fi hardcode_shlibpath_var=no ;; + freebsd1*) + ld_shlibs=no + ;; + # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor # support. Future versions do this automatically, but an explicit c++rt0.o # does not break anything, and helps significantly (at the cost of a little @@ -9511,7 +8834,7 @@ fi ;; # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2.*) + freebsd2*) archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' hardcode_direct=yes hardcode_minus_L=yes @@ -9520,7 +8843,7 @@ fi # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes hardcode_shlibpath_var=no @@ -9528,7 +8851,7 @@ fi hpux9*) if test "$GCC" = yes; then - archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' else archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' fi @@ -9543,13 +8866,14 @@ fi ;; hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then - archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + if test "$GCC" = yes -a "$with_gnu_ld" = no; then + archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi if test "$with_gnu_ld" = no; then hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_flag_spec_ld='+b $libdir' hardcode_libdir_separator=: hardcode_direct=yes hardcode_direct_absolute=yes @@ -9561,16 +8885,16 @@ fi ;; hpux11*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then + if test "$GCC" = yes -a "$with_gnu_ld" = no; then case $host_cpu in hppa*64*) archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else @@ -9582,46 +8906,7 @@ fi archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - - # Older versions of the 11.00 compiler do not understand -b yet - # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5 -$as_echo_n "checking if $CC understands -b... " >&6; } -if ${lt_cv_prog_compiler__b+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler__b=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -b" - echo "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The linker can only warn and ignore the option if not recognized - # So say no if there are warnings - if test -s conftest.err; then - # Append any errors to the config.log. - cat conftest.err 1>&5 - $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler__b=yes - fi - else - lt_cv_prog_compiler__b=yes - fi - fi - $RM -r conftest* - LDFLAGS="$save_LDFLAGS" - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 -$as_echo "$lt_cv_prog_compiler__b" >&6; } - -if test x"$lt_cv_prog_compiler__b" = xyes; then - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -else - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' -fi - + archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac fi @@ -9649,39 +8934,26 @@ fi irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' # Try to use the -exported_symbol ld option, if it does not # work, assume that -exports_file does not work either and # implicitly export all symbols. - # This should be the same for all languages, so no per-tag cache variable. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 -$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } -if ${lt_cv_irix_exported_symbol+:} false; then : - $as_echo_n "(cached) " >&6 -else - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -int foo (void) { return 0; } +int foo(void) {} _ACEOF if ac_fn_c_try_link "$LINENO"; then : - lt_cv_irix_exported_symbol=yes -else - lt_cv_irix_exported_symbol=no + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$save_LDFLAGS" -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 -$as_echo "$lt_cv_irix_exported_symbol" >&6; } - if test "$lt_cv_irix_exported_symbol" = yes; then - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' - fi + LDFLAGS="$save_LDFLAGS" else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' fi archive_cmds_need_lc='no' hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' @@ -9690,7 +8962,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; } link_all_deplibs=yes ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -9743,17 +9015,17 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; } hardcode_libdir_flag_spec='-L$libdir' hardcode_minus_L=yes allow_undefined_flag=unsupported - archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' + archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' ;; osf3*) if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' else allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' fi archive_cmds_need_lc='no' hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' @@ -9763,13 +9035,13 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; } osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' else allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ - $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' + $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' # Both c and cxx compiler support -rpath directly hardcode_libdir_flag_spec='-rpath $libdir' @@ -9782,9 +9054,9 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; } no_undefined_flag=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' - archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' else case `$CC -V 2>&1` in *"Compilers 5.0"*) @@ -9972,50 +9244,44 @@ x|xyes) # to ld, don't add -lc before -lgcc. { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } -if ${lt_cv_archive_cmds_need_lc+:} false; then : - $as_echo_n "(cached) " >&6 -else - $RM conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext + $RM conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$lt_prog_compiler_wl - pic_flag=$lt_prog_compiler_pic - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$allow_undefined_flag - allow_undefined_flag= - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext + deplibs= + wl=$lt_prog_compiler_wl + pic_flag=$lt_prog_compiler_pic + compiler_flags=-v + linker_flags=-v + verstring= + output_objdir=. + libname=conftest + lt_save_allow_undefined_flag=$allow_undefined_flag + allow_undefined_flag= + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } - then - lt_cv_archive_cmds_need_lc=no - else - lt_cv_archive_cmds_need_lc=yes - fi - allow_undefined_flag=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $RM conftest* - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5 -$as_echo "$lt_cv_archive_cmds_need_lc" >&6; } - archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc + then + archive_cmds_need_lc=no + else + archive_cmds_need_lc=yes + fi + allow_undefined_flag=$lt_save_allow_undefined_flag + else + cat conftest.err 1>&5 + fi + $RM conftest* + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5 +$as_echo "$archive_cmds_need_lc" >&6; } ;; esac fi @@ -10173,6 +9439,11 @@ esac + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 $as_echo_n "checking dynamic linker characteristics... " >&6; } @@ -10181,23 +9452,16 @@ if test "$GCC" = yes; then darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; *) lt_awk_arg="/^libraries:/" ;; esac - case $host_os in - mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;; - *) lt_sed_strip_eq="s,=/,/,g" ;; - esac - lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` - case $lt_search_path_spec in - *\;*) + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` + if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then # if the path contains ";" then we assume it to be the separator # otherwise default to the standard path separator (i.e. ":") - it is # assumed that no part of a normal pathname contains ";" but that should # okay in the real world where ";" in dirpaths is itself problematic. - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'` - ;; - *) - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"` - ;; - esac + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` + else + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi # Ok, now we have the path, separated by spaces, we can step through it # and add multilib dir if necessary. lt_tmp_lt_search_path_spec= @@ -10210,7 +9474,7 @@ if test "$GCC" = yes; then lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" fi done - lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' + lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk ' BEGIN {RS=" "; FS="/|\n";} { lt_foo=""; lt_count=0; @@ -10230,13 +9494,7 @@ BEGIN {RS=" "; FS="/|\n";} { if (lt_foo != "") { lt_freq[lt_foo]++; } if (lt_freq[lt_foo] == 1) { print lt_foo; } }'` - # AWK program above erroneously prepends '/' to C:/dos/paths - # for these hosts. - case $host_os in - mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ - $SED 's,/\([A-Za-z]:\),\1,g'` ;; - esac - sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` + sys_lib_search_path_spec=`$ECHO $lt_search_path_spec` else sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" fi @@ -10262,7 +9520,7 @@ need_version=unknown case $host_os in aix3*) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -10271,7 +9529,7 @@ aix3*) ;; aix[4-9]*) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -10324,7 +9582,7 @@ amigaos*) m68k) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ;; esac ;; @@ -10336,7 +9594,7 @@ beos*) ;; bsdi[45]*) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -10355,9 +9613,8 @@ cygwin* | mingw* | pw32* | cegcc*) need_version=no need_lib_prefix=no - case $GCC,$cc_basename in - yes,*) - # gcc + case $GCC,$host_os in + yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ @@ -10378,83 +9635,36 @@ cygwin* | mingw* | pw32* | cegcc*) cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - - sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" + sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" ;; mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - pw32*) - # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac - dynamic_linker='Win32 ld.exe' - ;; - - *,cl*) - # Native MSVC - libname_spec='$name' - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - library_names_spec='${libname}.dll.lib' - - case $build_os in - mingw*) - sys_lib_search_path_spec= - lt_save_ifs=$IFS - IFS=';' - for lt_path in $LIB - do - IFS=$lt_save_ifs - # Let DOS variable expansion print the short 8.3 style file name. - lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` - sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" - done - IFS=$lt_save_ifs - # Convert to MSYS style. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` - ;; - cygwin*) - # Convert to unix form, then to dos form, then back to unix form - # but this time dos style (no spaces!) so that the unix form looks - # like /cygdrive/c/PROGRA~1:/cygdr... - sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` - sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` - sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - ;; - *) - sys_lib_search_path_spec="$LIB" + sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then - # It is most probably a Windows format PATH. + # It is most probably a Windows format PATH printed by + # mingw gcc, but we are running on Cygwin. Gcc prints its search + # path with ; separators, and with drive letters. We can handle the + # drive letters (cygwin fileutils understands them), so leave them, + # especially as we might pass files found there to a mingw objdump, + # which wouldn't understand a cygwinified path. Ahh. sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` else - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` fi - # FIXME: find the short name or the path components, as spaces are - # common. (e.g. "Program Files" -> "PROGRA~1") + ;; + pw32*) + # pw32 DLLs use 'pw' prefix rather than 'lib' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac - - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $RM \$dlpath' - shlibpath_overrides_runpath=yes - dynamic_linker='Win32 link.exe' ;; *) - # Assume MSVC wrapper library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' - dynamic_linker='Win32 ld.exe' ;; esac + dynamic_linker='Win32 ld.exe' # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; @@ -10475,7 +9685,7 @@ darwin* | rhapsody*) ;; dgux*) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' @@ -10483,6 +9693,10 @@ dgux*) shlibpath_var=LD_LIBRARY_PATH ;; +freebsd1*) + dynamic_linker=no + ;; + freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -10490,7 +9704,7 @@ freebsd* | dragonfly*) objformat=`/usr/bin/objformat` else case $host_os in - freebsd[23].*) objformat=aout ;; + freebsd[123]*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -10508,7 +9722,7 @@ freebsd* | dragonfly*) esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2.*) + freebsd2*) shlibpath_overrides_runpath=yes ;; freebsd3.[01]* | freebsdelf3.[01]*) @@ -10528,26 +9742,12 @@ freebsd* | dragonfly*) ;; gnu*) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - -haiku*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - dynamic_linker="$host_os runtime_loader" - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' hardcode_into_libs=yes ;; @@ -10593,14 +9793,12 @@ hpux9* | hpux10* | hpux11*) soname_spec='${libname}${release}${shared_ext}$major' ;; esac - # HP-UX runs *really* slowly unless shared libraries are mode 555, ... + # HP-UX runs *really* slowly unless shared libraries are mode 555. postinstall_cmds='chmod 555 $lib' - # or fails outright, so override atomically: - install_override_mode=555 ;; interix[3-9]*) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' @@ -10616,7 +9814,7 @@ irix5* | irix6* | nonstopux*) nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux else version_type=irix fi ;; @@ -10653,9 +9851,9 @@ linux*oldld* | linux*aout* | linux*coff*) dynamic_linker=no ;; -# This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux # correct to gnu/linux during the next big refactor +# This must be Linux ELF. +linux* | k*bsd*-gnu) + version_type=linux need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -10663,17 +9861,12 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no - # Some binutils ld are patched to set DT_RUNPATH - if ${lt_cv_shlibpath_overrides_runpath+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_shlibpath_overrides_runpath=no - save_LDFLAGS=$LDFLAGS - save_libdir=$libdir - eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ - LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + save_LDFLAGS=$LDFLAGS + save_libdir=$libdir + eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ + LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -10686,17 +9879,13 @@ main () _ACEOF if ac_fn_c_try_link "$LINENO"; then : if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : - lt_cv_shlibpath_overrides_runpath=yes + shlibpath_overrides_runpath=yes fi fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - LDFLAGS=$save_LDFLAGS - libdir=$save_libdir - -fi - - shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath + LDFLAGS=$save_LDFLAGS + libdir=$save_libdir # This implies no fast_install, which is unacceptable. # Some rework will be needed to allow for fast_install @@ -10705,7 +9894,7 @@ fi # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi @@ -10718,18 +9907,6 @@ fi dynamic_linker='GNU/Linux ld.so' ;; -netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='NetBSD ld.elf_so' - ;; - netbsd*) version_type=sunos need_lib_prefix=no @@ -10749,7 +9926,7 @@ netbsd*) ;; newsos6) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -10818,7 +9995,7 @@ rdos*) ;; solaris*) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -10843,7 +10020,7 @@ sunos4*) ;; sysv4 | sysv4.3*) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -10867,7 +10044,7 @@ sysv4 | sysv4.3*) sysv4*MP*) if test -d /usr/nec ;then - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' soname_spec='$libname${shared_ext}.$major' shlibpath_var=LD_LIBRARY_PATH @@ -10898,7 +10075,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -10908,7 +10085,7 @@ tpf*) ;; uts4*) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -11020,11 +10197,6 @@ fi - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 $as_echo_n "checking how to hardcode library paths into programs... " >&6; } hardcode_action= @@ -11355,7 +10527,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line $LINENO "configure" +#line 10530 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11396,13 +10568,7 @@ else # endif #endif -/* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) -int fnord () __attribute__((visibility("default"))); -#endif - -int fnord () { return 42; } +void fnord() { int i=42;} int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); @@ -11411,11 +10577,7 @@ int main () if (self) { if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else - { - if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - else puts (dlerror ()); - } + else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; /* dlclose (self); */ } else @@ -11461,7 +10623,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line $LINENO "configure" +#line 10626 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11502,13 +10664,7 @@ else # endif #endif -/* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) -int fnord () __attribute__((visibility("default"))); -#endif - -int fnord () { return 42; } +void fnord() { int i=42;} int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); @@ -11517,11 +10673,7 @@ int main () if (self) { if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else - { - if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - else puts (dlerror ()); - } + else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; /* dlclose (self); */ } else @@ -11690,8 +10842,6 @@ CC="$lt_save_CC" - - ac_config_commands="$ac_config_commands libtool" @@ -11703,15 +10853,16 @@ CC="$lt_save_CC" : ${CONFIG_LT=./config.lt} { $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_LT" >&5 $as_echo "$as_me: creating $CONFIG_LT" >&6;} -as_write_fail=0 -cat >"$CONFIG_LT" <<_ASEOF || as_write_fail=1 +cat >"$CONFIG_LT" <<_LTEOF #! $SHELL # Generated by $as_me. # Run this file to recreate a libtool stub with the current configuration. + +lt_cl_silent=false SHELL=\${CONFIG_SHELL-$SHELL} -export SHELL -_ASEOF -cat >>"$CONFIG_LT" <<\_ASEOF || as_write_fail=1 +_LTEOF + +cat >>"$CONFIG_LT" <<\_LTEOF ## -------------------- ## ## M4sh Initialization. ## ## -------------------- ## @@ -11837,6 +10988,7 @@ export LANGUAGE (unset CDPATH) >/dev/null 2>&1 && unset CDPATH + # as_fn_error STATUS ERROR [LINENO LOG_FD] # ---------------------------------------- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are @@ -12045,7 +11197,7 @@ $as_echo X"$as_dir" | test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" "$LINENO" 5 } # as_fn_mkdir_p @@ -12086,15 +11238,8 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" -exec 6>&1 -## --------------------------------- ## -## Main body of "$CONFIG_LT" script. ## -## --------------------------------- ## -_ASEOF -test $as_write_fail = 0 && chmod +x "$CONFIG_LT" -cat >>"$CONFIG_LT" <<\_LTEOF -lt_cl_silent=false +exec 6>&1 exec 5>>config.log { echo @@ -12118,10 +11263,10 @@ Usage: $0 [OPTIONS] Report bugs to ." lt_cl_version="\ -pygobject config.lt 3.2.0 +pygobject config.lt 3.2.1 configured by $0, generated by GNU Autoconf 2.68. -Copyright (C) 2011 Free Software Foundation, Inc. +Copyright (C) 2008 Free Software Foundation, Inc. This config.lt script is free software; the Free Software Foundation gives unlimited permision to copy, distribute and modify it." @@ -12161,158 +11306,133 @@ cat >>"$CONFIG_LT" <<_LTEOF sed_quote_subst='$sed_quote_subst' double_quote_subst='$double_quote_subst' delay_variable_subst='$delay_variable_subst' -enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`' -AS='`$ECHO "$AS" | $SED "$delay_single_quote_subst"`' -DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' -OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' -macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`' -macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`' -enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`' -pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`' -enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' -SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' -ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' -PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' -host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' -host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' -host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`' -build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`' -build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`' -build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`' -SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`' -Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`' -GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`' -EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`' -FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`' -LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`' -NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`' -LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`' -max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`' -ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`' -exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' -lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' -lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' -lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' -lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' -lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' -reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' -reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' -deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' -file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' -file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' -want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' -sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' -AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' -AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' -archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' -STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' -RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' -old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`' -old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`' -lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`' -CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`' -CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`' -compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`' -GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`' -lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`' -lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' -lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' -nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' -lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' -objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' -MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' -lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' -need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' -MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' -DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' -NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' -LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`' -OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`' -libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`' -shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`' -extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`' -archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`' -enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`' -export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`' -whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`' -compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`' -old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`' -old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`' -archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`' -archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`' -module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`' -module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`' -with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`' -allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`' -no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`' -hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`' -hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`' -hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`' -hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`' -hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`' -hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' -inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' -link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' -always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' -export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' -exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' -include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' -prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' -postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' -file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' -variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' -need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`' -version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`' -runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`' -shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`' -shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`' -libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`' -library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`' -soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`' -install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`' -postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`' -postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`' -finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`' -finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`' -hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`' -sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`' -sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`' -hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`' -enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`' -enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`' -enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`' -old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`' -striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`' +enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`' +AS='`$ECHO "X$AS" | $Xsed -e "$delay_single_quote_subst"`' +DLLTOOL='`$ECHO "X$DLLTOOL" | $Xsed -e "$delay_single_quote_subst"`' +OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`' +macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`' +macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`' +enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`' +pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`' +enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`' +host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`' +host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`' +host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`' +build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`' +build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`' +build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`' +SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`' +Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`' +GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`' +EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`' +FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`' +LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`' +NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`' +LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`' +max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`' +ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`' +exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`' +lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`' +lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`' +lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`' +reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`' +reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`' +deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`' +file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`' +AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`' +AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`' +STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`' +RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`' +old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' +old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' +old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`' +CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`' +CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`' +compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`' +GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`' +objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`' +SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`' +ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`' +MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`' +lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`' +lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`' +lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`' +lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`' +lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`' +need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`' +DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`' +NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`' +LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`' +OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`' +OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`' +libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`' +shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`' +extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`' +archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`' +enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`' +export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' +whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' +compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`' +old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`' +old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`' +archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`' +archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`' +module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`' +module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`' +with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`' +allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`' +no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`' +inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`' +link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`' +fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`' +always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`' +export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`' +exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`' +include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`' +prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`' +file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`' +variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`' +need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`' +need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`' +version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`' +runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`' +shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`' +shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`' +libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`' +library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`' +soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`' +postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' +postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' +finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`' +finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`' +sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`' +sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`' +enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`' +enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`' +enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`' +old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`' +striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`' LTCC='$LTCC' LTCFLAGS='$LTCFLAGS' compiler='$compiler_DEFAULT' -# A function that is used when there is no print builtin or printf. -func_fallback_echo () -{ - eval 'cat <<_LTECHO_EOF -\$1 -_LTECHO_EOF' -} - # Quote evaled strings. -for var in AS \ -DLLTOOL \ -OBJDUMP \ -SHELL \ -ECHO \ -PATH_SEPARATOR \ -SED \ +for var in SED \ GREP \ EGREP \ FGREP \ @@ -12324,12 +11444,8 @@ lt_NL2SP \ reload_flag \ deplibs_check_method \ file_magic_cmd \ -file_magic_glob \ -want_nocaseglob \ -sharedlib_from_linklib_cmd \ AR \ AR_FLAGS \ -archiver_list_spec \ STRIP \ RANLIB \ CC \ @@ -12339,14 +11455,14 @@ lt_cv_sys_global_symbol_pipe \ lt_cv_sys_global_symbol_to_cdecl \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ -nm_file_list_spec \ +SHELL \ +ECHO \ lt_prog_compiler_no_builtin_flag \ -lt_prog_compiler_pic \ lt_prog_compiler_wl \ +lt_prog_compiler_pic \ lt_prog_compiler_static \ lt_cv_prog_compiler_c_o \ need_locks \ -MANIFEST_TOOL \ DSYMUTIL \ NMEDIT \ LIPO \ @@ -12360,7 +11476,9 @@ with_gnu_ld \ allow_undefined_flag \ no_undefined_flag \ hardcode_libdir_flag_spec \ +hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ +fix_srcfile_path \ exclude_expsyms \ include_expsyms \ file_list_spec \ @@ -12368,13 +11486,12 @@ variables_saved_for_relink \ libname_spec \ library_names_spec \ soname_spec \ -install_override_mode \ finish_eval \ old_striplib \ striplib; do - case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in + case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -12396,15 +11513,14 @@ module_cmds \ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ -postlink_cmds \ postinstall_cmds \ postuninstall_cmds \ finish_cmds \ sys_lib_search_path_spec \ sys_lib_dlsearch_path_spec; do - case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in + case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -12412,6 +11528,12 @@ sys_lib_dlsearch_path_spec; do esac done +# Fix-up fallback echo if it was mangled by the above quoting rules. +case \$lt_ECHO in +*'\\\$0 --fallback-echo"') lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\` + ;; +esac + ac_aux_dir='$ac_aux_dir' xsi_shell='$xsi_shell' lt_shell_append='$lt_shell_append' @@ -12457,8 +11579,7 @@ $as_echo "$as_me: creating $ofile" >&6;} # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# 2006, 2007, 2008 Free Software Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -12494,13 +11615,13 @@ available_tags="" build_old_libs=$enable_static # Assembler program. -AS=$lt_AS +AS=$AS # DLL creation program. -DLLTOOL=$lt_DLLTOOL +DLLTOOL=$DLLTOOL # Object dumper program. -OBJDUMP=$lt_OBJDUMP +OBJDUMP=$OBJDUMP # Which release of libtool.m4 was used? macro_version=$macro_version @@ -12513,16 +11634,7 @@ build_libtool_libs=$enable_shared pic_mode=$pic_mode # Whether or not to optimize for fast installation. -fast_install=$enable_fast_install - -# Shell to use when invoking shell scripts. -SHELL=$lt_SHELL - -# An echo program that protects backslashes. -ECHO=$lt_ECHO - -# The PATH separator for the build system. -PATH_SEPARATOR=$lt_PATH_SEPARATOR +fast_install=$enable_fast_install # The host system. host_alias=$host_alias @@ -12573,36 +11685,20 @@ SP2NL=$lt_lt_SP2NL # turn newlines into spaces. NL2SP=$lt_lt_NL2SP -# convert \$build file names to \$host format. -to_host_file_cmd=$lt_cv_to_host_file_cmd - -# convert \$build files to toolchain format. -to_tool_file_cmd=$lt_cv_to_tool_file_cmd +# How to create reloadable object files. +reload_flag=$lt_reload_flag +reload_cmds=$lt_reload_cmds # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method -# Command to use when deplibs_check_method = "file_magic". +# Command to use when deplibs_check_method == "file_magic". file_magic_cmd=$lt_file_magic_cmd -# How to find potential files when deplibs_check_method = "file_magic". -file_magic_glob=$lt_file_magic_glob - -# Find potential files using nocaseglob when deplibs_check_method = "file_magic". -want_nocaseglob=$lt_want_nocaseglob - -# Command to associate shared and link libraries. -sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd - # The archiver. AR=$lt_AR - -# Flags to create an archive. AR_FLAGS=$lt_AR_FLAGS -# How to feed a file listing to the archiver. -archiver_list_spec=$lt_archiver_list_spec - # A symbol stripping program. STRIP=$lt_STRIP @@ -12611,9 +11707,6 @@ RANLIB=$lt_RANLIB old_postinstall_cmds=$lt_old_postinstall_cmds old_postuninstall_cmds=$lt_old_postuninstall_cmds -# Whether to use a lock for old archive extraction. -lock_old_archive_extraction=$lock_old_archive_extraction - # A C compiler. LTCC=$lt_CC @@ -12632,24 +11725,21 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix -# Specify filename containing input files for \$NM. -nm_file_list_spec=$lt_nm_file_list_spec - -# The root where to search for dependent libraries,and in which our libraries should be installed. -lt_sysroot=$lt_sysroot - # The name of the directory that contains temporary libtool files. objdir=$objdir +# Shell to use when invoking shell scripts. +SHELL=$lt_SHELL + +# An echo program that does not interpret backslashes. +ECHO=$lt_ECHO + # Used to examine libraries when file_magic_cmd begins with "file". MAGIC_CMD=$MAGIC_CMD # Must we lock files when doing compilation? need_locks=$lt_need_locks -# Manifest tool. -MANIFEST_TOOL=$lt_MANIFEST_TOOL - # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL @@ -12706,9 +11796,6 @@ library_names_spec=$lt_library_names_spec # The coded name of the library, if different from the real name. soname_spec=$lt_soname_spec -# Permission mode override for installation of shared libraries. -install_override_mode=$lt_install_override_mode - # Command to use after installation of a shared archive. postinstall_cmds=$lt_postinstall_cmds @@ -12748,10 +11835,6 @@ striplib=$lt_striplib # The linker used to build libraries. LD=$lt_LD -# How to create reloadable object files. -reload_flag=$lt_reload_flag -reload_cmds=$lt_reload_cmds - # Commands used to build an old-style archive. old_archive_cmds=$lt_old_archive_cmds @@ -12764,12 +11847,12 @@ with_gcc=$GCC # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag -# Additional compiler flags for building library objects. -pic_flag=$lt_lt_prog_compiler_pic - # How to pass a linker flag through the compiler. wl=$lt_lt_prog_compiler_wl +# Additional compiler flags for building library objects. +pic_flag=$lt_lt_prog_compiler_pic + # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static @@ -12819,6 +11902,10 @@ no_undefined_flag=$lt_no_undefined_flag # This must work even if \$libdir does not exist hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec +# If ld is used when linking, flag to hardcode \$libdir into a binary +# during linking. This must work even if \$libdir does not exist. +hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld + # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator=$lt_hardcode_libdir_separator @@ -12852,6 +11939,9 @@ inherit_rpath=$inherit_rpath # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs +# Fix the shell variable \$srcfile for the compiler. +fix_srcfile_path=$lt_fix_srcfile_path + # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols @@ -12867,9 +11957,6 @@ include_expsyms=$lt_include_expsyms # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds -# Commands necessary for finishing linking programs. -postlink_cmds=$lt_postlink_cmds - # Specify filename containing input files. file_list_spec=$lt_file_list_spec @@ -12902,169 +11989,212 @@ ltmain="$ac_aux_dir/ltmain.sh" # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? - sed '$q' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) - - if test x"$xsi_shell" = xyes; then - sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ -func_dirname ()\ -{\ -\ case ${1} in\ -\ */*) func_dirname_result="${1%/*}${2}" ;;\ -\ * ) func_dirname_result="${3}" ;;\ -\ esac\ -} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_basename ()$/,/^} # func_basename /c\ -func_basename ()\ -{\ -\ func_basename_result="${1##*/}"\ -} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ -func_dirname_and_basename ()\ -{\ -\ case ${1} in\ -\ */*) func_dirname_result="${1%/*}${2}" ;;\ -\ * ) func_dirname_result="${3}" ;;\ -\ esac\ -\ func_basename_result="${1##*/}"\ -} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ -func_stripname ()\ -{\ -\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ -\ # positional parameters, so assign one to ordinary parameter first.\ -\ func_stripname_result=${3}\ -\ func_stripname_result=${func_stripname_result#"${1}"}\ -\ func_stripname_result=${func_stripname_result%"${2}"}\ -} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ -func_split_long_opt ()\ -{\ -\ func_split_long_opt_name=${1%%=*}\ -\ func_split_long_opt_arg=${1#*=}\ -} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ -func_split_short_opt ()\ -{\ -\ func_split_short_opt_arg=${1#??}\ -\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ -} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ -func_lo2o ()\ -{\ -\ case ${1} in\ -\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ -\ *) func_lo2o_result=${1} ;;\ -\ esac\ -} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_xform ()$/,/^} # func_xform /c\ -func_xform ()\ -{\ - func_xform_result=${1%.*}.lo\ -} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_arith ()$/,/^} # func_arith /c\ -func_arith ()\ -{\ - func_arith_result=$(( $* ))\ -} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_len ()$/,/^} # func_len /c\ -func_len ()\ -{\ - func_len_result=${#1}\ -} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - -fi - -if test x"$lt_shell_append" = xyes; then - sed -e '/^func_append ()$/,/^} # func_append /c\ -func_append ()\ -{\ - eval "${1}+=\\${2}"\ -} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ -func_append_quoted ()\ -{\ -\ func_quote_for_eval "${2}"\ -\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ -} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - # Save a `func_append' function call where possible by direct use of '+=' - sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -else - # Save a `func_append' function call even when '+=' is not available - sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -fi - -if test x"$_lt_function_replace_fail" = x":"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 -$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} -fi - - - mv -f "$cfgfile" "$ofile" || + sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) + + case $xsi_shell in + yes) + cat << \_LT_EOF >> "$cfgfile" + +# func_dirname file append nondir_replacement +# Compute the dirname of FILE. If nonempty, add APPEND to the result, +# otherwise set result to NONDIR_REPLACEMENT. +func_dirname () +{ + case ${1} in + */*) func_dirname_result="${1%/*}${2}" ;; + * ) func_dirname_result="${3}" ;; + esac +} + +# func_basename file +func_basename () +{ + func_basename_result="${1##*/}" +} + +# func_dirname_and_basename file append nondir_replacement +# perform func_basename and func_dirname in a single function +# call: +# dirname: Compute the dirname of FILE. If nonempty, +# add APPEND to the result, otherwise set result +# to NONDIR_REPLACEMENT. +# value returned in "$func_dirname_result" +# basename: Compute filename of FILE. +# value retuned in "$func_basename_result" +# Implementation must be kept synchronized with func_dirname +# and func_basename. For efficiency, we do not delegate to +# those functions but instead duplicate the functionality here. +func_dirname_and_basename () +{ + case ${1} in + */*) func_dirname_result="${1%/*}${2}" ;; + * ) func_dirname_result="${3}" ;; + esac + func_basename_result="${1##*/}" +} + +# func_stripname prefix suffix name +# strip PREFIX and SUFFIX off of NAME. +# PREFIX and SUFFIX must not contain globbing or regex special +# characters, hashes, percent signs, but SUFFIX may contain a leading +# dot (in which case that matches only a dot). +func_stripname () +{ + # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are + # positional parameters, so assign one to ordinary parameter first. + func_stripname_result=${3} + func_stripname_result=${func_stripname_result#"${1}"} + func_stripname_result=${func_stripname_result%"${2}"} +} + +# func_opt_split +func_opt_split () +{ + func_opt_split_opt=${1%%=*} + func_opt_split_arg=${1#*=} +} + +# func_lo2o object +func_lo2o () +{ + case ${1} in + *.lo) func_lo2o_result=${1%.lo}.${objext} ;; + *) func_lo2o_result=${1} ;; + esac +} + +# func_xform libobj-or-source +func_xform () +{ + func_xform_result=${1%.*}.lo +} + +# func_arith arithmetic-term... +func_arith () +{ + func_arith_result=$(( $* )) +} + +# func_len string +# STRING may not start with a hyphen. +func_len () +{ + func_len_result=${#1} +} + +_LT_EOF + ;; + *) # Bourne compatible functions. + cat << \_LT_EOF >> "$cfgfile" + +# func_dirname file append nondir_replacement +# Compute the dirname of FILE. If nonempty, add APPEND to the result, +# otherwise set result to NONDIR_REPLACEMENT. +func_dirname () +{ + # Extract subdirectory from the argument. + func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` + if test "X$func_dirname_result" = "X${1}"; then + func_dirname_result="${3}" + else + func_dirname_result="$func_dirname_result${2}" + fi +} + +# func_basename file +func_basename () +{ + func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` +} + + +# func_stripname prefix suffix name +# strip PREFIX and SUFFIX off of NAME. +# PREFIX and SUFFIX must not contain globbing or regex special +# characters, hashes, percent signs, but SUFFIX may contain a leading +# dot (in which case that matches only a dot). +# func_strip_suffix prefix name +func_stripname () +{ + case ${2} in + .*) func_stripname_result=`$ECHO "X${3}" \ + | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;; + *) func_stripname_result=`$ECHO "X${3}" \ + | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;; + esac +} + +# sed scripts: +my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' +my_sed_long_arg='1s/^-[^=]*=//' + +# func_opt_split +func_opt_split () +{ + func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"` + func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"` +} + +# func_lo2o object +func_lo2o () +{ + func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"` +} + +# func_xform libobj-or-source +func_xform () +{ + func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'` +} + +# func_arith arithmetic-term... +func_arith () +{ + func_arith_result=`expr "$@"` +} + +# func_len string +# STRING may not start with a hyphen. +func_len () +{ + func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` +} + +_LT_EOF +esac + +case $lt_shell_append in + yes) + cat << \_LT_EOF >> "$cfgfile" + +# func_append var value +# Append VALUE to the end of shell variable VAR. +func_append () +{ + eval "$1+=\$2" +} +_LT_EOF + ;; + *) + cat << \_LT_EOF >> "$cfgfile" + +# func_append var value +# Append VALUE to the end of shell variable VAR. +func_append () +{ + eval "$1=\$$1\$2" +} + +_LT_EOF + ;; + esac + + + sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) + + mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" @@ -13077,13 +12207,15 @@ chmod +x "$CONFIG_LT" # appending to config.log, which fails on DOS, as config.log is still kept # open by configure. Here we exec the FD to /dev/null, effectively closing # config.log, so it can be properly (re)opened and appended to by config.lt. -lt_cl_success=: -test "$silent" = yes && - lt_config_lt_args="$lt_config_lt_args --quiet" -exec 5>/dev/null -$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false -exec 5>>config.log -$lt_cl_success || as_fn_exit 1 +if test "$no_create" != yes; then + lt_cl_success=: + test "$silent" = yes && + lt_config_lt_args="$lt_config_lt_args --quiet" + exec 5>/dev/null + $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false + exec 5>>config.log + $lt_cl_success || as_fn_exit 1 +fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5 $as_echo_n "checking for library containing strerror... " >&6; } @@ -15263,7 +14395,6 @@ fi - if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. @@ -15646,7 +14777,6 @@ if test -n "$FFI_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_FFI_CFLAGS=`$PKG_CONFIG --cflags "libffi >= 3.0" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -15663,7 +14793,6 @@ if test -n "$FFI_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_FFI_LIBS=`$PKG_CONFIG --libs "libffi >= 3.0" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -15683,9 +14812,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - FFI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libffi >= 3.0" 2>&1` + FFI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libffi >= 3.0" 2>&1` else - FFI_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libffi >= 3.0" 2>&1` + FFI_PKG_ERRORS=`$PKG_CONFIG --print-errors "libffi >= 3.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$FFI_PKG_ERRORS" >&5 @@ -15736,7 +14865,6 @@ if test -n "$GIO_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GIO_CFLAGS=`$PKG_CONFIG --cflags "gio-2.0 >= 2.31.0" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -15753,7 +14881,6 @@ if test -n "$GIO_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_GIO_LIBS=`$PKG_CONFIG --libs "gio-2.0 >= 2.31.0" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -15773,9 +14900,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gio-2.0 >= 2.31.0" 2>&1` + GIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gio-2.0 >= 2.31.0" 2>&1` else - GIO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gio-2.0 >= 2.31.0" 2>&1` + GIO_PKG_ERRORS=`$PKG_CONFIG --print-errors "gio-2.0 >= 2.31.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GIO_PKG_ERRORS" >&5 @@ -15842,7 +14969,6 @@ if test -n "$GI_CFLAGS"; then pkg_cv_GI_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.31.0 gobject-introspection-1.0 >= 1.31.20 " 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -15865,7 +14991,6 @@ if test -n "$GI_LIBS"; then pkg_cv_GI_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.31.0 gobject-introspection-1.0 >= 1.31.20 " 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -15885,11 +15010,11 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.31.0 + GI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= 2.31.0 gobject-introspection-1.0 >= 1.31.20 " 2>&1` else - GI_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.31.0 + GI_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= 2.31.0 gobject-introspection-1.0 >= 1.31.20 " 2>&1` fi @@ -15954,7 +15079,6 @@ if test -n "$PYCAIRO_CFLAGS"; then test $ac_status = 0; }; then pkg_cv_PYCAIRO_CFLAGS=`$PKG_CONFIG --cflags "py3cairo >= 1.10.0 " 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -15974,7 +15098,6 @@ if test -n "$PYCAIRO_LIBS"; then test $ac_status = 0; }; then pkg_cv_PYCAIRO_LIBS=`$PKG_CONFIG --libs "py3cairo >= 1.10.0 " 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -15994,10 +15117,10 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - PYCAIRO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "py3cairo >= 1.10.0 + PYCAIRO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "py3cairo >= 1.10.0 " 2>&1` else - PYCAIRO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "py3cairo >= 1.10.0 + PYCAIRO_PKG_ERRORS=`$PKG_CONFIG --print-errors "py3cairo >= 1.10.0 " 2>&1` fi # Put the nasty error message in config.log where it belongs @@ -16055,7 +15178,6 @@ if test -n "$PYCAIRO_CFLAGS"; then test $ac_status = 0; }; then pkg_cv_PYCAIRO_CFLAGS=`$PKG_CONFIG --cflags "pycairo >= 1.2.0 " 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -16075,7 +15197,6 @@ if test -n "$PYCAIRO_LIBS"; then test $ac_status = 0; }; then pkg_cv_PYCAIRO_LIBS=`$PKG_CONFIG --libs "pycairo >= 1.2.0 " 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -16095,10 +15216,10 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - PYCAIRO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "pycairo >= 1.2.0 + PYCAIRO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "pycairo >= 1.2.0 " 2>&1` else - PYCAIRO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "pycairo >= 1.2.0 + PYCAIRO_PKG_ERRORS=`$PKG_CONFIG --print-errors "pycairo >= 1.2.0 " 2>&1` fi # Put the nasty error message in config.log where it belongs @@ -16828,7 +15949,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by pygobject $as_me 3.2.0, which was +This file was extended by pygobject $as_me 3.2.1, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16894,7 +16015,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -pygobject config.status 3.2.0 +pygobject config.status 3.2.1 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" @@ -17023,158 +16144,133 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" sed_quote_subst='$sed_quote_subst' double_quote_subst='$double_quote_subst' delay_variable_subst='$delay_variable_subst' -enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`' -AS='`$ECHO "$AS" | $SED "$delay_single_quote_subst"`' -DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' -OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' -macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`' -macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`' -enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`' -pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`' -enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' -SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' -ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' -PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' -host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' -host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' -host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`' -build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`' -build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`' -build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`' -SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`' -Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`' -GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`' -EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`' -FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`' -LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`' -NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`' -LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`' -max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`' -ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`' -exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`' -lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`' -lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`' -lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`' -lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`' -lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' -reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' -reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' -deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' -file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' -file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' -want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' -sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' -AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' -AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' -archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' -STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' -RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`' -old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`' -old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`' -old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`' -lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`' -CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`' -CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`' -compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`' -GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`' -lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`' -lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' -lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' -nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' -lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' -objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' -MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`' -lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`' -lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`' -need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`' -MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`' -DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`' -NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`' -LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`' -OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`' -OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`' -libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`' -shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`' -extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`' -archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`' -enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`' -export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`' -whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`' -compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`' -old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`' -old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`' -archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`' -archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`' -module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`' -module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`' -with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`' -allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`' -no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`' -hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`' -hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`' -hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`' -hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`' -hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`' -hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`' -inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`' -link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`' -always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`' -export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`' -exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`' -include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`' -prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`' -postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`' -file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`' -variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`' -need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`' -need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`' -version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`' -runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`' -shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`' -shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`' -libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`' -library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`' -soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`' -install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`' -postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`' -postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`' -finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`' -finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`' -hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`' -sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`' -sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`' -hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`' -enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`' -enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`' -enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`' -old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`' -striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`' +enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`' +AS='`$ECHO "X$AS" | $Xsed -e "$delay_single_quote_subst"`' +DLLTOOL='`$ECHO "X$DLLTOOL" | $Xsed -e "$delay_single_quote_subst"`' +OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`' +macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`' +macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`' +enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`' +pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`' +enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`' +host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`' +host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`' +host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`' +build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`' +build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`' +build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`' +SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`' +Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`' +GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`' +EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`' +FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`' +LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`' +NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`' +LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`' +max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`' +ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`' +exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`' +lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`' +lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`' +lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`' +reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`' +reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`' +deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`' +file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`' +AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`' +AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`' +STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`' +RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`' +old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' +old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' +old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`' +CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`' +CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`' +compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`' +GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`' +objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`' +SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`' +ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`' +MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`' +lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`' +lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`' +lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`' +lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`' +lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`' +need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`' +DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`' +NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`' +LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`' +OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`' +OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`' +libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`' +shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`' +extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`' +archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`' +enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`' +export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' +whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' +compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`' +old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`' +old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`' +archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`' +archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`' +module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`' +module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`' +with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`' +allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`' +no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`' +inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`' +link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`' +fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`' +always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`' +export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`' +exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`' +include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`' +prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`' +file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`' +variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`' +need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`' +need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`' +version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`' +runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`' +shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`' +shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`' +libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`' +library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`' +soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`' +postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' +postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`' +finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`' +finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`' +sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`' +sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`' +hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`' +enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`' +enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`' +enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`' +old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`' +striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`' LTCC='$LTCC' LTCFLAGS='$LTCFLAGS' compiler='$compiler_DEFAULT' -# A function that is used when there is no print builtin or printf. -func_fallback_echo () -{ - eval 'cat <<_LTECHO_EOF -\$1 -_LTECHO_EOF' -} - # Quote evaled strings. -for var in AS \ -DLLTOOL \ -OBJDUMP \ -SHELL \ -ECHO \ -PATH_SEPARATOR \ -SED \ +for var in SED \ GREP \ EGREP \ FGREP \ @@ -17186,12 +16282,8 @@ lt_NL2SP \ reload_flag \ deplibs_check_method \ file_magic_cmd \ -file_magic_glob \ -want_nocaseglob \ -sharedlib_from_linklib_cmd \ AR \ AR_FLAGS \ -archiver_list_spec \ STRIP \ RANLIB \ CC \ @@ -17201,14 +16293,14 @@ lt_cv_sys_global_symbol_pipe \ lt_cv_sys_global_symbol_to_cdecl \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ -nm_file_list_spec \ +SHELL \ +ECHO \ lt_prog_compiler_no_builtin_flag \ -lt_prog_compiler_pic \ lt_prog_compiler_wl \ +lt_prog_compiler_pic \ lt_prog_compiler_static \ lt_cv_prog_compiler_c_o \ need_locks \ -MANIFEST_TOOL \ DSYMUTIL \ NMEDIT \ LIPO \ @@ -17222,7 +16314,9 @@ with_gnu_ld \ allow_undefined_flag \ no_undefined_flag \ hardcode_libdir_flag_spec \ +hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ +fix_srcfile_path \ exclude_expsyms \ include_expsyms \ file_list_spec \ @@ -17230,13 +16324,12 @@ variables_saved_for_relink \ libname_spec \ library_names_spec \ soname_spec \ -install_override_mode \ finish_eval \ old_striplib \ striplib; do - case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in + case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -17258,15 +16351,14 @@ module_cmds \ module_expsym_cmds \ export_symbols_cmds \ prelink_cmds \ -postlink_cmds \ postinstall_cmds \ postuninstall_cmds \ finish_cmds \ sys_lib_search_path_spec \ sys_lib_dlsearch_path_spec; do - case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in + case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -17274,6 +16366,12 @@ sys_lib_dlsearch_path_spec; do esac done +# Fix-up fallback echo if it was mangled by the above quoting rules. +case \$lt_ECHO in +*'\\\$0 --fallback-echo"') lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\` + ;; +esac + ac_aux_dir='$ac_aux_dir' xsi_shell='$xsi_shell' lt_shell_append='$lt_shell_append' @@ -18028,8 +17126,7 @@ $as_echo X"$file" | # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# 2006, 2007, 2008 Free Software Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -18065,13 +17162,13 @@ available_tags="" build_old_libs=$enable_static # Assembler program. -AS=$lt_AS +AS=$AS # DLL creation program. -DLLTOOL=$lt_DLLTOOL +DLLTOOL=$DLLTOOL # Object dumper program. -OBJDUMP=$lt_OBJDUMP +OBJDUMP=$OBJDUMP # Which release of libtool.m4 was used? macro_version=$macro_version @@ -18086,15 +17183,6 @@ pic_mode=$pic_mode # Whether or not to optimize for fast installation. fast_install=$enable_fast_install -# Shell to use when invoking shell scripts. -SHELL=$lt_SHELL - -# An echo program that protects backslashes. -ECHO=$lt_ECHO - -# The PATH separator for the build system. -PATH_SEPARATOR=$lt_PATH_SEPARATOR - # The host system. host_alias=$host_alias host=$host @@ -18144,36 +17232,20 @@ SP2NL=$lt_lt_SP2NL # turn newlines into spaces. NL2SP=$lt_lt_NL2SP -# convert \$build file names to \$host format. -to_host_file_cmd=$lt_cv_to_host_file_cmd - -# convert \$build files to toolchain format. -to_tool_file_cmd=$lt_cv_to_tool_file_cmd +# How to create reloadable object files. +reload_flag=$lt_reload_flag +reload_cmds=$lt_reload_cmds # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method -# Command to use when deplibs_check_method = "file_magic". +# Command to use when deplibs_check_method == "file_magic". file_magic_cmd=$lt_file_magic_cmd -# How to find potential files when deplibs_check_method = "file_magic". -file_magic_glob=$lt_file_magic_glob - -# Find potential files using nocaseglob when deplibs_check_method = "file_magic". -want_nocaseglob=$lt_want_nocaseglob - -# Command to associate shared and link libraries. -sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd - # The archiver. AR=$lt_AR - -# Flags to create an archive. AR_FLAGS=$lt_AR_FLAGS -# How to feed a file listing to the archiver. -archiver_list_spec=$lt_archiver_list_spec - # A symbol stripping program. STRIP=$lt_STRIP @@ -18182,9 +17254,6 @@ RANLIB=$lt_RANLIB old_postinstall_cmds=$lt_old_postinstall_cmds old_postuninstall_cmds=$lt_old_postuninstall_cmds -# Whether to use a lock for old archive extraction. -lock_old_archive_extraction=$lock_old_archive_extraction - # A C compiler. LTCC=$lt_CC @@ -18203,24 +17272,21 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix -# Specify filename containing input files for \$NM. -nm_file_list_spec=$lt_nm_file_list_spec - -# The root where to search for dependent libraries,and in which our libraries should be installed. -lt_sysroot=$lt_sysroot - # The name of the directory that contains temporary libtool files. objdir=$objdir +# Shell to use when invoking shell scripts. +SHELL=$lt_SHELL + +# An echo program that does not interpret backslashes. +ECHO=$lt_ECHO + # Used to examine libraries when file_magic_cmd begins with "file". MAGIC_CMD=$MAGIC_CMD # Must we lock files when doing compilation? need_locks=$lt_need_locks -# Manifest tool. -MANIFEST_TOOL=$lt_MANIFEST_TOOL - # Tool to manipulate archived DWARF debug symbol files on Mac OS X. DSYMUTIL=$lt_DSYMUTIL @@ -18277,9 +17343,6 @@ library_names_spec=$lt_library_names_spec # The coded name of the library, if different from the real name. soname_spec=$lt_soname_spec -# Permission mode override for installation of shared libraries. -install_override_mode=$lt_install_override_mode - # Command to use after installation of a shared archive. postinstall_cmds=$lt_postinstall_cmds @@ -18319,10 +17382,6 @@ striplib=$lt_striplib # The linker used to build libraries. LD=$lt_LD -# How to create reloadable object files. -reload_flag=$lt_reload_flag -reload_cmds=$lt_reload_cmds - # Commands used to build an old-style archive. old_archive_cmds=$lt_old_archive_cmds @@ -18335,12 +17394,12 @@ with_gcc=$GCC # Compiler flag to turn off builtin functions. no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag -# Additional compiler flags for building library objects. -pic_flag=$lt_lt_prog_compiler_pic - # How to pass a linker flag through the compiler. wl=$lt_lt_prog_compiler_wl +# Additional compiler flags for building library objects. +pic_flag=$lt_lt_prog_compiler_pic + # Compiler flag to prevent dynamic linking. link_static_flag=$lt_lt_prog_compiler_static @@ -18390,6 +17449,10 @@ no_undefined_flag=$lt_no_undefined_flag # This must work even if \$libdir does not exist hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec +# If ld is used when linking, flag to hardcode \$libdir into a binary +# during linking. This must work even if \$libdir does not exist. +hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld + # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator=$lt_hardcode_libdir_separator @@ -18423,6 +17486,9 @@ inherit_rpath=$inherit_rpath # Whether libtool must link a program against all its dependency libraries. link_all_deplibs=$link_all_deplibs +# Fix the shell variable \$srcfile for the compiler. +fix_srcfile_path=$lt_fix_srcfile_path + # Set to "yes" if exported symbols are required. always_export_symbols=$always_export_symbols @@ -18438,9 +17504,6 @@ include_expsyms=$lt_include_expsyms # Commands necessary for linking programs (against libraries) with templates. prelink_cmds=$lt_prelink_cmds -# Commands necessary for finishing linking programs. -postlink_cmds=$lt_postlink_cmds - # Specify filename containing input files. file_list_spec=$lt_file_list_spec @@ -18473,169 +17536,212 @@ ltmain="$ac_aux_dir/ltmain.sh" # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? - sed '$q' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) - - if test x"$xsi_shell" = xyes; then - sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ -func_dirname ()\ -{\ -\ case ${1} in\ -\ */*) func_dirname_result="${1%/*}${2}" ;;\ -\ * ) func_dirname_result="${3}" ;;\ -\ esac\ -} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_basename ()$/,/^} # func_basename /c\ -func_basename ()\ -{\ -\ func_basename_result="${1##*/}"\ -} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ -func_dirname_and_basename ()\ -{\ -\ case ${1} in\ -\ */*) func_dirname_result="${1%/*}${2}" ;;\ -\ * ) func_dirname_result="${3}" ;;\ -\ esac\ -\ func_basename_result="${1##*/}"\ -} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ -func_stripname ()\ -{\ -\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ -\ # positional parameters, so assign one to ordinary parameter first.\ -\ func_stripname_result=${3}\ -\ func_stripname_result=${func_stripname_result#"${1}"}\ -\ func_stripname_result=${func_stripname_result%"${2}"}\ -} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ -func_split_long_opt ()\ -{\ -\ func_split_long_opt_name=${1%%=*}\ -\ func_split_long_opt_arg=${1#*=}\ -} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ -func_split_short_opt ()\ -{\ -\ func_split_short_opt_arg=${1#??}\ -\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ -} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ -func_lo2o ()\ -{\ -\ case ${1} in\ -\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ -\ *) func_lo2o_result=${1} ;;\ -\ esac\ -} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_xform ()$/,/^} # func_xform /c\ -func_xform ()\ -{\ - func_xform_result=${1%.*}.lo\ -} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_arith ()$/,/^} # func_arith /c\ -func_arith ()\ -{\ - func_arith_result=$(( $* ))\ -} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_len ()$/,/^} # func_len /c\ -func_len ()\ -{\ - func_len_result=${#1}\ -} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - -fi - -if test x"$lt_shell_append" = xyes; then - sed -e '/^func_append ()$/,/^} # func_append /c\ -func_append ()\ -{\ - eval "${1}+=\\${2}"\ -} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ -func_append_quoted ()\ -{\ -\ func_quote_for_eval "${2}"\ -\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ -} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - # Save a `func_append' function call where possible by direct use of '+=' - sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -else - # Save a `func_append' function call even when '+=' is not available - sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -fi - -if test x"$_lt_function_replace_fail" = x":"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 -$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} -fi - - - mv -f "$cfgfile" "$ofile" || + sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) + + case $xsi_shell in + yes) + cat << \_LT_EOF >> "$cfgfile" + +# func_dirname file append nondir_replacement +# Compute the dirname of FILE. If nonempty, add APPEND to the result, +# otherwise set result to NONDIR_REPLACEMENT. +func_dirname () +{ + case ${1} in + */*) func_dirname_result="${1%/*}${2}" ;; + * ) func_dirname_result="${3}" ;; + esac +} + +# func_basename file +func_basename () +{ + func_basename_result="${1##*/}" +} + +# func_dirname_and_basename file append nondir_replacement +# perform func_basename and func_dirname in a single function +# call: +# dirname: Compute the dirname of FILE. If nonempty, +# add APPEND to the result, otherwise set result +# to NONDIR_REPLACEMENT. +# value returned in "$func_dirname_result" +# basename: Compute filename of FILE. +# value retuned in "$func_basename_result" +# Implementation must be kept synchronized with func_dirname +# and func_basename. For efficiency, we do not delegate to +# those functions but instead duplicate the functionality here. +func_dirname_and_basename () +{ + case ${1} in + */*) func_dirname_result="${1%/*}${2}" ;; + * ) func_dirname_result="${3}" ;; + esac + func_basename_result="${1##*/}" +} + +# func_stripname prefix suffix name +# strip PREFIX and SUFFIX off of NAME. +# PREFIX and SUFFIX must not contain globbing or regex special +# characters, hashes, percent signs, but SUFFIX may contain a leading +# dot (in which case that matches only a dot). +func_stripname () +{ + # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are + # positional parameters, so assign one to ordinary parameter first. + func_stripname_result=${3} + func_stripname_result=${func_stripname_result#"${1}"} + func_stripname_result=${func_stripname_result%"${2}"} +} + +# func_opt_split +func_opt_split () +{ + func_opt_split_opt=${1%%=*} + func_opt_split_arg=${1#*=} +} + +# func_lo2o object +func_lo2o () +{ + case ${1} in + *.lo) func_lo2o_result=${1%.lo}.${objext} ;; + *) func_lo2o_result=${1} ;; + esac +} + +# func_xform libobj-or-source +func_xform () +{ + func_xform_result=${1%.*}.lo +} + +# func_arith arithmetic-term... +func_arith () +{ + func_arith_result=$(( $* )) +} + +# func_len string +# STRING may not start with a hyphen. +func_len () +{ + func_len_result=${#1} +} + +_LT_EOF + ;; + *) # Bourne compatible functions. + cat << \_LT_EOF >> "$cfgfile" + +# func_dirname file append nondir_replacement +# Compute the dirname of FILE. If nonempty, add APPEND to the result, +# otherwise set result to NONDIR_REPLACEMENT. +func_dirname () +{ + # Extract subdirectory from the argument. + func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` + if test "X$func_dirname_result" = "X${1}"; then + func_dirname_result="${3}" + else + func_dirname_result="$func_dirname_result${2}" + fi +} + +# func_basename file +func_basename () +{ + func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` +} + + +# func_stripname prefix suffix name +# strip PREFIX and SUFFIX off of NAME. +# PREFIX and SUFFIX must not contain globbing or regex special +# characters, hashes, percent signs, but SUFFIX may contain a leading +# dot (in which case that matches only a dot). +# func_strip_suffix prefix name +func_stripname () +{ + case ${2} in + .*) func_stripname_result=`$ECHO "X${3}" \ + | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;; + *) func_stripname_result=`$ECHO "X${3}" \ + | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;; + esac +} + +# sed scripts: +my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q' +my_sed_long_arg='1s/^-[^=]*=//' + +# func_opt_split +func_opt_split () +{ + func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"` + func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"` +} + +# func_lo2o object +func_lo2o () +{ + func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"` +} + +# func_xform libobj-or-source +func_xform () +{ + func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'` +} + +# func_arith arithmetic-term... +func_arith () +{ + func_arith_result=`expr "$@"` +} + +# func_len string +# STRING may not start with a hyphen. +func_len () +{ + func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` +} + +_LT_EOF +esac + +case $lt_shell_append in + yes) + cat << \_LT_EOF >> "$cfgfile" + +# func_append var value +# Append VALUE to the end of shell variable VAR. +func_append () +{ + eval "$1+=\$2" +} +_LT_EOF + ;; + *) + cat << \_LT_EOF >> "$cfgfile" + +# func_append var value +# Append VALUE to the end of shell variable VAR. +func_append () +{ + eval "$1=\$$1\$2" +} + +_LT_EOF + ;; + esac + + + sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) + + mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" diff --git a/configure.ac b/configure.ac index 89ccf84..6ec2eb0 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ m4_define(python3_min_ver, 3.1) dnl the pygobject version number m4_define(pygobject_major_version, 3) m4_define(pygobject_minor_version, 2) -m4_define(pygobject_micro_version, 0) +m4_define(pygobject_micro_version, 1) m4_define(pygobject_version, pygobject_major_version.pygobject_minor_version.pygobject_micro_version) dnl versions of packages we require ... diff --git a/examples/Makefile.in b/examples/Makefile.in index 7931d4b..05444cc 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -116,7 +116,6 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -161,7 +160,6 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ @@ -194,6 +192,7 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ diff --git a/gi/Makefile.am b/gi/Makefile.am index 2009d2c..0974b4f 100644 --- a/gi/Makefile.am +++ b/gi/Makefile.am @@ -117,8 +117,17 @@ _gi_cairo_la_LDFLAGS = \ .la.so: $(LN_S) .libs/$@ $@ || true -all-local: $(LTLIBRARIES:.la=.so) -check-local: $(LTLIBRARIES:.la=.so) +# if we build in a separate tree, we need to symlink the *.py files from the +# source tree; Python does not accept the extensions and modules in different +# paths +build_pylinks: + for f in $(pygi_PYTHON); do \ + [ -e $(builddir)/$$f ] || $(LN_S) $(srcdir)/$$f $(builddir)/$$f; \ + done + +all-local: $(LTLIBRARIES:.la=.so) build_pylinks + +check-local: $(LTLIBRARIES:.la=.so) build_pylinks clean-local: rm -f $(LTLIBRARIES:.la=.so) diff --git a/gi/Makefile.in b/gi/Makefile.in index 69fffa1..99aff72 100644 --- a/gi/Makefile.in +++ b/gi/Makefile.in @@ -242,7 +242,6 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -287,7 +286,6 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ @@ -320,6 +318,7 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -1066,8 +1065,17 @@ uninstall-am: uninstall-pygiLTLIBRARIES uninstall-pygiPYTHON .la.so: $(LN_S) .libs/$@ $@ || true -all-local: $(LTLIBRARIES:.la=.so) -check-local: $(LTLIBRARIES:.la=.so) +# if we build in a separate tree, we need to symlink the *.py files from the +# source tree; Python does not accept the extensions and modules in different +# paths +build_pylinks: + for f in $(pygi_PYTHON); do \ + [ -e $(builddir)/$$f ] || $(LN_S) $(srcdir)/$$f $(builddir)/$$f; \ + done + +all-local: $(LTLIBRARIES:.la=.so) build_pylinks + +check-local: $(LTLIBRARIES:.la=.so) build_pylinks clean-local: rm -f $(LTLIBRARIES:.la=.so) diff --git a/gi/_glib/Makefile.am b/gi/_glib/Makefile.am index 3cf2593..c152039 100644 --- a/gi/_glib/Makefile.am +++ b/gi/_glib/Makefile.am @@ -82,9 +82,17 @@ if PLATFORM_WIN32 _glib_la_CFLAGS += -DPLATFORM_WIN32 endif +# if we build in a separate tree, we need to symlink the *.py files from the +# source tree; Python does not accept the extensions and modules in different +# paths +build_pylinks: + for f in $(pyglib_PYTHON); do \ + [ -e $(builddir)/$$f ] || $(LN_S) $(srcdir)/$$f $(builddir)/$$f; \ + done -all: $(pyglib_LTLIBRARIES:.la=.so) -check-local: $(pyglib_LTLIBRARIES:.la=.so) + +all: $(pyglib_LTLIBRARIES:.la=.so) build_pylinks +check-local: $(pyglib_LTLIBRARIES:.la=.so) build_pylinks clean-local: rm -f $(pyglib_LTLIBRARIES:.la=.so) .la.so: diff --git a/gi/_glib/Makefile.in b/gi/_glib/Makefile.in index e93d3f1..9a7eece 100644 --- a/gi/_glib/Makefile.in +++ b/gi/_glib/Makefile.in @@ -206,7 +206,6 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -251,7 +250,6 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ @@ -284,6 +282,7 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -827,8 +826,16 @@ uninstall-am: uninstall-libLTLIBRARIES uninstall-pyglibLTLIBRARIES \ uninstall-pyglibPYTHON -all: $(pyglib_LTLIBRARIES:.la=.so) -check-local: $(pyglib_LTLIBRARIES:.la=.so) +# if we build in a separate tree, we need to symlink the *.py files from the +# source tree; Python does not accept the extensions and modules in different +# paths +build_pylinks: + for f in $(pyglib_PYTHON); do \ + [ -e $(builddir)/$$f ] || $(LN_S) $(srcdir)/$$f $(builddir)/$$f; \ + done + +all: $(pyglib_LTLIBRARIES:.la=.so) build_pylinks +check-local: $(pyglib_LTLIBRARIES:.la=.so) build_pylinks clean-local: rm -f $(pyglib_LTLIBRARIES:.la=.so) .la.so: diff --git a/gi/_gobject/Makefile.am b/gi/_gobject/Makefile.am index 3263889..36fd662 100644 --- a/gi/_gobject/Makefile.am +++ b/gi/_gobject/Makefile.am @@ -69,9 +69,17 @@ _gobject_la_LDFLAGS = \ $(extension_ldflags) \ -export-symbols-regex "_gobject|PyInit__gobject" +# if we build in a separate tree, we need to symlink the *.py files from the +# source tree; Python does not accept the extensions and modules in different +# paths +build_pylinks: + for f in $(pygobject_PYTHON); do \ + [ -e $(builddir)/$$f ] || $(LN_S) $(srcdir)/$$f $(builddir)/$$f; \ + done -all: $(pygobject_LTLIBRARIES:.la=.so) -check-local: $(pygobject_LTLIBRARIES:.la=.so) + +all: $(pygobject_LTLIBRARIES:.la=.so) build_pylinks +check-local: $(pygobject_LTLIBRARIES:.la=.so) build_pylinks clean-local: rm -f $(pygobject_LTLIBRARIES:.la=.so) .la.so: diff --git a/gi/_gobject/Makefile.in b/gi/_gobject/Makefile.in index c9313e6..4684914 100644 --- a/gi/_gobject/Makefile.in +++ b/gi/_gobject/Makefile.in @@ -195,7 +195,6 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -240,7 +239,6 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ @@ -273,6 +271,7 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -794,8 +793,16 @@ uninstall-am: uninstall-pkgincludeHEADERS \ uninstall-pygobjectLTLIBRARIES uninstall-pygobjectPYTHON -all: $(pygobject_LTLIBRARIES:.la=.so) -check-local: $(pygobject_LTLIBRARIES:.la=.so) +# if we build in a separate tree, we need to symlink the *.py files from the +# source tree; Python does not accept the extensions and modules in different +# paths +build_pylinks: + for f in $(pygobject_PYTHON); do \ + [ -e $(builddir)/$$f ] || $(LN_S) $(srcdir)/$$f $(builddir)/$$f; \ + done + +all: $(pygobject_LTLIBRARIES:.la=.so) build_pylinks +check-local: $(pygobject_LTLIBRARIES:.la=.so) build_pylinks clean-local: rm -f $(pygobject_LTLIBRARIES:.la=.so) .la.so: diff --git a/gi/_gobject/constants.py b/gi/_gobject/constants.py index ff970ae..cd861b9 100644 --- a/gi/_gobject/constants.py +++ b/gi/_gobject/constants.py @@ -45,6 +45,7 @@ TYPE_BOXED = _gobject.type_from_name('GBoxed') TYPE_PARAM = _gobject.type_from_name('GParam') TYPE_OBJECT = _gobject.type_from_name('GObject') TYPE_PYOBJECT = _gobject.type_from_name('PyObject') +TYPE_GTYPE = _gobject.type_from_name('GType') TYPE_UNICHAR = TYPE_UINT # do a little dance to maintain API compatibility diff --git a/gi/overrides/Gio.py b/gi/overrides/Gio.py index 20adf0c..28d6e3c 100644 --- a/gi/overrides/Gio.py +++ b/gi/overrides/Gio.py @@ -51,8 +51,8 @@ __all__.append('FileEnumerator') class Settings(Gio.Settings): '''Provide dictionary-like access to GLib.Settings.''' - def __init__(self, schema, path=None, backend=None): - Gio.Settings.__init__(self, schema=schema, backend=backend, path=path) + def __init__(self, schema, path=None, backend=None, **kwargs): + Gio.Settings.__init__(self, schema=schema, backend=backend, path=path, **kwargs) def __contains__(self, key): return key in self.list_keys() diff --git a/gi/overrides/Gtk.py b/gi/overrides/Gtk.py index 4018b32..aba5a73 100644 --- a/gi/overrides/Gtk.py +++ b/gi/overrides/Gtk.py @@ -327,8 +327,8 @@ __all__.append('SizeGroup') class MenuItem(Gtk.MenuItem): - def __init__(self, label=None): - super(MenuItem, self).__init__(label=label) + def __init__(self, label=None, **kwds): + super(MenuItem, self).__init__(label=label, **kwds) MenuItem = override(MenuItem) __all__.append('MenuItem') @@ -387,8 +387,8 @@ __all__.append('Builder') # NOTE: This must come before any other Window/Dialog subclassing, to ensure # that we have a correct inheritance hierarchy. class Window(Gtk.Window): - def __init__(self, type=Gtk.WindowType.TOPLEVEL, **kwargs): - Gtk.Window.__init__(self, type=type, **kwargs) + def __init__(self, type=Gtk.WindowType.TOPLEVEL, **kwds): + Gtk.Window.__init__(self, type=type, **kwds) Window = override(Window) __all__.append('Window') @@ -552,8 +552,8 @@ __all__.append('RecentChooserDialog') class IconView(Gtk.IconView): - def __init__(self, model=None): - Gtk.IconView.__init__(self, model=model) + def __init__(self, model=None, **kwds): + Gtk.IconView.__init__(self, model=model, **kwds) def get_item_at_pos(self, x, y): success, path, cell = super(IconView, self).get_item_at_pos(x, y) @@ -576,8 +576,8 @@ __all__.append('IconView') class ToolButton(Gtk.ToolButton): - def __init__(self, stock_id=None): - Gtk.ToolButton.__init__(self, stock_id=stock_id) + def __init__(self, stock_id=None, **kwds): + Gtk.ToolButton.__init__(self, stock_id=stock_id, **kwds) ToolButton = override(ToolButton) __all__.append('ToolButton') @@ -783,6 +783,12 @@ class TreeModel(Gtk.TreeModel): if success: return next_iter + def iter_previous(self, aiter): + prev_iter = aiter.copy() + success = super(TreeModel, self).iter_previous(prev_iter) + if success: + return prev_iter + def iter_children(self, aiter): success, child_iter = super(TreeModel, self).iter_children(aiter) if success: @@ -1429,15 +1435,15 @@ __all__.append('ScrolledWindow') class HScrollbar(Gtk.HScrollbar): - def __init__(self, adjustment=None): - Gtk.HScrollbar.__init__(self, adjustment=adjustment) + def __init__(self, adjustment=None, **kwds): + Gtk.HScrollbar.__init__(self, adjustment=adjustment, **kwds) HScrollbar = override(HScrollbar) __all__.append('HScrollbar') class VScrollbar(Gtk.VScrollbar): - def __init__(self, adjustment=None): - Gtk.VScrollbar.__init__(self, adjustment=adjustment) + def __init__(self, adjustment=None, **kwds): + Gtk.VScrollbar.__init__(self, adjustment=adjustment, **kwds) VScrollbar = override(VScrollbar) __all__.append('VScrollbar') @@ -1454,9 +1460,10 @@ __all__.append('Paned') class Arrow(Gtk.Arrow): - def __init__(self, arrow_type, shadow_type): + def __init__(self, arrow_type, shadow_type, **kwds): Gtk.Arrow.__init__(self, arrow_type=arrow_type, - shadow_type=shadow_type) + shadow_type=shadow_type, + **kwds) Arrow = override(Arrow) __all__.append('Arrow') @@ -1475,9 +1482,10 @@ __all__.append('IconSet') class Viewport(Gtk.Viewport): - def __init__(self, hadjustment=None, vadjustment=None): + def __init__(self, hadjustment=None, vadjustment=None, **kwds): Gtk.Viewport.__init__(self, hadjustment=hadjustment, - vadjustment=vadjustment) + vadjustment=vadjustment, + **kwds) Viewport = override(Viewport) __all__.append('Viewport') diff --git a/gi/overrides/Makefile.am b/gi/overrides/Makefile.am index 2657eb3..5d9ddd6 100644 --- a/gi/overrides/Makefile.am +++ b/gi/overrides/Makefile.am @@ -10,5 +10,15 @@ pygioverrides_PYTHON = \ keysyms.py \ __init__.py +# if we build in a separate tree, we need to symlink the *.py files from the +# source tree; Python does not accept the extensions and modules in different +# paths +build_pylinks: + for f in $(pygioverrides_PYTHON); do \ + [ -e $(builddir)/$$f ] || $(LN_S) $(srcdir)/$$f $(builddir)/$$f; \ + done + +all-local: build_pylinks +check-local: build_pylinks -include $(top_srcdir)/git.mk diff --git a/gi/overrides/Makefile.in b/gi/overrides/Makefile.in index 38d09fe..78626f5 100644 --- a/gi/overrides/Makefile.in +++ b/gi/overrides/Makefile.in @@ -147,7 +147,6 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -192,7 +191,6 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ @@ -225,6 +223,7 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -367,8 +366,9 @@ distdir: $(DISTFILES) fi; \ done check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am -all-am: Makefile +all-am: Makefile all-local installdirs: for dir in "$(DESTDIR)$(pygioverridesdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ @@ -469,15 +469,15 @@ ps-am: uninstall-am: uninstall-pygioverridesPYTHON -.MAKE: install-am install-strip +.MAKE: check-am install-am install-strip -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am \ +.PHONY: all all-am all-local check check-am check-local clean \ + clean-generic clean-libtool distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ install-pygioverridesPYTHON install-strip installcheck \ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ @@ -485,6 +485,17 @@ uninstall-am: uninstall-pygioverridesPYTHON uninstall-pygioverridesPYTHON +# if we build in a separate tree, we need to symlink the *.py files from the +# source tree; Python does not accept the extensions and modules in different +# paths +build_pylinks: + for f in $(pygioverrides_PYTHON); do \ + [ -e $(builddir)/$$f ] || $(LN_S) $(srcdir)/$$f $(builddir)/$$f; \ + done + +all-local: build_pylinks +check-local: build_pylinks + -include $(top_srcdir)/git.mk # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/gi/pygi-cache.c b/gi/pygi-cache.c index 5b107e1..231f6c4 100644 --- a/gi/pygi-cache.c +++ b/gi/pygi-cache.c @@ -161,7 +161,9 @@ _sequence_cache_new (GITypeInfo *type_info, if (!sc->is_zero_terminated) { sc->fixed_size = g_type_info_get_array_fixed_size (type_info); if (sc->fixed_size < 0) - sc->len_arg_index = g_type_info_get_array_length (type_info) + child_offset; + sc->len_arg_index = g_type_info_get_array_length (type_info); + if (sc->len_arg_index >= 0) + sc->len_arg_index += child_offset; } item_type_info = g_type_info_get_param_type (type_info, 0); diff --git a/gi/pygi-marshal-cleanup.c b/gi/pygi-marshal-cleanup.c index d580161..0f27ba7 100644 --- a/gi/pygi-marshal-cleanup.c +++ b/gi/pygi-marshal-cleanup.c @@ -279,13 +279,13 @@ _wrap_c_array (PyGIInvokeState *state, gpointer data) { GArray *array_; - gsize len; + gsize len = 0; if (sequence_cache->fixed_size >= 0) { len = sequence_cache->fixed_size; } else if (sequence_cache->is_zero_terminated) { len = g_strv_length ((gchar **)data); - } else { + } else if (sequence_cache->len_arg_index >= 0) { GIArgument *len_arg = state->args[sequence_cache->len_arg_index]; len = len_arg->v_long; } diff --git a/gi/pygtkcompat.py b/gi/pygtkcompat.py index 26f803a..c6dafcd 100644 --- a/gi/pygtkcompat.py +++ b/gi/pygtkcompat.py @@ -260,6 +260,25 @@ def enable_gtk(version='2.0'): orig_combo_row_separator_func(self, callback, user_data) Gtk.ComboBox.set_row_separator_func = combo_row_separator_func + # ComboBoxEntry + + class ComboBoxEntry(Gtk.ComboBox): + def __init__(self, **kwds): + Gtk.ComboBox.__init__(self, has_entry=True, **kwds) + def set_text_column (self, text_column): + self.set_entry_text_column(text_column) + def get_text_column (self): + return self.get_entry_text_column() + Gtk.ComboBoxEntry = ComboBoxEntry + + def combo_box_entry_new(): + return Gtk.ComboBoxEntry() + Gtk.combo_box_entry_new = combo_box_entry_new + + def combo_box_entry_new_with_model(model): + return Gtk.ComboBoxEntry(model=model) + Gtk.combo_box_entry_new_with_model = combo_box_entry_new_with_model + # Container def install_child_property(container, flag, pspec): @@ -311,7 +330,7 @@ def enable_gtk(version='2.0'): def __init__(self, req): self.height = req.height self.width = req.width - UserList.UserList.__init__(self, [self.width, + UserList.__init__(self, [self.width, self.height]) return SizeRequest(orig_size_request(widget)) Gtk.Widget.size_request = size_request diff --git a/gi/repository/Makefile.am b/gi/repository/Makefile.am index 9326dc3..27d5e81 100644 --- a/gi/repository/Makefile.am +++ b/gi/repository/Makefile.am @@ -4,4 +4,15 @@ pygirepository_PYTHON = \ __init__.py +# if we build in a separate tree, we need to symlink the *.py files from the +# source tree; Python does not accept the extensions and modules in different +# paths +build_pylinks: + for f in $(pygirepository_PYTHON); do \ + [ -e $(builddir)/$$f ] || $(LN_S) $(srcdir)/$$f $(builddir)/$$f; \ + done + +all-local: build_pylinks +check-local: build_pylinks + -include $(top_srcdir)/git.mk diff --git a/gi/repository/Makefile.in b/gi/repository/Makefile.in index 6478ded..e787f57 100644 --- a/gi/repository/Makefile.in +++ b/gi/repository/Makefile.in @@ -147,7 +147,6 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -192,7 +191,6 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ @@ -225,6 +223,7 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -360,8 +359,9 @@ distdir: $(DISTFILES) fi; \ done check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am -all-am: Makefile +all-am: Makefile all-local installdirs: for dir in "$(DESTDIR)$(pygirepositorydir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ @@ -462,15 +462,15 @@ ps-am: uninstall-am: uninstall-pygirepositoryPYTHON -.MAKE: install-am install-strip +.MAKE: check-am install-am install-strip -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am \ +.PHONY: all all-am all-local check check-am check-local clean \ + clean-generic clean-libtool distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ install-pygirepositoryPYTHON install-strip installcheck \ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ @@ -478,6 +478,17 @@ uninstall-am: uninstall-pygirepositoryPYTHON uninstall-pygirepositoryPYTHON +# if we build in a separate tree, we need to symlink the *.py files from the +# source tree; Python does not accept the extensions and modules in different +# paths +build_pylinks: + for f in $(pygirepository_PYTHON); do \ + [ -e $(builddir)/$$f ] || $(LN_S) $(srcdir)/$$f $(builddir)/$$f; \ + done + +all-local: build_pylinks +check-local: build_pylinks + -include $(top_srcdir)/git.mk # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/ltmain.sh b/ltmain.sh old mode 100644 new mode 100755 index c2852d8..b36c4ad --- a/ltmain.sh +++ b/ltmain.sh @@ -1,9 +1,9 @@ +# Generated from ltmain.m4sh. -# libtool (GNU libtool) 2.4.2 +# ltmain.sh (GNU libtool) 2.2.6 # Written by Gordon Matzigkeit , 1996 -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc. # This is free software; see the source for copying conditions. There is NO # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @@ -32,57 +32,50 @@ # # Provide generalized library-building support services. # -# --config show all configuration variables -# --debug enable verbose shell tracing -# -n, --dry-run display commands without modifying any files -# --features display basic configuration information and exit -# --mode=MODE use operation mode MODE -# --preserve-dup-deps don't remove duplicate dependency libraries -# --quiet, --silent don't print informational messages -# --no-quiet, --no-silent -# print informational messages (default) -# --no-warn don't display warning messages -# --tag=TAG use configuration variables from tag TAG -# -v, --verbose print more informational messages than default -# --no-verbose don't print the extra informational messages -# --version print version information -# -h, --help, --help-all print short, long, or detailed help message +# --config show all configuration variables +# --debug enable verbose shell tracing +# -n, --dry-run display commands without modifying any files +# --features display basic configuration information and exit +# --mode=MODE use operation mode MODE +# --preserve-dup-deps don't remove duplicate dependency libraries +# --quiet, --silent don't print informational messages +# --tag=TAG use configuration variables from tag TAG +# -v, --verbose print informational messages (default) +# --version print version information +# -h, --help print short or long help message # # MODE must be one of the following: # -# clean remove files from the build directory -# compile compile a source file into a libtool object -# execute automatically set library path, then run a program -# finish complete the installation of libtool libraries -# install install libraries or executables -# link create a library or an executable -# uninstall remove libraries from an installed directory +# clean remove files from the build directory +# compile compile a source file into a libtool object +# execute automatically set library path, then run a program +# finish complete the installation of libtool libraries +# install install libraries or executables +# link create a library or an executable +# uninstall remove libraries from an installed directory # -# MODE-ARGS vary depending on the MODE. When passed as first option, -# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that. +# MODE-ARGS vary depending on the MODE. # Try `$progname --help --mode=MODE' for a more detailed description of MODE. # # When reporting a bug, please describe a test case to reproduce it and # include the following information: # -# host-triplet: $host -# shell: $SHELL -# compiler: $LTCC -# compiler flags: $LTCFLAGS -# linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1ubuntu1 -# automake: $automake_version -# autoconf: $autoconf_version +# host-triplet: $host +# shell: $SHELL +# compiler: $LTCC +# compiler flags: $LTCFLAGS +# linker: $LD (gnu? $with_gnu_ld) +# $progname: (GNU libtool) 2.2.6 +# automake: $automake_version +# autoconf: $autoconf_version # # Report bugs to . -# GNU libtool home page: . -# General help using GNU software: . -PROGRAM=libtool +PROGRAM=ltmain.sh PACKAGE=libtool -VERSION="2.4.2 Debian-2.4.2-1ubuntu1" +VERSION=2.2.6 TIMESTAMP="" -package_revision=1.3337 +package_revision=1.3012 # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then @@ -98,15 +91,10 @@ fi BIN_SH=xpg4; export BIN_SH # for Tru64 DUALCASE=1; export DUALCASE # for MKS sh -# A function that is used when there is no print builtin or printf. -func_fallback_echo () -{ - eval 'cat <<_LTECHO_EOF -$1 -_LTECHO_EOF' -} - # NLS nuisances: We save the old values to restore during execute mode. +# Only set LANG and LC_ALL to C if already set. +# These must not be set unconditionally because not all systems understand +# e.g. LANG=C (notably SCO). lt_user_locale= lt_safe_locale= for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES @@ -119,28 +107,24 @@ do lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" fi" done -LC_ALL=C -LANGUAGE=C -export LANGUAGE LC_ALL $lt_unset CDPATH -# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh -# is ksh but when the shell is invoked as "sh" and the current value of -# the _XPG environment variable is not equal to 1 (one), the special -# positional parameter $0, within a function call, is the name of the -# function. -progpath="$0" : ${CP="cp -f"} -test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} +: ${ECHO="echo"} +: ${EGREP="/usr/bin/grep -E"} +: ${FGREP="/usr/bin/grep -F"} +: ${GREP="/usr/bin/grep"} +: ${LN_S="ln -s"} : ${MAKE="make"} : ${MKDIR="mkdir"} : ${MV="mv -f"} : ${RM="rm -f"} +: ${SED="/opt/local/bin/gsed"} : ${SHELL="${CONFIG_SHELL-/bin/sh}"} : ${Xsed="$SED -e 1s/^X//"} @@ -160,27 +144,6 @@ IFS=" $lt_nl" dirname="s,/[^/]*$,," basename="s,^.*/,," -# func_dirname file append nondir_replacement -# Compute the dirname of FILE. If nonempty, add APPEND to the result, -# otherwise set result to NONDIR_REPLACEMENT. -func_dirname () -{ - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi -} # func_dirname may be replaced by extended shell implementation - - -# func_basename file -func_basename () -{ - func_basename_result=`$ECHO "${1}" | $SED "$basename"` -} # func_basename may be replaced by extended shell implementation - - # func_dirname_and_basename file append nondir_replacement # perform func_basename and func_dirname in a single function # call: @@ -195,183 +158,33 @@ func_basename () # those functions but instead duplicate the functionality here. func_dirname_and_basename () { - # Extract subdirectory from the argument. - func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi - func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` -} # func_dirname_and_basename may be replaced by extended shell implementation - - -# func_stripname prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -# func_strip_suffix prefix name -func_stripname () -{ - case ${2} in - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; - esac -} # func_stripname may be replaced by extended shell implementation - - -# These SED scripts presuppose an absolute path with a trailing slash. -pathcar='s,^/\([^/]*\).*$,\1,' -pathcdr='s,^/[^/]*,,' -removedotparts=':dotsl - s@/\./@/@g - t dotsl - s,/\.$,/,' -collapseslashes='s@/\{1,\}@/@g' -finalslash='s,/*$,/,' - -# func_normal_abspath PATH -# Remove doubled-up and trailing slashes, "." path components, -# and cancel out any ".." path components in PATH after making -# it an absolute path. -# value returned in "$func_normal_abspath_result" -func_normal_abspath () -{ - # Start from root dir and reassemble the path. - func_normal_abspath_result= - func_normal_abspath_tpath=$1 - func_normal_abspath_altnamespace= - case $func_normal_abspath_tpath in - "") - # Empty path, that just means $cwd. - func_stripname '' '/' "`pwd`" - func_normal_abspath_result=$func_stripname_result - return - ;; - # The next three entries are used to spot a run of precisely - # two leading slashes without using negated character classes; - # we take advantage of case's first-match behaviour. - ///*) - # Unusual form of absolute path, do nothing. - ;; - //*) - # Not necessarily an ordinary path; POSIX reserves leading '//' - # and for example Cygwin uses it to access remote file shares - # over CIFS/SMB, so we conserve a leading double slash if found. - func_normal_abspath_altnamespace=/ - ;; - /*) - # Absolute path, do nothing. - ;; - *) - # Relative path, prepend $cwd. - func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath - ;; - esac - # Cancel out all the simple stuff to save iterations. We also want - # the path to end with a slash for ease of parsing, so make sure - # there is one (and only one) here. - func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"` - while :; do - # Processed it all yet? - if test "$func_normal_abspath_tpath" = / ; then - # If we ascended to the root using ".." the result may be empty now. - if test -z "$func_normal_abspath_result" ; then - func_normal_abspath_result=/ - fi - break - fi - func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$pathcar"` - func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$pathcdr"` - # Figure out what to do with it - case $func_normal_abspath_tcomponent in - "") - # Trailing empty path component, ignore it. - ;; - ..) - # Parent dir; strip last assembled component from result. - func_dirname "$func_normal_abspath_result" - func_normal_abspath_result=$func_dirname_result - ;; - *) - # Actual path component, append it. - func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent - ;; - esac - done - # Restore leading double-slash if one was found on entry. - func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result + # Extract subdirectory from the argument. + func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` + if test "X$func_dirname_result" = "X${1}"; then + func_dirname_result="${3}" + else + func_dirname_result="$func_dirname_result${2}" + fi + func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` } -# func_relative_path SRCDIR DSTDIR -# generates a relative path from SRCDIR to DSTDIR, with a trailing -# slash if non-empty, suitable for immediately appending a filename -# without needing to append a separator. -# value returned in "$func_relative_path_result" -func_relative_path () -{ - func_relative_path_result= - func_normal_abspath "$1" - func_relative_path_tlibdir=$func_normal_abspath_result - func_normal_abspath "$2" - func_relative_path_tbindir=$func_normal_abspath_result - - # Ascend the tree starting from libdir - while :; do - # check if we have found a prefix of bindir - case $func_relative_path_tbindir in - $func_relative_path_tlibdir) - # found an exact match - func_relative_path_tcancelled= - break - ;; - $func_relative_path_tlibdir*) - # found a matching prefix - func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir" - func_relative_path_tcancelled=$func_stripname_result - if test -z "$func_relative_path_result"; then - func_relative_path_result=. - fi - break - ;; - *) - func_dirname $func_relative_path_tlibdir - func_relative_path_tlibdir=${func_dirname_result} - if test "x$func_relative_path_tlibdir" = x ; then - # Have to descend all the way to the root! - func_relative_path_result=../$func_relative_path_result - func_relative_path_tcancelled=$func_relative_path_tbindir - break - fi - func_relative_path_result=../$func_relative_path_result - ;; - esac - done - - # Now calculate path; take care to avoid doubling-up slashes. - func_stripname '' '/' "$func_relative_path_result" - func_relative_path_result=$func_stripname_result - func_stripname '/' '/' "$func_relative_path_tcancelled" - if test "x$func_stripname_result" != x ; then - func_relative_path_result=${func_relative_path_result}/${func_stripname_result} - fi +# Generated shell functions inserted here. - # Normalisation. If bindir is libdir, return empty string, - # else relative path ending with a slash; either way, target - # file name can be directly appended. - if test ! -z "$func_relative_path_result"; then - func_stripname './' '' "$func_relative_path_result/" - func_relative_path_result=$func_stripname_result - fi -} +# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh +# is ksh but when the shell is invoked as "sh" and the current value of +# the _XPG environment variable is not equal to 1 (one), the special +# positional parameter $0, within a function call, is the name of the +# function. +progpath="$0" # The name of this program: +# In the unlikely event $progname began with a '-', it would play havoc with +# func_echo (imagine progname=-n), so we prepend ./ in that case: func_dirname_and_basename "$progpath" progname=$func_basename_result +case $progname in + -*) progname=./$progname ;; +esac # Make sure we have an absolute path for reexecution: case $progpath in @@ -383,7 +196,7 @@ case $progpath in ;; *) save_IFS="$IFS" - IFS=${PATH_SEPARATOR-:} + IFS=: for progdir in $PATH; do IFS="$save_IFS" test -x "$progdir/$progname" && break @@ -402,15 +215,6 @@ sed_quote_subst='s/\([`"$\\]\)/\\\1/g' # Same as above, but do not quote variable references. double_quote_subst='s/\(["`\\]\)/\\\1/g' -# Sed substitution that turns a string into a regex matching for the -# string literally. -sed_make_literal_regex='s,[].[^$\\*\/],\\&,g' - -# Sed substitution that converts a w32 file name or path -# which contains forward slashes, into one that contains -# (escaped) backslashes. A very naive implementation. -lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' - # Re-`\' parameter expansions in output of double_quote_subst that were # `\'-ed in input to the same. If an odd number of `\' preceded a '$' # in input to double_quote_subst, that '$' was protected from expansion. @@ -439,7 +243,7 @@ opt_warning=: # name if it has been set yet. func_echo () { - $ECHO "$progname: ${opt_mode+$opt_mode: }$*" + $ECHO "$progname${mode+: }$mode: $*" } # func_verbose arg... @@ -454,25 +258,18 @@ func_verbose () : } -# func_echo_all arg... -# Invoke $ECHO with all args, space-separated. -func_echo_all () -{ - $ECHO "$*" -} - # func_error arg... # Echo program name prefixed message to standard error. func_error () { - $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2 + $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2 } # func_warning arg... # Echo program name prefixed warning message to standard error. func_warning () { - $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2 + $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2 # bash bug again: : @@ -529,9 +326,9 @@ func_mkdir_p () case $my_directory_path in */*) ;; *) break ;; esac # ...otherwise throw away the child directory and loop - my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"` + my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"` done - my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'` + my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'` save_mkdir_p_IFS="$IFS"; IFS=':' for my_dir in $my_dir_list; do @@ -581,7 +378,7 @@ func_mktempdir () func_fatal_error "cannot create temporary directory \`$my_tmpdir'" fi - $ECHO "$my_tmpdir" + $ECHO "X$my_tmpdir" | $Xsed } @@ -595,7 +392,7 @@ func_quote_for_eval () { case $1 in *[\\\`\"\$]*) - func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;; + func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;; *) func_quote_for_eval_unquoted_result="$1" ;; esac @@ -622,7 +419,7 @@ func_quote_for_expand () { case $1 in *[\\\`\"]*) - my_arg=`$ECHO "$1" | $SED \ + my_arg=`$ECHO "X$1" | $Xsed \ -e "$double_quote_subst" -e "$sed_double_backslash"` ;; *) my_arg="$1" ;; @@ -691,39 +488,15 @@ func_show_eval_locale () fi } -# func_tr_sh -# Turn $1 into a string suitable for a shell variable name. -# Result is stored in $func_tr_sh_result. All characters -# not in the set a-zA-Z0-9_ are replaced with '_'. Further, -# if $1 begins with a digit, a '_' is prepended as well. -func_tr_sh () -{ - case $1 in - [0-9]* | *[!a-zA-Z0-9_]*) - func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'` - ;; - * ) - func_tr_sh_result=$1 - ;; - esac -} + + # func_version # Echo version message to standard output and exit. func_version () { - $opt_debug - - $SED -n '/(C)/!b go - :more - /\./!{ - N - s/\n# / / - b more - } - :go - /^# '$PROGRAM' (GNU /,/# warranty; / { + $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / { s/^# // s/^# *$// s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/ @@ -736,28 +509,22 @@ func_version () # Echo short help message to standard output and exit. func_usage () { - $opt_debug - - $SED -n '/^# Usage:/,/^# *.*--help/ { + $SED -n '/^# Usage:/,/# -h/ { s/^# // s/^# *$// s/\$progname/'$progname'/ p }' < "$progpath" - echo + $ECHO $ECHO "run \`$progname --help | more' for full usage" exit $? } -# func_help [NOEXIT] -# Echo long help message to standard output and exit, -# unless 'noexit' is passed as argument. +# func_help +# Echo long help message to standard output and exit. func_help () { - $opt_debug - $SED -n '/^# Usage:/,/# Report bugs to/ { - :print s/^# // s/^# *$// s*\$progname*'$progname'* @@ -767,18 +534,11 @@ func_help () s*\$LTCFLAGS*'"$LTCFLAGS"'* s*\$LD*'"$LD"'* s/\$with_gnu_ld/'"$with_gnu_ld"'/ - s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/ - s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/ + s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ + s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ p - d - } - /^# .* home page:/b print - /^# General help using/b print - ' < "$progpath" - ret=$? - if test -z "$1"; then - exit $ret - fi + }' < "$progpath" + exit $? } # func_missing_arg argname @@ -786,106 +546,63 @@ func_help () # exit_cmd. func_missing_arg () { - $opt_debug - - func_error "missing argument for $1." + func_error "missing argument for $1" exit_cmd=exit } +exit_cmd=: -# func_split_short_opt shortopt -# Set func_split_short_opt_name and func_split_short_opt_arg shell -# variables after splitting SHORTOPT after the 2nd character. -func_split_short_opt () -{ - my_sed_short_opt='1s/^\(..\).*$/\1/;q' - my_sed_short_rest='1s/^..\(.*\)$/\1/;q' - - func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"` - func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"` -} # func_split_short_opt may be replaced by extended shell implementation - - -# func_split_long_opt longopt -# Set func_split_long_opt_name and func_split_long_opt_arg shell -# variables after splitting LONGOPT at the `=' sign. -func_split_long_opt () -{ - my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q' - my_sed_long_arg='1s/^--[^=]*=//' - - func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"` - func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"` -} # func_split_long_opt may be replaced by extended shell implementation -exit_cmd=: +# Check that we have a working $ECHO. +if test "X$1" = X--no-reexec; then + # Discard the --no-reexec flag, and continue. + shift +elif test "X$1" = X--fallback-echo; then + # Avoid inline document here, it may be left over + : +elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then + # Yippee, $ECHO works! + : +else + # Restart under the correct shell, and then maybe $ECHO will work. + exec $SHELL "$progpath" --no-reexec ${1+"$@"} +fi +if test "X$1" = X--fallback-echo; then + # used as fallback echo + shift + cat </dev/null || echo $max_cmd_len` -} # func_len may be replaced by extended shell implementation - - -# func_lo2o object -func_lo2o () -{ - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` -} # func_lo2o may be replaced by extended shell implementation - - -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` -} # func_xform may be replaced by extended shell implementation - - # func_fatal_configuration arg... # Echo program name prefixed message to standard error, followed by # a configuration failure hint, and exit. @@ -919,16 +636,16 @@ func_config () # Display the features supported by this script. func_features () { - echo "host: $host" + $ECHO "host: $host" if test "$build_libtool_libs" = yes; then - echo "enable shared libraries" + $ECHO "enable shared libraries" else - echo "disable shared libraries" + $ECHO "disable shared libraries" fi if test "$build_old_libs" = yes; then - echo "enable static libraries" + $ECHO "enable static libraries" else - echo "disable static libraries" + $ECHO "disable static libraries" fi exit $? @@ -975,209 +692,117 @@ func_enable_tag () esac } -# func_check_version_match -# Ensure that we are using m4 macros, and libtool script from the same -# release of libtool. -func_check_version_match () +# Parse options once, thoroughly. This comes as soon as possible in +# the script to make things like `libtool --version' happen quickly. { - if test "$package_revision" != "$macro_revision"; then - if test "$VERSION" != "$macro_version"; then - if test -z "$macro_version"; then - cat >&2 <<_LT_EOF -$progname: Version mismatch error. This is $PACKAGE $VERSION, but the -$progname: definition of this LT_INIT comes from an older release. -$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION -$progname: and run autoconf again. -_LT_EOF - else - cat >&2 <<_LT_EOF -$progname: Version mismatch error. This is $PACKAGE $VERSION, but the -$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. -$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION -$progname: and run autoconf again. -_LT_EOF - fi - else - cat >&2 <<_LT_EOF -$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, -$progname: but the definition of this LT_INIT comes from revision $macro_revision. -$progname: You should recreate aclocal.m4 with macros from revision $package_revision -$progname: of $PACKAGE $VERSION and run autoconf again. -_LT_EOF - fi - - exit $EXIT_MISMATCH - fi -} - - -# Shorthand for --mode=foo, only valid as the first argument -case $1 in -clean|clea|cle|cl) - shift; set dummy --mode clean ${1+"$@"}; shift - ;; -compile|compil|compi|comp|com|co|c) - shift; set dummy --mode compile ${1+"$@"}; shift - ;; -execute|execut|execu|exec|exe|ex|e) - shift; set dummy --mode execute ${1+"$@"}; shift - ;; -finish|finis|fini|fin|fi|f) - shift; set dummy --mode finish ${1+"$@"}; shift - ;; -install|instal|insta|inst|ins|in|i) - shift; set dummy --mode install ${1+"$@"}; shift - ;; -link|lin|li|l) - shift; set dummy --mode link ${1+"$@"}; shift - ;; -uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) - shift; set dummy --mode uninstall ${1+"$@"}; shift - ;; -esac - - - -# Option defaults: -opt_debug=: -opt_dry_run=false -opt_config=false -opt_preserve_dup_deps=false -opt_features=false -opt_finish=false -opt_help=false -opt_help_all=false -opt_silent=: -opt_warning=: -opt_verbose=: -opt_silent=false -opt_verbose=false + # Shorthand for --mode=foo, only valid as the first argument + case $1 in + clean|clea|cle|cl) + shift; set dummy --mode clean ${1+"$@"}; shift + ;; + compile|compil|compi|comp|com|co|c) + shift; set dummy --mode compile ${1+"$@"}; shift + ;; + execute|execut|execu|exec|exe|ex|e) + shift; set dummy --mode execute ${1+"$@"}; shift + ;; + finish|finis|fini|fin|fi|f) + shift; set dummy --mode finish ${1+"$@"}; shift + ;; + install|instal|insta|inst|ins|in|i) + shift; set dummy --mode install ${1+"$@"}; shift + ;; + link|lin|li|l) + shift; set dummy --mode link ${1+"$@"}; shift + ;; + uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) + shift; set dummy --mode uninstall ${1+"$@"}; shift + ;; + esac -# Parse options once, thoroughly. This comes as soon as possible in the -# script to make things like `--version' happen as quickly as we can. -{ - # this just eases exit handling - while test $# -gt 0; do + # Parse non-mode specific arguments: + while test "$#" -gt 0; do opt="$1" shift + case $opt in - --debug|-x) opt_debug='set -x' + --config) func_config ;; + + --debug) preserve_args="$preserve_args $opt" func_echo "enabling shell trace mode" + opt_debug='set -x' $opt_debug ;; - --dry-run|--dryrun|-n) - opt_dry_run=: - ;; - --config) - opt_config=: -func_config - ;; - --dlopen|-dlopen) - optarg="$1" - opt_dlopen="${opt_dlopen+$opt_dlopen -}$optarg" + + -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break + execute_dlfiles="$execute_dlfiles $1" shift ;; - --preserve-dup-deps) - opt_preserve_dup_deps=: - ;; - --features) - opt_features=: -func_features - ;; - --finish) - opt_finish=: -set dummy --mode finish ${1+"$@"}; shift - ;; - --help) - opt_help=: - ;; - --help-all) - opt_help_all=: -opt_help=': help-all' - ;; - --mode) - test $# = 0 && func_missing_arg $opt && break - optarg="$1" - opt_mode="$optarg" -case $optarg in - # Valid mode arguments: - clean|compile|execute|finish|install|link|relink|uninstall) ;; - - # Catch anything else as an error - *) func_error "invalid argument for $opt" - exit_cmd=exit - break - ;; -esac + + --dry-run | -n) opt_dry_run=: ;; + --features) func_features ;; + --finish) mode="finish" ;; + + --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break + case $1 in + # Valid mode arguments: + clean) ;; + compile) ;; + execute) ;; + finish) ;; + install) ;; + link) ;; + relink) ;; + uninstall) ;; + + # Catch anything else as an error + *) func_error "invalid argument for $opt" + exit_cmd=exit + break + ;; + esac + + mode="$1" shift ;; - --no-silent|--no-quiet) - opt_silent=false -func_append preserve_args " $opt" - ;; - --no-warning|--no-warn) - opt_warning=false -func_append preserve_args " $opt" - ;; - --no-verbose) - opt_verbose=false -func_append preserve_args " $opt" - ;; - --silent|--quiet) + + --preserve-dup-deps) + opt_duplicate_deps=: ;; + + --quiet|--silent) preserve_args="$preserve_args $opt" opt_silent=: -func_append preserve_args " $opt" - opt_verbose=false ;; - --verbose|-v) - opt_verbose=: -func_append preserve_args " $opt" -opt_silent=false + + --verbose| -v) preserve_args="$preserve_args $opt" + opt_silent=false ;; - --tag) - test $# = 0 && func_missing_arg $opt && break - optarg="$1" - opt_tag="$optarg" -func_append preserve_args " $opt $optarg" -func_enable_tag "$optarg" + + --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break + preserve_args="$preserve_args $opt $1" + func_enable_tag "$1" # tagname is set here shift ;; - -\?|-h) func_usage ;; - --help) func_help ;; - --version) func_version ;; - # Separate optargs to long options: - --*=*) - func_split_long_opt "$opt" - set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"} + -dlopen=*|--mode=*|--tag=*) + func_opt_split "$opt" + set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"} shift ;; - # Separate non-argument short options: - -\?*|-h*|-n*|-v*) - func_split_short_opt "$opt" - set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"} - shift - ;; + -\?|-h) func_usage ;; + --help) opt_help=: ;; + --version) func_version ;; - --) break ;; - -*) func_fatal_help "unrecognized option \`$opt'" ;; - *) set dummy "$opt" ${1+"$@"}; shift; break ;; + -*) func_fatal_help "unrecognized option \`$opt'" ;; + + *) nonopt="$opt" + break + ;; esac done - # Validate options: - - # save first non-option argument - if test "$#" -gt 0; then - nonopt="$opt" - shift - fi - - # preserve --debug - test "$opt_debug" = : || func_append preserve_args " --debug" case $host in *cygwin* | *mingw* | *pw32* | *cegcc*) @@ -1185,44 +810,82 @@ func_enable_tag "$optarg" opt_duplicate_compiler_generated_deps=: ;; *) - opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps + opt_duplicate_compiler_generated_deps=$opt_duplicate_deps ;; esac - $opt_help || { - # Sanity checks first: - func_check_version_match + # Having warned about all mis-specified options, bail out if + # anything was wrong. + $exit_cmd $EXIT_FAILURE +} - if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then - func_fatal_configuration "not configured to build any kind of library" +# func_check_version_match +# Ensure that we are using m4 macros, and libtool script from the same +# release of libtool. +func_check_version_match () +{ + if test "$package_revision" != "$macro_revision"; then + if test "$VERSION" != "$macro_version"; then + if test -z "$macro_version"; then + cat >&2 <<_LT_EOF +$progname: Version mismatch error. This is $PACKAGE $VERSION, but the +$progname: definition of this LT_INIT comes from an older release. +$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION +$progname: and run autoconf again. +_LT_EOF + else + cat >&2 <<_LT_EOF +$progname: Version mismatch error. This is $PACKAGE $VERSION, but the +$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. +$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION +$progname: and run autoconf again. +_LT_EOF + fi + else + cat >&2 <<_LT_EOF +$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, +$progname: but the definition of this LT_INIT comes from revision $macro_revision. +$progname: You should recreate aclocal.m4 with macros from revision $package_revision +$progname: of $PACKAGE $VERSION and run autoconf again. +_LT_EOF fi - # Darwin sucks - eval std_shrext=\"$shrext_cmds\" + exit $EXIT_MISMATCH + fi +} - # Only execute mode is allowed to have -dlopen flags. - if test -n "$opt_dlopen" && test "$opt_mode" != execute; then - func_error "unrecognized option \`-dlopen'" - $ECHO "$help" 1>&2 - exit $EXIT_FAILURE - fi - # Change the help message to a mode-specific one. - generic_help="$help" - help="Try \`$progname --help --mode=$opt_mode' for more information." - } +## ----------- ## +## Main. ## +## ----------- ## +$opt_help || { + # Sanity checks first: + func_check_version_match - # Bail if the options were screwed - $exit_cmd $EXIT_FAILURE -} + if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then + func_fatal_configuration "not configured to build any kind of library" + fi + test -z "$mode" && func_fatal_error "error: you must specify a MODE." + # Darwin sucks + eval std_shrext=\"$shrext_cmds\" + + + # Only execute mode is allowed to have -dlopen flags. + if test -n "$execute_dlfiles" && test "$mode" != execute; then + func_error "unrecognized option \`-dlopen'" + $ECHO "$help" 1>&2 + exit $EXIT_FAILURE + fi + + # Change the help message to a mode-specific one. + generic_help="$help" + help="Try \`$progname --help --mode=$mode' for more information." +} -## ----------- ## -## Main. ## -## ----------- ## # func_lalib_p file # True iff FILE is a libtool `.la' library or `.lo' object file. @@ -1287,9 +950,12 @@ func_ltwrapper_executable_p () # temporary ltwrapper_script. func_ltwrapper_scriptname () { - func_dirname_and_basename "$1" "" "." - func_stripname '' '.exe' "$func_basename_result" - func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" + func_ltwrapper_scriptname_result="" + if func_ltwrapper_executable_p "$1"; then + func_dirname_and_basename "$1" "" "." + func_stripname '' '.exe' "$func_basename_result" + func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" + fi } # func_ltwrapper_p file @@ -1335,37 +1001,6 @@ func_source () } -# func_resolve_sysroot PATH -# Replace a leading = in PATH with a sysroot. Store the result into -# func_resolve_sysroot_result -func_resolve_sysroot () -{ - func_resolve_sysroot_result=$1 - case $func_resolve_sysroot_result in - =*) - func_stripname '=' '' "$func_resolve_sysroot_result" - func_resolve_sysroot_result=$lt_sysroot$func_stripname_result - ;; - esac -} - -# func_replace_sysroot PATH -# If PATH begins with the sysroot, replace it with = and -# store the result into func_replace_sysroot_result. -func_replace_sysroot () -{ - case "$lt_sysroot:$1" in - ?*:"$lt_sysroot"*) - func_stripname "$lt_sysroot" '' "$1" - func_replace_sysroot_result="=$func_stripname_result" - ;; - *) - # Including no sysroot. - func_replace_sysroot_result=$1 - ;; - esac -} - # func_infer_tag arg # Infer tagged configuration to use if any are available and # if one wasn't chosen via the "--tag" command line option. @@ -1378,15 +1013,13 @@ func_infer_tag () if test -n "$available_tags" && test -z "$tagname"; then CC_quoted= for arg in $CC; do - func_append_quoted CC_quoted "$arg" + func_quote_for_eval "$arg" + CC_quoted="$CC_quoted $func_quote_for_eval_result" done - CC_expanded=`func_echo_all $CC` - CC_quoted_expanded=`func_echo_all $CC_quoted` case $@ in # Blanks in the command may have been stripped by the calling shell, # but not from the CC environment variable when configure was run. - " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \ - " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;; + " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;; # Blanks at the start of $base_compile will cause this to fail # if we don't check for them as well. *) @@ -1397,13 +1030,11 @@ func_infer_tag () CC_quoted= for arg in $CC; do # Double-quote args containing other shell metacharacters. - func_append_quoted CC_quoted "$arg" + func_quote_for_eval "$arg" + CC_quoted="$CC_quoted $func_quote_for_eval_result" done - CC_expanded=`func_echo_all $CC` - CC_quoted_expanded=`func_echo_all $CC_quoted` case "$@ " in - " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \ - " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) + " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) # The compiler in the base compile command matches # the one in the tagged configuration. # Assume this is the tagged configuration we want. @@ -1466,486 +1097,6 @@ EOF } } - -################################################## -# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS # -################################################## - -# func_convert_core_file_wine_to_w32 ARG -# Helper function used by file name conversion functions when $build is *nix, -# and $host is mingw, cygwin, or some other w32 environment. Relies on a -# correctly configured wine environment available, with the winepath program -# in $build's $PATH. -# -# ARG is the $build file name to be converted to w32 format. -# Result is available in $func_convert_core_file_wine_to_w32_result, and will -# be empty on error (or when ARG is empty) -func_convert_core_file_wine_to_w32 () -{ - $opt_debug - func_convert_core_file_wine_to_w32_result="$1" - if test -n "$1"; then - # Unfortunately, winepath does not exit with a non-zero error code, so we - # are forced to check the contents of stdout. On the other hand, if the - # command is not found, the shell will set an exit code of 127 and print - # *an error message* to stdout. So we must check for both error code of - # zero AND non-empty stdout, which explains the odd construction: - func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null` - if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then - func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" | - $SED -e "$lt_sed_naive_backslashify"` - else - func_convert_core_file_wine_to_w32_result= - fi - fi -} -# end: func_convert_core_file_wine_to_w32 - - -# func_convert_core_path_wine_to_w32 ARG -# Helper function used by path conversion functions when $build is *nix, and -# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly -# configured wine environment available, with the winepath program in $build's -# $PATH. Assumes ARG has no leading or trailing path separator characters. -# -# ARG is path to be converted from $build format to win32. -# Result is available in $func_convert_core_path_wine_to_w32_result. -# Unconvertible file (directory) names in ARG are skipped; if no directory names -# are convertible, then the result may be empty. -func_convert_core_path_wine_to_w32 () -{ - $opt_debug - # unfortunately, winepath doesn't convert paths, only file names - func_convert_core_path_wine_to_w32_result="" - if test -n "$1"; then - oldIFS=$IFS - IFS=: - for func_convert_core_path_wine_to_w32_f in $1; do - IFS=$oldIFS - func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f" - if test -n "$func_convert_core_file_wine_to_w32_result" ; then - if test -z "$func_convert_core_path_wine_to_w32_result"; then - func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result" - else - func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result" - fi - fi - done - IFS=$oldIFS - fi -} -# end: func_convert_core_path_wine_to_w32 - - -# func_cygpath ARGS... -# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when -# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2) -# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or -# (2), returns the Cygwin file name or path in func_cygpath_result (input -# file name or path is assumed to be in w32 format, as previously converted -# from $build's *nix or MSYS format). In case (3), returns the w32 file name -# or path in func_cygpath_result (input file name or path is assumed to be in -# Cygwin format). Returns an empty string on error. -# -# ARGS are passed to cygpath, with the last one being the file name or path to -# be converted. -# -# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH -# environment variable; do not put it in $PATH. -func_cygpath () -{ - $opt_debug - if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then - func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null` - if test "$?" -ne 0; then - # on failure, ensure result is empty - func_cygpath_result= - fi - else - func_cygpath_result= - func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'" - fi -} -#end: func_cygpath - - -# func_convert_core_msys_to_w32 ARG -# Convert file name or path ARG from MSYS format to w32 format. Return -# result in func_convert_core_msys_to_w32_result. -func_convert_core_msys_to_w32 () -{ - $opt_debug - # awkward: cmd appends spaces to result - func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null | - $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` -} -#end: func_convert_core_msys_to_w32 - - -# func_convert_file_check ARG1 ARG2 -# Verify that ARG1 (a file name in $build format) was converted to $host -# format in ARG2. Otherwise, emit an error message, but continue (resetting -# func_to_host_file_result to ARG1). -func_convert_file_check () -{ - $opt_debug - if test -z "$2" && test -n "$1" ; then - func_error "Could not determine host file name corresponding to" - func_error " \`$1'" - func_error "Continuing, but uninstalled executables may not work." - # Fallback: - func_to_host_file_result="$1" - fi -} -# end func_convert_file_check - - -# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH -# Verify that FROM_PATH (a path in $build format) was converted to $host -# format in TO_PATH. Otherwise, emit an error message, but continue, resetting -# func_to_host_file_result to a simplistic fallback value (see below). -func_convert_path_check () -{ - $opt_debug - if test -z "$4" && test -n "$3"; then - func_error "Could not determine the host path corresponding to" - func_error " \`$3'" - func_error "Continuing, but uninstalled executables may not work." - # Fallback. This is a deliberately simplistic "conversion" and - # should not be "improved". See libtool.info. - if test "x$1" != "x$2"; then - lt_replace_pathsep_chars="s|$1|$2|g" - func_to_host_path_result=`echo "$3" | - $SED -e "$lt_replace_pathsep_chars"` - else - func_to_host_path_result="$3" - fi - fi -} -# end func_convert_path_check - - -# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG -# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT -# and appending REPL if ORIG matches BACKPAT. -func_convert_path_front_back_pathsep () -{ - $opt_debug - case $4 in - $1 ) func_to_host_path_result="$3$func_to_host_path_result" - ;; - esac - case $4 in - $2 ) func_append func_to_host_path_result "$3" - ;; - esac -} -# end func_convert_path_front_back_pathsep - - -################################################## -# $build to $host FILE NAME CONVERSION FUNCTIONS # -################################################## -# invoked via `$to_host_file_cmd ARG' -# -# In each case, ARG is the path to be converted from $build to $host format. -# Result will be available in $func_to_host_file_result. - - -# func_to_host_file ARG -# Converts the file name ARG from $build format to $host format. Return result -# in func_to_host_file_result. -func_to_host_file () -{ - $opt_debug - $to_host_file_cmd "$1" -} -# end func_to_host_file - - -# func_to_tool_file ARG LAZY -# converts the file name ARG from $build format to toolchain format. Return -# result in func_to_tool_file_result. If the conversion in use is listed -# in (the comma separated) LAZY, no conversion takes place. -func_to_tool_file () -{ - $opt_debug - case ,$2, in - *,"$to_tool_file_cmd",*) - func_to_tool_file_result=$1 - ;; - *) - $to_tool_file_cmd "$1" - func_to_tool_file_result=$func_to_host_file_result - ;; - esac -} -# end func_to_tool_file - - -# func_convert_file_noop ARG -# Copy ARG to func_to_host_file_result. -func_convert_file_noop () -{ - func_to_host_file_result="$1" -} -# end func_convert_file_noop - - -# func_convert_file_msys_to_w32 ARG -# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic -# conversion to w32 is not available inside the cwrapper. Returns result in -# func_to_host_file_result. -func_convert_file_msys_to_w32 () -{ - $opt_debug - func_to_host_file_result="$1" - if test -n "$1"; then - func_convert_core_msys_to_w32 "$1" - func_to_host_file_result="$func_convert_core_msys_to_w32_result" - fi - func_convert_file_check "$1" "$func_to_host_file_result" -} -# end func_convert_file_msys_to_w32 - - -# func_convert_file_cygwin_to_w32 ARG -# Convert file name ARG from Cygwin to w32 format. Returns result in -# func_to_host_file_result. -func_convert_file_cygwin_to_w32 () -{ - $opt_debug - func_to_host_file_result="$1" - if test -n "$1"; then - # because $build is cygwin, we call "the" cygpath in $PATH; no need to use - # LT_CYGPATH in this case. - func_to_host_file_result=`cygpath -m "$1"` - fi - func_convert_file_check "$1" "$func_to_host_file_result" -} -# end func_convert_file_cygwin_to_w32 - - -# func_convert_file_nix_to_w32 ARG -# Convert file name ARG from *nix to w32 format. Requires a wine environment -# and a working winepath. Returns result in func_to_host_file_result. -func_convert_file_nix_to_w32 () -{ - $opt_debug - func_to_host_file_result="$1" - if test -n "$1"; then - func_convert_core_file_wine_to_w32 "$1" - func_to_host_file_result="$func_convert_core_file_wine_to_w32_result" - fi - func_convert_file_check "$1" "$func_to_host_file_result" -} -# end func_convert_file_nix_to_w32 - - -# func_convert_file_msys_to_cygwin ARG -# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. -# Returns result in func_to_host_file_result. -func_convert_file_msys_to_cygwin () -{ - $opt_debug - func_to_host_file_result="$1" - if test -n "$1"; then - func_convert_core_msys_to_w32 "$1" - func_cygpath -u "$func_convert_core_msys_to_w32_result" - func_to_host_file_result="$func_cygpath_result" - fi - func_convert_file_check "$1" "$func_to_host_file_result" -} -# end func_convert_file_msys_to_cygwin - - -# func_convert_file_nix_to_cygwin ARG -# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed -# in a wine environment, working winepath, and LT_CYGPATH set. Returns result -# in func_to_host_file_result. -func_convert_file_nix_to_cygwin () -{ - $opt_debug - func_to_host_file_result="$1" - if test -n "$1"; then - # convert from *nix to w32, then use cygpath to convert from w32 to cygwin. - func_convert_core_file_wine_to_w32 "$1" - func_cygpath -u "$func_convert_core_file_wine_to_w32_result" - func_to_host_file_result="$func_cygpath_result" - fi - func_convert_file_check "$1" "$func_to_host_file_result" -} -# end func_convert_file_nix_to_cygwin - - -############################################# -# $build to $host PATH CONVERSION FUNCTIONS # -############################################# -# invoked via `$to_host_path_cmd ARG' -# -# In each case, ARG is the path to be converted from $build to $host format. -# The result will be available in $func_to_host_path_result. -# -# Path separators are also converted from $build format to $host format. If -# ARG begins or ends with a path separator character, it is preserved (but -# converted to $host format) on output. -# -# All path conversion functions are named using the following convention: -# file name conversion function : func_convert_file_X_to_Y () -# path conversion function : func_convert_path_X_to_Y () -# where, for any given $build/$host combination the 'X_to_Y' value is the -# same. If conversion functions are added for new $build/$host combinations, -# the two new functions must follow this pattern, or func_init_to_host_path_cmd -# will break. - - -# func_init_to_host_path_cmd -# Ensures that function "pointer" variable $to_host_path_cmd is set to the -# appropriate value, based on the value of $to_host_file_cmd. -to_host_path_cmd= -func_init_to_host_path_cmd () -{ - $opt_debug - if test -z "$to_host_path_cmd"; then - func_stripname 'func_convert_file_' '' "$to_host_file_cmd" - to_host_path_cmd="func_convert_path_${func_stripname_result}" - fi -} - - -# func_to_host_path ARG -# Converts the path ARG from $build format to $host format. Return result -# in func_to_host_path_result. -func_to_host_path () -{ - $opt_debug - func_init_to_host_path_cmd - $to_host_path_cmd "$1" -} -# end func_to_host_path - - -# func_convert_path_noop ARG -# Copy ARG to func_to_host_path_result. -func_convert_path_noop () -{ - func_to_host_path_result="$1" -} -# end func_convert_path_noop - - -# func_convert_path_msys_to_w32 ARG -# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic -# conversion to w32 is not available inside the cwrapper. Returns result in -# func_to_host_path_result. -func_convert_path_msys_to_w32 () -{ - $opt_debug - func_to_host_path_result="$1" - if test -n "$1"; then - # Remove leading and trailing path separator characters from ARG. MSYS - # behavior is inconsistent here; cygpath turns them into '.;' and ';.'; - # and winepath ignores them completely. - func_stripname : : "$1" - func_to_host_path_tmp1=$func_stripname_result - func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" - func_to_host_path_result="$func_convert_core_msys_to_w32_result" - func_convert_path_check : ";" \ - "$func_to_host_path_tmp1" "$func_to_host_path_result" - func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" - fi -} -# end func_convert_path_msys_to_w32 - - -# func_convert_path_cygwin_to_w32 ARG -# Convert path ARG from Cygwin to w32 format. Returns result in -# func_to_host_file_result. -func_convert_path_cygwin_to_w32 () -{ - $opt_debug - func_to_host_path_result="$1" - if test -n "$1"; then - # See func_convert_path_msys_to_w32: - func_stripname : : "$1" - func_to_host_path_tmp1=$func_stripname_result - func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"` - func_convert_path_check : ";" \ - "$func_to_host_path_tmp1" "$func_to_host_path_result" - func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" - fi -} -# end func_convert_path_cygwin_to_w32 - - -# func_convert_path_nix_to_w32 ARG -# Convert path ARG from *nix to w32 format. Requires a wine environment and -# a working winepath. Returns result in func_to_host_file_result. -func_convert_path_nix_to_w32 () -{ - $opt_debug - func_to_host_path_result="$1" - if test -n "$1"; then - # See func_convert_path_msys_to_w32: - func_stripname : : "$1" - func_to_host_path_tmp1=$func_stripname_result - func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" - func_to_host_path_result="$func_convert_core_path_wine_to_w32_result" - func_convert_path_check : ";" \ - "$func_to_host_path_tmp1" "$func_to_host_path_result" - func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" - fi -} -# end func_convert_path_nix_to_w32 - - -# func_convert_path_msys_to_cygwin ARG -# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. -# Returns result in func_to_host_file_result. -func_convert_path_msys_to_cygwin () -{ - $opt_debug - func_to_host_path_result="$1" - if test -n "$1"; then - # See func_convert_path_msys_to_w32: - func_stripname : : "$1" - func_to_host_path_tmp1=$func_stripname_result - func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" - func_cygpath -u -p "$func_convert_core_msys_to_w32_result" - func_to_host_path_result="$func_cygpath_result" - func_convert_path_check : : \ - "$func_to_host_path_tmp1" "$func_to_host_path_result" - func_convert_path_front_back_pathsep ":*" "*:" : "$1" - fi -} -# end func_convert_path_msys_to_cygwin - - -# func_convert_path_nix_to_cygwin ARG -# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a -# a wine environment, working winepath, and LT_CYGPATH set. Returns result in -# func_to_host_file_result. -func_convert_path_nix_to_cygwin () -{ - $opt_debug - func_to_host_path_result="$1" - if test -n "$1"; then - # Remove leading and trailing path separator characters from - # ARG. msys behavior is inconsistent here, cygpath turns them - # into '.;' and ';.', and winepath ignores them completely. - func_stripname : : "$1" - func_to_host_path_tmp1=$func_stripname_result - func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" - func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result" - func_to_host_path_result="$func_cygpath_result" - func_convert_path_check : : \ - "$func_to_host_path_tmp1" "$func_to_host_path_result" - func_convert_path_front_back_pathsep ":*" "*:" : "$1" - fi -} -# end func_convert_path_nix_to_cygwin - - # func_mode_compile arg... func_mode_compile () { @@ -1986,12 +1137,12 @@ func_mode_compile () ;; -pie | -fpie | -fPIE) - func_append pie_flag " $arg" + pie_flag="$pie_flag $arg" continue ;; -shared | -static | -prefer-pic | -prefer-non-pic) - func_append later " $arg" + later="$later $arg" continue ;; @@ -2012,14 +1163,15 @@ func_mode_compile () save_ifs="$IFS"; IFS=',' for arg in $args; do IFS="$save_ifs" - func_append_quoted lastarg "$arg" + func_quote_for_eval "$arg" + lastarg="$lastarg $func_quote_for_eval_result" done IFS="$save_ifs" func_stripname ' ' '' "$lastarg" lastarg=$func_stripname_result # Add the arguments to base_compile. - func_append base_compile " $lastarg" + base_compile="$base_compile $lastarg" continue ;; @@ -2035,7 +1187,8 @@ func_mode_compile () esac # case $arg_mode # Aesthetically quote the previous argument. - func_append_quoted base_compile "$lastarg" + func_quote_for_eval "$lastarg" + base_compile="$base_compile $func_quote_for_eval_result" done # for arg case $arg_mode in @@ -2060,7 +1213,7 @@ func_mode_compile () *.[cCFSifmso] | \ *.ada | *.adb | *.ads | *.asm | \ *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ - *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup) + *.[fF][09]? | *.for | *.java | *.obj | *.sx) func_xform "$libobj" libobj=$func_xform_result ;; @@ -2135,7 +1288,7 @@ func_mode_compile () # Calculate the filename of the output object if compiler does # not support -o with -c if test "$compiler_c_o" = no; then - output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext} + output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext} lockfile="$output_obj.lock" else output_obj= @@ -2166,16 +1319,17 @@ compiler." $opt_dry_run || $RM $removelist exit $EXIT_FAILURE fi - func_append removelist " $output_obj" + removelist="$removelist $output_obj" $ECHO "$srcfile" > "$lockfile" fi $opt_dry_run || $RM $removelist - func_append removelist " $lockfile" + removelist="$removelist $lockfile" trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15 - func_to_tool_file "$srcfile" func_convert_file_msys_to_w32 - srcfile=$func_to_tool_file_result + if test -n "$fix_srcfile_path"; then + eval srcfile=\"$fix_srcfile_path\" + fi func_quote_for_eval "$srcfile" qsrcfile=$func_quote_for_eval_result @@ -2195,7 +1349,7 @@ compiler." if test -z "$output_obj"; then # Place PIC objects in $objdir - func_append command " -o $lobj" + command="$command -o $lobj" fi func_show_eval_locale "$command" \ @@ -2242,11 +1396,11 @@ compiler." command="$base_compile $qsrcfile $pic_flag" fi if test "$compiler_c_o" = yes; then - func_append command " -o $obj" + command="$command -o $obj" fi # Suppress compiler output if we already did a PIC compilation. - func_append command "$suppress_output" + command="$command$suppress_output" func_show_eval_locale "$command" \ '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' @@ -2291,13 +1445,13 @@ compiler." } $opt_help || { - test "$opt_mode" = compile && func_mode_compile ${1+"$@"} +test "$mode" = compile && func_mode_compile ${1+"$@"} } func_mode_help () { # We need to display help for each of the modes. - case $opt_mode in + case $mode in "") # Generic help is extracted from the usage comments # at the start of this file. @@ -2328,11 +1482,10 @@ This mode accepts the following additional options: -o OUTPUT-FILE set the output file name to OUTPUT-FILE -no-suppress do not suppress compiler output for multiple passes - -prefer-pic try to build PIC objects only - -prefer-non-pic try to build non-PIC objects only + -prefer-pic try to building PIC objects only + -prefer-non-pic try to building non-PIC objects only -shared do not build a \`.o' file suitable for static linking -static only build a \`.o' file suitable for static linking - -Wc,FLAG pass FLAG directly to the compiler COMPILE-COMMAND is a command to be used in creating a \`standard' object file from the given SOURCEFILE. @@ -2385,7 +1538,7 @@ either the \`install' or \`cp' program. The following components of INSTALL-COMMAND are treated specially: - -inst-prefix-dir PREFIX-DIR Use PREFIX-DIR as a staging area for installation + -inst-prefix PREFIX-DIR Use PREFIX-DIR as a staging area for installation The rest of the components are interpreted as arguments to that command (only BSD-compatible install options are recognized)." @@ -2405,8 +1558,6 @@ The following components of LINK-COMMAND are treated specially: -all-static do not do any dynamic linking at all -avoid-version do not add a version suffix if possible - -bindir BINDIR specify path to binaries directory (for systems where - libraries must be found in the PATH setting at runtime) -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) @@ -2435,11 +1586,6 @@ The following components of LINK-COMMAND are treated specially: -version-info CURRENT[:REVISION[:AGE]] specify library version info [each variable defaults to 0] -weak LIBNAME declare that the target provides the LIBNAME interface - -Wc,FLAG - -Xcompiler FLAG pass linker-specific FLAG directly to the compiler - -Wl,FLAG - -Xlinker FLAG pass linker-specific FLAG directly to the linker - -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC) All other options (arguments beginning with \`-') are ignored. @@ -2473,44 +1619,18 @@ Otherwise, only FILE itself is deleted using RM." ;; *) - func_fatal_help "invalid operation mode \`$opt_mode'" + func_fatal_help "invalid operation mode \`$mode'" ;; esac - echo + $ECHO $ECHO "Try \`$progname --help' for more information about other modes." + + exit $? } -# Now that we've collected a possible --mode arg, show help if necessary -if $opt_help; then - if test "$opt_help" = :; then - func_mode_help - else - { - func_help noexit - for opt_mode in compile link execute install finish uninstall clean; do - func_mode_help - done - } | sed -n '1p; 2,$s/^Usage:/ or: /p' - { - func_help noexit - for opt_mode in compile link execute install finish uninstall clean; do - echo - func_mode_help - done - } | - sed '1d - /^When reporting/,/^Report/{ - H - d - } - $x - /information about other modes/d - /more detailed .*MODE/d - s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/' - fi - exit $? -fi + # Now that we've collected a possible --mode arg, show help if necessary + $opt_help && func_mode_help # func_mode_execute arg... @@ -2523,16 +1643,13 @@ func_mode_execute () func_fatal_help "you must specify a COMMAND" # Handle -dlopen flags immediately. - for file in $opt_dlopen; do + for file in $execute_dlfiles; do test -f "$file" \ || func_fatal_help "\`$file' is not a file" dir= case $file in *.la) - func_resolve_sysroot "$file" - file=$func_resolve_sysroot_result - # Check to see that this really is a libtool archive. func_lalib_unsafe_p "$file" \ || func_fatal_help "\`$lib' is not a valid libtool archive" @@ -2554,7 +1671,7 @@ func_mode_execute () dir="$func_dirname_result" if test -f "$dir/$objdir/$dlname"; then - func_append dir "/$objdir" + dir="$dir/$objdir" else if test ! -f "$dir/$dlname"; then func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" @@ -2595,7 +1712,7 @@ func_mode_execute () for file do case $file in - -* | *.la | *.lo ) ;; + -*) ;; *) # Do a test to see if this is really a libtool program. if func_ltwrapper_script_p "$file"; then @@ -2611,7 +1728,8 @@ func_mode_execute () ;; esac # Quote arguments (to preserve shell metacharacters). - func_append_quoted args "$file" + func_quote_for_eval "$file" + args="$args $func_quote_for_eval_result" done if test "X$opt_dry_run" = Xfalse; then @@ -2636,66 +1754,29 @@ func_mode_execute () # Display what would be done. if test -n "$shlibpath_var"; then eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" - echo "export $shlibpath_var" + $ECHO "export $shlibpath_var" fi $ECHO "$cmd$args" exit $EXIT_SUCCESS fi } -test "$opt_mode" = execute && func_mode_execute ${1+"$@"} +test "$mode" = execute && func_mode_execute ${1+"$@"} # func_mode_finish arg... func_mode_finish () { $opt_debug - libs= - libdirs= + libdirs="$nonopt" admincmds= - for opt in "$nonopt" ${1+"$@"} - do - if test -d "$opt"; then - func_append libdirs " $opt" - - elif test -f "$opt"; then - if func_lalib_unsafe_p "$opt"; then - func_append libs " $opt" - else - func_warning "\`$opt' is not a valid libtool archive" - fi - - else - func_fatal_error "invalid argument \`$opt'" - fi - done - - if test -n "$libs"; then - if test -n "$lt_sysroot"; then - sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"` - sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;" - else - sysroot_cmd= - fi - - # Remove sysroot references - if $opt_dry_run; then - for lib in $libs; do - echo "removing references to $lt_sysroot and \`=' prefixes from $lib" - done - else - tmpdir=`func_mktempdir` - for lib in $libs; do - sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ - > $tmpdir/tmp-la - mv -f $tmpdir/tmp-la $lib - done - ${RM}r "$tmpdir" - fi - fi - if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then + for dir + do + libdirs="$libdirs $dir" + done + for libdir in $libdirs; do if test -n "$finish_cmds"; then # Do each command in the finish commands. @@ -2705,7 +1786,7 @@ func_mode_finish () if test -n "$finish_eval"; then # Do the single finish_eval. eval cmds=\"$finish_eval\" - $opt_dry_run || eval "$cmds" || func_append admincmds " + $opt_dry_run || eval "$cmds" || admincmds="$admincmds $cmds" fi done @@ -2714,55 +1795,53 @@ func_mode_finish () # Exit here if they wanted silent mode. $opt_silent && exit $EXIT_SUCCESS - if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then - echo "----------------------------------------------------------------------" - echo "Libraries have been installed in:" - for libdir in $libdirs; do - $ECHO " $libdir" - done - echo - echo "If you ever happen to want to link against installed libraries" - echo "in a given directory, LIBDIR, you must either use libtool, and" - echo "specify the full pathname of the library, or use the \`-LLIBDIR'" - echo "flag during linking and do at least one of the following:" - if test -n "$shlibpath_var"; then - echo " - add LIBDIR to the \`$shlibpath_var' environment variable" - echo " during execution" - fi - if test -n "$runpath_var"; then - echo " - add LIBDIR to the \`$runpath_var' environment variable" - echo " during linking" - fi - if test -n "$hardcode_libdir_flag_spec"; then - libdir=LIBDIR - eval flag=\"$hardcode_libdir_flag_spec\" - - $ECHO " - use the \`$flag' linker flag" - fi - if test -n "$admincmds"; then - $ECHO " - have your system administrator run these commands:$admincmds" - fi - if test -f /etc/ld.so.conf; then - echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" - fi - echo - - echo "See any operating system documentation about shared libraries for" - case $host in - solaris2.[6789]|solaris2.1[0-9]) - echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" - echo "pages." - ;; - *) - echo "more information, such as the ld(1) and ld.so(8) manual pages." - ;; - esac - echo "----------------------------------------------------------------------" + $ECHO "X----------------------------------------------------------------------" | $Xsed + $ECHO "Libraries have been installed in:" + for libdir in $libdirs; do + $ECHO " $libdir" + done + $ECHO + $ECHO "If you ever happen to want to link against installed libraries" + $ECHO "in a given directory, LIBDIR, you must either use libtool, and" + $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'" + $ECHO "flag during linking and do at least one of the following:" + if test -n "$shlibpath_var"; then + $ECHO " - add LIBDIR to the \`$shlibpath_var' environment variable" + $ECHO " during execution" fi + if test -n "$runpath_var"; then + $ECHO " - add LIBDIR to the \`$runpath_var' environment variable" + $ECHO " during linking" + fi + if test -n "$hardcode_libdir_flag_spec"; then + libdir=LIBDIR + eval flag=\"$hardcode_libdir_flag_spec\" + + $ECHO " - use the \`$flag' linker flag" + fi + if test -n "$admincmds"; then + $ECHO " - have your system administrator run these commands:$admincmds" + fi + if test -f /etc/ld.so.conf; then + $ECHO " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" + fi + $ECHO + + $ECHO "See any operating system documentation about shared libraries for" + case $host in + solaris2.[6789]|solaris2.1[0-9]) + $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual" + $ECHO "pages." + ;; + *) + $ECHO "more information, such as the ld(1) and ld.so(8) manual pages." + ;; + esac + $ECHO "X----------------------------------------------------------------------" | $Xsed exit $EXIT_SUCCESS } -test "$opt_mode" = finish && func_mode_finish ${1+"$@"} +test "$mode" = finish && func_mode_finish ${1+"$@"} # func_mode_install arg... @@ -2773,7 +1852,7 @@ func_mode_install () # install_prog (especially on Windows NT). if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || # Allow the use of GNU shtool's install command. - case $nonopt in *shtool*) :;; *) false;; esac; then + $ECHO "X$nonopt" | $GREP shtool >/dev/null; then # Aesthetically quote it. func_quote_for_eval "$nonopt" install_prog="$func_quote_for_eval_result " @@ -2787,12 +1866,7 @@ func_mode_install () # The real first argument should be the name of the installation program. # Aesthetically quote it. func_quote_for_eval "$arg" - func_append install_prog "$func_quote_for_eval_result" - install_shared_prog=$install_prog - case " $install_prog " in - *[\\\ /]cp\ *) install_cp=: ;; - *) install_cp=false ;; - esac + install_prog="$install_prog$func_quote_for_eval_result" # We need to accept at least all the BSD install flags. dest= @@ -2802,12 +1876,10 @@ func_mode_install () install_type= isdir=no stripme= - no_mode=: for arg do - arg2= if test -n "$dest"; then - func_append files " $dest" + files="$files $dest" dest=$arg continue fi @@ -2815,9 +1887,10 @@ func_mode_install () case $arg in -d) isdir=yes ;; -f) - if $install_cp; then :; else - prev=$arg - fi + case " $install_prog " in + *[\\\ /]cp\ *) ;; + *) prev=$arg ;; + esac ;; -g | -m | -o) prev=$arg @@ -2831,10 +1904,6 @@ func_mode_install () *) # If the previous option needed an argument, then skip it. if test -n "$prev"; then - if test "x$prev" = x-m && test -n "$install_override_mode"; then - arg2=$install_override_mode - no_mode=false - fi prev= else dest=$arg @@ -2845,11 +1914,7 @@ func_mode_install () # Aesthetically quote the argument. func_quote_for_eval "$arg" - func_append install_prog " $func_quote_for_eval_result" - if test -n "$arg2"; then - func_quote_for_eval "$arg2" - fi - func_append install_shared_prog " $func_quote_for_eval_result" + install_prog="$install_prog $func_quote_for_eval_result" done test -z "$install_prog" && \ @@ -2858,13 +1923,6 @@ func_mode_install () test -n "$prev" && \ func_fatal_help "the \`$prev' option requires an argument" - if test -n "$install_override_mode" && $no_mode; then - if $install_cp; then :; else - func_quote_for_eval "$install_override_mode" - func_append install_shared_prog " -m $func_quote_for_eval_result" - fi - fi - if test -z "$files"; then if test -z "$dest"; then func_fatal_help "no file or destination specified" @@ -2919,13 +1977,10 @@ func_mode_install () case $file in *.$libext) # Do the static libraries later. - func_append staticlibs " $file" + staticlibs="$staticlibs $file" ;; *.la) - func_resolve_sysroot "$file" - file=$func_resolve_sysroot_result - # Check to see that this really is a libtool archive. func_lalib_unsafe_p "$file" \ || func_fatal_help "\`$file' is not a valid libtool archive" @@ -2939,23 +1994,23 @@ func_mode_install () if test "X$destdir" = "X$libdir"; then case "$current_libdirs " in *" $libdir "*) ;; - *) func_append current_libdirs " $libdir" ;; + *) current_libdirs="$current_libdirs $libdir" ;; esac else # Note the libdir as a future libdir. case "$future_libdirs " in *" $libdir "*) ;; - *) func_append future_libdirs " $libdir" ;; + *) future_libdirs="$future_libdirs $libdir" ;; esac fi func_dirname "$file" "/" "" dir="$func_dirname_result" - func_append dir "$objdir" + dir="$dir$objdir" if test -n "$relink_command"; then # Determine the prefix the user has applied to our future dir. - inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"` + inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"` # Don't allow the user to place us outside of our expected # location b/c this prevents finding dependent libraries that @@ -2968,9 +2023,9 @@ func_mode_install () if test -n "$inst_prefix_dir"; then # Stick the inst_prefix_dir data into the link command. - relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` + relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` else - relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"` + relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"` fi func_warning "relinking \`$file'" @@ -2988,7 +2043,7 @@ func_mode_install () test -n "$relink_command" && srcname="$realname"T # Install the shared library and build the symlinks. - func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \ + func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \ 'exit $?' tstripme="$stripme" case $host_os in @@ -3028,7 +2083,7 @@ func_mode_install () func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' # Maybe install the static library, too. - test -n "$old_library" && func_append staticlibs " $dir/$old_library" + test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" ;; *.lo) @@ -3128,7 +2183,7 @@ func_mode_install () if test -f "$lib"; then func_source "$lib" fi - libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test + libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test if test -n "$libdir" && test ! -f "$libfile"; then func_warning "\`$lib' has not been installed in \`$libdir'" finalize=no @@ -3147,7 +2202,7 @@ func_mode_install () file="$func_basename_result" outputname="$tmpdir/$file" # Replace the output file specification. - relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'` + relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'` $opt_silent || { func_quote_for_expand "$relink_command" @@ -3166,7 +2221,7 @@ func_mode_install () } else # Install the binary that we compiled earlier. - file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"` + file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"` fi fi @@ -3202,13 +2257,11 @@ func_mode_install () # Set up the ranlib parameters. oldlib="$destdir/$name" - func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 - tool_oldlib=$func_to_tool_file_result func_show_eval "$install_prog \$file \$oldlib" 'exit $?' if test -n "$stripme" && test -n "$old_striplib"; then - func_show_eval "$old_striplib $tool_oldlib" 'exit $?' + func_show_eval "$old_striplib $oldlib" 'exit $?' fi # Do each command in the postinstall commands. @@ -3227,7 +2280,7 @@ func_mode_install () fi } -test "$opt_mode" = install && func_mode_install ${1+"$@"} +test "$mode" = install && func_mode_install ${1+"$@"} # func_generate_dlsyms outputname originator pic_p @@ -3270,22 +2323,6 @@ func_generate_dlsyms () extern \"C\" { #endif -#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4)) -#pragma GCC diagnostic ignored \"-Wstrict-prototypes\" -#endif - -/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -/* DATA imports from DLLs on WIN32 con't be const, because runtime - relocations are performed -- see ld's documentation on pseudo-relocs. */ -# define LT_DLSYM_CONST -#elif defined(__osf__) -/* This system does not cope well with relocations in const data. */ -# define LT_DLSYM_CONST -#else -# define LT_DLSYM_CONST const -#endif - /* External symbol declarations for the compiler. */\ " @@ -3295,11 +2332,10 @@ extern \"C\" { $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist" # Add our own program objects to the symbol list. - progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP` + progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` for progfile in $progfiles; do - func_to_tool_file "$progfile" func_convert_file_msys_to_w32 - func_verbose "extracting global C symbols from \`$func_to_tool_file_result'" - $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'" + func_verbose "extracting global C symbols from \`$progfile'" + $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'" done if test -n "$exclude_expsyms"; then @@ -3335,7 +2371,7 @@ extern \"C\" { eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' eval '$MV "$nlist"T "$nlist"' case $host in - *cygwin* | *mingw* | *cegcc* ) + *cygwin | *mingw* | *cegcc* ) eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' ;; @@ -3348,52 +2384,10 @@ extern \"C\" { func_verbose "extracting global C symbols from \`$dlprefile'" func_basename "$dlprefile" name="$func_basename_result" - case $host in - *cygwin* | *mingw* | *cegcc* ) - # if an import library, we need to obtain dlname - if func_win32_import_lib_p "$dlprefile"; then - func_tr_sh "$dlprefile" - eval "curr_lafile=\$libfile_$func_tr_sh_result" - dlprefile_dlbasename="" - if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then - # Use subshell, to avoid clobbering current variable values - dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"` - if test -n "$dlprefile_dlname" ; then - func_basename "$dlprefile_dlname" - dlprefile_dlbasename="$func_basename_result" - else - # no lafile. user explicitly requested -dlpreopen . - $sharedlib_from_linklib_cmd "$dlprefile" - dlprefile_dlbasename=$sharedlib_from_linklib_result - fi - fi - $opt_dry_run || { - if test -n "$dlprefile_dlbasename" ; then - eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"' - else - func_warning "Could not compute DLL name from $name" - eval '$ECHO ": $name " >> "$nlist"' - fi - func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 - eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe | - $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'" - } - else # not an import lib - $opt_dry_run || { - eval '$ECHO ": $name " >> "$nlist"' - func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 - eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" - } - fi - ;; - *) - $opt_dry_run || { - eval '$ECHO ": $name " >> "$nlist"' - func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 - eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" - } - ;; - esac + $opt_dry_run || { + eval '$ECHO ": $name " >> "$nlist"' + eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'" + } done $opt_dry_run || { @@ -3421,19 +2415,36 @@ extern \"C\" { if test -f "$nlist"S; then eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"' else - echo '/* NONE */' >> "$output_objdir/$my_dlsyms" + $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms" fi - echo >> "$output_objdir/$my_dlsyms" "\ + $ECHO >> "$output_objdir/$my_dlsyms" "\ /* The mapping between symbol names and symbols. */ typedef struct { const char *name; void *address; } lt_dlsymlist; -extern LT_DLSYM_CONST lt_dlsymlist +" + case $host in + *cygwin* | *mingw* | *cegcc* ) + $ECHO >> "$output_objdir/$my_dlsyms" "\ +/* DATA imports from DLLs on WIN32 con't be const, because + runtime relocations are performed -- see ld's documentation + on pseudo-relocs. */" + lt_dlsym_const= ;; + *osf5*) + echo >> "$output_objdir/$my_dlsyms" "\ +/* This system does not cope well with relocations in const data */" + lt_dlsym_const= ;; + *) + lt_dlsym_const=const ;; + esac + + $ECHO >> "$output_objdir/$my_dlsyms" "\ +extern $lt_dlsym_const lt_dlsymlist lt_${my_prefix}_LTX_preloaded_symbols[]; -LT_DLSYM_CONST lt_dlsymlist +$lt_dlsym_const lt_dlsymlist lt_${my_prefix}_LTX_preloaded_symbols[] = {\ { \"$my_originator\", (void *) 0 }," @@ -3446,7 +2457,7 @@ lt_${my_prefix}_LTX_preloaded_symbols[] = eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms" ;; esac - echo >> "$output_objdir/$my_dlsyms" "\ + $ECHO >> "$output_objdir/$my_dlsyms" "\ {0, (void *) 0} }; @@ -3473,7 +2484,7 @@ static const void *lt_preloaded_setup() { # linked before any other PIC object. But we must not use # pic_flag when linking with -static. The problem exists in # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. - *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) + *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;; *-*-hpux*) pic_flag_for_symtable=" $pic_flag" ;; @@ -3489,7 +2500,7 @@ static const void *lt_preloaded_setup() { for arg in $LTCFLAGS; do case $arg in -pie | -fpie | -fPIE) ;; - *) func_append symtab_cflags " $arg" ;; + *) symtab_cflags="$symtab_cflags $arg" ;; esac done @@ -3504,16 +2515,16 @@ static const void *lt_preloaded_setup() { case $host in *cygwin* | *mingw* | *cegcc* ) if test -f "$output_objdir/$my_outputname.def"; then - compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` - finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` + compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` + finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` else - compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"` - finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"` + compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` + finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` fi ;; *) - compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"` - finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"` + compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` + finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` ;; esac ;; @@ -3527,8 +2538,8 @@ static const void *lt_preloaded_setup() { # really was required. # Nullify the symbol file. - compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"` - finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"` + compile_command=`$ECHO "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"` + finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"` fi } @@ -3538,7 +2549,6 @@ static const void *lt_preloaded_setup() { # Need a lot of goo to handle *both* DLLs and import libs # Has to be a shell function in order to 'eat' the argument # that is supplied when $file_magic_command is called. -# Despite the name, also deal with 64 bit binaries. func_win32_libid () { $opt_debug @@ -3549,11 +2559,9 @@ func_win32_libid () win32_libid_type="x86 archive import" ;; *ar\ archive*) # could be an import, or static - # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD. if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | - $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then - func_to_tool_file "$1" func_convert_file_msys_to_w32 - win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | + $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then + win32_nmres=`eval $NM -f posix -A $1 | $SED -n -e ' 1,100{ / I /{ @@ -3582,131 +2590,6 @@ func_win32_libid () $ECHO "$win32_libid_type" } -# func_cygming_dll_for_implib ARG -# -# Platform-specific function to extract the -# name of the DLL associated with the specified -# import library ARG. -# Invoked by eval'ing the libtool variable -# $sharedlib_from_linklib_cmd -# Result is available in the variable -# $sharedlib_from_linklib_result -func_cygming_dll_for_implib () -{ - $opt_debug - sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"` -} - -# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs -# -# The is the core of a fallback implementation of a -# platform-specific function to extract the name of the -# DLL associated with the specified import library LIBNAME. -# -# SECTION_NAME is either .idata$6 or .idata$7, depending -# on the platform and compiler that created the implib. -# -# Echos the name of the DLL associated with the -# specified import library. -func_cygming_dll_for_implib_fallback_core () -{ - $opt_debug - match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"` - $OBJDUMP -s --section "$1" "$2" 2>/dev/null | - $SED '/^Contents of section '"$match_literal"':/{ - # Place marker at beginning of archive member dllname section - s/.*/====MARK====/ - p - d - } - # These lines can sometimes be longer than 43 characters, but - # are always uninteresting - /:[ ]*file format pe[i]\{,1\}-/d - /^In archive [^:]*:/d - # Ensure marker is printed - /^====MARK====/p - # Remove all lines with less than 43 characters - /^.\{43\}/!d - # From remaining lines, remove first 43 characters - s/^.\{43\}//' | - $SED -n ' - # Join marker and all lines until next marker into a single line - /^====MARK====/ b para - H - $ b para - b - :para - x - s/\n//g - # Remove the marker - s/^====MARK====// - # Remove trailing dots and whitespace - s/[\. \t]*$// - # Print - /./p' | - # we now have a list, one entry per line, of the stringified - # contents of the appropriate section of all members of the - # archive which possess that section. Heuristic: eliminate - # all those which have a first or second character that is - # a '.' (that is, objdump's representation of an unprintable - # character.) This should work for all archives with less than - # 0x302f exports -- but will fail for DLLs whose name actually - # begins with a literal '.' or a single character followed by - # a '.'. - # - # Of those that remain, print the first one. - $SED -e '/^\./d;/^.\./d;q' -} - -# func_cygming_gnu_implib_p ARG -# This predicate returns with zero status (TRUE) if -# ARG is a GNU/binutils-style import library. Returns -# with nonzero status (FALSE) otherwise. -func_cygming_gnu_implib_p () -{ - $opt_debug - func_to_tool_file "$1" func_convert_file_msys_to_w32 - func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` - test -n "$func_cygming_gnu_implib_tmp" -} - -# func_cygming_ms_implib_p ARG -# This predicate returns with zero status (TRUE) if -# ARG is an MS-style import library. Returns -# with nonzero status (FALSE) otherwise. -func_cygming_ms_implib_p () -{ - $opt_debug - func_to_tool_file "$1" func_convert_file_msys_to_w32 - func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` - test -n "$func_cygming_ms_implib_tmp" -} - -# func_cygming_dll_for_implib_fallback ARG -# Platform-specific function to extract the -# name of the DLL associated with the specified -# import library ARG. -# -# This fallback implementation is for use when $DLLTOOL -# does not support the --identify-strict option. -# Invoked by eval'ing the libtool variable -# $sharedlib_from_linklib_cmd -# Result is available in the variable -# $sharedlib_from_linklib_result -func_cygming_dll_for_implib_fallback () -{ - $opt_debug - if func_cygming_gnu_implib_p "$1" ; then - # binutils import library - sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"` - elif func_cygming_ms_implib_p "$1" ; then - # ms-generated import library - sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"` - else - # unknown - sharedlib_from_linklib_result="" - fi -} # func_extract_an_archive dir oldlib @@ -3715,18 +2598,7 @@ func_extract_an_archive () $opt_debug f_ex_an_ar_dir="$1"; shift f_ex_an_ar_oldlib="$1" - if test "$lock_old_archive_extraction" = yes; then - lockfile=$f_ex_an_ar_oldlib.lock - until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do - func_echo "Waiting for $lockfile to be removed" - sleep 2 - done - fi - func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \ - 'stat=$?; rm -f "$lockfile"; exit $stat' - if test "$lock_old_archive_extraction" = yes; then - $opt_dry_run || rm -f "$lockfile" - fi + func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?' if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then : else @@ -3797,7 +2669,7 @@ func_extract_archives () darwin_file= darwin_files= for darwin_file in $darwin_filelist; do - darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP` + darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` $LIPO -create -output "$darwin_file" $darwin_files done # $darwin_filelist $RM -rf unfat-$$ @@ -3812,30 +2684,25 @@ func_extract_archives () func_extract_an_archive "$my_xdir" "$my_xabs" ;; esac - my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP` + my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` done func_extract_archives_result="$my_oldobjs" } -# func_emit_wrapper [arg=no] -# -# Emit a libtool wrapper script on stdout. -# Don't directly open a file because we may want to -# incorporate the script contents within a cygwin/mingw -# wrapper executable. Must ONLY be called from within -# func_mode_link because it depends on a number of variables -# set therein. + +# func_emit_wrapper_part1 [arg=no] # -# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR -# variable will take. If 'yes', then the emitted script -# will assume that the directory in which it is stored is -# the $objdir directory. This is a cygwin/mingw-specific -# behavior. -func_emit_wrapper () +# Emit the first part of a libtool wrapper script on stdout. +# For more information, see the description associated with +# func_emit_wrapper(), below. +func_emit_wrapper_part1 () { - func_emit_wrapper_arg1=${1-no} + func_emit_wrapper_part1_arg1=no + if test -n "$1" ; then + func_emit_wrapper_part1_arg1=$1 + fi $ECHO "\ #! $SHELL @@ -3851,6 +2718,7 @@ func_emit_wrapper () # Sed substitution that helps us do robust quoting. It backslashifies # metacharacters that are still active within double-quoted strings. +Xsed='${SED} -e 1s/^X//' sed_quote_subst='$sed_quote_subst' # Be Bourne compatible @@ -3881,135 +2749,31 @@ if test \"\$libtool_install_magic\" = \"$magic\"; then else # When we are sourced in execute mode, \$file and \$ECHO are already set. if test \"\$libtool_execute_magic\" != \"$magic\"; then - file=\"\$0\"" - - qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"` - $ECHO "\ - -# A function that is used when there is no print builtin or printf. -func_fallback_echo () -{ - eval 'cat <<_LTECHO_EOF -\$1 -_LTECHO_EOF' -} - ECHO=\"$qECHO\" - fi - -# Very basic option parsing. These options are (a) specific to -# the libtool wrapper, (b) are identical between the wrapper -# /script/ and the wrapper /executable/ which is used only on -# windows platforms, and (c) all begin with the string "--lt-" -# (application programs are unlikely to have options which match -# this pattern). -# -# There are only two supported options: --lt-debug and -# --lt-dump-script. There is, deliberately, no --lt-help. -# -# The first argument to this parsing function should be the -# script's $0 value, followed by "$@". -lt_option_debug= -func_parse_lt_options () -{ - lt_script_arg0=\$0 - shift - for lt_opt - do - case \"\$lt_opt\" in - --lt-debug) lt_option_debug=1 ;; - --lt-dump-script) - lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\` - test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=. - lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\` - cat \"\$lt_dump_D/\$lt_dump_F\" - exit 0 - ;; - --lt-*) - \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2 - exit 1 - ;; - esac - done - - # Print the debug banner immediately: - if test -n \"\$lt_option_debug\"; then - echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2 - fi -} - -# Used when --lt-debug. Prints its arguments to stdout -# (redirection is the responsibility of the caller) -func_lt_dump_args () -{ - lt_dump_args_N=1; - for lt_arg - do - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\" - lt_dump_args_N=\`expr \$lt_dump_args_N + 1\` - done -} - -# Core function for launching the target application -func_exec_program_core () -{ -" - case $host in - # Backslashes separate directories on plain windows - *-*-mingw | *-*-os2* | *-cegcc*) - $ECHO "\ - if test -n \"\$lt_option_debug\"; then - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2 - func_lt_dump_args \${1+\"\$@\"} 1>&2 - fi - exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} -" - ;; - - *) - $ECHO "\ - if test -n \"\$lt_option_debug\"; then - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2 - func_lt_dump_args \${1+\"\$@\"} 1>&2 - fi - exec \"\$progdir/\$program\" \${1+\"\$@\"} -" - ;; - esac - $ECHO "\ - \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 - exit 1 -} - -# A function to encapsulate launching the target application -# Strips options in the --lt-* namespace from \$@ and -# launches target application with the remaining arguments. -func_exec_program () -{ - case \" \$* \" in - *\\ --lt-*) - for lt_wr_arg - do - case \$lt_wr_arg in - --lt-*) ;; - *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; - esac + ECHO=\"$qecho\" + file=\"\$0\" + # Make sure echo works. + if test \"X\$1\" = X--no-reexec; then + # Discard the --no-reexec flag, and continue. shift - done ;; - esac - func_exec_program_core \${1+\"\$@\"} -} - - # Parse options - func_parse_lt_options \"\$0\" \${1+\"\$@\"} + elif test \"X\`{ \$ECHO '\t'; } 2>/dev/null\`\" = 'X\t'; then + # Yippee, \$ECHO works! + : + else + # Restart under the correct shell, and then maybe \$ECHO will work. + exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"} + fi + fi\ +" + $ECHO "\ # Find the directory that this script lives in. - thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\` + thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\` test \"x\$thisdir\" = \"x\$file\" && thisdir=. # Follow symbolic links until we get to the real thisdir. - file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\` + file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\` while test -n \"\$file\"; do - destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\` + destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\` # If there was a directory component, then change thisdir. if test \"x\$destdir\" != \"x\$file\"; then @@ -4019,13 +2783,30 @@ func_exec_program () esac fi - file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\` - file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\` + file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\` + file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\` done +" +} +# end: func_emit_wrapper_part1 + +# func_emit_wrapper_part2 [arg=no] +# +# Emit the second part of a libtool wrapper script on stdout. +# For more information, see the description associated with +# func_emit_wrapper(), below. +func_emit_wrapper_part2 () +{ + func_emit_wrapper_part2_arg1=no + if test -n "$1" ; then + func_emit_wrapper_part2_arg1=$1 + fi + + $ECHO "\ # Usually 'no', except on cygwin/mingw when embedded into # the cwrapper. - WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1 + WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1 if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then # special case for '.' if test \"\$thisdir\" = \".\"; then @@ -4033,7 +2814,7 @@ func_exec_program () fi # remove .libs from thisdir case \"\$thisdir\" in - *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;; + *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;; $objdir ) thisdir=. ;; esac fi @@ -4088,18 +2869,6 @@ func_exec_program () if test -f \"\$progdir/\$program\"; then" - # fixup the dll searchpath if we need to. - # - # Fix the DLL searchpath if we need to. Do this before prepending - # to shlibpath, because on Windows, both are PATH and uninstalled - # libraries must come first. - if test -n "$dllsearchpath"; then - $ECHO "\ - # Add the dll search path components to the executable PATH - PATH=$dllsearchpath:\$PATH -" - fi - # Export our shlibpath_var if we have one. if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then $ECHO "\ @@ -4108,28 +2877,253 @@ func_exec_program () # Some systems cannot cope with colon-terminated $shlibpath_var # The second colon is a workaround for a bug in BeOS R4 sed - $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\` + $shlibpath_var=\`\$ECHO \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\` export $shlibpath_var " fi + # fixup the dll searchpath if we need to. + if test -n "$dllsearchpath"; then + $ECHO "\ + # Add the dll search path components to the executable PATH + PATH=$dllsearchpath:\$PATH +" + fi + $ECHO "\ if test \"\$libtool_execute_magic\" != \"$magic\"; then # Run the actual program with our arguments. - func_exec_program \${1+\"\$@\"} +" + case $host in + # Backslashes separate directories on plain windows + *-*-mingw | *-*-os2* | *-cegcc*) + $ECHO "\ + exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} +" + ;; + + *) + $ECHO "\ + exec \"\$progdir/\$program\" \${1+\"\$@\"} +" + ;; + esac + $ECHO "\ + \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 + exit 1 fi else # The program doesn't exist. \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 \$ECHO \"This script is just a wrapper for \$program.\" 1>&2 - \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 + $ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 exit 1 fi fi\ " } +# end: func_emit_wrapper_part2 + + +# func_emit_wrapper [arg=no] +# +# Emit a libtool wrapper script on stdout. +# Don't directly open a file because we may want to +# incorporate the script contents within a cygwin/mingw +# wrapper executable. Must ONLY be called from within +# func_mode_link because it depends on a number of variables +# set therein. +# +# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR +# variable will take. If 'yes', then the emitted script +# will assume that the directory in which it is stored is +# the $objdir directory. This is a cygwin/mingw-specific +# behavior. +func_emit_wrapper () +{ + func_emit_wrapper_arg1=no + if test -n "$1" ; then + func_emit_wrapper_arg1=$1 + fi + + # split this up so that func_emit_cwrapperexe_src + # can call each part independently. + func_emit_wrapper_part1 "${func_emit_wrapper_arg1}" + func_emit_wrapper_part2 "${func_emit_wrapper_arg1}" +} + + +# func_to_host_path arg +# +# Convert paths to host format when used with build tools. +# Intended for use with "native" mingw (where libtool itself +# is running under the msys shell), or in the following cross- +# build environments: +# $build $host +# mingw (msys) mingw [e.g. native] +# cygwin mingw +# *nix + wine mingw +# where wine is equipped with the `winepath' executable. +# In the native mingw case, the (msys) shell automatically +# converts paths for any non-msys applications it launches, +# but that facility isn't available from inside the cwrapper. +# Similar accommodations are necessary for $host mingw and +# $build cygwin. Calling this function does no harm for other +# $host/$build combinations not listed above. +# +# ARG is the path (on $build) that should be converted to +# the proper representation for $host. The result is stored +# in $func_to_host_path_result. +func_to_host_path () +{ + func_to_host_path_result="$1" + if test -n "$1" ; then + case $host in + *mingw* ) + lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' + case $build in + *mingw* ) # actually, msys + # awkward: cmd appends spaces to result + lt_sed_strip_trailing_spaces="s/[ ]*\$//" + func_to_host_path_tmp1=`( cmd //c echo "$1" |\ + $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""` + func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ + $SED -e "$lt_sed_naive_backslashify"` + ;; + *cygwin* ) + func_to_host_path_tmp1=`cygpath -w "$1"` + func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ + $SED -e "$lt_sed_naive_backslashify"` + ;; + * ) + # Unfortunately, winepath does not exit with a non-zero + # error code, so we are forced to check the contents of + # stdout. On the other hand, if the command is not + # found, the shell will set an exit code of 127 and print + # *an error message* to stdout. So we must check for both + # error code of zero AND non-empty stdout, which explains + # the odd construction: + func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null` + if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then + func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ + $SED -e "$lt_sed_naive_backslashify"` + else + # Allow warning below. + func_to_host_path_result="" + fi + ;; + esac + if test -z "$func_to_host_path_result" ; then + func_error "Could not determine host path corresponding to" + func_error " '$1'" + func_error "Continuing, but uninstalled executables may not work." + # Fallback: + func_to_host_path_result="$1" + fi + ;; + esac + fi +} +# end: func_to_host_path +# func_to_host_pathlist arg +# +# Convert pathlists to host format when used with build tools. +# See func_to_host_path(), above. This function supports the +# following $build/$host combinations (but does no harm for +# combinations not listed here): +# $build $host +# mingw (msys) mingw [e.g. native] +# cygwin mingw +# *nix + wine mingw +# +# Path separators are also converted from $build format to +# $host format. If ARG begins or ends with a path separator +# character, it is preserved (but converted to $host format) +# on output. +# +# ARG is a pathlist (on $build) that should be converted to +# the proper representation on $host. The result is stored +# in $func_to_host_pathlist_result. +func_to_host_pathlist () +{ + func_to_host_pathlist_result="$1" + if test -n "$1" ; then + case $host in + *mingw* ) + lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' + # Remove leading and trailing path separator characters from + # ARG. msys behavior is inconsistent here, cygpath turns them + # into '.;' and ';.', and winepath ignores them completely. + func_to_host_pathlist_tmp2="$1" + # Once set for this call, this variable should not be + # reassigned. It is used in tha fallback case. + func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\ + $SED -e 's|^:*||' -e 's|:*$||'` + case $build in + *mingw* ) # Actually, msys. + # Awkward: cmd appends spaces to result. + lt_sed_strip_trailing_spaces="s/[ ]*\$//" + func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\ + $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""` + func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\ + $SED -e "$lt_sed_naive_backslashify"` + ;; + *cygwin* ) + func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"` + func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\ + $SED -e "$lt_sed_naive_backslashify"` + ;; + * ) + # unfortunately, winepath doesn't convert pathlists + func_to_host_pathlist_result="" + func_to_host_pathlist_oldIFS=$IFS + IFS=: + for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do + IFS=$func_to_host_pathlist_oldIFS + if test -n "$func_to_host_pathlist_f" ; then + func_to_host_path "$func_to_host_pathlist_f" + if test -n "$func_to_host_path_result" ; then + if test -z "$func_to_host_pathlist_result" ; then + func_to_host_pathlist_result="$func_to_host_path_result" + else + func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result" + fi + fi + fi + IFS=: + done + IFS=$func_to_host_pathlist_oldIFS + ;; + esac + if test -z "$func_to_host_pathlist_result" ; then + func_error "Could not determine the host path(s) corresponding to" + func_error " '$1'" + func_error "Continuing, but uninstalled executables may not work." + # Fallback. This may break if $1 contains DOS-style drive + # specifications. The fix is not to complicate the expression + # below, but for the user to provide a working wine installation + # with winepath so that path translation in the cross-to-mingw + # case works properly. + lt_replace_pathsep_nix_to_dos="s|:|;|g" + func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\ + $SED -e "$lt_replace_pathsep_nix_to_dos"` + fi + # Now, add the leading and trailing path separators back + case "$1" in + :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result" + ;; + esac + case "$1" in + *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;" + ;; + esac + ;; + esac + fi +} +# end: func_to_host_pathlist # func_emit_cwrapperexe_src # emit the source code for a wrapper executable on stdout @@ -4147,71 +3141,41 @@ func_emit_cwrapperexe_src () This wrapper executable should never be moved out of the build directory. If it is, it will not operate correctly. + + Currently, it simply execs the wrapper *script* "$SHELL $output", + but could eventually absorb all of the scripts functionality and + exec $objdir/$outputname directly. */ EOF cat <<"EOF" -#ifdef _MSC_VER -# define _CRT_SECURE_NO_DEPRECATE 1 -#endif #include #include #ifdef _MSC_VER # include # include # include +# define setmode _setmode #else # include # include # ifdef __CYGWIN__ # include -# endif -#endif -#include -#include -#include -#include -#include -#include -#include -#include - -/* declarations of non-ANSI functions */ -#if defined(__MINGW32__) -# ifdef __STRICT_ANSI__ -int _putenv (const char *); -# endif -#elif defined(__CYGWIN__) -# ifdef __STRICT_ANSI__ +# define HAVE_SETENV +# ifdef __STRICT_ANSI__ char *realpath (const char *, char *); int putenv (char *); int setenv (const char *, const char *, int); +# endif # endif -/* #elif defined (other platforms) ... */ -#endif - -/* portability defines, excluding path handling macros */ -#if defined(_MSC_VER) -# define setmode _setmode -# define stat _stat -# define chmod _chmod -# define getcwd _getcwd -# define putenv _putenv -# define S_IXUSR _S_IEXEC -# ifndef _INTPTR_T_DEFINED -# define _INTPTR_T_DEFINED -# define intptr_t int -# endif -#elif defined(__MINGW32__) -# define setmode _setmode -# define stat _stat -# define chmod _chmod -# define getcwd _getcwd -# define putenv _putenv -#elif defined(__CYGWIN__) -# define HAVE_SETENV -# define FOPEN_WB "wb" -/* #elif defined (other platforms) ... */ #endif +#include +#include +#include +#include +#include +#include +#include +#include #if defined(PATH_MAX) # define LT_PATHMAX PATH_MAX @@ -4228,7 +3192,14 @@ int setenv (const char *, const char *, int); # define S_IXGRP 0 #endif -/* path handling portability macros */ +#ifdef _MSC_VER +# define S_IXUSR _S_IEXEC +# define stat _stat +# ifndef _INTPTR_T_DEFINED +# define intptr_t int +# endif +#endif + #ifndef DIR_SEPARATOR # define DIR_SEPARATOR '/' # define PATH_SEPARATOR ':' @@ -4259,6 +3230,10 @@ int setenv (const char *, const char *, int); # define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) #endif /* PATH_SEPARATOR_2 */ +#ifdef __CYGWIN__ +# define FOPEN_WB "wb" +#endif + #ifndef FOPEN_WB # define FOPEN_WB "w" #endif @@ -4271,13 +3246,22 @@ int setenv (const char *, const char *, int); if (stale) { free ((void *) stale); stale = 0; } \ } while (0) -#if defined(LT_DEBUGWRAPPER) -static int lt_debug = 1; +#undef LTWRAPPER_DEBUGPRINTF +#if defined DEBUGWRAPPER +# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args +static void +ltwrapper_debugprintf (const char *fmt, ...) +{ + va_list args; + va_start (args, fmt); + (void) vfprintf (stderr, fmt, args); + va_end (args); +} #else -static int lt_debug = 0; +# define LTWRAPPER_DEBUGPRINTF(args) #endif -const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */ +const char *program_name = NULL; void *xmalloc (size_t num); char *xstrdup (const char *string); @@ -4287,27 +3271,41 @@ char *chase_symlinks (const char *pathspec); int make_executable (const char *path); int check_executable (const char *path); char *strendzap (char *str, const char *pat); -void lt_debugprintf (const char *file, int line, const char *fmt, ...); -void lt_fatal (const char *file, int line, const char *message, ...); -static const char *nonnull (const char *s); -static const char *nonempty (const char *s); +void lt_fatal (const char *message, ...); void lt_setenv (const char *name, const char *value); char *lt_extend_str (const char *orig_value, const char *add, int to_end); +void lt_opt_process_env_set (const char *arg); +void lt_opt_process_env_prepend (const char *arg); +void lt_opt_process_env_append (const char *arg); +int lt_split_name_value (const char *arg, char** name, char** value); void lt_update_exe_path (const char *name, const char *value); void lt_update_lib_path (const char *name, const char *value); -char **prepare_spawn (char **argv); -void lt_dump_script (FILE *f); + +static const char *script_text_part1 = +EOF + + func_emit_wrapper_part1 yes | + $SED -e 's/\([\\"]\)/\\\1/g' \ + -e 's/^/ "/' -e 's/$/\\n"/' + echo ";" + cat <"))); for (i = 0; i < newargc; i++) { - lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n", - i, nonnull (newargz[i])); + LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : ""))); } EOF @@ -4523,14 +3560,11 @@ EOF mingw*) cat <<"EOF" /* execv doesn't actually work on mingw as expected on unix */ - newargz = prepare_spawn (newargz); rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz); if (rval == -1) { /* failed to start process */ - lt_debugprintf (__FILE__, __LINE__, - "(main) failed to launch target \"%s\": %s\n", - lt_argv_zero, nonnull (strerror (errno))); + LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno)); return 127; } return rval; @@ -4552,7 +3586,7 @@ xmalloc (size_t num) { void *p = (void *) malloc (num); if (!p) - lt_fatal (__FILE__, __LINE__, "memory exhausted"); + lt_fatal ("Memory exhausted"); return p; } @@ -4586,8 +3620,8 @@ check_executable (const char *path) { struct stat st; - lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n", - nonempty (path)); + LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n", + path ? (*path ? path : "EMPTY!") : "NULL!")); if ((!path) || (!*path)) return 0; @@ -4604,8 +3638,8 @@ make_executable (const char *path) int rval = 0; struct stat st; - lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n", - nonempty (path)); + LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n", + path ? (*path ? path : "EMPTY!") : "NULL!")); if ((!path) || (!*path)) return 0; @@ -4631,8 +3665,8 @@ find_executable (const char *wrapper) int tmp_len; char *concat_name; - lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n", - nonempty (wrapper)); + LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n", + wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!")); if ((wrapper == NULL) || (*wrapper == '\0')) return NULL; @@ -4685,8 +3719,7 @@ find_executable (const char *wrapper) { /* empty path: current directory */ if (getcwd (tmp, LT_PATHMAX) == NULL) - lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", - nonnull (strerror (errno))); + lt_fatal ("getcwd failed"); tmp_len = strlen (tmp); concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); @@ -4711,8 +3744,7 @@ find_executable (const char *wrapper) } /* Relative path | not found in path: prepend cwd */ if (getcwd (tmp, LT_PATHMAX) == NULL) - lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", - nonnull (strerror (errno))); + lt_fatal ("getcwd failed"); tmp_len = strlen (tmp); concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); memcpy (concat_name, tmp, tmp_len); @@ -4738,9 +3770,8 @@ chase_symlinks (const char *pathspec) int has_symlinks = 0; while (strlen (tmp_pathspec) && !has_symlinks) { - lt_debugprintf (__FILE__, __LINE__, - "checking path component for symlinks: %s\n", - tmp_pathspec); + LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n", + tmp_pathspec)); if (lstat (tmp_pathspec, &s) == 0) { if (S_ISLNK (s.st_mode) != 0) @@ -4762,9 +3793,8 @@ chase_symlinks (const char *pathspec) } else { - lt_fatal (__FILE__, __LINE__, - "error accessing file \"%s\": %s", - tmp_pathspec, nonnull (strerror (errno))); + char *errstr = strerror (errno); + lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr); } } XFREE (tmp_pathspec); @@ -4777,8 +3807,7 @@ chase_symlinks (const char *pathspec) tmp_pathspec = realpath (pathspec, buf); if (tmp_pathspec == 0) { - lt_fatal (__FILE__, __LINE__, - "could not follow symlinks for %s", pathspec); + lt_fatal ("Could not follow symlinks for %s", pathspec); } return xstrdup (tmp_pathspec); #endif @@ -4804,25 +3833,11 @@ strendzap (char *str, const char *pat) return str; } -void -lt_debugprintf (const char *file, int line, const char *fmt, ...) -{ - va_list args; - if (lt_debug) - { - (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line); - va_start (args, fmt); - (void) vfprintf (stderr, fmt, args); - va_end (args); - } -} - static void -lt_error_core (int exit_status, const char *file, - int line, const char *mode, +lt_error_core (int exit_status, const char *mode, const char *message, va_list ap) { - fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode); + fprintf (stderr, "%s: %s: ", program_name, mode); vfprintf (stderr, message, ap); fprintf (stderr, ".\n"); @@ -4831,32 +3846,20 @@ lt_error_core (int exit_status, const char *file, } void -lt_fatal (const char *file, int line, const char *message, ...) +lt_fatal (const char *message, ...) { va_list ap; va_start (ap, message); - lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap); + lt_error_core (EXIT_FAILURE, "FATAL", message, ap); va_end (ap); } -static const char * -nonnull (const char *s) -{ - return s ? s : "(null)"; -} - -static const char * -nonempty (const char *s) -{ - return (s && !*s) ? "(empty)" : nonnull (s); -} - void lt_setenv (const char *name, const char *value) { - lt_debugprintf (__FILE__, __LINE__, - "(lt_setenv) setting '%s' to '%s'\n", - nonnull (name), nonnull (value)); + LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n", + (name ? name : ""), + (value ? value : ""))); { #ifdef HAVE_SETENV /* always make a copy, for consistency with !HAVE_SETENV */ @@ -4901,12 +3904,95 @@ lt_extend_str (const char *orig_value, const char *add, int to_end) return new_value; } +int +lt_split_name_value (const char *arg, char** name, char** value) +{ + const char *p; + int len; + if (!arg || !*arg) + return 1; + + p = strchr (arg, (int)'='); + + if (!p) + return 1; + + *value = xstrdup (++p); + + len = strlen (arg) - strlen (*value); + *name = XMALLOC (char, len); + strncpy (*name, arg, len-1); + (*name)[len - 1] = '\0'; + + return 0; +} + +void +lt_opt_process_env_set (const char *arg) +{ + char *name = NULL; + char *value = NULL; + + if (lt_split_name_value (arg, &name, &value) != 0) + { + XFREE (name); + XFREE (value); + lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg); + } + + lt_setenv (name, value); + XFREE (name); + XFREE (value); +} + +void +lt_opt_process_env_prepend (const char *arg) +{ + char *name = NULL; + char *value = NULL; + char *new_value = NULL; + + if (lt_split_name_value (arg, &name, &value) != 0) + { + XFREE (name); + XFREE (value); + lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg); + } + + new_value = lt_extend_str (getenv (name), value, 0); + lt_setenv (name, new_value); + XFREE (new_value); + XFREE (name); + XFREE (value); +} + +void +lt_opt_process_env_append (const char *arg) +{ + char *name = NULL; + char *value = NULL; + char *new_value = NULL; + + if (lt_split_name_value (arg, &name, &value) != 0) + { + XFREE (name); + XFREE (value); + lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg); + } + + new_value = lt_extend_str (getenv (name), value, 1); + lt_setenv (name, new_value); + XFREE (new_value); + XFREE (name); + XFREE (value); +} + void lt_update_exe_path (const char *name, const char *value) { - lt_debugprintf (__FILE__, __LINE__, - "(lt_update_exe_path) modifying '%s' by prepending '%s'\n", - nonnull (name), nonnull (value)); + LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n", + (name ? name : ""), + (value ? value : ""))); if (name && *name && value && *value) { @@ -4925,9 +4011,9 @@ lt_update_exe_path (const char *name, const char *value) void lt_update_lib_path (const char *name, const char *value) { - lt_debugprintf (__FILE__, __LINE__, - "(lt_update_lib_path) modifying '%s' by prepending '%s'\n", - nonnull (name), nonnull (value)); + LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n", + (name ? name : ""), + (value ? value : ""))); if (name && *name && value && *value) { @@ -4937,158 +4023,11 @@ lt_update_lib_path (const char *name, const char *value) } } -EOF - case $host_os in - mingw*) - cat <<"EOF" - -/* Prepares an argument vector before calling spawn(). - Note that spawn() does not by itself call the command interpreter - (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") : - ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); - GetVersionEx(&v); - v.dwPlatformId == VER_PLATFORM_WIN32_NT; - }) ? "cmd.exe" : "command.com"). - Instead it simply concatenates the arguments, separated by ' ', and calls - CreateProcess(). We must quote the arguments since Win32 CreateProcess() - interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a - special way: - - Space and tab are interpreted as delimiters. They are not treated as - delimiters if they are surrounded by double quotes: "...". - - Unescaped double quotes are removed from the input. Their only effect is - that within double quotes, space and tab are treated like normal - characters. - - Backslashes not followed by double quotes are not special. - - But 2*n+1 backslashes followed by a double quote become - n backslashes followed by a double quote (n >= 0): - \" -> " - \\\" -> \" - \\\\\" -> \\" - */ -#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037" -#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037" -char ** -prepare_spawn (char **argv) -{ - size_t argc; - char **new_argv; - size_t i; - - /* Count number of arguments. */ - for (argc = 0; argv[argc] != NULL; argc++) - ; - - /* Allocate new argument vector. */ - new_argv = XMALLOC (char *, argc + 1); - - /* Put quoted arguments into the new argument vector. */ - for (i = 0; i < argc; i++) - { - const char *string = argv[i]; - - if (string[0] == '\0') - new_argv[i] = xstrdup ("\"\""); - else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL) - { - int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL); - size_t length; - unsigned int backslashes; - const char *s; - char *quoted_string; - char *p; - - length = 0; - backslashes = 0; - if (quote_around) - length++; - for (s = string; *s != '\0'; s++) - { - char c = *s; - if (c == '"') - length += backslashes + 1; - length++; - if (c == '\\') - backslashes++; - else - backslashes = 0; - } - if (quote_around) - length += backslashes + 1; - - quoted_string = XMALLOC (char, length + 1); - - p = quoted_string; - backslashes = 0; - if (quote_around) - *p++ = '"'; - for (s = string; *s != '\0'; s++) - { - char c = *s; - if (c == '"') - { - unsigned int j; - for (j = backslashes + 1; j > 0; j--) - *p++ = '\\'; - } - *p++ = c; - if (c == '\\') - backslashes++; - else - backslashes = 0; - } - if (quote_around) - { - unsigned int j; - for (j = backslashes; j > 0; j--) - *p++ = '\\'; - *p++ = '"'; - } - *p = '\0'; - - new_argv[i] = quoted_string; - } - else - new_argv[i] = (char *) string; - } - new_argv[argc] = NULL; - - return new_argv; -} -EOF - ;; - esac - cat <<"EOF" -void lt_dump_script (FILE* f) -{ -EOF - func_emit_wrapper yes | - $SED -n -e ' -s/^\(.\{79\}\)\(..*\)/\1\ -\2/ -h -s/\([\\"]\)/\\\1/g -s/$/\\n/ -s/\([^\n]*\).*/ fputs ("\1", f);/p -g -D' - cat <<"EOF" -} EOF } # end: func_emit_cwrapperexe_src -# func_win32_import_lib_p ARG -# True if ARG is an import lib, as indicated by $file_magic_cmd -func_win32_import_lib_p () -{ - $opt_debug - case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in - *import*) : ;; - *) false ;; - esac -} - # func_mode_link arg... func_mode_link () { @@ -5133,7 +4072,6 @@ func_mode_link () new_inherited_linker_flags= avoid_version=no - bindir= dlfiles= dlprefiles= dlself=no @@ -5226,11 +4164,6 @@ func_mode_link () esac case $prev in - bindir) - bindir="$arg" - prev= - continue - ;; dlfiles|dlprefiles) if test "$preload" = no; then # Add the symbol object into the linking commands. @@ -5262,9 +4195,9 @@ func_mode_link () ;; *) if test "$prev" = dlfiles; then - func_append dlfiles " $arg" + dlfiles="$dlfiles $arg" else - func_append dlprefiles " $arg" + dlprefiles="$dlprefiles $arg" fi prev= continue @@ -5288,7 +4221,7 @@ func_mode_link () *-*-darwin*) case "$deplibs " in *" $qarg.ltframework "*) ;; - *) func_append deplibs " $qarg.ltframework" # this is fixed later + *) deplibs="$deplibs $qarg.ltframework" # this is fixed later ;; esac ;; @@ -5307,7 +4240,7 @@ func_mode_link () moreargs= for fil in `cat "$save_arg"` do -# func_append moreargs " $fil" +# moreargs="$moreargs $fil" arg=$fil # A libtool-controlled object. @@ -5336,7 +4269,7 @@ func_mode_link () if test "$prev" = dlfiles; then if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then - func_append dlfiles " $pic_object" + dlfiles="$dlfiles $pic_object" prev= continue else @@ -5348,7 +4281,7 @@ func_mode_link () # CHECK ME: I think I busted this. -Ossama if test "$prev" = dlprefiles; then # Preload the old-style object. - func_append dlprefiles " $pic_object" + dlprefiles="$dlprefiles $pic_object" prev= fi @@ -5418,12 +4351,12 @@ func_mode_link () if test "$prev" = rpath; then case "$rpath " in *" $arg "*) ;; - *) func_append rpath " $arg" ;; + *) rpath="$rpath $arg" ;; esac else case "$xrpath " in *" $arg "*) ;; - *) func_append xrpath " $arg" ;; + *) xrpath="$xrpath $arg" ;; esac fi prev= @@ -5435,28 +4368,28 @@ func_mode_link () continue ;; weak) - func_append weak_libs " $arg" + weak_libs="$weak_libs $arg" prev= continue ;; xcclinker) - func_append linker_flags " $qarg" - func_append compiler_flags " $qarg" + linker_flags="$linker_flags $qarg" + compiler_flags="$compiler_flags $qarg" prev= func_append compile_command " $qarg" func_append finalize_command " $qarg" continue ;; xcompiler) - func_append compiler_flags " $qarg" + compiler_flags="$compiler_flags $qarg" prev= func_append compile_command " $qarg" func_append finalize_command " $qarg" continue ;; xlinker) - func_append linker_flags " $qarg" - func_append compiler_flags " $wl$qarg" + linker_flags="$linker_flags $qarg" + compiler_flags="$compiler_flags $wl$qarg" prev= func_append compile_command " $wl$qarg" func_append finalize_command " $wl$qarg" @@ -5492,11 +4425,6 @@ func_mode_link () continue ;; - -bindir) - prev=bindir - continue - ;; - -dlopen) prev=dlfiles continue @@ -5547,16 +4475,15 @@ func_mode_link () ;; -L*) - func_stripname "-L" '' "$arg" - if test -z "$func_stripname_result"; then + func_stripname '-L' '' "$arg" + dir=$func_stripname_result + if test -z "$dir"; then if test "$#" -gt 0; then func_fatal_error "require no space between \`-L' and \`$1'" else func_fatal_error "need path for \`-L' option" fi fi - func_resolve_sysroot "$func_stripname_result" - dir=$func_resolve_sysroot_result # We need an absolute path. case $dir in [\\/]* | [A-Za-z]:[\\/]*) ;; @@ -5568,30 +4495,24 @@ func_mode_link () ;; esac case "$deplibs " in - *" -L$dir "* | *" $arg "*) - # Will only happen for absolute or sysroot arguments - ;; + *" -L$dir "*) ;; *) - # Preserve sysroot, but never include relative directories - case $dir in - [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;; - *) func_append deplibs " -L$dir" ;; - esac - func_append lib_search_path " $dir" + deplibs="$deplibs -L$dir" + lib_search_path="$lib_search_path $dir" ;; esac case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) - testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'` + testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'` case :$dllsearchpath: in *":$dir:"*) ;; ::) dllsearchpath=$dir;; - *) func_append dllsearchpath ":$dir";; + *) dllsearchpath="$dllsearchpath:$dir";; esac case :$dllsearchpath: in *":$testbindir:"*) ;; ::) dllsearchpath=$testbindir;; - *) func_append dllsearchpath ":$testbindir";; + *) dllsearchpath="$dllsearchpath:$testbindir";; esac ;; esac @@ -5601,7 +4522,7 @@ func_mode_link () -l*) if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*) + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*) # These systems don't actually have a C or math library (as such) continue ;; @@ -5615,7 +4536,7 @@ func_mode_link () ;; *-*-rhapsody* | *-*-darwin1.[012]) # Rhapsody C and math libraries are in the System framework - func_append deplibs " System.ltframework" + deplibs="$deplibs System.ltframework" continue ;; *-*-sco3.2v5* | *-*-sco5v6*) @@ -5635,7 +4556,7 @@ func_mode_link () ;; esac fi - func_append deplibs " $arg" + deplibs="$deplibs $arg" continue ;; @@ -5647,22 +4568,21 @@ func_mode_link () # Tru64 UNIX uses -model [arg] to determine the layout of C++ # classes, name mangling, and exception handling. # Darwin uses the -arch flag to determine output architecture. - -model|-arch|-isysroot|--sysroot) - func_append compiler_flags " $arg" + -model|-arch|-isysroot) + compiler_flags="$compiler_flags $arg" func_append compile_command " $arg" func_append finalize_command " $arg" prev=xcompiler continue ;; - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ - |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) - func_append compiler_flags " $arg" + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + compiler_flags="$compiler_flags $arg" func_append compile_command " $arg" func_append finalize_command " $arg" case "$new_inherited_linker_flags " in *" $arg "*) ;; - * ) func_append new_inherited_linker_flags " $arg" ;; + * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;; esac continue ;; @@ -5729,17 +4649,13 @@ func_mode_link () # We need an absolute path. case $dir in [\\/]* | [A-Za-z]:[\\/]*) ;; - =*) - func_stripname '=' '' "$dir" - dir=$lt_sysroot$func_stripname_result - ;; *) func_fatal_error "only absolute run-paths are allowed" ;; esac case "$xrpath " in *" $dir "*) ;; - *) func_append xrpath " $dir" ;; + *) xrpath="$xrpath $dir" ;; esac continue ;; @@ -5792,8 +4708,8 @@ func_mode_link () for flag in $args; do IFS="$save_ifs" func_quote_for_eval "$flag" - func_append arg " $func_quote_for_eval_result" - func_append compiler_flags " $func_quote_for_eval_result" + arg="$arg $wl$func_quote_for_eval_result" + compiler_flags="$compiler_flags $func_quote_for_eval_result" done IFS="$save_ifs" func_stripname ' ' '' "$arg" @@ -5808,9 +4724,9 @@ func_mode_link () for flag in $args; do IFS="$save_ifs" func_quote_for_eval "$flag" - func_append arg " $wl$func_quote_for_eval_result" - func_append compiler_flags " $wl$func_quote_for_eval_result" - func_append linker_flags " $func_quote_for_eval_result" + arg="$arg $wl$func_quote_for_eval_result" + compiler_flags="$compiler_flags $wl$func_quote_for_eval_result" + linker_flags="$linker_flags $func_quote_for_eval_result" done IFS="$save_ifs" func_stripname ' ' '' "$arg" @@ -5838,27 +4754,23 @@ func_mode_link () arg="$func_quote_for_eval_result" ;; - # Flags to be passed through unchanged, with rationale: - # -64, -mips[0-9] enable 64-bit mode for the SGI compiler - # -r[0-9][0-9]* specify processor for the SGI compiler - # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler - # +DA*, +DD* enable 64-bit mode for the HP compiler - # -q* compiler args for the IBM compiler - # -m*, -t[45]*, -txscale* architecture-specific flags for GCC - # -F/path path to uninstalled frameworks, gcc on darwin - # -p, -pg, --coverage, -fprofile-* profiling flags for GCC - # @file GCC response files - # -tp=* Portland pgcc target processor selection - # --sysroot=* for sysroot support - # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization + # -64, -mips[0-9] enable 64-bit mode on the SGI compiler + # -r[0-9][0-9]* specifies the processor on the SGI compiler + # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler + # +DA*, +DD* enable 64-bit mode on the HP compiler + # -q* pass through compiler args for the IBM compiler + # -m*, -t[45]*, -txscale* pass through architecture-specific + # compiler args for GCC + # -F/path gives path to uninstalled frameworks, gcc on darwin + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ - -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ - -O*|-flto*|-fwhopr*|-fuse-linker-plugin) + -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) func_quote_for_eval "$arg" arg="$func_quote_for_eval_result" func_append compile_command " $arg" func_append finalize_command " $arg" - func_append compiler_flags " $arg" + compiler_flags="$compiler_flags $arg" continue ;; @@ -5870,7 +4782,7 @@ func_mode_link () *.$objext) # A standard object. - func_append objs " $arg" + objs="$objs $arg" ;; *.lo) @@ -5901,7 +4813,7 @@ func_mode_link () if test "$prev" = dlfiles; then if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then - func_append dlfiles " $pic_object" + dlfiles="$dlfiles $pic_object" prev= continue else @@ -5913,7 +4825,7 @@ func_mode_link () # CHECK ME: I think I busted this. -Ossama if test "$prev" = dlprefiles; then # Preload the old-style object. - func_append dlprefiles " $pic_object" + dlprefiles="$dlprefiles $pic_object" prev= fi @@ -5958,25 +4870,24 @@ func_mode_link () *.$libext) # An archive. - func_append deplibs " $arg" - func_append old_deplibs " $arg" + deplibs="$deplibs $arg" + old_deplibs="$old_deplibs $arg" continue ;; *.la) # A libtool-controlled library. - func_resolve_sysroot "$arg" if test "$prev" = dlfiles; then # This library was specified with -dlopen. - func_append dlfiles " $func_resolve_sysroot_result" + dlfiles="$dlfiles $arg" prev= elif test "$prev" = dlprefiles; then # The library was specified with -dlpreopen. - func_append dlprefiles " $func_resolve_sysroot_result" + dlprefiles="$dlprefiles $arg" prev= else - func_append deplibs " $func_resolve_sysroot_result" + deplibs="$deplibs $arg" fi continue ;; @@ -6014,7 +4925,7 @@ func_mode_link () if test -n "$shlibpath_var"; then # get the directories listed in $shlibpath_var - eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\` + eval shlib_search_path=\`\$ECHO \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\` else shlib_search_path= fi @@ -6023,8 +4934,6 @@ func_mode_link () func_dirname "$output" "/" "" output_objdir="$func_dirname_result$objdir" - func_to_tool_file "$output_objdir/" - tool_output_objdir=$func_to_tool_file_result # Create the object directory. func_mkdir_p "$output_objdir" @@ -6045,12 +4954,12 @@ func_mode_link () # Find all interdependent deplibs by searching for libraries # that are linked more than once (e.g. -la -lb -la) for deplib in $deplibs; do - if $opt_preserve_dup_deps ; then + if $opt_duplicate_deps ; then case "$libs " in - *" $deplib "*) func_append specialdeplibs " $deplib" ;; + *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; esac fi - func_append libs " $deplib" + libs="$libs $deplib" done if test "$linkmode" = lib; then @@ -6063,9 +4972,9 @@ func_mode_link () if $opt_duplicate_compiler_generated_deps; then for pre_post_dep in $predeps $postdeps; do case "$pre_post_deps " in - *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;; + *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;; esac - func_append pre_post_deps " $pre_post_dep" + pre_post_deps="$pre_post_deps $pre_post_dep" done fi pre_post_deps= @@ -6124,10 +5033,7 @@ func_mode_link () case $pass in dlopen) libs="$dlfiles" ;; dlpreopen) libs="$dlprefiles" ;; - link) - libs="$deplibs %DEPLIBS%" - test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" - ;; + link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; esac fi if test "$linkmode,$pass" = "lib,dlpreopen"; then @@ -6135,19 +5041,17 @@ func_mode_link () for lib in $dlprefiles; do # Ignore non-libtool-libs dependency_libs= - func_resolve_sysroot "$lib" case $lib in - *.la) func_source "$func_resolve_sysroot_result" ;; + *.la) func_source "$lib" ;; esac # Collect preopened libtool deplibs, except any this library # has declared as weak libs for deplib in $dependency_libs; do - func_basename "$deplib" - deplib_base=$func_basename_result + deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"` case " $weak_libs " in *" $deplib_base "*) ;; - *) func_append deplibs " $deplib" ;; + *) deplibs="$deplibs $deplib" ;; esac done done @@ -6163,17 +5067,16 @@ func_mode_link () lib= found=no case $deplib in - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ - |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) if test "$linkmode,$pass" = "prog,link"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else - func_append compiler_flags " $deplib" + compiler_flags="$compiler_flags $deplib" if test "$linkmode" = lib ; then case "$new_inherited_linker_flags " in *" $deplib "*) ;; - * ) func_append new_inherited_linker_flags " $deplib" ;; + * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; esac fi fi @@ -6258,7 +5161,7 @@ func_mode_link () if test "$linkmode" = lib ; then case "$new_inherited_linker_flags " in *" $deplib "*) ;; - * ) func_append new_inherited_linker_flags " $deplib" ;; + * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; esac fi fi @@ -6271,8 +5174,7 @@ func_mode_link () test "$pass" = conv && continue newdependency_libs="$deplib $newdependency_libs" func_stripname '-L' '' "$deplib" - func_resolve_sysroot "$func_stripname_result" - func_append newlib_search_path " $func_resolve_sysroot_result" + newlib_search_path="$newlib_search_path $func_stripname_result" ;; prog) if test "$pass" = conv; then @@ -6286,8 +5188,7 @@ func_mode_link () finalize_deplibs="$deplib $finalize_deplibs" fi func_stripname '-L' '' "$deplib" - func_resolve_sysroot "$func_stripname_result" - func_append newlib_search_path " $func_resolve_sysroot_result" + newlib_search_path="$newlib_search_path $func_stripname_result" ;; *) func_warning "\`-L' is ignored for archives/objects" @@ -6298,21 +5199,17 @@ func_mode_link () -R*) if test "$pass" = link; then func_stripname '-R' '' "$deplib" - func_resolve_sysroot "$func_stripname_result" - dir=$func_resolve_sysroot_result + dir=$func_stripname_result # Make sure the xrpath contains only unique directories. case "$xrpath " in *" $dir "*) ;; - *) func_append xrpath " $dir" ;; + *) xrpath="$xrpath $dir" ;; esac fi deplibs="$deplib $deplibs" continue ;; - *.la) - func_resolve_sysroot "$deplib" - lib=$func_resolve_sysroot_result - ;; + *.la) lib="$deplib" ;; *.$libext) if test "$pass" = conv; then deplibs="$deplib $deplibs" @@ -6330,7 +5227,7 @@ func_mode_link () match_pattern*) set dummy $deplibs_check_method; shift match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` - if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \ + if eval "\$ECHO \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \ | $EGREP "$match_pattern_regex" > /dev/null; then valid_a_lib=yes fi @@ -6340,15 +5237,15 @@ func_mode_link () ;; esac if test "$valid_a_lib" != yes; then - echo + $ECHO $ECHO "*** Warning: Trying to link with static lib archive $deplib." - echo "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which you do not appear to have" - echo "*** because the file extensions .$libext of this argument makes me believe" - echo "*** that it is just a static archive that I should not use here." + $ECHO "*** I have the capability to make that library automatically link in when" + $ECHO "*** you link to this library. But I can only do this if you have a" + $ECHO "*** shared version of the library, which you do not appear to have" + $ECHO "*** because the file extensions .$libext of this argument makes me believe" + $ECHO "*** that it is just a static archive that I should not use here." else - echo + $ECHO $ECHO "*** Warning: Linking the shared library $output against the" $ECHO "*** static library $deplib is not portable!" deplibs="$deplib $deplibs" @@ -6375,11 +5272,11 @@ func_mode_link () if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then # If there is no dlopen support or we're linking statically, # we need to preload. - func_append newdlprefiles " $deplib" + newdlprefiles="$newdlprefiles $deplib" compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else - func_append newdlfiles " $deplib" + newdlfiles="$newdlfiles $deplib" fi fi continue @@ -6421,20 +5318,20 @@ func_mode_link () # Convert "-framework foo" to "foo.ltframework" if test -n "$inherited_linker_flags"; then - tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'` + tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'` for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do case " $new_inherited_linker_flags " in *" $tmp_inherited_linker_flag "*) ;; - *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";; + *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";; esac done fi - dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` if test "$linkmode,$pass" = "lib,link" || test "$linkmode,$pass" = "prog,scan" || { test "$linkmode" != prog && test "$linkmode" != lib; }; then - test -n "$dlopen" && func_append dlfiles " $dlopen" - test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen" + test -n "$dlopen" && dlfiles="$dlfiles $dlopen" + test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen" fi if test "$pass" = conv; then @@ -6445,36 +5342,30 @@ func_mode_link () func_fatal_error "cannot find name of link library for \`$lib'" fi # It is a libtool convenience library, so add in its objects. - func_append convenience " $ladir/$objdir/$old_library" - func_append old_convenience " $ladir/$objdir/$old_library" - tmp_libs= - for deplib in $dependency_libs; do - deplibs="$deplib $deplibs" - if $opt_preserve_dup_deps ; then - case "$tmp_libs " in - *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi - func_append tmp_libs " $deplib" - done + convenience="$convenience $ladir/$objdir/$old_library" + old_convenience="$old_convenience $ladir/$objdir/$old_library" elif test "$linkmode" != prog && test "$linkmode" != lib; then func_fatal_error "\`$lib' is not a convenience library" fi + tmp_libs= + for deplib in $dependency_libs; do + deplibs="$deplib $deplibs" + if $opt_duplicate_deps ; then + case "$tmp_libs " in + *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; + esac + fi + tmp_libs="$tmp_libs $deplib" + done continue fi # $pass = conv # Get the name of the library we link against. linklib= - if test -n "$old_library" && - { test "$prefer_static_libs" = yes || - test "$prefer_static_libs,$installed" = "built,no"; }; then - linklib=$old_library - else - for l in $old_library $library_names; do - linklib="$l" - done - fi + for l in $old_library $library_names; do + linklib="$l" + done if test -z "$linklib"; then func_fatal_error "cannot find name of link library for \`$lib'" fi @@ -6491,9 +5382,9 @@ func_mode_link () # statically, we need to preload. We also need to preload any # dependent libraries so libltdl's deplib preloader doesn't # bomb out in the load deplibs phase. - func_append dlprefiles " $lib $dependency_libs" + dlprefiles="$dlprefiles $lib $dependency_libs" else - func_append newdlfiles " $lib" + newdlfiles="$newdlfiles $lib" fi continue fi # $pass = dlopen @@ -6515,14 +5406,14 @@ func_mode_link () # Find the relevant object directory and library name. if test "X$installed" = Xyes; then - if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then + if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then func_warning "library \`$lib' was moved." dir="$ladir" absdir="$abs_ladir" libdir="$abs_ladir" else - dir="$lt_sysroot$libdir" - absdir="$lt_sysroot$libdir" + dir="$libdir" + absdir="$libdir" fi test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes else @@ -6530,12 +5421,12 @@ func_mode_link () dir="$ladir" absdir="$abs_ladir" # Remove this search path later - func_append notinst_path " $abs_ladir" + notinst_path="$notinst_path $abs_ladir" else dir="$ladir/$objdir" absdir="$abs_ladir/$objdir" # Remove this search path later - func_append notinst_path " $abs_ladir" + notinst_path="$notinst_path $abs_ladir" fi fi # $installed = yes func_stripname 'lib' '.la' "$laname" @@ -6546,46 +5437,20 @@ func_mode_link () if test -z "$libdir" && test "$linkmode" = prog; then func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'" fi - case "$host" in - # special handling for platforms with PE-DLLs. - *cygwin* | *mingw* | *cegcc* ) - # Linker will automatically link against shared library if both - # static and shared are present. Therefore, ensure we extract - # symbols from the import library if a shared library is present - # (otherwise, the dlopen module name will be incorrect). We do - # this by putting the import library name into $newdlprefiles. - # We recover the dlopen module name by 'saving' the la file - # name in a special purpose variable, and (later) extracting the - # dlname from the la file. - if test -n "$dlname"; then - func_tr_sh "$dir/$linklib" - eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname" - func_append newdlprefiles " $dir/$linklib" - else - func_append newdlprefiles " $dir/$old_library" - # Keep a list of preopened convenience libraries to check - # that they are being used correctly in the link pass. - test -z "$libdir" && \ - func_append dlpreconveniencelibs " $dir/$old_library" - fi - ;; - * ) - # Prefer using a static library (so that no silly _DYNAMIC symbols - # are required to link). - if test -n "$old_library"; then - func_append newdlprefiles " $dir/$old_library" - # Keep a list of preopened convenience libraries to check - # that they are being used correctly in the link pass. - test -z "$libdir" && \ - func_append dlpreconveniencelibs " $dir/$old_library" - # Otherwise, use the dlname, so that lt_dlopen finds it. - elif test -n "$dlname"; then - func_append newdlprefiles " $dir/$dlname" - else - func_append newdlprefiles " $dir/$linklib" - fi - ;; - esac + # Prefer using a static library (so that no silly _DYNAMIC symbols + # are required to link). + if test -n "$old_library"; then + newdlprefiles="$newdlprefiles $dir/$old_library" + # Keep a list of preopened convenience libraries to check + # that they are being used correctly in the link pass. + test -z "$libdir" && \ + dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library" + # Otherwise, use the dlname, so that lt_dlopen finds it. + elif test -n "$dlname"; then + newdlprefiles="$newdlprefiles $dir/$dlname" + else + newdlprefiles="$newdlprefiles $dir/$linklib" + fi fi # $pass = dlpreopen if test -z "$libdir"; then @@ -6603,7 +5468,7 @@ func_mode_link () if test "$linkmode" = prog && test "$pass" != link; then - func_append newlib_search_path " $ladir" + newlib_search_path="$newlib_search_path $ladir" deplibs="$lib $deplibs" linkalldeplibs=no @@ -6616,8 +5481,7 @@ func_mode_link () for deplib in $dependency_libs; do case $deplib in -L*) func_stripname '-L' '' "$deplib" - func_resolve_sysroot "$func_stripname_result" - func_append newlib_search_path " $func_resolve_sysroot_result" + newlib_search_path="$newlib_search_path $func_stripname_result" ;; esac # Need to link against all dependency_libs? @@ -6628,12 +5492,12 @@ func_mode_link () # or/and link against static libraries newdependency_libs="$deplib $newdependency_libs" fi - if $opt_preserve_dup_deps ; then + if $opt_duplicate_deps ; then case "$tmp_libs " in - *" $deplib "*) func_append specialdeplibs " $deplib" ;; + *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; esac fi - func_append tmp_libs " $deplib" + tmp_libs="$tmp_libs $deplib" done # for deplib continue fi # $linkmode = prog... @@ -6648,7 +5512,7 @@ func_mode_link () # Make sure the rpath contains only unique directories. case "$temp_rpath:" in *"$absdir:"*) ;; - *) func_append temp_rpath "$absdir:" ;; + *) temp_rpath="$temp_rpath$absdir:" ;; esac fi @@ -6660,7 +5524,7 @@ func_mode_link () *) case "$compile_rpath " in *" $absdir "*) ;; - *) func_append compile_rpath " $absdir" ;; + *) compile_rpath="$compile_rpath $absdir" esac ;; esac @@ -6669,7 +5533,7 @@ func_mode_link () *) case "$finalize_rpath " in *" $libdir "*) ;; - *) func_append finalize_rpath " $libdir" ;; + *) finalize_rpath="$finalize_rpath $libdir" esac ;; esac @@ -6694,12 +5558,12 @@ func_mode_link () case $host in *cygwin* | *mingw* | *cegcc*) # No point in relinking DLLs because paths are not encoded - func_append notinst_deplibs " $lib" + notinst_deplibs="$notinst_deplibs $lib" need_relink=no ;; *) if test "$installed" = no; then - func_append notinst_deplibs " $lib" + notinst_deplibs="$notinst_deplibs $lib" need_relink=yes fi ;; @@ -6716,7 +5580,7 @@ func_mode_link () fi done if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then - echo + $ECHO if test "$linkmode" = prog; then $ECHO "*** Warning: Linking the executable $output against the loadable module" else @@ -6734,7 +5598,7 @@ func_mode_link () *) case "$compile_rpath " in *" $absdir "*) ;; - *) func_append compile_rpath " $absdir" ;; + *) compile_rpath="$compile_rpath $absdir" esac ;; esac @@ -6743,7 +5607,7 @@ func_mode_link () *) case "$finalize_rpath " in *" $libdir "*) ;; - *) func_append finalize_rpath " $libdir" ;; + *) finalize_rpath="$finalize_rpath $libdir" esac ;; esac @@ -6797,7 +5661,7 @@ func_mode_link () linklib=$newlib fi # test -n "$old_archive_from_expsyms_cmds" - if test "$linkmode" = prog || test "$opt_mode" != relink; then + if test "$linkmode" = prog || test "$mode" != relink; then add_shlibpath= add_dir= add= @@ -6819,9 +5683,9 @@ func_mode_link () if test "X$dlopenmodule" != "X$lib"; then $ECHO "*** Warning: lib $linklib is a module, not a shared library" if test -z "$old_library" ; then - echo - echo "*** And there doesn't seem to be a static archive available" - echo "*** The link will probably fail, sorry" + $ECHO + $ECHO "*** And there doesn't seem to be a static archive available" + $ECHO "*** The link will probably fail, sorry" else add="$dir/$old_library" fi @@ -6848,12 +5712,12 @@ func_mode_link () test "$hardcode_direct_absolute" = no; then add="$dir/$linklib" elif test "$hardcode_minus_L" = yes; then - add_dir="-L$absdir" + add_dir="-L$dir" # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then case $libdir in [\\/]*) - func_append add_dir " -L$inst_prefix_dir$libdir" + add_dir="$add_dir -L$inst_prefix_dir$libdir" ;; esac fi @@ -6875,7 +5739,7 @@ func_mode_link () if test -n "$add_shlibpath"; then case :$compile_shlibpath: in *":$add_shlibpath:"*) ;; - *) func_append compile_shlibpath "$add_shlibpath:" ;; + *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;; esac fi if test "$linkmode" = prog; then @@ -6889,13 +5753,13 @@ func_mode_link () test "$hardcode_shlibpath_var" = yes; then case :$finalize_shlibpath: in *":$libdir:"*) ;; - *) func_append finalize_shlibpath "$libdir:" ;; + *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; esac fi fi fi - if test "$linkmode" = prog || test "$opt_mode" = relink; then + if test "$linkmode" = prog || test "$mode" = relink; then add_shlibpath= add_dir= add= @@ -6909,7 +5773,7 @@ func_mode_link () elif test "$hardcode_shlibpath_var" = yes; then case :$finalize_shlibpath: in *":$libdir:"*) ;; - *) func_append finalize_shlibpath "$libdir:" ;; + *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; esac add="-l$name" elif test "$hardcode_automatic" = yes; then @@ -6926,7 +5790,7 @@ func_mode_link () if test -n "$inst_prefix_dir"; then case $libdir in [\\/]*) - func_append add_dir " -L$inst_prefix_dir$libdir" + add_dir="$add_dir -L$inst_prefix_dir$libdir" ;; esac fi @@ -6961,21 +5825,21 @@ func_mode_link () # Just print a warning and add the library to dependency_libs so # that the program can be linked against the static library. - echo + $ECHO $ECHO "*** Warning: This system can not link to static lib archive $lib." - echo "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which you do not appear to have." + $ECHO "*** I have the capability to make that library automatically link in when" + $ECHO "*** you link to this library. But I can only do this if you have a" + $ECHO "*** shared version of the library, which you do not appear to have." if test "$module" = yes; then - echo "*** But as you try to build a module library, libtool will still create " - echo "*** a static module, that should work as long as the dlopening application" - echo "*** is linked with the -dlopen flag to resolve symbols at runtime." + $ECHO "*** But as you try to build a module library, libtool will still create " + $ECHO "*** a static module, that should work as long as the dlopening application" + $ECHO "*** is linked with the -dlopen flag to resolve symbols at runtime." if test -z "$global_symbol_pipe"; then - echo - echo "*** However, this would only work if libtool was able to extract symbol" - echo "*** lists from a program, using \`nm' or equivalent, but libtool could" - echo "*** not find such a program. So, this module is probably useless." - echo "*** \`nm' from GNU binutils and a full rebuild may help." + $ECHO + $ECHO "*** However, this would only work if libtool was able to extract symbol" + $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could" + $ECHO "*** not find such a program. So, this module is probably useless." + $ECHO "*** \`nm' from GNU binutils and a full rebuild may help." fi if test "$build_old_libs" = no; then build_libtool_libs=module @@ -7003,46 +5867,37 @@ func_mode_link () temp_xrpath=$func_stripname_result case " $xrpath " in *" $temp_xrpath "*) ;; - *) func_append xrpath " $temp_xrpath";; + *) xrpath="$xrpath $temp_xrpath";; esac;; - *) func_append temp_deplibs " $libdir";; + *) temp_deplibs="$temp_deplibs $libdir";; esac done dependency_libs="$temp_deplibs" fi - func_append newlib_search_path " $absdir" + newlib_search_path="$newlib_search_path $absdir" # Link against this library test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" # ... and its dependency_libs tmp_libs= for deplib in $dependency_libs; do newdependency_libs="$deplib $newdependency_libs" - case $deplib in - -L*) func_stripname '-L' '' "$deplib" - func_resolve_sysroot "$func_stripname_result";; - *) func_resolve_sysroot "$deplib" ;; - esac - if $opt_preserve_dup_deps ; then + if $opt_duplicate_deps ; then case "$tmp_libs " in - *" $func_resolve_sysroot_result "*) - func_append specialdeplibs " $func_resolve_sysroot_result" ;; + *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; esac fi - func_append tmp_libs " $func_resolve_sysroot_result" + tmp_libs="$tmp_libs $deplib" done if test "$link_all_deplibs" != no; then # Add the search paths of all dependency libraries for deplib in $dependency_libs; do - path= case $deplib in -L*) path="$deplib" ;; *.la) - func_resolve_sysroot "$deplib" - deplib=$func_resolve_sysroot_result func_dirname "$deplib" "" "." - dir=$func_dirname_result + dir="$func_dirname_result" # We need an absolute path. case $dir in [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; @@ -7069,8 +5924,8 @@ func_mode_link () if test -z "$darwin_install_name"; then darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` fi - func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" - func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}" + compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" + linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}" path= fi fi @@ -7103,7 +5958,7 @@ func_mode_link () compile_deplibs="$new_inherited_linker_flags $compile_deplibs" finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs" else - compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + compiler_flags="$compiler_flags "`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` fi fi dependency_libs="$newdependency_libs" @@ -7120,7 +5975,7 @@ func_mode_link () for dir in $newlib_search_path; do case "$lib_search_path " in *" $dir "*) ;; - *) func_append lib_search_path " $dir" ;; + *) lib_search_path="$lib_search_path $dir" ;; esac done newlib_search_path= @@ -7178,10 +6033,10 @@ func_mode_link () -L*) case " $tmp_libs " in *" $deplib "*) ;; - *) func_append tmp_libs " $deplib" ;; + *) tmp_libs="$tmp_libs $deplib" ;; esac ;; - *) func_append tmp_libs " $deplib" ;; + *) tmp_libs="$tmp_libs $deplib" ;; esac done eval $var=\"$tmp_libs\" @@ -7197,7 +6052,7 @@ func_mode_link () ;; esac if test -n "$i" ; then - func_append tmp_libs " $i" + tmp_libs="$tmp_libs $i" fi done dependency_libs=$tmp_libs @@ -7238,7 +6093,7 @@ func_mode_link () # Now set the variables for building old libraries. build_libtool_libs=no oldlibs="$output" - func_append objs "$old_deplibs" + objs="$objs$old_deplibs" ;; lib) @@ -7271,10 +6126,10 @@ func_mode_link () if test "$deplibs_check_method" != pass_all; then func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs" else - echo + $ECHO $ECHO "*** Warning: Linking the shared library $output against the non-libtool" $ECHO "*** objects $objs is not portable!" - func_append libobjs " $objs" + libobjs="$libobjs $objs" fi fi @@ -7333,14 +6188,13 @@ func_mode_link () # which has an extra 1 added just for fun # case $version_type in - # correct linux to gnu/linux during the next big refactor darwin|linux|osf|windows|none) func_arith $number_major + $number_minor current=$func_arith_result age="$number_minor" revision="$number_revision" ;; - freebsd-aout|freebsd-elf|qnx|sunos) + freebsd-aout|freebsd-elf|sunos) current="$number_major" revision="$number_minor" age="0" @@ -7352,9 +6206,6 @@ func_mode_link () revision="$number_minor" lt_irix_increment=no ;; - *) - func_fatal_configuration "$modename: unknown library version type \`$version_type'" - ;; esac ;; no) @@ -7453,7 +6304,7 @@ func_mode_link () versuffix="$major.$revision" ;; - linux) # correct to gnu/linux during the next big refactor + linux) func_arith $current - $age major=.$func_arith_result versuffix="$major.$age.$revision" @@ -7476,7 +6327,7 @@ func_mode_link () done # Make executables depend on our current version. - func_append verstring ":${current}.0" + verstring="$verstring:${current}.0" ;; qnx) @@ -7544,10 +6395,10 @@ func_mode_link () fi func_generate_dlsyms "$libname" "$libname" "yes" - func_append libobjs " $symfileobj" + libobjs="$libobjs $symfileobj" test "X$libobjs" = "X " && libobjs= - if test "$opt_mode" != relink; then + if test "$mode" != relink; then # Remove our outputs, but don't remove object files since they # may have been created when compiling PIC objects. removelist= @@ -7563,7 +6414,7 @@ func_mode_link () continue fi fi - func_append removelist " $p" + removelist="$removelist $p" ;; *) ;; esac @@ -7574,28 +6425,27 @@ func_mode_link () # Now set the variables for building old libraries. if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then - func_append oldlibs " $output_objdir/$libname.$libext" + oldlibs="$oldlibs $output_objdir/$libname.$libext" # Transform .lo files to .o files. - oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP` + oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP` fi # Eliminate all temporary directories. #for path in $notinst_path; do - # lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"` - # deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"` - # dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"` + # lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% $path % %g"` + # deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"` + # dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% -L$path % %g"` #done if test -n "$xrpath"; then # If the user specified any rpath flags, then add them. temp_xrpath= for libdir in $xrpath; do - func_replace_sysroot "$libdir" - func_append temp_xrpath " -R$func_replace_sysroot_result" + temp_xrpath="$temp_xrpath -R$libdir" case "$finalize_rpath " in *" $libdir "*) ;; - *) func_append finalize_rpath " $libdir" ;; + *) finalize_rpath="$finalize_rpath $libdir" ;; esac done if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then @@ -7609,7 +6459,7 @@ func_mode_link () for lib in $old_dlfiles; do case " $dlprefiles $dlfiles " in *" $lib "*) ;; - *) func_append dlfiles " $lib" ;; + *) dlfiles="$dlfiles $lib" ;; esac done @@ -7619,19 +6469,19 @@ func_mode_link () for lib in $old_dlprefiles; do case "$dlprefiles " in *" $lib "*) ;; - *) func_append dlprefiles " $lib" ;; + *) dlprefiles="$dlprefiles $lib" ;; esac done if test "$build_libtool_libs" = yes; then if test -n "$rpath"; then case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*) + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*) # these systems don't actually have a c library (as such)! ;; *-*-rhapsody* | *-*-darwin1.[012]) # Rhapsody C library is in the System framework - func_append deplibs " System.ltframework" + deplibs="$deplibs System.ltframework" ;; *-*-netbsd*) # Don't link with libc until the a.out ld.so is fixed. @@ -7648,7 +6498,7 @@ func_mode_link () *) # Add libc to deplibs on all other systems if necessary. if test "$build_libtool_need_lc" = "yes"; then - func_append deplibs " -lc" + deplibs="$deplibs -lc" fi ;; esac @@ -7697,7 +6547,7 @@ EOF if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then case " $predeps $postdeps " in *" $i "*) - func_append newdeplibs " $i" + newdeplibs="$newdeplibs $i" i="" ;; esac @@ -7708,21 +6558,21 @@ EOF set dummy $deplib_matches; shift deplib_match=$1 if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then - func_append newdeplibs " $i" + newdeplibs="$newdeplibs $i" else droppeddeps=yes - echo + $ECHO $ECHO "*** Warning: dynamic linker does not accept needed library $i." - echo "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which I believe you do not have" - echo "*** because a test_compile did reveal that the linker did not use it for" - echo "*** its dynamic dependency list that programs get resolved with at runtime." + $ECHO "*** I have the capability to make that library automatically link in when" + $ECHO "*** you link to this library. But I can only do this if you have a" + $ECHO "*** shared version of the library, which I believe you do not have" + $ECHO "*** because a test_compile did reveal that the linker did not use it for" + $ECHO "*** its dynamic dependency list that programs get resolved with at runtime." fi fi ;; *) - func_append newdeplibs " $i" + newdeplibs="$newdeplibs $i" ;; esac done @@ -7740,7 +6590,7 @@ EOF if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then case " $predeps $postdeps " in *" $i "*) - func_append newdeplibs " $i" + newdeplibs="$newdeplibs $i" i="" ;; esac @@ -7751,29 +6601,29 @@ EOF set dummy $deplib_matches; shift deplib_match=$1 if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then - func_append newdeplibs " $i" + newdeplibs="$newdeplibs $i" else droppeddeps=yes - echo + $ECHO $ECHO "*** Warning: dynamic linker does not accept needed library $i." - echo "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which you do not appear to have" - echo "*** because a test_compile did reveal that the linker did not use this one" - echo "*** as a dynamic dependency that programs can get resolved with at runtime." + $ECHO "*** I have the capability to make that library automatically link in when" + $ECHO "*** you link to this library. But I can only do this if you have a" + $ECHO "*** shared version of the library, which you do not appear to have" + $ECHO "*** because a test_compile did reveal that the linker did not use this one" + $ECHO "*** as a dynamic dependency that programs can get resolved with at runtime." fi fi else droppeddeps=yes - echo + $ECHO $ECHO "*** Warning! Library $i is needed by this library but I was not able to" - echo "*** make it link in! You will probably need to install it or some" - echo "*** library that it depends on before this library will be fully" - echo "*** functional. Installing it before continuing would be even better." + $ECHO "*** make it link in! You will probably need to install it or some" + $ECHO "*** library that it depends on before this library will be fully" + $ECHO "*** functional. Installing it before continuing would be even better." fi ;; *) - func_append newdeplibs " $i" + newdeplibs="$newdeplibs $i" ;; esac done @@ -7790,27 +6640,15 @@ EOF if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then case " $predeps $postdeps " in *" $a_deplib "*) - func_append newdeplibs " $a_deplib" + newdeplibs="$newdeplibs $a_deplib" a_deplib="" ;; esac fi if test -n "$a_deplib" ; then libname=`eval "\\$ECHO \"$libname_spec\""` - if test -n "$file_magic_glob"; then - libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob` - else - libnameglob=$libname - fi - test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob` for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do - if test "$want_nocaseglob" = yes; then - shopt -s nocaseglob - potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` - $nocaseglob - else - potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` - fi + potential_libs=`ls $i/$libname[.-]* 2>/dev/null` for potent_lib in $potential_libs; do # Follow soft links. if ls -lLd "$potent_lib" 2>/dev/null | @@ -7827,13 +6665,13 @@ EOF potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` case $potliblink in [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; - *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";; + *) potlib=`$ECHO "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";; esac done if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | $SED -e 10q | $EGREP "$file_magic_regex" > /dev/null; then - func_append newdeplibs " $a_deplib" + newdeplibs="$newdeplibs $a_deplib" a_deplib="" break 2 fi @@ -7842,12 +6680,12 @@ EOF fi if test -n "$a_deplib" ; then droppeddeps=yes - echo + $ECHO $ECHO "*** Warning: linker path does not have real file for library $a_deplib." - echo "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which you do not appear to have" - echo "*** because I did check the linker path looking for a file starting" + $ECHO "*** I have the capability to make that library automatically link in when" + $ECHO "*** you link to this library. But I can only do this if you have a" + $ECHO "*** shared version of the library, which you do not appear to have" + $ECHO "*** because I did check the linker path looking for a file starting" if test -z "$potlib" ; then $ECHO "*** with $libname but no candidates were found. (...for file magic test)" else @@ -7858,7 +6696,7 @@ EOF ;; *) # Add a -L argument. - func_append newdeplibs " $a_deplib" + newdeplibs="$newdeplibs $a_deplib" ;; esac done # Gone through all deplibs. @@ -7874,7 +6712,7 @@ EOF if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then case " $predeps $postdeps " in *" $a_deplib "*) - func_append newdeplibs " $a_deplib" + newdeplibs="$newdeplibs $a_deplib" a_deplib="" ;; esac @@ -7885,9 +6723,9 @@ EOF potential_libs=`ls $i/$libname[.-]* 2>/dev/null` for potent_lib in $potential_libs; do potlib="$potent_lib" # see symlink-check above in file_magic test - if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ + if eval "\$ECHO \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \ $EGREP "$match_pattern_regex" > /dev/null; then - func_append newdeplibs " $a_deplib" + newdeplibs="$newdeplibs $a_deplib" a_deplib="" break 2 fi @@ -7896,12 +6734,12 @@ EOF fi if test -n "$a_deplib" ; then droppeddeps=yes - echo + $ECHO $ECHO "*** Warning: linker path does not have real file for library $a_deplib." - echo "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which you do not appear to have" - echo "*** because I did check the linker path looking for a file starting" + $ECHO "*** I have the capability to make that library automatically link in when" + $ECHO "*** you link to this library. But I can only do this if you have a" + $ECHO "*** shared version of the library, which you do not appear to have" + $ECHO "*** because I did check the linker path looking for a file starting" if test -z "$potlib" ; then $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)" else @@ -7912,32 +6750,32 @@ EOF ;; *) # Add a -L argument. - func_append newdeplibs " $a_deplib" + newdeplibs="$newdeplibs $a_deplib" ;; esac done # Gone through all deplibs. ;; none | unknown | *) newdeplibs="" - tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'` + tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \ + -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'` if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then for i in $predeps $postdeps ; do # can't use Xsed below, because $i might contain '/' - tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"` + tmp_deplibs=`$ECHO "X $tmp_deplibs" | $Xsed -e "s,$i,,"` done fi - case $tmp_deplibs in - *[!\ \ ]*) - echo + if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' | + $GREP . >/dev/null; then + $ECHO if test "X$deplibs_check_method" = "Xnone"; then - echo "*** Warning: inter-library dependencies are not supported in this platform." + $ECHO "*** Warning: inter-library dependencies are not supported in this platform." else - echo "*** Warning: inter-library dependencies are not known to be supported." + $ECHO "*** Warning: inter-library dependencies are not known to be supported." fi - echo "*** All declared inter-library dependencies are being dropped." + $ECHO "*** All declared inter-library dependencies are being dropped." droppeddeps=yes - ;; - esac + fi ;; esac versuffix=$versuffix_save @@ -7949,23 +6787,23 @@ EOF case $host in *-*-rhapsody* | *-*-darwin1.[012]) # On Rhapsody replace the C library with the System framework - newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'` + newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'` ;; esac if test "$droppeddeps" = yes; then if test "$module" = yes; then - echo - echo "*** Warning: libtool could not satisfy all declared inter-library" + $ECHO + $ECHO "*** Warning: libtool could not satisfy all declared inter-library" $ECHO "*** dependencies of module $libname. Therefore, libtool will create" - echo "*** a static module, that should work as long as the dlopening" - echo "*** application is linked with the -dlopen flag." + $ECHO "*** a static module, that should work as long as the dlopening" + $ECHO "*** application is linked with the -dlopen flag." if test -z "$global_symbol_pipe"; then - echo - echo "*** However, this would only work if libtool was able to extract symbol" - echo "*** lists from a program, using \`nm' or equivalent, but libtool could" - echo "*** not find such a program. So, this module is probably useless." - echo "*** \`nm' from GNU binutils and a full rebuild may help." + $ECHO + $ECHO "*** However, this would only work if libtool was able to extract symbol" + $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could" + $ECHO "*** not find such a program. So, this module is probably useless." + $ECHO "*** \`nm' from GNU binutils and a full rebuild may help." fi if test "$build_old_libs" = no; then oldlibs="$output_objdir/$libname.$libext" @@ -7975,16 +6813,16 @@ EOF build_libtool_libs=no fi else - echo "*** The inter-library dependencies that have been dropped here will be" - echo "*** automatically added whenever a program is linked with this library" - echo "*** or is declared to -dlopen it." + $ECHO "*** The inter-library dependencies that have been dropped here will be" + $ECHO "*** automatically added whenever a program is linked with this library" + $ECHO "*** or is declared to -dlopen it." if test "$allow_undefined" = no; then - echo - echo "*** Since this library must not contain undefined symbols," - echo "*** because either the platform does not support them or" - echo "*** it was explicitly requested with -no-undefined," - echo "*** libtool will only create a static version of it." + $ECHO + $ECHO "*** Since this library must not contain undefined symbols," + $ECHO "*** because either the platform does not support them or" + $ECHO "*** it was explicitly requested with -no-undefined," + $ECHO "*** libtool will only create a static version of it." if test "$build_old_libs" = no; then oldlibs="$output_objdir/$libname.$libext" build_libtool_libs=module @@ -8001,9 +6839,9 @@ EOF # Time to change all our "foo.ltframework" stuff back to "-framework foo" case $host in *-*-darwin*) - newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` + new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` + deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` ;; esac @@ -8016,7 +6854,7 @@ EOF *) case " $deplibs " in *" -L$path/$objdir "*) - func_append new_libs " -L$path/$objdir" ;; + new_libs="$new_libs -L$path/$objdir" ;; esac ;; esac @@ -8026,10 +6864,10 @@ EOF -L*) case " $new_libs " in *" $deplib "*) ;; - *) func_append new_libs " $deplib" ;; + *) new_libs="$new_libs $deplib" ;; esac ;; - *) func_append new_libs " $deplib" ;; + *) new_libs="$new_libs $deplib" ;; esac done deplibs="$new_libs" @@ -8041,22 +6879,15 @@ EOF # Test again, we may have decided not to build it any more if test "$build_libtool_libs" = yes; then - # Remove ${wl} instances when linking with ld. - # FIXME: should test the right _cmds variable. - case $archive_cmds in - *\$LD\ *) wl= ;; - esac if test "$hardcode_into_libs" = yes; then # Hardcode the library paths hardcode_libdirs= dep_rpath= rpath="$finalize_rpath" - test "$opt_mode" != relink && rpath="$compile_rpath$rpath" + test "$mode" != relink && rpath="$compile_rpath$rpath" for libdir in $rpath; do if test -n "$hardcode_libdir_flag_spec"; then if test -n "$hardcode_libdir_separator"; then - func_replace_sysroot "$libdir" - libdir=$func_replace_sysroot_result if test -z "$hardcode_libdirs"; then hardcode_libdirs="$libdir" else @@ -8065,18 +6896,18 @@ EOF *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) ;; *) - func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" + hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" ;; esac fi else eval flag=\"$hardcode_libdir_flag_spec\" - func_append dep_rpath " $flag" + dep_rpath="$dep_rpath $flag" fi elif test -n "$runpath_var"; then case "$perm_rpath " in *" $libdir "*) ;; - *) func_append perm_rpath " $libdir" ;; + *) perm_rpath="$perm_rpath $libdir" ;; esac fi done @@ -8084,13 +6915,17 @@ EOF if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then libdir="$hardcode_libdirs" - eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" + if test -n "$hardcode_libdir_flag_spec_ld"; then + eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" + else + eval dep_rpath=\"$hardcode_libdir_flag_spec\" + fi fi if test -n "$runpath_var" && test -n "$perm_rpath"; then # We should set the runpath_var. rpath= for dir in $perm_rpath; do - func_append rpath "$dir:" + rpath="$rpath$dir:" done eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" fi @@ -8098,7 +6933,7 @@ EOF fi shlibpath="$finalize_shlibpath" - test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath" + test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath" if test -n "$shlibpath"; then eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" fi @@ -8124,18 +6959,18 @@ EOF linknames= for link do - func_append linknames " $link" + linknames="$linknames $link" done # Use standard objects if they are pic - test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP` + test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` test "X$libobjs" = "X " && libobjs= delfiles= if test -n "$export_symbols" && test -n "$include_expsyms"; then $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" export_symbols="$output_objdir/$libname.uexp" - func_append delfiles " $export_symbols" + delfiles="$delfiles $export_symbols" fi orig_export_symbols= @@ -8166,45 +7001,13 @@ EOF $opt_dry_run || $RM $export_symbols cmds=$export_symbols_cmds save_ifs="$IFS"; IFS='~' - for cmd1 in $cmds; do + for cmd in $cmds; do IFS="$save_ifs" - # Take the normal branch if the nm_file_list_spec branch - # doesn't work or if tool conversion is not needed. - case $nm_file_list_spec~$to_tool_file_cmd in - *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*) - try_normal_branch=yes - eval cmd=\"$cmd1\" - func_len " $cmd" - len=$func_len_result - ;; - *) - try_normal_branch=no - ;; - esac - if test "$try_normal_branch" = yes \ - && { test "$len" -lt "$max_cmd_len" \ - || test "$max_cmd_len" -le -1; } - then - func_show_eval "$cmd" 'exit $?' - skipped_export=false - elif test -n "$nm_file_list_spec"; then - func_basename "$output" - output_la=$func_basename_result - save_libobjs=$libobjs - save_output=$output - output=${output_objdir}/${output_la}.nm - func_to_tool_file "$output" - libobjs=$nm_file_list_spec$func_to_tool_file_result - func_append delfiles " $output" - func_verbose "creating $NM input file list: $output" - for obj in $save_libobjs; do - func_to_tool_file "$obj" - $ECHO "$func_to_tool_file_result" - done > "$output" - eval cmd=\"$cmd1\" + eval cmd=\"$cmd\" + func_len " $cmd" + len=$func_len_result + if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then func_show_eval "$cmd" 'exit $?' - output=$save_output - libobjs=$save_libobjs skipped_export=false else # The command line is too long to execute in one step. @@ -8226,7 +7029,7 @@ EOF if test -n "$export_symbols" && test -n "$include_expsyms"; then tmp_export_symbols="$export_symbols" test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" - $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' + $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"' fi if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then @@ -8238,7 +7041,7 @@ EOF # global variables. join(1) would be nice here, but unfortunately # isn't a blessed tool. $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter - func_append delfiles " $export_symbols $output_objdir/$libname.filter" + delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" export_symbols=$output_objdir/$libname.def $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols fi @@ -8248,7 +7051,7 @@ EOF case " $convenience " in *" $test_deplib "*) ;; *) - func_append tmp_deplibs " $test_deplib" + tmp_deplibs="$tmp_deplibs $test_deplib" ;; esac done @@ -8268,21 +7071,21 @@ EOF test "X$libobjs" = "X " && libobjs= else gentop="$output_objdir/${outputname}x" - func_append generated " $gentop" + generated="$generated $gentop" func_extract_archives $gentop $convenience - func_append libobjs " $func_extract_archives_result" + libobjs="$libobjs $func_extract_archives_result" test "X$libobjs" = "X " && libobjs= fi fi if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then eval flag=\"$thread_safe_flag_spec\" - func_append linker_flags " $flag" + linker_flags="$linker_flags $flag" fi # Make a backup of the uninstalled library when relinking - if test "$opt_mode" = relink; then + if test "$mode" = relink; then $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? fi @@ -8327,8 +7130,7 @@ EOF save_libobjs=$libobjs fi save_output=$output - func_basename "$output" - output_la=$func_basename_result + output_la=`$ECHO "X$output" | $Xsed -e "$basename"` # Clear the reloadable object creation command queue and # initialize k to one. @@ -8341,16 +7143,13 @@ EOF if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then output=${output_objdir}/${output_la}.lnkscript func_verbose "creating GNU ld script: $output" - echo 'INPUT (' > $output + $ECHO 'INPUT (' > $output for obj in $save_libobjs do - func_to_tool_file "$obj" - $ECHO "$func_to_tool_file_result" >> $output + $ECHO "$obj" >> $output done - echo ')' >> $output - func_append delfiles " $output" - func_to_tool_file "$output" - output=$func_to_tool_file_result + $ECHO ')' >> $output + delfiles="$delfiles $output" elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then output=${output_objdir}/${output_la}.lnk func_verbose "creating linker input file list: $output" @@ -8364,12 +7163,10 @@ EOF fi for obj do - func_to_tool_file "$obj" - $ECHO "$func_to_tool_file_result" >> $output + $ECHO "$obj" >> $output done - func_append delfiles " $output" - func_to_tool_file "$output" - output=$firstobj\"$file_list_spec$func_to_tool_file_result\" + delfiles="$delfiles $output" + output=$firstobj\"$file_list_spec$output\" else if test -n "$save_libobjs"; then func_verbose "creating reloadable object files..." @@ -8393,19 +7190,17 @@ EOF # command to the queue. if test "$k" -eq 1 ; then # The first file doesn't have a previous command to add. - reload_objs=$objlist - eval concat_cmds=\"$reload_cmds\" + eval concat_cmds=\"$reload_cmds $objlist $last_robj\" else # All subsequent reloadable object files will link in # the last one created. - reload_objs="$objlist $last_robj" - eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\" + eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$RM $last_robj\" fi last_robj=$output_objdir/$output_la-${k}.$objext func_arith $k + 1 k=$func_arith_result output=$output_objdir/$output_la-${k}.$objext - objlist=" $obj" + objlist=$obj func_len " $last_robj" func_arith $len0 + $func_len_result len=$func_arith_result @@ -8415,12 +7210,11 @@ EOF # reloadable object file. All subsequent reloadable object # files will link in the last one created. test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - reload_objs="$objlist $last_robj" - eval concat_cmds=\"\${concat_cmds}$reload_cmds\" + eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\" if test -n "$last_robj"; then eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" fi - func_append delfiles " $output" + delfiles="$delfiles $output" else output= @@ -8454,7 +7248,7 @@ EOF lt_exit=$? # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then + if test "$mode" = relink; then ( cd "$output_objdir" && \ $RM "${realname}T" && \ $MV "${realname}U" "$realname" ) @@ -8475,7 +7269,7 @@ EOF if test -n "$export_symbols" && test -n "$include_expsyms"; then tmp_export_symbols="$export_symbols" test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" - $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' + $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"' fi if test -n "$orig_export_symbols"; then @@ -8487,7 +7281,7 @@ EOF # global variables. join(1) would be nice here, but unfortunately # isn't a blessed tool. $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter - func_append delfiles " $export_symbols $output_objdir/$libname.filter" + delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" export_symbols=$output_objdir/$libname.def $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols fi @@ -8528,10 +7322,10 @@ EOF # Add any objects from preloaded convenience libraries if test -n "$dlprefiles"; then gentop="$output_objdir/${outputname}x" - func_append generated " $gentop" + generated="$generated $gentop" func_extract_archives $gentop $dlprefiles - func_append libobjs " $func_extract_archives_result" + libobjs="$libobjs $func_extract_archives_result" test "X$libobjs" = "X " && libobjs= fi @@ -8547,7 +7341,7 @@ EOF lt_exit=$? # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then + if test "$mode" = relink; then ( cd "$output_objdir" && \ $RM "${realname}T" && \ $MV "${realname}U" "$realname" ) @@ -8559,7 +7353,7 @@ EOF IFS="$save_ifs" # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then + if test "$mode" = relink; then $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? if test -n "$convenience"; then @@ -8640,21 +7434,18 @@ EOF if test -n "$convenience"; then if test -n "$whole_archive_flag_spec"; then eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" - reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` + reload_conv_objs=$reload_objs\ `$ECHO "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'` else gentop="$output_objdir/${obj}x" - func_append generated " $gentop" + generated="$generated $gentop" func_extract_archives $gentop $convenience reload_conv_objs="$reload_objs $func_extract_archives_result" fi fi - # If we're not building shared, we need to use non_pic_objs - test "$build_libtool_libs" != yes && libobjs="$non_pic_objects" - # Create the old-style object. - reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test + reload_objs="$objs$old_deplibs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test output="$obj" func_execute_cmds "$reload_cmds" 'exit $?' @@ -8714,8 +7505,8 @@ EOF case $host in *-*-rhapsody* | *-*-darwin1.[012]) # On Rhapsody replace the C library is the System framework - compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'` - finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'` + compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'` + finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'` ;; esac @@ -8726,14 +7517,14 @@ EOF if test "$tagname" = CXX ; then case ${MACOSX_DEPLOYMENT_TARGET-10.0} in 10.[0123]) - func_append compile_command " ${wl}-bind_at_load" - func_append finalize_command " ${wl}-bind_at_load" + compile_command="$compile_command ${wl}-bind_at_load" + finalize_command="$finalize_command ${wl}-bind_at_load" ;; esac fi # Time to change all our "foo.ltframework" stuff back to "-framework foo" - compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` + finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` ;; esac @@ -8747,7 +7538,7 @@ EOF *) case " $compile_deplibs " in *" -L$path/$objdir "*) - func_append new_libs " -L$path/$objdir" ;; + new_libs="$new_libs -L$path/$objdir" ;; esac ;; esac @@ -8757,17 +7548,17 @@ EOF -L*) case " $new_libs " in *" $deplib "*) ;; - *) func_append new_libs " $deplib" ;; + *) new_libs="$new_libs $deplib" ;; esac ;; - *) func_append new_libs " $deplib" ;; + *) new_libs="$new_libs $deplib" ;; esac done compile_deplibs="$new_libs" - func_append compile_command " $compile_deplibs" - func_append finalize_command " $finalize_deplibs" + compile_command="$compile_command $compile_deplibs" + finalize_command="$finalize_command $finalize_deplibs" if test -n "$rpath$xrpath"; then # If the user specified any rpath flags, then add them. @@ -8775,7 +7566,7 @@ EOF # This is the magic to use -rpath. case "$finalize_rpath " in *" $libdir "*) ;; - *) func_append finalize_rpath " $libdir" ;; + *) finalize_rpath="$finalize_rpath $libdir" ;; esac done fi @@ -8794,18 +7585,18 @@ EOF *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) ;; *) - func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" + hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" ;; esac fi else eval flag=\"$hardcode_libdir_flag_spec\" - func_append rpath " $flag" + rpath="$rpath $flag" fi elif test -n "$runpath_var"; then case "$perm_rpath " in *" $libdir "*) ;; - *) func_append perm_rpath " $libdir" ;; + *) perm_rpath="$perm_rpath $libdir" ;; esac fi case $host in @@ -8814,12 +7605,12 @@ EOF case :$dllsearchpath: in *":$libdir:"*) ;; ::) dllsearchpath=$libdir;; - *) func_append dllsearchpath ":$libdir";; + *) dllsearchpath="$dllsearchpath:$libdir";; esac case :$dllsearchpath: in *":$testbindir:"*) ;; ::) dllsearchpath=$testbindir;; - *) func_append dllsearchpath ":$testbindir";; + *) dllsearchpath="$dllsearchpath:$testbindir";; esac ;; esac @@ -8845,18 +7636,18 @@ EOF *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) ;; *) - func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" + hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" ;; esac fi else eval flag=\"$hardcode_libdir_flag_spec\" - func_append rpath " $flag" + rpath="$rpath $flag" fi elif test -n "$runpath_var"; then case "$finalize_perm_rpath " in *" $libdir "*) ;; - *) func_append finalize_perm_rpath " $libdir" ;; + *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;; esac fi done @@ -8870,8 +7661,8 @@ EOF if test -n "$libobjs" && test "$build_old_libs" = yes; then # Transform all the library objects into standard objects. - compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP` - finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP` + compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` + finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` fi func_generate_dlsyms "$outputname" "@PROGRAM@" "no" @@ -8883,15 +7674,15 @@ EOF wrappers_required=yes case $host in - *cegcc* | *mingw32ce*) - # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway. - wrappers_required=no - ;; *cygwin* | *mingw* ) if test "$build_libtool_libs" != yes; then wrappers_required=no fi ;; + *cegcc) + # Disable wrappers for cegcc, we are cross compiling anyway. + wrappers_required=no + ;; *) if test "$need_relink" = no || test "$build_libtool_libs" != yes; then wrappers_required=no @@ -8900,19 +7691,13 @@ EOF esac if test "$wrappers_required" = no; then # Replace the output file specification. - compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'` + compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` link_command="$compile_command$compile_rpath" # We have no uninstalled library dependencies, so finalize right now. exit_status=0 func_show_eval "$link_command" 'exit_status=$?' - if test -n "$postlink_cmds"; then - func_to_tool_file "$output" - postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` - func_execute_cmds "$postlink_cmds" 'exit $?' - fi - # Delete the generated files. if test -f "$output_objdir/${outputname}S.${objext}"; then func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' @@ -8935,7 +7720,7 @@ EOF # We should set the runpath_var. rpath= for dir in $perm_rpath; do - func_append rpath "$dir:" + rpath="$rpath$dir:" done compile_var="$runpath_var=\"$rpath\$$runpath_var\" " fi @@ -8943,7 +7728,7 @@ EOF # We should set the runpath_var. rpath= for dir in $finalize_perm_rpath; do - func_append rpath "$dir:" + rpath="$rpath$dir:" done finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " fi @@ -8953,18 +7738,11 @@ EOF # We don't need to create a wrapper script. link_command="$compile_var$compile_command$compile_rpath" # Replace the output file specification. - link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'` + link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` # Delete the old output file. $opt_dry_run || $RM $output # Link the executable and exit func_show_eval "$link_command" 'exit $?' - - if test -n "$postlink_cmds"; then - func_to_tool_file "$output" - postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` - func_execute_cmds "$postlink_cmds" 'exit $?' - fi - exit $EXIT_SUCCESS fi @@ -8979,7 +7757,7 @@ EOF if test "$fast_install" != no; then link_command="$finalize_var$compile_command$finalize_rpath" if test "$fast_install" = yes; then - relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'` + relink_command=`$ECHO "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'` else # fast_install is set to needless relink_command= @@ -8991,19 +7769,13 @@ EOF fi # Replace the output file specification. - link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` + link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` # Delete the old output files. $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname func_show_eval "$link_command" 'exit $?' - if test -n "$postlink_cmds"; then - func_to_tool_file "$output_objdir/$outputname" - postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` - func_execute_cmds "$postlink_cmds" 'exit $?' - fi - # Now create the wrapper script. func_verbose "creating $output" @@ -9021,7 +7793,18 @@ EOF fi done relink_command="(cd `pwd`; $relink_command)" - relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` + relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"` + fi + + # Quote $ECHO for shipping. + if test "X$ECHO" = "X$SHELL $progpath --fallback-echo"; then + case $progpath in + [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";; + *) qecho="$SHELL `pwd`/$progpath --fallback-echo";; + esac + qecho=`$ECHO "X$qecho" | $Xsed -e "$sed_quote_subst"` + else + qecho=`$ECHO "X$ECHO" | $Xsed -e "$sed_quote_subst"` fi # Only actually do things if not in dry run mode. @@ -9101,7 +7884,7 @@ EOF else oldobjs="$old_deplibs $non_pic_objects" if test "$preload" = yes && test -f "$symfileobj"; then - func_append oldobjs " $symfileobj" + oldobjs="$oldobjs $symfileobj" fi fi addlibs="$old_convenience" @@ -9109,10 +7892,10 @@ EOF if test -n "$addlibs"; then gentop="$output_objdir/${outputname}x" - func_append generated " $gentop" + generated="$generated $gentop" func_extract_archives $gentop $addlibs - func_append oldobjs " $func_extract_archives_result" + oldobjs="$oldobjs $func_extract_archives_result" fi # Do each command in the archive commands. @@ -9123,10 +7906,10 @@ EOF # Add any objects from preloaded convenience libraries if test -n "$dlprefiles"; then gentop="$output_objdir/${outputname}x" - func_append generated " $gentop" + generated="$generated $gentop" func_extract_archives $gentop $dlprefiles - func_append oldobjs " $func_extract_archives_result" + oldobjs="$oldobjs $func_extract_archives_result" fi # POSIX demands no paths to be encoded in archives. We have @@ -9142,9 +7925,9 @@ EOF done | sort | sort -uc >/dev/null 2>&1); then : else - echo "copying selected object files to avoid basename conflicts..." + $ECHO "copying selected object files to avoid basename conflicts..." gentop="$output_objdir/${outputname}x" - func_append generated " $gentop" + generated="$generated $gentop" func_mkdir_p "$gentop" save_oldobjs=$oldobjs oldobjs= @@ -9168,30 +7951,18 @@ EOF esac done func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" - func_append oldobjs " $gentop/$newobj" + oldobjs="$oldobjs $gentop/$newobj" ;; - *) func_append oldobjs " $obj" ;; + *) oldobjs="$oldobjs $obj" ;; esac done fi - func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 - tool_oldlib=$func_to_tool_file_result eval cmds=\"$old_archive_cmds\" func_len " $cmds" len=$func_len_result if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then cmds=$old_archive_cmds - elif test -n "$archiver_list_spec"; then - func_verbose "using command file archive linking..." - for obj in $oldobjs - do - func_to_tool_file "$obj" - $ECHO "$func_to_tool_file_result" - done > $output_objdir/$libname.libcmd - func_to_tool_file "$output_objdir/$libname.libcmd" - oldobjs=" $archiver_list_spec$func_to_tool_file_result" - cmds=$old_archive_cmds else # the command line is too long to link in one step, link in parts func_verbose "using piecewise archive linking..." @@ -9265,7 +8036,7 @@ EOF done # Quote the link command for shipping. relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" - relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` + relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"` if test "$hardcode_automatic" = yes ; then relink_command= fi @@ -9285,23 +8056,12 @@ EOF *.la) func_basename "$deplib" name="$func_basename_result" - func_resolve_sysroot "$deplib" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` test -z "$libdir" && \ func_fatal_error "\`$deplib' is not a valid libtool archive" - func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" - ;; - -L*) - func_stripname -L '' "$deplib" - func_replace_sysroot "$func_stripname_result" - func_append newdependency_libs " -L$func_replace_sysroot_result" + newdependency_libs="$newdependency_libs $libdir/$name" ;; - -R*) - func_stripname -R '' "$deplib" - func_replace_sysroot "$func_stripname_result" - func_append newdependency_libs " -R$func_replace_sysroot_result" - ;; - *) func_append newdependency_libs " $deplib" ;; + *) newdependency_libs="$newdependency_libs $deplib" ;; esac done dependency_libs="$newdependency_libs" @@ -9315,9 +8075,9 @@ EOF eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` test -z "$libdir" && \ func_fatal_error "\`$lib' is not a valid libtool archive" - func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name" + newdlfiles="$newdlfiles $libdir/$name" ;; - *) func_append newdlfiles " $lib" ;; + *) newdlfiles="$newdlfiles $lib" ;; esac done dlfiles="$newdlfiles" @@ -9334,7 +8094,7 @@ EOF eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` test -z "$libdir" && \ func_fatal_error "\`$lib' is not a valid libtool archive" - func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name" + newdlprefiles="$newdlprefiles $libdir/$name" ;; esac done @@ -9346,7 +8106,7 @@ EOF [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; *) abs=`pwd`"/$lib" ;; esac - func_append newdlfiles " $abs" + newdlfiles="$newdlfiles $abs" done dlfiles="$newdlfiles" newdlprefiles= @@ -9355,33 +8115,15 @@ EOF [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; *) abs=`pwd`"/$lib" ;; esac - func_append newdlprefiles " $abs" + newdlprefiles="$newdlprefiles $abs" done dlprefiles="$newdlprefiles" fi $RM $output # place dlname in correct position for cygwin - # In fact, it would be nice if we could use this code for all target - # systems that can't hard-code library paths into their executables - # and that have no shared library path variable independent of PATH, - # but it turns out we can't easily determine that from inspecting - # libtool variables, so we have to hard-code the OSs to which it - # applies here; at the moment, that means platforms that use the PE - # object format with DLL files. See the long comment at the top of - # tests/bindir.at for full details. tdlname=$dlname case $host,$output,$installed,$module,$dlname in - *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) - # If a -bindir argument was supplied, place the dll there. - if test "x$bindir" != x ; - then - func_relative_path "$install_libdir" "$bindir" - tdlname=$func_relative_path_result$dlname - else - # Otherwise fall back on heuristic. - tdlname=../bin/$dlname - fi - ;; + *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; esac $ECHO > $output "\ # $outputname - a libtool library file @@ -9440,7 +8182,7 @@ relink_command=\"$relink_command\"" exit $EXIT_SUCCESS } -{ test "$opt_mode" = link || test "$opt_mode" = relink; } && +{ test "$mode" = link || test "$mode" = relink; } && func_mode_link ${1+"$@"} @@ -9460,9 +8202,9 @@ func_mode_uninstall () for arg do case $arg in - -f) func_append RM " $arg"; rmforce=yes ;; - -*) func_append RM " $arg" ;; - *) func_append files " $arg" ;; + -f) RM="$RM $arg"; rmforce=yes ;; + -*) RM="$RM $arg" ;; + *) files="$files $arg" ;; esac done @@ -9471,23 +8213,24 @@ func_mode_uninstall () rmdirs= + origobjdir="$objdir" for file in $files; do func_dirname "$file" "" "." dir="$func_dirname_result" if test "X$dir" = X.; then - odir="$objdir" + objdir="$origobjdir" else - odir="$dir/$objdir" + objdir="$dir/$origobjdir" fi func_basename "$file" name="$func_basename_result" - test "$opt_mode" = uninstall && odir="$dir" + test "$mode" = uninstall && objdir="$dir" - # Remember odir for removal later, being careful to avoid duplicates - if test "$opt_mode" = clean; then + # Remember objdir for removal later, being careful to avoid duplicates + if test "$mode" = clean; then case " $rmdirs " in - *" $odir "*) ;; - *) func_append rmdirs " $odir" ;; + *" $objdir "*) ;; + *) rmdirs="$rmdirs $objdir" ;; esac fi @@ -9513,17 +8256,18 @@ func_mode_uninstall () # Delete the libtool libraries and symlinks. for n in $library_names; do - func_append rmfiles " $odir/$n" + rmfiles="$rmfiles $objdir/$n" done - test -n "$old_library" && func_append rmfiles " $odir/$old_library" + test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library" - case "$opt_mode" in + case "$mode" in clean) - case " $library_names " in + case " $library_names " in + # " " in the beginning catches empty $dlname *" $dlname "*) ;; - *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;; + *) rmfiles="$rmfiles $objdir/$dlname" ;; esac - test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i" + test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" ;; uninstall) if test -n "$library_names"; then @@ -9551,19 +8295,19 @@ func_mode_uninstall () # Add PIC object to the list of files to remove. if test -n "$pic_object" && test "$pic_object" != none; then - func_append rmfiles " $dir/$pic_object" + rmfiles="$rmfiles $dir/$pic_object" fi # Add non-PIC object to the list of files to remove. if test -n "$non_pic_object" && test "$non_pic_object" != none; then - func_append rmfiles " $dir/$non_pic_object" + rmfiles="$rmfiles $dir/$non_pic_object" fi fi ;; *) - if test "$opt_mode" = clean ; then + if test "$mode" = clean ; then noexename=$name case $file in *.exe) @@ -9573,7 +8317,7 @@ func_mode_uninstall () noexename=$func_stripname_result # $file with .exe has already been added to rmfiles, # add $file without .exe - func_append rmfiles " $file" + rmfiles="$rmfiles $file" ;; esac # Do a test to see if this is a libtool program. @@ -9582,7 +8326,7 @@ func_mode_uninstall () func_ltwrapper_scriptname "$file" relink_command= func_source $func_ltwrapper_scriptname_result - func_append rmfiles " $func_ltwrapper_scriptname_result" + rmfiles="$rmfiles $func_ltwrapper_scriptname_result" else relink_command= func_source $dir/$noexename @@ -9590,12 +8334,12 @@ func_mode_uninstall () # note $name still contains .exe if it was in $file originally # as does the version of $file that was added into $rmfiles - func_append rmfiles " $odir/$name $odir/${name}S.${objext}" + rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}" if test "$fast_install" = yes && test -n "$relink_command"; then - func_append rmfiles " $odir/lt-$name" + rmfiles="$rmfiles $objdir/lt-$name" fi if test "X$noexename" != "X$name" ; then - func_append rmfiles " $odir/lt-${noexename}.c" + rmfiles="$rmfiles $objdir/lt-${noexename}.c" fi fi fi @@ -9603,6 +8347,7 @@ func_mode_uninstall () esac func_show_eval "$RM $rmfiles" 'exit_status=1' done + objdir="$origobjdir" # Try to remove the ${objdir}s in the directories where we deleted files for dir in $rmdirs; do @@ -9614,16 +8359,16 @@ func_mode_uninstall () exit $exit_status } -{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } && +{ test "$mode" = uninstall || test "$mode" = clean; } && func_mode_uninstall ${1+"$@"} -test -z "$opt_mode" && { +test -z "$mode" && { help="$generic_help" func_fatal_help "you must specify a MODE" } test -z "$exec_cmd" && \ - func_fatal_help "invalid operation mode \`$opt_mode'" + func_fatal_help "invalid operation mode \`$mode'" if test -n "$exec_cmd"; then eval exec "$exec_cmd" diff --git a/m4/libtool.m4 b/m4/libtool.m4 index 828104c..39ba996 100644 --- a/m4/libtool.m4 +++ b/m4/libtool.m4 @@ -1,8 +1,7 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# 2006, 2007, 2008 Free Software Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is free software; the Free Software Foundation gives @@ -11,8 +10,7 @@ m4_define([_LT_COPYING], [dnl # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# 2006, 2007, 2008 Free Software Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -39,7 +37,7 @@ m4_define([_LT_COPYING], [dnl # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ]) -# serial 57 LT_INIT +# serial 56 LT_INIT # LT_PREREQ(VERSION) @@ -68,7 +66,6 @@ esac # ------------------ AC_DEFUN([LT_INIT], [AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT -AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl AC_BEFORE([$0], [LT_LANG])dnl AC_BEFORE([$0], [LT_OUTPUT])dnl AC_BEFORE([$0], [LTDL_INIT])dnl @@ -85,8 +82,6 @@ AC_REQUIRE([LTVERSION_VERSION])dnl AC_REQUIRE([LTOBSOLETE_VERSION])dnl m4_require([_LT_PROG_LTMAIN])dnl -_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}]) - dnl Parse OPTIONS _LT_SET_OPTIONS([$0], [$1]) @@ -123,7 +118,7 @@ m4_defun([_LT_CC_BASENAME], *) break;; esac done -cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` ]) @@ -143,11 +138,6 @@ m4_defun([_LT_FILEUTILS_DEFAULTS], m4_defun([_LT_SETUP], [AC_REQUIRE([AC_CANONICAL_HOST])dnl AC_REQUIRE([AC_CANONICAL_BUILD])dnl -AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl -AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl - -_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl -dnl _LT_DECL([], [host_alias], [0], [The host system])dnl _LT_DECL([], [host], [0])dnl _LT_DECL([], [host_os], [0])dnl @@ -170,13 +160,10 @@ _LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl dnl m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_CHECK_SHELL_FEATURES])dnl -m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl m4_require([_LT_CMD_RELOAD])dnl m4_require([_LT_CHECK_MAGIC_METHOD])dnl -m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl m4_require([_LT_CMD_OLD_ARCHIVE])dnl m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl -m4_require([_LT_WITH_SYSROOT])dnl _LT_CONFIG_LIBTOOL_INIT([ # See if we are running on zsh, and set the options which allow our @@ -192,6 +179,7 @@ fi _LT_CHECK_OBJDIR m4_require([_LT_TAG_COMPILER])dnl +_LT_PROG_ECHO_BACKSLASH case $host_os in aix3*) @@ -205,6 +193,23 @@ aix3*) ;; esac +# Sed substitution that helps us do robust quoting. It backslashifies +# metacharacters that are still active within double-quoted strings. +sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' + +# Same as above, but do not quote variable references. +double_quote_subst='s/\([["`\\]]\)/\\\1/g' + +# Sed substitution to delay expansion of an escaped shell variable in a +# double_quote_subst'ed string. +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' + +# Sed substitution to delay expansion of an escaped single quote. +delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' + +# Sed substitution to avoid accidental globbing in evaled expressions +no_glob_subst='s/\*/\\\*/g' + # Global variables: ofile=libtool can_build_shared=yes @@ -245,28 +250,6 @@ _LT_CONFIG_COMMANDS ])# _LT_SETUP -# _LT_PREPARE_SED_QUOTE_VARS -# -------------------------- -# Define a few sed substitution that help us do robust quoting. -m4_defun([_LT_PREPARE_SED_QUOTE_VARS], -[# Backslashify metacharacters that are still active within -# double-quoted strings. -sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' - -# Same as above, but do not quote variable references. -double_quote_subst='s/\([["`\\]]\)/\\\1/g' - -# Sed substitution to delay expansion of an escaped shell variable in a -# double_quote_subst'ed string. -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' - -# Sed substitution to delay expansion of an escaped single quote. -delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' - -# Sed substitution to avoid accidental globbing in evaled expressions -no_glob_subst='s/\*/\\\*/g' -]) - # _LT_PROG_LTMAIN # --------------- # Note that this code is called both from `configure', and `config.status' @@ -425,7 +408,7 @@ m4_define([_lt_decl_all_varnames], # declaration there will have the same value as in `configure'. VARNAME # must have a single quote delimited value for this to work. m4_define([_LT_CONFIG_STATUS_DECLARE], -[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`']) +[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`']) # _LT_CONFIG_STATUS_DECLARATIONS @@ -435,7 +418,7 @@ m4_define([_LT_CONFIG_STATUS_DECLARE], # embedded single quotes properly. In configure, this macro expands # each variable declared with _LT_DECL (and _LT_TAGDECL) into: # -# ='`$ECHO "$" | $SED "$delay_single_quote_subst"`' +# ='`$ECHO "X$" | $Xsed -e "$delay_single_quote_subst"`' m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], [m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames), [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])]) @@ -534,20 +517,12 @@ LTCC='$LTCC' LTCFLAGS='$LTCFLAGS' compiler='$compiler_DEFAULT' -# A function that is used when there is no print builtin or printf. -func_fallback_echo () -{ - eval 'cat <<_LTECHO_EOF -\$[]1 -_LTECHO_EOF' -} - # Quote evaled strings. for var in lt_decl_all_varnames([[ \ ]], lt_decl_quote_varnames); do - case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in + case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -558,9 +533,9 @@ done # Double-quote double-evaled strings. for var in lt_decl_all_varnames([[ \ ]], lt_decl_dquote_varnames); do - case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in + case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -568,38 +543,16 @@ for var in lt_decl_all_varnames([[ \ esac done +# Fix-up fallback echo if it was mangled by the above quoting rules. +case \$lt_ECHO in +*'\\\[$]0 --fallback-echo"')dnl " + lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\` + ;; +esac + _LT_OUTPUT_LIBTOOL_INIT ]) -# _LT_GENERATED_FILE_INIT(FILE, [COMMENT]) -# ------------------------------------ -# Generate a child script FILE with all initialization necessary to -# reuse the environment learned by the parent script, and make the -# file executable. If COMMENT is supplied, it is inserted after the -# `#!' sequence but before initialization text begins. After this -# macro, additional text can be appended to FILE to form the body of -# the child script. The macro ends with non-zero status if the -# file could not be fully written (such as if the disk is full). -m4_ifdef([AS_INIT_GENERATED], -[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])], -[m4_defun([_LT_GENERATED_FILE_INIT], -[m4_require([AS_PREPARE])]dnl -[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl -[lt_write_fail=0 -cat >$1 <<_ASEOF || lt_write_fail=1 -#! $SHELL -# Generated by $as_me. -$2 -SHELL=\${CONFIG_SHELL-$SHELL} -export SHELL -_ASEOF -cat >>$1 <<\_ASEOF || lt_write_fail=1 -AS_SHELL_SANITIZE -_AS_PREPARE -exec AS_MESSAGE_FD>&1 -_ASEOF -test $lt_write_fail = 0 && chmod +x $1[]dnl -m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT # LT_OUTPUT # --------- @@ -609,11 +562,20 @@ m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT AC_DEFUN([LT_OUTPUT], [: ${CONFIG_LT=./config.lt} AC_MSG_NOTICE([creating $CONFIG_LT]) -_LT_GENERATED_FILE_INIT(["$CONFIG_LT"], -[# Run this file to recreate a libtool stub with the current configuration.]) +cat >"$CONFIG_LT" <<_LTEOF +#! $SHELL +# Generated by $as_me. +# Run this file to recreate a libtool stub with the current configuration. -cat >>"$CONFIG_LT" <<\_LTEOF lt_cl_silent=false +SHELL=\${CONFIG_SHELL-$SHELL} +_LTEOF + +cat >>"$CONFIG_LT" <<\_LTEOF +AS_SHELL_SANITIZE +_AS_PREPARE + +exec AS_MESSAGE_FD>&1 exec AS_MESSAGE_LOG_FD>>config.log { echo @@ -639,7 +601,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) configured by $[0], generated by m4_PACKAGE_STRING. -Copyright (C) 2011 Free Software Foundation, Inc. +Copyright (C) 2008 Free Software Foundation, Inc. This config.lt script is free software; the Free Software Foundation gives unlimited permision to copy, distribute and modify it." @@ -684,13 +646,15 @@ chmod +x "$CONFIG_LT" # appending to config.log, which fails on DOS, as config.log is still kept # open by configure. Here we exec the FD to /dev/null, effectively closing # config.log, so it can be properly (re)opened and appended to by config.lt. -lt_cl_success=: -test "$silent" = yes && - lt_config_lt_args="$lt_config_lt_args --quiet" -exec AS_MESSAGE_LOG_FD>/dev/null -$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false -exec AS_MESSAGE_LOG_FD>>config.log -$lt_cl_success || AS_EXIT(1) +if test "$no_create" != yes; then + lt_cl_success=: + test "$silent" = yes && + lt_config_lt_args="$lt_config_lt_args --quiet" + exec AS_MESSAGE_LOG_FD>/dev/null + $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false + exec AS_MESSAGE_LOG_FD>>config.log + $lt_cl_success || AS_EXIT(1) +fi ])# LT_OUTPUT @@ -753,12 +717,15 @@ _LT_EOF # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? - sed '$q' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) + sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) + + _LT_PROG_XSI_SHELLFNS - _LT_PROG_REPLACE_SHELLFNS + sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ + || (rm -f "$cfgfile"; exit 1) - mv -f "$cfgfile" "$ofile" || + mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" ], @@ -803,7 +770,6 @@ AC_DEFUN([LT_LANG], m4_case([$1], [C], [_LT_LANG(C)], [C++], [_LT_LANG(CXX)], - [Go], [_LT_LANG(GO)], [Java], [_LT_LANG(GCJ)], [Fortran 77], [_LT_LANG(F77)], [Fortran], [_LT_LANG(FC)], @@ -825,31 +791,6 @@ m4_defun([_LT_LANG], ])# _LT_LANG -m4_ifndef([AC_PROG_GO], [ -############################################################ -# NOTE: This macro has been submitted for inclusion into # -# GNU Autoconf as AC_PROG_GO. When it is available in # -# a released version of Autoconf we should remove this # -# macro and use it instead. # -############################################################ -m4_defun([AC_PROG_GO], -[AC_LANG_PUSH(Go)dnl -AC_ARG_VAR([GOC], [Go compiler command])dnl -AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl -_AC_ARG_VAR_LDFLAGS()dnl -AC_CHECK_TOOL(GOC, gccgo) -if test -z "$GOC"; then - if test -n "$ac_tool_prefix"; then - AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo]) - fi -fi -if test -z "$GOC"; then - AC_CHECK_PROG(GOC, gccgo, gccgo, false) -fi -])#m4_defun -])#m4_ifndef - - # _LT_LANG_DEFAULT_CONFIG # ----------------------- m4_defun([_LT_LANG_DEFAULT_CONFIG], @@ -880,10 +821,6 @@ AC_PROVIDE_IFELSE([AC_PROG_GCJ], m4_ifdef([LT_PROG_GCJ], [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) -AC_PROVIDE_IFELSE([AC_PROG_GO], - [LT_LANG(GO)], - [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])]) - AC_PROVIDE_IFELSE([LT_PROG_RC], [LT_LANG(RC)], [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) @@ -894,13 +831,11 @@ AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)]) AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)]) AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)]) AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)]) -AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)]) dnl aclocal-1.4 backwards compatibility: dnl AC_DEFUN([AC_LIBTOOL_CXX], []) dnl AC_DEFUN([AC_LIBTOOL_F77], []) dnl AC_DEFUN([AC_LIBTOOL_FC], []) dnl AC_DEFUN([AC_LIBTOOL_GCJ], []) -dnl AC_DEFUN([AC_LIBTOOL_RC], []) # _LT_TAG_COMPILER @@ -986,13 +921,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err _lt_result=$? - # If there is a non-empty error log, and "single_module" - # appears in it, assume the flag caused a linker warning - if test -s conftest.err && $GREP single_module conftest.err; then - cat conftest.err >&AS_MESSAGE_LOG_FD - # Otherwise, if the output was created with a 0 exit code from - # the compiler, it worked. - elif test -f libconftest.dylib && test $_lt_result -eq 0; then + if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -1000,7 +929,6 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ rm -rf libconftest.dylib* rm -f conftest.* fi]) - AC_CACHE_CHECK([for -exported_symbols_list linker flag], [lt_cv_ld_exported_symbols_list], [lt_cv_ld_exported_symbols_list=no @@ -1012,34 +940,6 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ [lt_cv_ld_exported_symbols_list=no]) LDFLAGS="$save_LDFLAGS" ]) - - AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], - [lt_cv_ld_force_load=no - cat > conftest.c << _LT_EOF -int forced_loaded() { return 2;} -_LT_EOF - echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD - echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD - $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD - echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD - $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD - cat > conftest.c << _LT_EOF -int main() { return 0;} -_LT_EOF - echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD - $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err - _lt_result=$? - if test -s conftest.err && $GREP force_load conftest.err; then - cat conftest.err >&AS_MESSAGE_LOG_FD - elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then - lt_cv_ld_force_load=yes - else - cat conftest.err >&AS_MESSAGE_LOG_FD - fi - rm -f conftest.err libconftest.a conftest conftest.c - rm -rf conftest.dSYM - ]) case $host_os in rhapsody* | darwin1.[[012]]) _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; @@ -1067,7 +967,7 @@ _LT_EOF else _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' fi - if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then + if test "$DSYMUTIL" != ":"; then _lt_dsymutil='~$DSYMUTIL $lib || :' else _lt_dsymutil= @@ -1077,8 +977,8 @@ _LT_EOF ]) -# _LT_DARWIN_LINKER_FEATURES([TAG]) -# --------------------------------- +# _LT_DARWIN_LINKER_FEATURES +# -------------------------- # Checks for linker and compiler features on darwin m4_defun([_LT_DARWIN_LINKER_FEATURES], [ @@ -1087,13 +987,7 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=yes _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - if test "$lt_cv_ld_force_load" = "yes"; then - _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' - m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], - [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) - else - _LT_TAGVAR(whole_archive_flag_spec, $1)='' - fi + _LT_TAGVAR(whole_archive_flag_spec, $1)='' _LT_TAGVAR(link_all_deplibs, $1)=yes _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" case $cc_basename in @@ -1101,7 +995,7 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], *) _lt_dar_can_shared=$GCC ;; esac if test "$_lt_dar_can_shared" = "yes"; then - output_verbose_link_cmd=func_echo_all + output_verbose_link_cmd=echo _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" @@ -1117,141 +1011,202 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], fi ]) -# _LT_SYS_MODULE_PATH_AIX([TAGNAME]) -# ---------------------------------- +# _LT_SYS_MODULE_PATH_AIX +# ----------------------- # Links a minimal program and checks the executable # for the system default hardcoded library path. In most cases, # this is /usr/lib:/lib, but when the MPI compilers are used # the location of the communication and MPI libs are included too. # If we don't find anything, use the default library path according # to the aix ld manual. -# Store the results from the different compilers for each TAGNAME. -# Allow to override them for all tags through lt_cv_aix_libpath. m4_defun([_LT_SYS_MODULE_PATH_AIX], [m4_require([_LT_DECL_SED])dnl -if test "${lt_cv_aix_libpath+set}" = set; then - aix_libpath=$lt_cv_aix_libpath -else - AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], - [AC_LINK_IFELSE([AC_LANG_PROGRAM],[ - lt_aix_libpath_sed='[ - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\([^ ]*\) *$/\1/ - p - } - }]' - _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - # Check for a 64-bit object if we didn't find anything. - if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then - _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - fi],[]) - if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then - _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib" - fi - ]) - aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) -fi +AC_LINK_IFELSE(AC_LANG_PROGRAM,[ +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +# Check for a 64-bit object if we didn't find anything. +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi],[]) +if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ])# _LT_SYS_MODULE_PATH_AIX # _LT_SHELL_INIT(ARG) # ------------------- m4_define([_LT_SHELL_INIT], -[m4_divert_text([M4SH-INIT], [$1 -])])# _LT_SHELL_INIT - +[ifdef([AC_DIVERSION_NOTICE], + [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], + [AC_DIVERT_PUSH(NOTICE)]) +$1 +AC_DIVERT_POP +])# _LT_SHELL_INIT # _LT_PROG_ECHO_BACKSLASH # ----------------------- -# Find how we can fake an echo command that does not interpret backslash. -# In particular, with Autoconf 2.60 or later we add some code to the start -# of the generated configure script which will find a shell with a builtin -# printf (which we can use as an echo command). +# Add some code to the start of the generated configure script which +# will find an echo command which doesn't interpret backslashes. m4_defun([_LT_PROG_ECHO_BACKSLASH], -[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO -ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - -AC_MSG_CHECKING([how to print strings]) -# Test print first, because it will be a builtin if present. -if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='print -r --' -elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='printf %s\n' +[_LT_SHELL_INIT([ +# Check that we are running under the correct shell. +SHELL=${CONFIG_SHELL-/bin/sh} + +case X$lt_ECHO in +X*--fallback-echo) + # Remove one level of quotation (which was required for Make). + ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` + ;; +esac + +ECHO=${lt_ECHO-echo} +if test "X[$]1" = X--no-reexec; then + # Discard the --no-reexec flag, and continue. + shift +elif test "X[$]1" = X--fallback-echo; then + # Avoid inline document here, it may be left over + : +elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then + # Yippee, $ECHO works! + : else - # Use this function as a fallback that always works. - func_fallback_echo () - { - eval 'cat <<_LTECHO_EOF -$[]1 -_LTECHO_EOF' - } - ECHO='func_fallback_echo' + # Restart under the correct shell. + exec $SHELL "[$]0" --no-reexec ${1+"[$]@"} fi -# func_echo_all arg... -# Invoke $ECHO with all args, space-separated. -func_echo_all () -{ - $ECHO "$*" -} +if test "X[$]1" = X--fallback-echo; then + # used as fallback echo + shift + cat <<_LT_EOF +[$]* +_LT_EOF + exit 0 +fi -case "$ECHO" in - printf*) AC_MSG_RESULT([printf]) ;; - print*) AC_MSG_RESULT([print -r]) ;; - *) AC_MSG_RESULT([cat]) ;; -esac +# The HP-UX ksh and POSIX shell print the target directory to stdout +# if CDPATH is set. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH -m4_ifdef([_AS_DETECT_SUGGESTED], -[_AS_DETECT_SUGGESTED([ - test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || ( - ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' - ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO - ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - PATH=/empty FPATH=/empty; export PATH FPATH - test "X`printf %s $ECHO`" = "X$ECHO" \ - || test "X`print -r -- $ECHO`" = "X$ECHO" )])]) +if test -z "$lt_ECHO"; then + if test "X${echo_test_string+set}" != Xset; then + # find a string as large as possible, as long as the shell can cope with it + for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do + # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... + if { echo_test_string=`eval $cmd`; } 2>/dev/null && + { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null + then + break + fi + done + fi -_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) -_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) -])# _LT_PROG_ECHO_BACKSLASH + if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && + echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + : + else + # The Solaris, AIX, and Digital Unix default echo programs unquote + # backslashes. This makes it impossible to quote backslashes using + # echo "$something" | sed 's/\\/\\\\/g' + # + # So, first we look for a working echo in the user's PATH. + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for dir in $PATH /usr/ucb; do + IFS="$lt_save_ifs" + if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && + test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && + echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + ECHO="$dir/echo" + break + fi + done + IFS="$lt_save_ifs" -# _LT_WITH_SYSROOT -# ---------------- -AC_DEFUN([_LT_WITH_SYSROOT], -[AC_MSG_CHECKING([for sysroot]) -AC_ARG_WITH([sysroot], -[ --with-sysroot[=DIR] Search for dependent libraries within DIR - (or the compiler's sysroot if not specified).], -[], [with_sysroot=no]) - -dnl lt_sysroot will always be passed unquoted. We quote it here -dnl in case the user passed a directory name. -lt_sysroot= -case ${with_sysroot} in #( - yes) - if test "$GCC" = yes; then - lt_sysroot=`$CC --print-sysroot 2>/dev/null` - fi - ;; #( - /*) - lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` - ;; #( - no|'') - ;; #( - *) - AC_MSG_RESULT([${with_sysroot}]) - AC_MSG_ERROR([The sysroot must be an absolute path.]) - ;; -esac + if test "X$ECHO" = Xecho; then + # We didn't find a better echo, so look for alternatives. + if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' && + echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + # This shell has a builtin print -r that does the trick. + ECHO='print -r' + elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && + test "X$CONFIG_SHELL" != X/bin/ksh; then + # If we have ksh, try running configure again with it. + ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} + export ORIGINAL_CONFIG_SHELL + CONFIG_SHELL=/bin/ksh + export CONFIG_SHELL + exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} + else + # Try using printf. + ECHO='printf %s\n' + if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && + echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + # Cool, printf works + : + elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && + test "X$echo_testing_string" = 'X\t' && + echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL + export CONFIG_SHELL + SHELL="$CONFIG_SHELL" + export SHELL + ECHO="$CONFIG_SHELL [$]0 --fallback-echo" + elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && + test "X$echo_testing_string" = 'X\t' && + echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + ECHO="$CONFIG_SHELL [$]0 --fallback-echo" + else + # maybe with a smaller string... + prev=: + + for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do + if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null + then + break + fi + prev="$cmd" + done + + if test "$prev" != 'sed 50q "[$]0"'; then + echo_test_string=`eval $prev` + export echo_test_string + exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} + else + # Oops. We lost completely, so just stick with echo. + ECHO=echo + fi + fi + fi + fi + fi +fi + +# Copy echo and quote the copy suitably for passing to libtool from +# the Makefile, instead of quoting the original, which is used later. +lt_ECHO=$ECHO +if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then + lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" +fi + +AC_SUBST(lt_ECHO) +]) +_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) +_LT_DECL([], [ECHO], [1], + [An echo program that does not interpret backslashes]) +])# _LT_PROG_ECHO_BACKSLASH - AC_MSG_RESULT([${lt_sysroot:-no}]) -_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl -[dependent libraries, and in which our libraries should be installed.])]) # _LT_ENABLE_LOCK # --------------- @@ -1281,7 +1236,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext + echo '[#]line __oline__ "configure"' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then if test "$lt_cv_prog_gnu_ld" = yes; then case `/usr/bin/file conftest.$ac_objext` in @@ -1374,27 +1329,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) CFLAGS="$SAVE_CFLAGS" fi ;; -*-*solaris*) +sparc*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in - yes*) - case $host in - i?86-*-solaris*) - LD="${LD-ld} -m elf_x86_64" - ;; - sparc*-*-solaris*) - LD="${LD-ld} -m elf64_sparc" - ;; - esac - # GNU ld 2.21 introduced _sol2 emulations. Use them if available. - if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then - LD="${LD-ld}_sol2" - fi - ;; + yes*) LD="${LD-ld} -m elf64_sparc" ;; *) if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then LD="${LD-ld} -64" @@ -1412,47 +1354,14 @@ need_locks="$enable_libtool_lock" ])# _LT_ENABLE_LOCK -# _LT_PROG_AR -# ----------- -m4_defun([_LT_PROG_AR], -[AC_CHECK_TOOLS(AR, [ar], false) -: ${AR=ar} -: ${AR_FLAGS=cru} -_LT_DECL([], [AR], [1], [The archiver]) -_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) - -AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], - [lt_cv_ar_at_file=no - AC_COMPILE_IFELSE([AC_LANG_PROGRAM], - [echo conftest.$ac_objext > conftest.lst - lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD' - AC_TRY_EVAL([lt_ar_try]) - if test "$ac_status" -eq 0; then - # Ensure the archiver fails upon bogus file names. - rm -f conftest.$ac_objext libconftest.a - AC_TRY_EVAL([lt_ar_try]) - if test "$ac_status" -ne 0; then - lt_cv_ar_at_file=@ - fi - fi - rm -f conftest.* libconftest.a - ]) - ]) - -if test "x$lt_cv_ar_at_file" = xno; then - archiver_list_spec= -else - archiver_list_spec=$lt_cv_ar_at_file -fi -_LT_DECL([], [archiver_list_spec], [1], - [How to feed a file listing to the archiver]) -])# _LT_PROG_AR - - # _LT_CMD_OLD_ARCHIVE # ------------------- m4_defun([_LT_CMD_OLD_ARCHIVE], -[_LT_PROG_AR +[AC_CHECK_TOOL(AR, ar, false) +test -z "$AR" && AR=ar +test -z "$AR_FLAGS" && AR_FLAGS=cru +_LT_DECL([], [AR], [1], [The archiver]) +_LT_DECL([], [AR_FLAGS], [1]) AC_CHECK_TOOL(STRIP, strip, :) test -z "$STRIP" && STRIP=: @@ -1471,27 +1380,18 @@ old_postuninstall_cmds= if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" ;; *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" ;; esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" + old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" fi - -case $host_os in - darwin*) - lock_old_archive_extraction=yes ;; - *) - lock_old_archive_extraction=no ;; -esac _LT_DECL([], [old_postinstall_cmds], [2]) _LT_DECL([], [old_postuninstall_cmds], [2]) _LT_TAGDECL([], [old_archive_cmds], [2], [Commands used to build an old-style archive]) -_LT_DECL([], [lock_old_archive_extraction], [0], - [Whether to use a lock for old archive extraction]) ])# _LT_CMD_OLD_ARCHIVE @@ -1516,15 +1416,15 @@ AC_CACHE_CHECK([$1], [$2], -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) + (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&AS_MESSAGE_LOG_FD - echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp + $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then $2=yes @@ -1564,7 +1464,7 @@ AC_CACHE_CHECK([$1], [$2], if test -s conftest.err; then # Append any errors to the config.log. cat conftest.err 1>&AS_MESSAGE_LOG_FD - $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp + $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 if diff conftest.exp conftest.er2 >/dev/null; then $2=yes @@ -1627,11 +1527,6 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl lt_cv_sys_max_cmd_len=8192; ;; - mint*) - # On MiNT this can take a long time and run out of memory. - lt_cv_sys_max_cmd_len=8192; - ;; - amigaos*) # On AmigaOS with pdksh, this test takes hours, literally. # So we just punt and use a minimum line length of 8192. @@ -1657,11 +1552,6 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl lt_cv_sys_max_cmd_len=196608 ;; - os2*) - # The test takes a long time on OS/2. - lt_cv_sys_max_cmd_len=8192 - ;; - osf*) # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not @@ -1701,8 +1591,8 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ - = "X$teststring$teststring"; } >/dev/null 2>&1 && + while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ + = "XX$teststring$teststring"; } >/dev/null 2>&1 && test $i != 17 # 1/2 MB should be enough do i=`expr $i + 1` @@ -1753,7 +1643,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -[#line $LINENO "configure" +[#line __oline__ "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -1794,13 +1684,7 @@ else # endif #endif -/* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) -int fnord () __attribute__((visibility("default"))); -#endif - -int fnord () { return 42; } +void fnord() { int i=42;} int main () { void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); @@ -1809,11 +1693,7 @@ int main () if (self) { if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else - { - if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - else puts (dlerror ()); - } + else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; /* dlclose (self); */ } else @@ -1989,16 +1869,16 @@ AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD) + (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&AS_MESSAGE_LOG_FD - echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp + $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes @@ -2157,7 +2037,6 @@ m4_require([_LT_DECL_EGREP])dnl m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_DECL_OBJDUMP])dnl m4_require([_LT_DECL_SED])dnl -m4_require([_LT_CHECK_SHELL_FEATURES])dnl AC_MSG_CHECKING([dynamic linker characteristics]) m4_if([$1], [], [ @@ -2166,23 +2045,16 @@ if test "$GCC" = yes; then darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; *) lt_awk_arg="/^libraries:/" ;; esac - case $host_os in - mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;; - *) lt_sed_strip_eq="s,=/,/,g" ;; - esac - lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` - case $lt_search_path_spec in - *\;*) + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` + if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then # if the path contains ";" then we assume it to be the separator # otherwise default to the standard path separator (i.e. ":") - it is # assumed that no part of a normal pathname contains ";" but that should # okay in the real world where ";" in dirpaths is itself problematic. - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'` - ;; - *) - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"` - ;; - esac + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` + else + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + fi # Ok, now we have the path, separated by spaces, we can step through it # and add multilib dir if necessary. lt_tmp_lt_search_path_spec= @@ -2195,7 +2067,7 @@ if test "$GCC" = yes; then lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" fi done - lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' + lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk ' BEGIN {RS=" "; FS="/|\n";} { lt_foo=""; lt_count=0; @@ -2215,13 +2087,7 @@ BEGIN {RS=" "; FS="/|\n";} { if (lt_foo != "") { lt_freq[[lt_foo]]++; } if (lt_freq[[lt_foo]] == 1) { print lt_foo; } }'` - # AWK program above erroneously prepends '/' to C:/dos/paths - # for these hosts. - case $host_os in - mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ - $SED 's,/\([[A-Za-z]]:\),\1,g'` ;; - esac - sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` + sys_lib_search_path_spec=`$ECHO $lt_search_path_spec` else sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" fi]) @@ -2247,7 +2113,7 @@ need_version=unknown case $host_os in aix3*) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -2256,7 +2122,7 @@ aix3*) ;; aix[[4-9]]*) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -2309,7 +2175,7 @@ amigaos*) m68k) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ;; esac ;; @@ -2321,7 +2187,7 @@ beos*) ;; bsdi[[45]]*) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -2340,9 +2206,8 @@ cygwin* | mingw* | pw32* | cegcc*) need_version=no need_lib_prefix=no - case $GCC,$cc_basename in - yes,*) - # gcc + case $GCC,$host_os in + yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds postinstall_cmds='base_file=`basename \${file}`~ @@ -2363,83 +2228,36 @@ cygwin* | mingw* | pw32* | cegcc*) cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' -m4_if([$1], [],[ - sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) + sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" ;; mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - ;; - pw32*) - # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - ;; - esac - dynamic_linker='Win32 ld.exe' - ;; - - *,cl*) - # Native MSVC - libname_spec='$name' - soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - library_names_spec='${libname}.dll.lib' - - case $build_os in - mingw*) - sys_lib_search_path_spec= - lt_save_ifs=$IFS - IFS=';' - for lt_path in $LIB - do - IFS=$lt_save_ifs - # Let DOS variable expansion print the short 8.3 style file name. - lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` - sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" - done - IFS=$lt_save_ifs - # Convert to MSYS style. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` - ;; - cygwin*) - # Convert to unix form, then to dos form, then back to unix form - # but this time dos style (no spaces!) so that the unix form looks - # like /cygdrive/c/PROGRA~1:/cygdr... - sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` - sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` - sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - ;; - *) - sys_lib_search_path_spec="$LIB" + sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then - # It is most probably a Windows format PATH. + # It is most probably a Windows format PATH printed by + # mingw gcc, but we are running on Cygwin. Gcc prints its search + # path with ; separators, and with drive letters. We can handle the + # drive letters (cygwin fileutils understands them), so leave them, + # especially as we might pass files found there to a mingw objdump, + # which wouldn't understand a cygwinified path. Ahh. sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` else - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` fi - # FIXME: find the short name or the path components, as spaces are - # common. (e.g. "Program Files" -> "PROGRA~1") + ;; + pw32*) + # pw32 DLLs use 'pw' prefix rather than 'lib' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' ;; esac - - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $RM \$dlpath' - shlibpath_overrides_runpath=yes - dynamic_linker='Win32 link.exe' ;; *) - # Assume MSVC wrapper library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' - dynamic_linker='Win32 ld.exe' ;; esac + dynamic_linker='Win32 ld.exe' # FIXME: first we should search . and the directory the executable is in shlibpath_var=PATH ;; @@ -2460,7 +2278,7 @@ m4_if([$1], [],[ ;; dgux*) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' @@ -2468,6 +2286,10 @@ dgux*) shlibpath_var=LD_LIBRARY_PATH ;; +freebsd1*) + dynamic_linker=no + ;; + freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -2475,7 +2297,7 @@ freebsd* | dragonfly*) objformat=`/usr/bin/objformat` else case $host_os in - freebsd[[23]].*) objformat=aout ;; + freebsd[[123]]*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -2493,7 +2315,7 @@ freebsd* | dragonfly*) esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2.*) + freebsd2*) shlibpath_overrides_runpath=yes ;; freebsd3.[[01]]* | freebsdelf3.[[01]]*) @@ -2513,26 +2335,12 @@ freebsd* | dragonfly*) ;; gnu*) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - -haiku*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - dynamic_linker="$host_os runtime_loader" - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' hardcode_into_libs=yes ;; @@ -2578,14 +2386,12 @@ hpux9* | hpux10* | hpux11*) soname_spec='${libname}${release}${shared_ext}$major' ;; esac - # HP-UX runs *really* slowly unless shared libraries are mode 555, ... + # HP-UX runs *really* slowly unless shared libraries are mode 555. postinstall_cmds='chmod 555 $lib' - # or fails outright, so override atomically: - install_override_mode=555 ;; interix[[3-9]]*) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' @@ -2601,7 +2407,7 @@ irix5* | irix6* | nonstopux*) nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux else version_type=irix fi ;; @@ -2638,9 +2444,9 @@ linux*oldld* | linux*aout* | linux*coff*) dynamic_linker=no ;; -# This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux # correct to gnu/linux during the next big refactor +# This must be Linux ELF. +linux* | k*bsd*-gnu) + version_type=linux need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -2648,21 +2454,16 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no - # Some binutils ld are patched to set DT_RUNPATH - AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath], - [lt_cv_shlibpath_overrides_runpath=no - save_LDFLAGS=$LDFLAGS - save_libdir=$libdir - eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ - LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" - AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], - [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], - [lt_cv_shlibpath_overrides_runpath=yes])]) - LDFLAGS=$save_LDFLAGS - libdir=$save_libdir - ]) - shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath + save_LDFLAGS=$LDFLAGS + save_libdir=$libdir + eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ + LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" + AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], + [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], + [shlibpath_overrides_runpath=yes])]) + LDFLAGS=$save_LDFLAGS + libdir=$save_libdir # This implies no fast_install, which is unacceptable. # Some rework will be needed to allow for fast_install @@ -2671,7 +2472,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi @@ -2684,18 +2485,6 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) dynamic_linker='GNU/Linux ld.so' ;; -netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='NetBSD ld.elf_so' - ;; - netbsd*) version_type=sunos need_lib_prefix=no @@ -2715,7 +2504,7 @@ netbsd*) ;; newsos6) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -2784,7 +2573,7 @@ rdos*) ;; solaris*) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -2809,7 +2598,7 @@ sunos4*) ;; sysv4 | sysv4.3*) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -2833,7 +2622,7 @@ sysv4 | sysv4.3*) sysv4*MP*) if test -d /usr/nec ;then - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' soname_spec='$libname${shared_ext}.$major' shlibpath_var=LD_LIBRARY_PATH @@ -2864,7 +2653,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -2874,7 +2663,7 @@ tpf*) ;; uts4*) - version_type=linux # correct to gnu/linux during the next big refactor + version_type=linux library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -2916,8 +2705,6 @@ _LT_DECL([], [library_names_spec], [1], The last name is the one that the linker finds with -lNAME]]) _LT_DECL([], [soname_spec], [1], [[The coded name of the library, if different from the real name]]) -_LT_DECL([], [install_override_mode], [1], - [Permission mode override for installation of shared libraries]) _LT_DECL([], [postinstall_cmds], [2], [Command to use after installation of a shared archive]) _LT_DECL([], [postuninstall_cmds], [2], @@ -3030,7 +2817,6 @@ AC_REQUIRE([AC_CANONICAL_HOST])dnl AC_REQUIRE([AC_CANONICAL_BUILD])dnl m4_require([_LT_DECL_SED])dnl m4_require([_LT_DECL_EGREP])dnl -m4_require([_LT_PROG_ECHO_BACKSLASH])dnl AC_ARG_WITH([gnu-ld], [AS_HELP_STRING([--with-gnu-ld], @@ -3152,11 +2938,6 @@ case $reload_flag in esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in - cygwin* | mingw* | pw32* | cegcc*) - if test "$GCC" != yes; then - reload_cmds=false - fi - ;; darwin*) if test "$GCC" = yes; then reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' @@ -3165,8 +2946,8 @@ case $host_os in fi ;; esac -_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl -_LT_TAGDECL([], [reload_cmds], [2])dnl +_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl +_LT_DECL([], [reload_cmds], [2])dnl ])# _LT_CMD_RELOAD @@ -3218,18 +2999,16 @@ mingw* | pw32*) # Base MSYS/MinGW do not provide the 'file' command needed by # func_win32_libid shell function, so use a weaker test based on 'objdump', # unless we find 'file', for example because we are cross-compiling. - # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. - if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then + if ( file / ) >/dev/null 2>&1; then lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else - # Keep this pattern in sync with the one in func_win32_libid. - lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' + lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' lt_cv_file_magic_cmd='$OBJDUMP -f' fi ;; -cegcc*) +cegcc) # use the weaker test based on 'objdump'. See mingw*. lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' lt_cv_file_magic_cmd='$OBJDUMP -f' @@ -3259,10 +3038,6 @@ gnu*) lt_cv_deplibs_check_method=pass_all ;; -haiku*) - lt_cv_deplibs_check_method=pass_all - ;; - hpux10.20* | hpux11*) lt_cv_file_magic_cmd=/usr/bin/file case $host_cpu in @@ -3271,11 +3046,11 @@ hpux10.20* | hpux11*) lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so ;; hppa*64*) - [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'] + [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'] lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl ;; *) - lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library' + lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' lt_cv_file_magic_test_file=/usr/lib/libc.sl ;; esac @@ -3296,12 +3071,12 @@ irix5* | irix6* | nonstopux*) lt_cv_deplibs_check_method=pass_all ;; -# This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +# This must be Linux ELF. +linux* | k*bsd*-gnu) lt_cv_deplibs_check_method=pass_all ;; -netbsd* | netbsdelf*-gnu) +netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' else @@ -3375,21 +3150,6 @@ tpf*) ;; esac ]) - -file_magic_glob= -want_nocaseglob=no -if test "$build" = "$host"; then - case $host_os in - mingw* | pw32*) - if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then - want_nocaseglob=yes - else - file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"` - fi - ;; - esac -fi - file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -3397,11 +3157,7 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown _LT_DECL([], [deplibs_check_method], [1], [Method to check whether dependent libraries are shared objects]) _LT_DECL([], [file_magic_cmd], [1], - [Command to use when deplibs_check_method = "file_magic"]) -_LT_DECL([], [file_magic_glob], [1], - [How to find potential files when deplibs_check_method = "file_magic"]) -_LT_DECL([], [want_nocaseglob], [1], - [Find potential files using nocaseglob when deplibs_check_method = "file_magic"]) + [Command to use when deplibs_check_method == "file_magic"]) ])# _LT_CHECK_MAGIC_METHOD @@ -3458,19 +3214,7 @@ if test "$lt_cv_path_NM" != "no"; then NM="$lt_cv_path_NM" else # Didn't find any BSD compatible name lister, look for dumpbin. - if test -n "$DUMPBIN"; then : - # Let the user override the test. - else - AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :) - case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in - *COFF*) - DUMPBIN="$DUMPBIN -symbols" - ;; - *) - DUMPBIN=: - ;; - esac - fi + AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :) AC_SUBST([DUMPBIN]) if test "$DUMPBIN" != ":"; then NM="$DUMPBIN" @@ -3483,13 +3227,13 @@ _LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface], [lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD) + (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&AS_MESSAGE_LOG_FD - (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) + (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&AS_MESSAGE_LOG_FD - (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD) + (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD) cat conftest.out >&AS_MESSAGE_LOG_FD if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -3504,67 +3248,6 @@ dnl aclocal-1.4 backwards compatibility: dnl AC_DEFUN([AM_PROG_NM], []) dnl AC_DEFUN([AC_PROG_NM], []) -# _LT_CHECK_SHAREDLIB_FROM_LINKLIB -# -------------------------------- -# how to determine the name of the shared library -# associated with a specific link library. -# -- PORTME fill in with the dynamic library characteristics -m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB], -[m4_require([_LT_DECL_EGREP]) -m4_require([_LT_DECL_OBJDUMP]) -m4_require([_LT_DECL_DLLTOOL]) -AC_CACHE_CHECK([how to associate runtime and link libraries], -lt_cv_sharedlib_from_linklib_cmd, -[lt_cv_sharedlib_from_linklib_cmd='unknown' - -case $host_os in -cygwin* | mingw* | pw32* | cegcc*) - # two different shell functions defined in ltmain.sh - # decide which to use based on capabilities of $DLLTOOL - case `$DLLTOOL --help 2>&1` in - *--identify-strict*) - lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib - ;; - *) - lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback - ;; - esac - ;; -*) - # fallback: assume linklib IS sharedlib - lt_cv_sharedlib_from_linklib_cmd="$ECHO" - ;; -esac -]) -sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd -test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO - -_LT_DECL([], [sharedlib_from_linklib_cmd], [1], - [Command to associate shared and link libraries]) -])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB - - -# _LT_PATH_MANIFEST_TOOL -# ---------------------- -# locate the manifest tool -m4_defun([_LT_PATH_MANIFEST_TOOL], -[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :) -test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool], - [lt_cv_path_mainfest_tool=no - echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD - $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out - cat conftest.err >&AS_MESSAGE_LOG_FD - if $GREP 'Manifest Tool' conftest.out > /dev/null; then - lt_cv_path_mainfest_tool=yes - fi - rm -f conftest*]) -if test "x$lt_cv_path_mainfest_tool" != xyes; then - MANIFEST_TOOL=: -fi -_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl -])# _LT_PATH_MANIFEST_TOOL - # LT_LIB_M # -------- @@ -3573,7 +3256,7 @@ AC_DEFUN([LT_LIB_M], [AC_REQUIRE([AC_CANONICAL_HOST])dnl LIBM= case $host in -*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*) +*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) # These system don't have libm, or don't need it ;; *-ncr-sysv4.3*) @@ -3601,12 +3284,7 @@ m4_defun([_LT_COMPILER_NO_RTTI], _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= if test "$GCC" = yes; then - case $cc_basename in - nvcc*) - _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;; - *) - _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;; - esac + _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], lt_cv_prog_compiler_rtti_exceptions, @@ -3623,7 +3301,6 @@ _LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1], m4_defun([_LT_CMD_GLOBAL_SYMBOLS], [AC_REQUIRE([AC_CANONICAL_HOST])dnl AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_PROG_AWK])dnl AC_REQUIRE([LT_PATH_NM])dnl AC_REQUIRE([LT_PATH_LD])dnl m4_require([_LT_DECL_SED])dnl @@ -3691,8 +3368,8 @@ esac lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" # Handle CRLF in mingw tool chain opt_cr= @@ -3716,7 +3393,6 @@ for ac_symprfx in "" "_"; do # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK ['"\ " {last_section=section; section=\$ 3};"\ -" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ @@ -3729,7 +3405,6 @@ for ac_symprfx in "" "_"; do else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi - lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" # Check to see that the pipe works correctly. pipe_works=no @@ -3751,7 +3426,7 @@ _LT_EOF if AC_TRY_EVAL(ac_compile); then # Now try to grab the symbols. nlist=conftest.nm - if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then + if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then mv -f "$nlist"T "$nlist" @@ -3763,18 +3438,6 @@ _LT_EOF if $GREP ' nm_test_var$' "$nlist" >/dev/null; then if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext -/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -/* DATA imports from DLLs on WIN32 con't be const, because runtime - relocations are performed -- see ld's documentation on pseudo-relocs. */ -# define LT@&t@_DLSYM_CONST -#elif defined(__osf__) -/* This system does not cope well with relocations in const data. */ -# define LT@&t@_DLSYM_CONST -#else -# define LT@&t@_DLSYM_CONST const -#endif - #ifdef __cplusplus extern "C" { #endif @@ -3786,7 +3449,7 @@ _LT_EOF cat <<_LT_EOF >> conftest.$ac_ext /* The mapping between symbol names and symbols. */ -LT@&t@_DLSYM_CONST struct { +const struct { const char *name; void *address; } @@ -3812,15 +3475,15 @@ static const void *lt_preloaded_setup() { _LT_EOF # Now try linking the two files. mv conftest.$ac_objext conftstm.$ac_objext - lt_globsym_save_LIBS=$LIBS - lt_globsym_save_CFLAGS=$CFLAGS + lt_save_LIBS="$LIBS" + lt_save_CFLAGS="$CFLAGS" LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then pipe_works=yes fi - LIBS=$lt_globsym_save_LIBS - CFLAGS=$lt_globsym_save_CFLAGS + LIBS="$lt_save_LIBS" + CFLAGS="$lt_save_CFLAGS" else echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD fi @@ -3853,13 +3516,6 @@ else AC_MSG_RESULT(ok) fi -# Response file support. -if test "$lt_cv_nm_interface" = "MS dumpbin"; then - nm_file_list_spec='@' -elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then - nm_file_list_spec='@' -fi - _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], [Take the output of nm and produce a listing of raw symbols and C names]) _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], @@ -3870,8 +3526,6 @@ _LT_DECL([global_symbol_to_c_name_address], _LT_DECL([global_symbol_to_c_name_address_lib_prefix], [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], [Transform the output of nm in a C name address pair when lib prefix is needed]) -_LT_DECL([], [nm_file_list_spec], [1], - [Specify filename containing input files for $NM]) ]) # _LT_CMD_GLOBAL_SYMBOLS @@ -3883,6 +3537,7 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)= _LT_TAGVAR(lt_prog_compiler_pic, $1)= _LT_TAGVAR(lt_prog_compiler_static, $1)= +AC_MSG_CHECKING([for $compiler option to produce PIC]) m4_if([$1], [CXX], [ # C++ specific cases for pic, static, wl, etc. if test "$GXX" = yes; then @@ -3933,11 +3588,6 @@ m4_if([$1], [CXX], [ # DJGPP does not support shared libraries at all _LT_TAGVAR(lt_prog_compiler_pic, $1)= ;; - haiku*) - # PIC is the default for Haiku. - # The "-static" flag exists, but is broken. - _LT_TAGVAR(lt_prog_compiler_static, $1)= - ;; interix[[3-9]]*) # Interix 3.x gcc -fpic/-fPIC options generate broken code. # Instead, we relocate shared libraries at runtime. @@ -3987,12 +3637,6 @@ m4_if([$1], [CXX], [ ;; esac ;; - mingw* | cygwin* | os2* | pw32* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - m4_if([$1], [GCJ], [], - [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) - ;; dgux*) case $cc_basename in ec++*) @@ -4049,7 +3693,7 @@ m4_if([$1], [CXX], [ ;; esac ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu) case $cc_basename in KCC*) # KAI C++ Compiler @@ -4082,8 +3726,8 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_pic, $1)= _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*) - # IBM XL 8.0, 9.0 on PPC and BlueGene + xlc* | xlC*) + # IBM XL 8.0 on PPC _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' @@ -4113,7 +3757,7 @@ m4_if([$1], [CXX], [ ;; esac ;; - netbsd* | netbsdelf*-gnu) + netbsd*) ;; *qnx* | *nto*) # QNX uses GNU C++, but need to define -shared option too, otherwise @@ -4145,7 +3789,7 @@ m4_if([$1], [CXX], [ ;; solaris*) case $cc_basename in - CC* | sunCC*) + CC*) # Sun C++ 4.2, 5.x and Centerline C++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' @@ -4249,12 +3893,6 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' ;; - haiku*) - # PIC is the default for Haiku. - # The "-static" flag exists, but is broken. - _LT_TAGVAR(lt_prog_compiler_static, $1)= - ;; - hpux*) # PIC is the default for 64-bit PA HP-UX, but not for 32-bit # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag @@ -4297,15 +3935,6 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ;; esac - - case $cc_basename in - nvcc*) # Cuda Compiler Driver 2.2 - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' - if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then - _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)" - fi - ;; - esac else # PORTME Check for flag to pass linker flags through the system compiler. case $host_os in @@ -4348,7 +3977,7 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -4369,13 +3998,7 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' ;; - nagfor*) - # NAG Fortran compiler - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) + pgcc* | pgf77* | pgf90* | pgf95*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' @@ -4387,40 +4010,25 @@ m4_if([$1], [CXX], [ # All Alpha code is PIC. _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - xl* | bgxl* | bgf* | mpixl*) - # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene + xl*) + # IBM XL C 8.0/Fortran 10.1 on PPC _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' ;; *) case `$CC -V 2>&1 | sed 5q` in - *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) - # Sun Fortran 8.3 passes all unrecognized flags to the linker - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='' - ;; - *Sun\ F* | *Sun*Fortran*) - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - ;; *Sun\ C*) # Sun C 5.9 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ;; - *Intel*\ [[CF]]*Compiler*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' - ;; - *Portland\ Group*) - _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + *Sun\ F*) + # Sun Fortran 8.3 passes all unrecognized flags to the linker + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='' ;; esac ;; @@ -4452,7 +4060,7 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' case $cc_basename in - f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) + f77* | f90* | f95*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; *) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; @@ -4509,11 +4117,9 @@ case $host_os in _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" ;; esac - -AC_CACHE_CHECK([for $compiler option to produce PIC], - [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)], - [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) -_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1) +AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) +_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], + [How to pass a linker flag through the compiler]) # # Check to make sure the PIC flag actually works. @@ -4532,8 +4138,6 @@ fi _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], [Additional compiler flags for building library objects]) -_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], - [How to pass a linker flag through the compiler]) # # Check to make sure the static flag actually works. # @@ -4554,7 +4158,6 @@ _LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], m4_defun([_LT_LINKER_SHLIBS], [AC_REQUIRE([LT_PATH_LD])dnl AC_REQUIRE([LT_PATH_NM])dnl -m4_require([_LT_PATH_MANIFEST_TOOL])dnl m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_DECL_EGREP])dnl m4_require([_LT_DECL_SED])dnl @@ -4563,40 +4166,27 @@ m4_require([_LT_TAG_COMPILER])dnl AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) m4_if([$1], [CXX], [ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] case $host_os in aix[[4-9]]*) # If we're using GNU nm, then we don't want the "-C" option. # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global defined - # symbols, whereas GNU nm marks them as "W". if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' else _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' fi ;; pw32*) _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" - ;; + ;; cygwin* | mingw* | cegcc*) - case $cc_basename in - cl*) - _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' - ;; - *) - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' - _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] - ;; - esac - ;; - linux* | k*bsd*-gnu | gnu*) - _LT_TAGVAR(link_all_deplibs, $1)=no - ;; + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' + ;; *) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - ;; + ;; esac + _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] ], [ runpath_var= _LT_TAGVAR(allow_undefined_flag, $1)= @@ -4611,6 +4201,7 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= + _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported @@ -4655,39 +4246,10 @@ dnl Note also adjust exclude_expsyms for C++ above. openbsd*) with_gnu_ld=no ;; - linux* | k*bsd*-gnu | gnu*) - _LT_TAGVAR(link_all_deplibs, $1)=no - ;; esac _LT_TAGVAR(ld_shlibs, $1)=yes - - # On some targets, GNU ld is compatible enough with the native linker - # that we're better off using the native interface for both. - lt_use_gnu_ld_interface=no if test "$with_gnu_ld" = yes; then - case $host_os in - aix*) - # The AIX port of GNU ld has always aspired to compatibility - # with the native linker. However, as the warning in the GNU ld - # block says, versions before 2.19.5* couldn't really create working - # shared libraries, regardless of the interface used. - case `$LD -v 2>&1` in - *\ \(GNU\ Binutils\)\ 2.19.5*) ;; - *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;; - *\ \(GNU\ Binutils\)\ [[3-9]]*) ;; - *) - lt_use_gnu_ld_interface=yes - ;; - esac - ;; - *) - lt_use_gnu_ld_interface=yes - ;; - esac - fi - - if test "$lt_use_gnu_ld_interface" = yes; then # If archive_cmds runs LD, not CC, wlarc should be empty wlarc='${wl}' @@ -4705,7 +4267,6 @@ dnl Note also adjust exclude_expsyms for C++ above. fi supports_anon_versioning=no case `$LD -v 2>&1` in - *GNU\ gold*) supports_anon_versioning=yes ;; *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... @@ -4721,12 +4282,11 @@ dnl Note also adjust exclude_expsyms for C++ above. _LT_TAGVAR(ld_shlibs, $1)=no cat <<_LT_EOF 1>&2 -*** Warning: the GNU linker, at least up to release 2.19, is reported +*** Warning: the GNU linker, at least up to release 2.9.1, is reported *** to be unable to reliably create shared libraries on AIX. *** Therefore, libtool is disabling shared libraries support. If you -*** really care for shared libraries, you may want to install binutils -*** 2.20 or above, or modify your PATH so that a non-GNU linker is found. -*** You will then need to restart the configuration process. +*** really care for shared libraries, you may want to modify your PATH +*** so that a non-GNU linker is found, and then restart. _LT_EOF fi @@ -4762,12 +4322,10 @@ _LT_EOF # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, # as there is no search path for DLLs. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' _LT_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_TAGVAR(always_export_symbols, $1)=no _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' - _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] + _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' @@ -4785,11 +4343,6 @@ _LT_EOF fi ;; - haiku*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(link_all_deplibs, $1)=yes - ;; - interix[[3-9]]*) _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no @@ -4805,7 +4358,7 @@ _LT_EOF _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; - gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) + gnu* | linux* | tpf* | k*bsd*-gnu) tmp_diet=no if test "$host_os" = linux-dietlibc; then case $cc_basename in @@ -4815,16 +4368,15 @@ _LT_EOF if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ && test "$tmp_diet" = no then - tmp_addflag=' $pic_flag' + tmp_addflag= tmp_sharedflag='-shared' case $cc_basename,$host_cpu in pgcc*) # Portland Group C compiler - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' tmp_addflag=' $pic_flag' ;; - pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group f77 and f90 compilers - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' tmp_addflag=' $pic_flag -Mnomain' ;; ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 tmp_addflag=' -i_dynamic' ;; @@ -4835,17 +4387,13 @@ _LT_EOF lf95*) # Lahey Fortran 8.1 _LT_TAGVAR(whole_archive_flag_spec, $1)= tmp_sharedflag='--shared' ;; - xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) + xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) tmp_sharedflag='-qmkshrobj' tmp_addflag= ;; - nvcc*) # Cuda Compiler Driver 2.2 - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' - _LT_TAGVAR(compiler_needs_object, $1)=yes - ;; esac case `$CC -V 2>&1 | sed 5q` in *Sun\ C*) # Sun C 5.9 - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes tmp_sharedflag='-G' ;; *Sun\ F*) # Sun Fortran 8.3 @@ -4861,16 +4409,17 @@ _LT_EOF fi case $cc_basename in - xlf* | bgf* | bgxlf* | mpixlf*) + xlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= + _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' + _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' if test "x$supports_anon_versioning" = xyes; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ - $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' fi ;; esac @@ -4879,13 +4428,13 @@ _LT_EOF fi ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' fi ;; @@ -4903,8 +4452,8 @@ _LT_EOF _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -4950,8 +4499,8 @@ _LT_EOF *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -4991,10 +4540,8 @@ _LT_EOF else # If we're using GNU nm, then we don't want the "-C" option. # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global - # defined symbols, whereas GNU nm marks them as "W". if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' else _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' fi @@ -5056,7 +4603,6 @@ _LT_EOF if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi - _LT_TAGVAR(link_all_deplibs, $1)=no else # not using gcc if test "$host_cpu" = ia64; then @@ -5082,9 +4628,9 @@ _LT_EOF _LT_TAGVAR(allow_undefined_flag, $1)='-berok' # Determine the default libpath from the value encoded in an # empty executable. - _LT_SYS_MODULE_PATH_AIX([$1]) + _LT_SYS_MODULE_PATH_AIX _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' @@ -5093,19 +4639,14 @@ _LT_EOF else # Determine the default libpath from the value encoded in an # empty executable. - _LT_SYS_MODULE_PATH_AIX([$1]) + _LT_SYS_MODULE_PATH_AIX _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then - # We only use this code for GNU lds that support --whole-archive. - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - else - # Exported symbols can be pulled into shared objects from archives - _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' - fi + # Exported symbols can be pulled into shared objects from archives + _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' _LT_TAGVAR(archive_cmds_need_lc, $1)=yes # This is similar to how AIX traditionally builds its shared libraries. _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' @@ -5137,64 +4678,20 @@ _LT_EOF # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. - case $cc_basename in - cl*) - # Native MSVC - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='@' - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; - else - sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' - # The linker will not automatically build a static lib if we build a DLL. - # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' - # Don't use ranlib - _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' - _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' - ;; - *) - # Assume MSVC wrapper - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' - # FIXME: Should let the user specify the lib program. - _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - ;; - esac + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames=' + # The linker will automatically build a .lib file if we build a DLL. + _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' + # FIXME: Should let the user specify the lib program. + _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' + _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ;; darwin* | rhapsody*) @@ -5207,6 +4704,10 @@ _LT_EOF _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ;; + freebsd1*) + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor # support. Future versions do this automatically, but an explicit c++rt0.o # does not break anything, and helps significantly (at the cost of a little @@ -5219,7 +4720,7 @@ _LT_EOF ;; # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2.*) + freebsd2*) _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_minus_L, $1)=yes @@ -5228,7 +4729,7 @@ _LT_EOF # FreeBSD 3 and greater uses gcc -shared to do shared libraries. freebsd* | dragonfly*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_shlibpath_var, $1)=no @@ -5236,7 +4737,7 @@ _LT_EOF hpux9*) if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' else _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' fi @@ -5251,13 +4752,14 @@ _LT_EOF ;; hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + if test "$GCC" = yes -a "$with_gnu_ld" = no; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi if test "$with_gnu_ld" = no; then _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_direct_absolute, $1)=yes @@ -5269,16 +4771,16 @@ _LT_EOF ;; hpux11*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then + if test "$GCC" = yes -a "$with_gnu_ld" = no; then case $host_cpu in hppa*64*) _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else @@ -5290,14 +4792,7 @@ _LT_EOF _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - m4_if($1, [], [ - # Older versions of the 11.00 compiler do not understand -b yet - # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) - _LT_LINKER_OPTION([if $CC understands -b], - _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b], - [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'], - [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])], - [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags']) + _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac fi @@ -5325,34 +4820,19 @@ _LT_EOF irix5* | irix6* | nonstopux*) if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' # Try to use the -exported_symbol ld option, if it does not # work, assume that -exports_file does not work either and # implicitly export all symbols. - # This should be the same for all languages, so no per-tag cache variable. - AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol], - [lt_cv_irix_exported_symbol], - [save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" - AC_LINK_IFELSE( - [AC_LANG_SOURCE( - [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], - [C++], [[int foo (void) { return 0; }]], - [Fortran 77], [[ - subroutine foo - end]], - [Fortran], [[ - subroutine foo - end]])])], - [lt_cv_irix_exported_symbol=yes], - [lt_cv_irix_exported_symbol=no]) - LDFLAGS="$save_LDFLAGS"]) - if test "$lt_cv_irix_exported_symbol" = yes; then - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' - fi + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" + AC_LINK_IFELSE(int foo(void) {}, + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + ) + LDFLAGS="$save_LDFLAGS" else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' fi _LT_TAGVAR(archive_cmds_need_lc, $1)='no' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' @@ -5361,7 +4841,7 @@ _LT_EOF _LT_TAGVAR(link_all_deplibs, $1)=yes ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -5414,17 +4894,17 @@ _LT_EOF _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' _LT_TAGVAR(hardcode_minus_L, $1)=yes _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' ;; osf3*) if test "$GCC" = yes; then _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' else _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' fi _LT_TAGVAR(archive_cmds_need_lc, $1)='no' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' @@ -5434,13 +4914,13 @@ _LT_EOF osf4* | osf5*) # as osf3* with the addition of -msym flag if test "$GCC" = yes; then _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' else _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ - $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' + $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' # Both c and cxx compiler support -rpath directly _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' @@ -5453,9 +4933,9 @@ _LT_EOF _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' if test "$GCC" = yes; then wlarc='${wl}' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' else case `$CC -V 2>&1` in *"Compilers 5.0"*) @@ -5631,38 +5111,36 @@ x|xyes) # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - AC_CACHE_CHECK([whether -lc should be explicitly linked in], - [lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1), - [$RM conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - - if AC_TRY_EVAL(ac_compile) 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) - pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) - _LT_TAGVAR(allow_undefined_flag, $1)= - if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) - then - lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no - else - lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes - fi - _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $RM conftest* - ]) - _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1) + AC_MSG_CHECKING([whether -lc should be explicitly linked in]) + $RM conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + if AC_TRY_EVAL(ac_compile) 2>conftest.err; then + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext + deplibs= + wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) + pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) + compiler_flags=-v + linker_flags=-v + verstring= + output_objdir=. + libname=conftest + lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) + _LT_TAGVAR(allow_undefined_flag, $1)= + if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) + then + _LT_TAGVAR(archive_cmds_need_lc, $1)=no + else + _LT_TAGVAR(archive_cmds_need_lc, $1)=yes + fi + _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag + else + cat conftest.err 1>&5 + fi + $RM conftest* + AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)]) ;; esac fi @@ -5699,6 +5177,9 @@ _LT_TAGDECL([], [no_undefined_flag], [1], _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], [Flag to hardcode $libdir into a binary during linking. This must work even if $libdir does not exist]) +_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1], + [[If ld is used when linking, flag to hardcode $libdir into a binary + during linking. This must work even if $libdir does not exist]]) _LT_TAGDECL([], [hardcode_libdir_separator], [1], [Whether we need a single "-rpath" flag with a separated argument]) _LT_TAGDECL([], [hardcode_direct], [0], @@ -5724,6 +5205,8 @@ _LT_TAGDECL([], [inherit_rpath], [0], to runtime path list]) _LT_TAGDECL([], [link_all_deplibs], [0], [Whether libtool must link a program against all its dependency libraries]) +_LT_TAGDECL([], [fix_srcfile_path], [1], + [Fix the shell variable $srcfile for the compiler]) _LT_TAGDECL([], [always_export_symbols], [0], [Set to "yes" if exported symbols are required]) _LT_TAGDECL([], [export_symbols_cmds], [2], @@ -5734,8 +5217,6 @@ _LT_TAGDECL([], [include_expsyms], [1], [Symbols that must always be exported]) _LT_TAGDECL([], [prelink_cmds], [2], [Commands necessary for linking programs (against libraries) with templates]) -_LT_TAGDECL([], [postlink_cmds], [2], - [Commands necessary for finishing linking programs]) _LT_TAGDECL([], [file_list_spec], [1], [Specify filename containing input files]) dnl FIXME: Not yet implemented @@ -5829,15 +5310,14 @@ CC="$lt_save_CC" ])# _LT_LANG_C_CONFIG -# _LT_LANG_CXX_CONFIG([TAG]) -# -------------------------- -# Ensure that the configuration variables for a C++ compiler are suitably -# defined. These variables are subsequently used by _LT_CONFIG to write -# the compiler configuration to `libtool'. -m4_defun([_LT_LANG_CXX_CONFIG], -[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_DECL_EGREP])dnl -m4_require([_LT_PATH_MANIFEST_TOOL])dnl +# _LT_PROG_CXX +# ------------ +# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++ +# compiler, we have our own version here. +m4_defun([_LT_PROG_CXX], +[ +pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes]) +AC_PROG_CXX if test -n "$CXX" && ( test "X$CXX" != "Xno" && ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || (test "X$CXX" != "Xg++"))) ; then @@ -5845,6 +5325,22 @@ if test -n "$CXX" && ( test "X$CXX" != "Xno" && else _lt_caught_CXX_error=yes fi +popdef([AC_MSG_ERROR]) +])# _LT_PROG_CXX + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([_LT_PROG_CXX], []) + + +# _LT_LANG_CXX_CONFIG([TAG]) +# -------------------------- +# Ensure that the configuration variables for a C++ compiler are suitably +# defined. These variables are subsequently used by _LT_CONFIG to write +# the compiler configuration to `libtool'. +m4_defun([_LT_LANG_CXX_CONFIG], +[AC_REQUIRE([_LT_PROG_CXX])dnl +m4_require([_LT_FILEUTILS_DEFAULTS])dnl +m4_require([_LT_DECL_EGREP])dnl AC_LANG_PUSH(C++) _LT_TAGVAR(archive_cmds_need_lc, $1)=no @@ -5856,6 +5352,7 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)= _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= +_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported @@ -5865,8 +5362,6 @@ _LT_TAGVAR(module_cmds, $1)= _LT_TAGVAR(module_expsym_cmds, $1)= _LT_TAGVAR(link_all_deplibs, $1)=unknown _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_TAGVAR(reload_flag, $1)=$reload_flag -_LT_TAGVAR(reload_cmds, $1)=$reload_cmds _LT_TAGVAR(no_undefined_flag, $1)= _LT_TAGVAR(whole_archive_flag_spec, $1)= _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no @@ -5898,7 +5393,6 @@ if test "$_lt_caught_CXX_error" != yes; then # Allow CC to be a program name with arguments. lt_save_CC=$CC - lt_save_CFLAGS=$CFLAGS lt_save_LD=$LD lt_save_GCC=$GCC GCC=$GXX @@ -5916,7 +5410,6 @@ if test "$_lt_caught_CXX_error" != yes; then fi test -z "${LDCXX+set}" || LD=$LDCXX CC=${CXX-"c++"} - CFLAGS=$CXXFLAGS compiler=$CC _LT_TAGVAR(compiler, $1)=$CC _LT_CC_BASENAME([$compiler]) @@ -5938,8 +5431,8 @@ if test "$_lt_caught_CXX_error" != yes; then # Check if GNU C++ uses GNU ld as the underlying linker, since the # archiving commands below assume that GNU ld is being used. if test "$with_gnu_ld" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' @@ -5971,7 +5464,7 @@ if test "$_lt_caught_CXX_error" != yes; then # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' else GXX=no @@ -6080,10 +5573,10 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(allow_undefined_flag, $1)='-berok' # Determine the default libpath from the value encoded in an empty # executable. - _LT_SYS_MODULE_PATH_AIX([$1]) + _LT_SYS_MODULE_PATH_AIX _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' @@ -6092,19 +5585,14 @@ if test "$_lt_caught_CXX_error" != yes; then else # Determine the default libpath from the value encoded in an # empty executable. - _LT_SYS_MODULE_PATH_AIX([$1]) + _LT_SYS_MODULE_PATH_AIX _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then - # We only use this code for GNU lds that support --whole-archive. - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - else - # Exported symbols can be pulled into shared objects from archives - _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' - fi + # Exported symbols can be pulled into shared objects from archives + _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' _LT_TAGVAR(archive_cmds_need_lc, $1)=yes # This is similar to how AIX traditionally builds its shared # libraries. @@ -6134,75 +5622,28 @@ if test "$_lt_caught_CXX_error" != yes; then ;; cygwin* | mingw* | pw32* | cegcc*) - case $GXX,$cc_basename in - ,cl* | no,cl*) - # Native MSVC - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='@' - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; - else - $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' - # The linker will not automatically build a static lib if we build a DLL. - # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - # Don't use ranlib - _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' - _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - func_to_tool_file "$lt_outputfile"~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' - ;; - *) - # g++ - # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, - # as there is no search path for DLLs. - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' - _LT_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_TAGVAR(always_export_symbols, $1)=no - _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - - if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; + # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, + # as there is no search path for DLLs. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_TAGVAR(always_export_symbols, $1)=no + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + + if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file (1st line + # is EXPORTS), use it as is; otherwise, prepend... + _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + else + _LT_TAGVAR(ld_shlibs, $1)=no + fi + ;; darwin* | rhapsody*) _LT_DARWIN_LINKER_FEATURES($1) ;; @@ -6225,7 +5666,7 @@ if test "$_lt_caught_CXX_error" != yes; then esac ;; - freebsd2.*) + freebsd[[12]]*) # C++ shared libraries reported to be fairly broken before # switch to ELF _LT_TAGVAR(ld_shlibs, $1)=no @@ -6244,11 +5685,6 @@ if test "$_lt_caught_CXX_error" != yes; then gnu*) ;; - haiku*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(link_all_deplibs, $1)=yes - ;; - hpux9*) _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: @@ -6273,11 +5709,11 @@ if test "$_lt_caught_CXX_error" != yes; then # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' ;; *) if test "$GXX" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' else # FIXME: insert proper C++ library support _LT_TAGVAR(ld_shlibs, $1)=no @@ -6338,7 +5774,7 @@ if test "$_lt_caught_CXX_error" != yes; then # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' ;; *) if test "$GXX" = yes; then @@ -6348,10 +5784,10 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; esac fi @@ -6381,7 +5817,7 @@ if test "$_lt_caught_CXX_error" != yes; then case $cc_basename in CC*) # SGI C++ - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' # Archives containing C++ object files must be created using # "CC -ar", where "CC" is the IRIX C++ compiler. This is @@ -6392,9 +5828,9 @@ if test "$_lt_caught_CXX_error" != yes; then *) if test "$GXX" = yes; then if test "$with_gnu_ld" = no; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib' fi fi _LT_TAGVAR(link_all_deplibs, $1)=yes @@ -6405,7 +5841,7 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(inherit_rpath, $1)=yes ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler @@ -6423,7 +5859,7 @@ if test "$_lt_caught_CXX_error" != yes; then # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' @@ -6460,26 +5896,26 @@ if test "$_lt_caught_CXX_error" != yes; then pgCC* | pgcpp*) # Portland Group C++ compiler case `$CC -V` in - *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*) + *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*) _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ - compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"' + compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ - $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~ + $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ $RANLIB $oldlib' _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ rm -rf $tpldir~ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ - $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' ;; - *) # Version 6 and above use weak symbols + *) # Version 6 will use weak symbols _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' ;; @@ -6487,7 +5923,7 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' ;; cxx*) # Compaq C++ @@ -6506,9 +5942,9 @@ if test "$_lt_caught_CXX_error" != yes; then # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed' + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' ;; - xl* | mpixl* | bgxl*) + xl*) # IBM XL 8.0 on PPC, with GNU ld _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' @@ -6528,13 +5964,13 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes # Not sure whether something based on # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 # would be better. - output_verbose_link_cmd='func_echo_all' + output_verbose_link_cmd='echo' # Archives containing C++ object files must be created using # "CC -xar", where "CC" is the Sun C++ compiler. This is @@ -6603,7 +6039,7 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' fi - output_verbose_link_cmd=func_echo_all + output_verbose_link_cmd=echo else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -6638,15 +6074,15 @@ if test "$_lt_caught_CXX_error" != yes; then case $host in osf3*) _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ;; *) _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ echo "-hidden">> $lib.exp~ - $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~ + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~ $RM $lib.exp' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' ;; @@ -6662,17 +6098,17 @@ if test "$_lt_caught_CXX_error" != yes; then # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' ;; *) if test "$GXX" = yes && test "$with_gnu_ld" = no; then _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' case $host in osf3*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ;; esac @@ -6682,7 +6118,7 @@ if test "$_lt_caught_CXX_error" != yes; then # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' else # FIXME: insert proper C++ library support @@ -6718,7 +6154,7 @@ if test "$_lt_caught_CXX_error" != yes; then solaris*) case $cc_basename in - CC* | sunCC*) + CC*) # Sun C++ 4.2, 5.x and Centerline C++ _LT_TAGVAR(archive_cmds_need_lc,$1)=yes _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' @@ -6739,7 +6175,7 @@ if test "$_lt_caught_CXX_error" != yes; then esac _LT_TAGVAR(link_all_deplibs, $1)=yes - output_verbose_link_cmd='func_echo_all' + output_verbose_link_cmd='echo' # Archives containing C++ object files must be created using # "CC -xar", where "CC" is the Sun C++ compiler. This is @@ -6759,14 +6195,14 @@ if test "$_lt_caught_CXX_error" != yes; then if test "$GXX" = yes && test "$with_gnu_ld" = no; then _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' if $CC --version | $GREP -v '^2\.7' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' else # g++ 2.7 appears to require `-G' NOT `-shared' on this # platform. @@ -6777,7 +6213,7 @@ if test "$_lt_caught_CXX_error" != yes; then # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' fi _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' @@ -6831,10 +6267,6 @@ if test "$_lt_caught_CXX_error" != yes; then CC*) _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~ - '"$_LT_TAGVAR(old_archive_cmds, $1)" - _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~ - '"$_LT_TAGVAR(reload_cmds, $1)" ;; *) _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' @@ -6890,7 +6322,6 @@ if test "$_lt_caught_CXX_error" != yes; then fi # test -n "$compiler" CC=$lt_save_CC - CFLAGS=$lt_save_CFLAGS LDCXX=$LD LD=$lt_save_LD GCC=$lt_save_GCC @@ -6905,29 +6336,6 @@ AC_LANG_POP ])# _LT_LANG_CXX_CONFIG -# _LT_FUNC_STRIPNAME_CNF -# ---------------------- -# func_stripname_cnf prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -# -# This function is identical to the (non-XSI) version of func_stripname, -# except this one can be used by m4 code that may be executed by configure, -# rather than the libtool script. -m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl -AC_REQUIRE([_LT_DECL_SED]) -AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH]) -func_stripname_cnf () -{ - case ${2} in - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; - esac -} # func_stripname_cnf -])# _LT_FUNC_STRIPNAME_CNF - # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) # --------------------------------- # Figure out "hidden" library dependencies from verbose @@ -6936,7 +6344,6 @@ func_stripname_cnf () # objects, libraries and library flags. m4_defun([_LT_SYS_HIDDEN_LIBDEPS], [m4_require([_LT_FILEUTILS_DEFAULTS])dnl -AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl # Dependencies to place before and after the object being linked: _LT_TAGVAR(predep_objects, $1)= _LT_TAGVAR(postdep_objects, $1)= @@ -6986,20 +6393,7 @@ public class foo { } }; _LT_EOF -], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF -package foo -func foo() { -} -_LT_EOF ]) - -_lt_libdeps_save_CFLAGS=$CFLAGS -case "$CC $CFLAGS " in #( -*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; -*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; -*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; -esac - dnl Parse the compiler output and extract the necessary dnl objects, libraries and library flags. if AC_TRY_EVAL(ac_compile); then @@ -7011,7 +6405,7 @@ if AC_TRY_EVAL(ac_compile); then pre_test_object_deps_done=no for p in `eval "$output_verbose_link_cmd"`; do - case ${prev}${p} in + case $p in -L* | -R* | -l*) # Some compilers place space between "-{L,R}" and the path. @@ -7020,22 +6414,13 @@ if AC_TRY_EVAL(ac_compile); then test $p = "-R"; then prev=$p continue + else + prev= fi - # Expand the sysroot to ease extracting the directories later. - if test -z "$prev"; then - case $p in - -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;; - -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;; - -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;; - esac - fi - case $p in - =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; - esac if test "$pre_test_object_deps_done" = no; then - case ${prev} in - -L | -R) + case $p in + -L* | -R*) # Internal compiler library paths should come after those # provided the user. The postdeps already come after the # user supplied libs so there is no need to process them. @@ -7055,10 +6440,8 @@ if AC_TRY_EVAL(ac_compile); then _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" fi fi - prev= ;; - *.lto.$objext) ;; # Ignore GCC LTO objects *.$objext) # This assumes that the test object file only shows up # once in the compiler output. @@ -7094,7 +6477,6 @@ else fi $RM -f confest.$objext -CFLAGS=$_lt_libdeps_save_CFLAGS # PORTME: override above test on systems where it is broken m4_if([$1], [CXX], @@ -7131,7 +6513,7 @@ linux*) solaris*) case $cc_basename in - CC* | sunCC*) + CC*) # The more standards-conforming stlport4 library is # incompatible with the Cstd library. Avoid specifying # it if it's in CXXFLAGS. Ignore libCrun as @@ -7175,16 +6557,32 @@ _LT_TAGDECL([], [compiler_lib_search_path], [1], ])# _LT_SYS_HIDDEN_LIBDEPS +# _LT_PROG_F77 +# ------------ +# Since AC_PROG_F77 is broken, in that it returns the empty string +# if there is no fortran compiler, we have our own version here. +m4_defun([_LT_PROG_F77], +[ +pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes]) +AC_PROG_F77 +if test -z "$F77" || test "X$F77" = "Xno"; then + _lt_disable_F77=yes +fi +popdef([AC_MSG_ERROR]) +])# _LT_PROG_F77 + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([_LT_PROG_F77], []) + + # _LT_LANG_F77_CONFIG([TAG]) # -------------------------- # Ensure that the configuration variables for a Fortran 77 compiler are # suitably defined. These variables are subsequently used by _LT_CONFIG # to write the compiler configuration to `libtool'. m4_defun([_LT_LANG_F77_CONFIG], -[AC_LANG_PUSH(Fortran 77) -if test -z "$F77" || test "X$F77" = "Xno"; then - _lt_disable_F77=yes -fi +[AC_REQUIRE([_LT_PROG_F77])dnl +AC_LANG_PUSH(Fortran 77) _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(allow_undefined_flag, $1)= @@ -7194,6 +6592,7 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)= _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= +_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=no @@ -7202,8 +6601,6 @@ _LT_TAGVAR(module_cmds, $1)= _LT_TAGVAR(module_expsym_cmds, $1)= _LT_TAGVAR(link_all_deplibs, $1)=unknown _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_TAGVAR(reload_flag, $1)=$reload_flag -_LT_TAGVAR(reload_cmds, $1)=$reload_cmds _LT_TAGVAR(no_undefined_flag, $1)= _LT_TAGVAR(whole_archive_flag_spec, $1)= _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no @@ -7243,9 +6640,7 @@ if test "$_lt_disable_F77" != yes; then # Allow CC to be a program name with arguments. lt_save_CC="$CC" lt_save_GCC=$GCC - lt_save_CFLAGS=$CFLAGS CC=${F77-"f77"} - CFLAGS=$FFLAGS compiler=$CC _LT_TAGVAR(compiler, $1)=$CC _LT_CC_BASENAME([$compiler]) @@ -7299,24 +6694,38 @@ if test "$_lt_disable_F77" != yes; then GCC=$lt_save_GCC CC="$lt_save_CC" - CFLAGS="$lt_save_CFLAGS" fi # test "$_lt_disable_F77" != yes AC_LANG_POP ])# _LT_LANG_F77_CONFIG +# _LT_PROG_FC +# ----------- +# Since AC_PROG_FC is broken, in that it returns the empty string +# if there is no fortran compiler, we have our own version here. +m4_defun([_LT_PROG_FC], +[ +pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes]) +AC_PROG_FC +if test -z "$FC" || test "X$FC" = "Xno"; then + _lt_disable_FC=yes +fi +popdef([AC_MSG_ERROR]) +])# _LT_PROG_FC + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([_LT_PROG_FC], []) + + # _LT_LANG_FC_CONFIG([TAG]) # ------------------------- # Ensure that the configuration variables for a Fortran compiler are # suitably defined. These variables are subsequently used by _LT_CONFIG # to write the compiler configuration to `libtool'. m4_defun([_LT_LANG_FC_CONFIG], -[AC_LANG_PUSH(Fortran) - -if test -z "$FC" || test "X$FC" = "Xno"; then - _lt_disable_FC=yes -fi +[AC_REQUIRE([_LT_PROG_FC])dnl +AC_LANG_PUSH(Fortran) _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(allow_undefined_flag, $1)= @@ -7326,6 +6735,7 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)= _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= +_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=no @@ -7334,8 +6744,6 @@ _LT_TAGVAR(module_cmds, $1)= _LT_TAGVAR(module_expsym_cmds, $1)= _LT_TAGVAR(link_all_deplibs, $1)=unknown _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_TAGVAR(reload_flag, $1)=$reload_flag -_LT_TAGVAR(reload_cmds, $1)=$reload_cmds _LT_TAGVAR(no_undefined_flag, $1)= _LT_TAGVAR(whole_archive_flag_spec, $1)= _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no @@ -7375,9 +6783,7 @@ if test "$_lt_disable_FC" != yes; then # Allow CC to be a program name with arguments. lt_save_CC="$CC" lt_save_GCC=$GCC - lt_save_CFLAGS=$CFLAGS CC=${FC-"f95"} - CFLAGS=$FCFLAGS compiler=$CC GCC=$ac_cv_fc_compiler_gnu @@ -7433,8 +6839,7 @@ if test "$_lt_disable_FC" != yes; then fi # test -n "$compiler" GCC=$lt_save_GCC - CC=$lt_save_CC - CFLAGS=$lt_save_CFLAGS + CC="$lt_save_CC" fi # test "$_lt_disable_FC" != yes AC_LANG_POP @@ -7471,12 +6876,10 @@ _LT_COMPILER_BOILERPLATE _LT_LINKER_BOILERPLATE # Allow CC to be a program name with arguments. -lt_save_CC=$CC -lt_save_CFLAGS=$CFLAGS +lt_save_CC="$CC" lt_save_GCC=$GCC GCC=yes CC=${GCJ-"gcj"} -CFLAGS=$GCJFLAGS compiler=$CC _LT_TAGVAR(compiler, $1)=$CC _LT_TAGVAR(LD, $1)="$LD" @@ -7486,8 +6889,6 @@ _LT_CC_BASENAME([$compiler]) _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_TAGVAR(reload_flag, $1)=$reload_flag -_LT_TAGVAR(reload_cmds, $1)=$reload_cmds ## CAVEAT EMPTOR: ## There is no encapsulation within the following macros, do not change @@ -7507,82 +6908,10 @@ fi AC_LANG_RESTORE GCC=$lt_save_GCC -CC=$lt_save_CC -CFLAGS=$lt_save_CFLAGS +CC="$lt_save_CC" ])# _LT_LANG_GCJ_CONFIG -# _LT_LANG_GO_CONFIG([TAG]) -# -------------------------- -# Ensure that the configuration variables for the GNU Go compiler -# are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. -m4_defun([_LT_LANG_GO_CONFIG], -[AC_REQUIRE([LT_PROG_GO])dnl -AC_LANG_SAVE - -# Source file extension for Go test sources. -ac_ext=go - -# Object file extension for compiled Go test sources. -objext=o -_LT_TAGVAR(objext, $1)=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code="package main; func main() { }" - -# Code to be used in simple link tests -lt_simple_link_test_code='package main; func main() { }' - -# ltmain only uses $CC for tagged configurations so make sure $CC is set. -_LT_TAG_COMPILER - -# save warnings/boilerplate of simple test code -_LT_COMPILER_BOILERPLATE -_LT_LINKER_BOILERPLATE - -# Allow CC to be a program name with arguments. -lt_save_CC=$CC -lt_save_CFLAGS=$CFLAGS -lt_save_GCC=$GCC -GCC=yes -CC=${GOC-"gccgo"} -CFLAGS=$GOFLAGS -compiler=$CC -_LT_TAGVAR(compiler, $1)=$CC -_LT_TAGVAR(LD, $1)="$LD" -_LT_CC_BASENAME([$compiler]) - -# Go did not exist at the time GCC didn't implicitly link libc in. -_LT_TAGVAR(archive_cmds_need_lc, $1)=no - -_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_TAGVAR(reload_flag, $1)=$reload_flag -_LT_TAGVAR(reload_cmds, $1)=$reload_cmds - -## CAVEAT EMPTOR: -## There is no encapsulation within the following macros, do not change -## the running order or otherwise move them around unless you know exactly -## what you are doing... -if test -n "$compiler"; then - _LT_COMPILER_NO_RTTI($1) - _LT_COMPILER_PIC($1) - _LT_COMPILER_C_O($1) - _LT_COMPILER_FILE_LOCKS($1) - _LT_LINKER_SHLIBS($1) - _LT_LINKER_HARDCODE_LIBPATH($1) - - _LT_CONFIG($1) -fi - -AC_LANG_RESTORE - -GCC=$lt_save_GCC -CC=$lt_save_CC -CFLAGS=$lt_save_CFLAGS -])# _LT_LANG_GO_CONFIG - - # _LT_LANG_RC_CONFIG([TAG]) # ------------------------- # Ensure that the configuration variables for the Windows resource compiler @@ -7614,11 +6943,9 @@ _LT_LINKER_BOILERPLATE # Allow CC to be a program name with arguments. lt_save_CC="$CC" -lt_save_CFLAGS=$CFLAGS lt_save_GCC=$GCC GCC= CC=${RC-"windres"} -CFLAGS= compiler=$CC _LT_TAGVAR(compiler, $1)=$CC _LT_CC_BASENAME([$compiler]) @@ -7631,8 +6958,7 @@ fi GCC=$lt_save_GCC AC_LANG_RESTORE -CC=$lt_save_CC -CFLAGS=$lt_save_CFLAGS +CC="$lt_save_CC" ])# _LT_LANG_RC_CONFIG @@ -7652,13 +6978,6 @@ dnl aclocal-1.4 backwards compatibility: dnl AC_DEFUN([LT_AC_PROG_GCJ], []) -# LT_PROG_GO -# ---------- -AC_DEFUN([LT_PROG_GO], -[AC_CHECK_TOOL(GOC, gccgo,) -]) - - # LT_PROG_RC # ---------- AC_DEFUN([LT_PROG_RC], @@ -7698,15 +7017,6 @@ _LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) AC_SUBST([OBJDUMP]) ]) -# _LT_DECL_DLLTOOL -# ---------------- -# Ensure DLLTOOL variable is set. -m4_defun([_LT_DECL_DLLTOOL], -[AC_CHECK_TOOL(DLLTOOL, dlltool, false) -test -z "$DLLTOOL" && DLLTOOL=dlltool -_LT_DECL([], [DLLTOOL], [1], [DLL creation program]) -AC_SUBST([DLLTOOL]) -]) # _LT_DECL_SED # ------------ @@ -7800,8 +7110,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES], # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" - test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ - = c,a/b,b/c, \ + test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ + = c,a/b,, \ && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes @@ -7840,162 +7150,208 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl ])# _LT_CHECK_SHELL_FEATURES -# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) -# ------------------------------------------------------ -# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and -# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY. -m4_defun([_LT_PROG_FUNCTION_REPLACE], -[dnl { -sed -e '/^$1 ()$/,/^} # $1 /c\ -$1 ()\ -{\ -m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1]) -} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: -]) +# _LT_PROG_XSI_SHELLFNS +# --------------------- +# Bourne and XSI compatible variants of some useful shell functions. +m4_defun([_LT_PROG_XSI_SHELLFNS], +[case $xsi_shell in + yes) + cat << \_LT_EOF >> "$cfgfile" + +# func_dirname file append nondir_replacement +# Compute the dirname of FILE. If nonempty, add APPEND to the result, +# otherwise set result to NONDIR_REPLACEMENT. +func_dirname () +{ + case ${1} in + */*) func_dirname_result="${1%/*}${2}" ;; + * ) func_dirname_result="${3}" ;; + esac +} +# func_basename file +func_basename () +{ + func_basename_result="${1##*/}" +} -# _LT_PROG_REPLACE_SHELLFNS -# ------------------------- -# Replace existing portable implementations of several shell functions with -# equivalent extended shell implementations where those features are available.. -m4_defun([_LT_PROG_REPLACE_SHELLFNS], -[if test x"$xsi_shell" = xyes; then - _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac]) - - _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl - func_basename_result="${1##*/}"]) - - _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac - func_basename_result="${1##*/}"]) +# func_dirname_and_basename file append nondir_replacement +# perform func_basename and func_dirname in a single function +# call: +# dirname: Compute the dirname of FILE. If nonempty, +# add APPEND to the result, otherwise set result +# to NONDIR_REPLACEMENT. +# value returned in "$func_dirname_result" +# basename: Compute filename of FILE. +# value retuned in "$func_basename_result" +# Implementation must be kept synchronized with func_dirname +# and func_basename. For efficiency, we do not delegate to +# those functions but instead duplicate the functionality here. +func_dirname_and_basename () +{ + case ${1} in + */*) func_dirname_result="${1%/*}${2}" ;; + * ) func_dirname_result="${3}" ;; + esac + func_basename_result="${1##*/}" +} - _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are - # positional parameters, so assign one to ordinary parameter first. - func_stripname_result=${3} - func_stripname_result=${func_stripname_result#"${1}"} - func_stripname_result=${func_stripname_result%"${2}"}]) +# func_stripname prefix suffix name +# strip PREFIX and SUFFIX off of NAME. +# PREFIX and SUFFIX must not contain globbing or regex special +# characters, hashes, percent signs, but SUFFIX may contain a leading +# dot (in which case that matches only a dot). +func_stripname () +{ + # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are + # positional parameters, so assign one to ordinary parameter first. + func_stripname_result=${3} + func_stripname_result=${func_stripname_result#"${1}"} + func_stripname_result=${func_stripname_result%"${2}"} +} - _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl - func_split_long_opt_name=${1%%=*} - func_split_long_opt_arg=${1#*=}]) +# func_opt_split +func_opt_split () +{ + func_opt_split_opt=${1%%=*} + func_opt_split_arg=${1#*=} +} - _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl - func_split_short_opt_arg=${1#??} - func_split_short_opt_name=${1%"$func_split_short_opt_arg"}]) +# func_lo2o object +func_lo2o () +{ + case ${1} in + *.lo) func_lo2o_result=${1%.lo}.${objext} ;; + *) func_lo2o_result=${1} ;; + esac +} - _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl - case ${1} in - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; - *) func_lo2o_result=${1} ;; - esac]) +# func_xform libobj-or-source +func_xform () +{ + func_xform_result=${1%.*}.lo +} - _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo]) +# func_arith arithmetic-term... +func_arith () +{ + func_arith_result=$(( $[*] )) +} - _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))]) +# func_len string +# STRING may not start with a hyphen. +func_len () +{ + func_len_result=${#1} +} - _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}]) -fi +_LT_EOF + ;; + *) # Bourne compatible functions. + cat << \_LT_EOF >> "$cfgfile" -if test x"$lt_shell_append" = xyes; then - _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"]) +# func_dirname file append nondir_replacement +# Compute the dirname of FILE. If nonempty, add APPEND to the result, +# otherwise set result to NONDIR_REPLACEMENT. +func_dirname () +{ + # Extract subdirectory from the argument. + func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` + if test "X$func_dirname_result" = "X${1}"; then + func_dirname_result="${3}" + else + func_dirname_result="$func_dirname_result${2}" + fi +} - _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl - func_quote_for_eval "${2}" -dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \ - eval "${1}+=\\\\ \\$func_quote_for_eval_result"]) +# func_basename file +func_basename () +{ + func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` +} - # Save a `func_append' function call where possible by direct use of '+=' - sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -else - # Save a `func_append' function call even when '+=' is not available - sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -fi +dnl func_dirname_and_basename +dnl A portable version of this function is already defined in general.m4sh +dnl so there is no need for it here. -if test x"$_lt_function_replace_fail" = x":"; then - AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) -fi -]) +# func_stripname prefix suffix name +# strip PREFIX and SUFFIX off of NAME. +# PREFIX and SUFFIX must not contain globbing or regex special +# characters, hashes, percent signs, but SUFFIX may contain a leading +# dot (in which case that matches only a dot). +# func_strip_suffix prefix name +func_stripname () +{ + case ${2} in + .*) func_stripname_result=`$ECHO "X${3}" \ + | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;; + *) func_stripname_result=`$ECHO "X${3}" \ + | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;; + esac +} -# _LT_PATH_CONVERSION_FUNCTIONS -# ----------------------------- -# Determine which file name conversion functions should be used by -# func_to_host_file (and, implicitly, by func_to_host_path). These are needed -# for certain cross-compile configurations and native mingw. -m4_defun([_LT_PATH_CONVERSION_FUNCTIONS], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_CANONICAL_BUILD])dnl -AC_MSG_CHECKING([how to convert $build file names to $host format]) -AC_CACHE_VAL(lt_cv_to_host_file_cmd, -[case $host in - *-*-mingw* ) - case $build in - *-*-mingw* ) # actually msys - lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 - ;; - *-*-cygwin* ) - lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 - ;; - * ) # otherwise, assume *nix - lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 - ;; - esac - ;; - *-*-cygwin* ) - case $build in - *-*-mingw* ) # actually msys - lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin - ;; - *-*-cygwin* ) - lt_cv_to_host_file_cmd=func_convert_file_noop - ;; - * ) # otherwise, assume *nix - lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin - ;; - esac - ;; - * ) # unhandled hosts (and "normal" native builds) - lt_cv_to_host_file_cmd=func_convert_file_noop - ;; +# sed scripts: +my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q' +my_sed_long_arg='1s/^-[[^=]]*=//' + +# func_opt_split +func_opt_split () +{ + func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"` + func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"` +} + +# func_lo2o object +func_lo2o () +{ + func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"` +} + +# func_xform libobj-or-source +func_xform () +{ + func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'` +} + +# func_arith arithmetic-term... +func_arith () +{ + func_arith_result=`expr "$[@]"` +} + +# func_len string +# STRING may not start with a hyphen. +func_len () +{ + func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len` +} + +_LT_EOF esac -]) -to_host_file_cmd=$lt_cv_to_host_file_cmd -AC_MSG_RESULT([$lt_cv_to_host_file_cmd]) -_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd], - [0], [convert $build file names to $host format])dnl - -AC_MSG_CHECKING([how to convert $build file names to toolchain format]) -AC_CACHE_VAL(lt_cv_to_tool_file_cmd, -[#assume ordinary cross tools, or native build. -lt_cv_to_tool_file_cmd=func_convert_file_noop -case $host in - *-*-mingw* ) - case $build in - *-*-mingw* ) # actually msys - lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 - ;; - esac + +case $lt_shell_append in + yes) + cat << \_LT_EOF >> "$cfgfile" + +# func_append var value +# Append VALUE to the end of shell variable VAR. +func_append () +{ + eval "$[1]+=\$[2]" +} +_LT_EOF ;; -esac + *) + cat << \_LT_EOF >> "$cfgfile" + +# func_append var value +# Append VALUE to the end of shell variable VAR. +func_append () +{ + eval "$[1]=\$$[1]\$[2]" +} + +_LT_EOF + ;; + esac ]) -to_tool_file_cmd=$lt_cv_to_tool_file_cmd -AC_MSG_RESULT([$lt_cv_to_tool_file_cmd]) -_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd], - [0], [convert $build files to toolchain format])dnl -])# _LT_PATH_CONVERSION_FUNCTIONS diff --git a/m4/ltoptions.m4 b/m4/ltoptions.m4 index 5d9acd8..34151a3 100644 --- a/m4/ltoptions.m4 +++ b/m4/ltoptions.m4 @@ -1,14 +1,13 @@ # Helper functions for option handling. -*- Autoconf -*- # -# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. # Written by Gary V. Vaughan, 2004 # # This file is free software; the Free Software Foundation gives # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. -# serial 7 ltoptions.m4 +# serial 6 ltoptions.m4 # This is to help aclocal find these macros, as it can't see m4_define. AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) @@ -126,7 +125,7 @@ LT_OPTION_DEFINE([LT_INIT], [win32-dll], [enable_win32_dll=yes case $host in -*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) +*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*) AC_CHECK_TOOL(AS, as, false) AC_CHECK_TOOL(DLLTOOL, dlltool, false) AC_CHECK_TOOL(OBJDUMP, objdump, false) @@ -134,13 +133,13 @@ case $host in esac test -z "$AS" && AS=as -_LT_DECL([], [AS], [1], [Assembler program])dnl +_LT_DECL([], [AS], [0], [Assembler program])dnl test -z "$DLLTOOL" && DLLTOOL=dlltool -_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl +_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl test -z "$OBJDUMP" && OBJDUMP=objdump -_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl +_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl ])# win32-dll AU_DEFUN([AC_LIBTOOL_WIN32_DLL], @@ -326,24 +325,9 @@ dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], []) # MODE is either `yes' or `no'. If omitted, it defaults to `both'. m4_define([_LT_WITH_PIC], [AC_ARG_WITH([pic], - [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], + [AS_HELP_STRING([--with-pic], [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], - [lt_p=${PACKAGE-default} - case $withval in - yes|no) pic_mode=$withval ;; - *) - pic_mode=default - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for lt_pkg in $withval; do - IFS="$lt_save_ifs" - if test "X$lt_pkg" = "X$lt_p"; then - pic_mode=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac], + [pic_mode="$withval"], [pic_mode=default]) test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) diff --git a/m4/ltversion.m4 b/m4/ltversion.m4 index 07a8602..b8e154f 100644 --- a/m4/ltversion.m4 +++ b/m4/ltversion.m4 @@ -7,17 +7,17 @@ # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. -# @configure_input@ +# Generated from ltversion.in. -# serial 3337 ltversion.m4 +# serial 3012 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.4.2]) -m4_define([LT_PACKAGE_REVISION], [1.3337]) +m4_define([LT_PACKAGE_VERSION], [2.2.6]) +m4_define([LT_PACKAGE_REVISION], [1.3012]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4.2' -macro_revision='1.3337' +[macro_version='2.2.6' +macro_revision='1.3012' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) diff --git a/m4/lt~obsolete.m4 b/m4/lt~obsolete.m4 index c573da9..637bb20 100644 --- a/m4/lt~obsolete.m4 +++ b/m4/lt~obsolete.m4 @@ -1,13 +1,13 @@ # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- # -# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc. +# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc. # Written by Scott James Remnant, 2004. # # This file is free software; the Free Software Foundation gives # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. -# serial 5 lt~obsolete.m4 +# serial 4 lt~obsolete.m4 # These exist entirely to fool aclocal when bootstrapping libtool. # @@ -77,6 +77,7 @@ m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])]) m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])]) m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])]) m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])]) +m4_ifndef([AC_LIBTOOL_RC], [AC_DEFUN([AC_LIBTOOL_RC])]) m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])]) m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])]) m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])]) @@ -89,10 +90,3 @@ m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])]) m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])]) m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])]) m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) -m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])]) -m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])]) -m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])]) -m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])]) -m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])]) -m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) -m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) diff --git a/tests/Makefile.in b/tests/Makefile.in index 5744e30..98a7cea 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -168,7 +168,6 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -213,7 +212,6 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ @@ -246,6 +244,7 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ diff --git a/tests/compathelper.py b/tests/compathelper.py index 2465747..668e60a 100644 --- a/tests/compathelper.py +++ b/tests/compathelper.py @@ -49,7 +49,7 @@ if sys.version_info >= (3, 0): for tests that need to write to intefaces that take unicode in python 2 - python 3 strings are unicode encoded as UTF-8 so the unicode object + python 3 strings are unicode encoded as UTF-8 so the unicode object doesn't exist python 2 differs between a string an unicode string and you must specify diff --git a/tests/runtests.py b/tests/runtests.py index 2a8ecf4..2ca1b02 100755 --- a/tests/runtests.py +++ b/tests/runtests.py @@ -11,24 +11,26 @@ if '--help' in sys.argv: print("Usage: ./runtests.py ") sys.exit(0) +mydir = os.path.dirname(os.path.abspath(__file__)) + # force untranslated messages, as we check for them in some tests os.environ['LC_MESSAGES'] = 'C' # Load tests. if 'TEST_NAMES' in os.environ: - names = os.environ['TEST_NAMES'].split() + names = os.environ['TEST_NAMES'].split() elif 'TEST_FILES' in os.environ: - names = [] - for filename in os.environ['TEST_FILES'].split(): - names.append(filename[:-3]) + names = [] + for filename in os.environ['TEST_FILES'].split(): + names.append(filename[:-3]) elif len(sys.argv) > 1: names = [] for filename in sys.argv[1:]: names.append(filename.replace('.py', '')) else: - names = [] - for filename in glob.iglob("test_*.py"): - names.append(filename[:-3]) + names = [] + for filename in glob.iglob(os.path.join(mydir, 'test_*.py')): + names.append(os.path.basename(filename)[:-3]) loader = unittest.TestLoader() suite = loader.loadTestsFromNames(names) @@ -38,5 +40,4 @@ suite = loader.loadTestsFromNames(names) runner = unittest.TextTestRunner(verbosity=2) result = runner.run(suite) if not result.wasSuccessful(): - sys.exit(1) # exit code so "make check" reports error - + sys.exit(1) # exit code so "make check" reports error diff --git a/tests/test_everything.py b/tests/test_everything.py index 86ddb42..ffebf94 100644 --- a/tests/test_everything.py +++ b/tests/test_everything.py @@ -66,7 +66,7 @@ class TestEverything(unittest.TestCase): self.assertEquals(UNICHAR, Everything.test_unichar(UNICHAR)) self.assertRaises(TypeError, Everything.test_unichar, "") self.assertRaises(TypeError, Everything.test_unichar, "morethanonechar") - + def test_floating(self): e = Everything.TestFloating() @@ -140,22 +140,22 @@ class TestEverything(unittest.TestCase): gtype = Everything.test_gtype(ARegisteredClass) self.assertEquals(ARegisteredClass.__gtype__, gtype) self.assertRaises(TypeError, Everything.test_gtype, 'ARegisteredClass') - + def test_dir(self): attr_list = dir(Everything) - + # test that typelib attributes are listed self.assertTrue('TestStructA' in attr_list) - + # test that class attributes and methods are listed self.assertTrue('__class__' in attr_list) self.assertTrue('__dir__' in attr_list) self.assertTrue('__repr__' in attr_list) - + # test that instance members are listed self.assertTrue('_namespace' in attr_list) self.assertTrue('_version' in attr_list) - + # test that there are no duplicates returned self.assertEqual(len(attr_list), len(set(attr_list))) @@ -235,7 +235,7 @@ class TestCallbacks(unittest.TestCase): TestCallbacks.called = False def callback(): TestCallbacks.called = True - + Everything.test_simple_callback(callback) self.assertTrue(TestCallbacks.called) @@ -246,7 +246,7 @@ class TestCallbacks(unittest.TestCase): """ def callback(): x = 1 / 0 - + try: Everything.test_simple_callback(callback) except ZeroDivisionError: @@ -278,7 +278,7 @@ class TestCallbacks(unittest.TestCase): self.assertEquals(Everything.test_callback(callback), 44) self.assertTrue(TestCallbacks.called) - + def test_callback_async(self): TestCallbacks.called = False def callback(foo): @@ -305,11 +305,11 @@ class TestCallbacks(unittest.TestCase): self.assertEquals(userdata, "Test%d" % TestCallbacks.called) TestCallbacks.called += 1 return TestCallbacks.called - + for i in range(100): val = Everything.test_callback_user_data(callback, "Test%d" % i) self.assertEquals(val, i+1) - + self.assertEquals(TestCallbacks.called, 100) def test_callback_userdata_refcount(self): @@ -323,7 +323,7 @@ class TestCallbacks(unittest.TestCase): start_ref_count = getrefcount(ud) for i in range(100): Everything.test_callback_destroy_notify(callback, ud) - + Everything.test_callback_thaw_notifications() end_ref_count = getrefcount(ud) diff --git a/tests/test_gdbus.py b/tests/test_gdbus.py index 5db5d93..7af8847 100644 --- a/tests/test_gdbus.py +++ b/tests/test_gdbus.py @@ -15,20 +15,20 @@ class TestGDBusClient(unittest.TestCase): self.bus = Gio.bus_get_sync(Gio.BusType.SESSION, None) self.dbus_proxy = Gio.DBusProxy.new_sync(self.bus, - Gio.DBusProxyFlags.NONE, None, + Gio.DBusProxyFlags.NONE, None, 'org.freedesktop.DBus', '/org/freedesktop/DBus', 'org.freedesktop.DBus', None) def test_native_calls_sync(self): - result = self.dbus_proxy.call_sync('ListNames', None, + result = self.dbus_proxy.call_sync('ListNames', None, Gio.DBusCallFlags.NO_AUTO_START, 500, None) self.assertTrue(isinstance(result, GLib.Variant)) result = result.unpack()[0] # result is always a tuple self.assertTrue(len(result) > 1) self.assertTrue('org.freedesktop.DBus' in result) - result = self.dbus_proxy.call_sync('GetNameOwner', + result = self.dbus_proxy.call_sync('GetNameOwner', GLib.Variant('(s)', ('org.freedesktop.DBus',)), Gio.DBusCallFlags.NO_AUTO_START, 500, None) self.assertTrue(isinstance(result, GLib.Variant)) @@ -45,7 +45,7 @@ class TestGDBusClient(unittest.TestCase): # error case: invalid argument try: - self.dbus_proxy.call_sync('GetConnectionUnixProcessID', + self.dbus_proxy.call_sync('GetConnectionUnixProcessID', GLib.Variant('(s)', (' unknown',)), Gio.DBusCallFlags.NO_AUTO_START, 500, None) self.fail('call with invalid arguments should raise an exception') @@ -69,7 +69,7 @@ class TestGDBusClient(unittest.TestCase): main_loop = GObject.MainLoop() data = {'main_loop': main_loop} - self.dbus_proxy.call('ListNames', None, + self.dbus_proxy.call('ListNames', None, Gio.DBusCallFlags.NO_AUTO_START, 500, None, call_done, data) main_loop.run() @@ -128,7 +128,7 @@ class TestGDBusClient(unittest.TestCase): # test keyword argument; timeout=0 will fail immediately try: - self.dbus_proxy.GetConnectionUnixProcessID('()', timeout=0) + self.dbus_proxy.GetConnectionUnixProcessID('(s)', '1', timeout=0) self.fail('call with timeout=0 should raise an exception') except Exception as e: self.assertTrue('Timeout' in str(e), str(e)) @@ -204,4 +204,3 @@ class TestGDBusClient(unittest.TestCase): self.assertTrue(isinstance(data['error'], Exception)) self.assertTrue('InvalidArgs' in str(data['error']), str(data['error'])) - diff --git a/tests/test_gi.py b/tests/test_gi.py index edbe461..26b5ce9 100644 --- a/tests/test_gi.py +++ b/tests/test_gi.py @@ -716,33 +716,33 @@ class TestArray(unittest.TestCase): self.assertEquals([-1, 0, 1, 2], object_.method_array_return()) def test_array_enum_in(self): - GIMarshallingTests.array_enum_in([GIMarshallingTests.Enum.VALUE1, - GIMarshallingTests.Enum.VALUE2, - GIMarshallingTests.Enum.VALUE3]) + GIMarshallingTests.array_enum_in([GIMarshallingTests.Enum.VALUE1, + GIMarshallingTests.Enum.VALUE2, + GIMarshallingTests.Enum.VALUE3]) def test_array_boxed_struct_in(self): - struct1 = GIMarshallingTests.BoxedStruct() - struct1.long_ = 1 - struct2 = GIMarshallingTests.BoxedStruct() - struct2.long_ = 2 - struct3 = GIMarshallingTests.BoxedStruct() - struct3.long_ = 3 + struct1 = GIMarshallingTests.BoxedStruct() + struct1.long_ = 1 + struct2 = GIMarshallingTests.BoxedStruct() + struct2.long_ = 2 + struct3 = GIMarshallingTests.BoxedStruct() + struct3.long_ = 3 - GIMarshallingTests.array_struct_in([struct1, struct2, struct3]) + GIMarshallingTests.array_struct_in([struct1, struct2, struct3]) def test_array_simple_struct_in(self): - struct1 = GIMarshallingTests.SimpleStruct() - struct1.long_ = 1 - struct2 = GIMarshallingTests.SimpleStruct() - struct2.long_ = 2 - struct3 = GIMarshallingTests.SimpleStruct() - struct3.long_ = 3 + struct1 = GIMarshallingTests.SimpleStruct() + struct1.long_ = 1 + struct2 = GIMarshallingTests.SimpleStruct() + struct2.long_ = 2 + struct3 = GIMarshallingTests.SimpleStruct() + struct3.long_ = 3 - GIMarshallingTests.array_simple_struct_in([struct1, struct2, struct3]) + GIMarshallingTests.array_simple_struct_in([struct1, struct2, struct3]) def test_array_multi_array_key_value_in(self): - GIMarshallingTests.multi_array_key_value_in(["one", "two", "three"], - [1, 2, 3]) + GIMarshallingTests.multi_array_key_value_in(["one", "two", "three"], + [1, 2, 3]) def test_array_fixed_out_struct(self): struct1, struct2 = GIMarshallingTests.array_fixed_out_struct() diff --git a/tests/test_gobject.py b/tests/test_gobject.py index eef9cf6..4bb7c53 100644 --- a/tests/test_gobject.py +++ b/tests/test_gobject.py @@ -123,7 +123,7 @@ class TestReferenceCounting(unittest.TestCase): obj.release() self.assertEquals(obj.__grefcount__, 1) - + def testFloatingAndSunkUsingGObjectNew(self): # Upon creation, the refcount of the object should be 2: # - someone already has a reference on the new object. diff --git a/tests/test_interface.py b/tests/test_interface.py index f60a25c..2df61b1 100644 --- a/tests/test_interface.py +++ b/tests/test_interface.py @@ -46,4 +46,3 @@ class TestIfaceImpl(unittest.TestCase): m = MyObject() m.iface_method() self.assertEqual(m.called, True) - diff --git a/tests/test_option.py b/tests/test_option.py index 9233eed..6718eb3 100644 --- a/tests/test_option.py +++ b/tests/test_option.py @@ -118,4 +118,3 @@ class TestOption(unittest.TestCase): assert (sio.getvalue().split('\n')[-2] == "Exception: " + self.EXCEPTION_MESSAGE) - diff --git a/tests/test_overrides.py b/tests/test_overrides.py index 78e589f..becb4cb 100644 --- a/tests/test_overrides.py +++ b/tests/test_overrides.py @@ -11,7 +11,7 @@ from compathelper import _long, _unicode, _bytes os.environ['GSETTINGS_BACKEND'] = 'memory' # support a separate build tree, so look in build dir first -os.environ['GSETTINGS_SCHEMA_DIR'] = os.environ.get('TESTS_BUILDDIR', +os.environ['GSETTINGS_SCHEMA_DIR'] = os.environ.get('TESTS_BUILDDIR', os.path.dirname(__file__)) from gi.repository import GLib @@ -346,15 +346,15 @@ class TestGLib(unittest.TestCase): self.assertEqual(GLib.Variant.split_signature('(iso)'), ['i', 's', 'o']) - self.assertEqual(GLib.Variant.split_signature('(s(ss)i(ii))'), + self.assertEqual(GLib.Variant.split_signature('(s(ss)i(ii))'), ['s', '(ss)', 'i', '(ii)']) self.assertEqual(GLib.Variant.split_signature('(as)'), ['as']) - self.assertEqual(GLib.Variant.split_signature('(s(ss)iaiaasa(ii))'), + self.assertEqual(GLib.Variant.split_signature('(s(ss)iaiaasa(ii))'), ['s', '(ss)', 'i', 'ai', 'aas', 'a(ii)']) - self.assertEqual(GLib.Variant.split_signature('(a{iv}(ii)((ss)a{s(ss)}))'), + self.assertEqual(GLib.Variant.split_signature('(a{iv}(ii)((ss)a{s(ss)}))'), ['a{iv}', '(ii)', '((ss)a{s(ss)})']) def test_variant_hash(self): @@ -975,41 +975,41 @@ class TestGtk(unittest.TestCase): treeiter = tree_store.iter_children(parent) while treeiter: - i = tree_store.get_value(treeiter, 0) - s = tree_store.get_value(treeiter, 1) - obj = tree_store.get_value(treeiter, 2) - obj.check(i, s) - obj2 = tree_store.get_value(treeiter, 3) - self.assertEquals(obj, obj2); - - pyobj = tree_store.get_value(treeiter, 4) - self.assertEquals(pyobj, test_pyobj) - pydict = tree_store.get_value(treeiter, 5) - self.assertEquals(pydict, test_pydict) - pylist = tree_store.get_value(treeiter, 6) - self.assertEquals(pylist, test_pylist) - - bool_1 = tree_store.get_value(treeiter, 7) - bool_2 = tree_store.get_value(treeiter, 8) - self.assertEquals(bool_1, bool_2) - self.assertTrue(isinstance(bool_1, bool)) - self.assertTrue(isinstance(bool_2, bool)) - - uint_ = tree_store.get_value(treeiter, 9) - self.assertEquals(uint_, i) - ulong_ = tree_store.get_value(treeiter, 10) - self.assertEquals(ulong_, GObject.G_MAXULONG) - int64_ = tree_store.get_value(treeiter, 11) - self.assertEquals(int64_, GObject.G_MININT64) - uint64_ = tree_store.get_value(treeiter, 12) - self.assertEquals(uint64_, 0xffffffffffffffff) - uchar_ = tree_store.get_value(treeiter, 13) - self.assertEquals(ord(uchar_), 254) - char_ = tree_store.get_value(treeiter, 14) - self.assertEquals(char_, 'a') - - parent = treeiter - treeiter = tree_store.iter_children(parent) + i = tree_store.get_value(treeiter, 0) + s = tree_store.get_value(treeiter, 1) + obj = tree_store.get_value(treeiter, 2) + obj.check(i, s) + obj2 = tree_store.get_value(treeiter, 3) + self.assertEquals(obj, obj2); + + pyobj = tree_store.get_value(treeiter, 4) + self.assertEquals(pyobj, test_pyobj) + pydict = tree_store.get_value(treeiter, 5) + self.assertEquals(pydict, test_pydict) + pylist = tree_store.get_value(treeiter, 6) + self.assertEquals(pylist, test_pylist) + + bool_1 = tree_store.get_value(treeiter, 7) + bool_2 = tree_store.get_value(treeiter, 8) + self.assertEquals(bool_1, bool_2) + self.assertTrue(isinstance(bool_1, bool)) + self.assertTrue(isinstance(bool_2, bool)) + + uint_ = tree_store.get_value(treeiter, 9) + self.assertEquals(uint_, i) + ulong_ = tree_store.get_value(treeiter, 10) + self.assertEquals(ulong_, GObject.G_MAXULONG) + int64_ = tree_store.get_value(treeiter, 11) + self.assertEquals(int64_, GObject.G_MININT64) + uint64_ = tree_store.get_value(treeiter, 12) + self.assertEquals(uint64_, 0xffffffffffffffff) + uchar_ = tree_store.get_value(treeiter, 13) + self.assertEquals(ord(uchar_), 254) + char_ = tree_store.get_value(treeiter, 14) + self.assertEquals(char_, 'a') + + parent = treeiter + treeiter = tree_store.iter_children(parent) self.assertEquals(i, 99) @@ -1124,7 +1124,7 @@ class TestGtk(unittest.TestCase): list_store.set_value(treeiter, 2, TestGtk.TestClass(self, i, label)) list_store.set_value(treeiter, 4, test_pydict) list_store.set_value(treeiter, 7, True) - + # this should append i = 99 label = 'this is row #99' @@ -1350,6 +1350,8 @@ class TestGtk(unittest.TestCase): self.assertTrue(tree_store) self.assertEqual(len(tree_store), 100) + self.assertEqual(tree_store.iter_previous(tree_store.get_iter(0)), None) + for i,row in enumerate(tree_store): self.assertEqual(row.model, tree_store) self.assertEqual(row.parent, None) @@ -1375,6 +1377,8 @@ class TestGtk(unittest.TestCase): next = tree_store.iter_next(aiter) if i < len(tree_store) - 1: self.assertEqual(tree_store.get_path(next), row.next.path) + self.assertEqual(tree_store.get_path(tree_store.iter_previous(next)), + tree_store.get_path(aiter)) else: self.assertEqual(next, None) @@ -1849,6 +1853,12 @@ class TestGtk(unittest.TestCase): button = Gtk.ToolButton('gtk-new') self.assertEquals(button.props.stock_id, 'gtk-new') + icon = Gtk.Image.new_from_stock(Gtk.STOCK_OPEN, Gtk.IconSize.SMALL_TOOLBAR) + + button = Gtk.ToolButton(label='mylabel', icon_widget=icon) + self.assertEqual(button.props.label, 'mylabel') + self.assertEqual(button.props.icon_widget, icon) + def test_iconset(self): # PyGTK compat iconset = Gtk.IconSet() diff --git a/tests/test_properties.py b/tests/test_properties.py index f7f8e25..b1ae0ea 100644 --- a/tests/test_properties.py +++ b/tests/test_properties.py @@ -90,7 +90,7 @@ class TestProperties(unittest.TestCase): self.assertEqual(obj.props.construct, "456") obj.props.construct = '789' self.assertEqual(obj.props.construct, "789") - + def testUTF8(self): obj = new(PropertyObject, construct_only=UNICODE_UTF8) self.assertEqual(obj.props.construct_only, TEST_UTF8) diff --git a/tests/test_pygtkcompat.py b/tests/test_pygtkcompat.py index b9765c3..fd0ad85 100644 --- a/tests/test_pygtkcompat.py +++ b/tests/test_pygtkcompat.py @@ -70,6 +70,32 @@ class TestGTKCompat(unittest.TestCase): self.assertEquals(padding, 0) self.assertEquals(pack_type, gtk.PACK_END) + def testComboBoxEntry(self): + liststore = gtk.ListStore(int, str) + liststore.append((1, 'One')) + liststore.append((2, 'Two')) + liststore.append((3, 'Three')) + combo = gtk.ComboBoxEntry(model=liststore) + combo.set_text_column(1) + combo.set_active(0) + self.assertEquals(combo.get_text_column(), 1) + self.assertEquals(combo.get_child().get_text(), 'One') + combo = gtk.combo_box_entry_new() + combo.set_model(liststore) + combo.set_text_column(1) + combo.set_active(0) + self.assertEquals(combo.get_text_column(), 1) + self.assertEquals(combo.get_child().get_text(), 'One') + combo = gtk.combo_box_entry_new_with_model(liststore) + combo.set_text_column(1) + combo.set_active(0) + self.assertEquals(combo.get_text_column(), 1) + self.assertEquals(combo.get_child().get_text(), 'One') + + def testSizeRequest(self): + box = gtk.Box() + self.assertEqual(box.size_request(), [0, 0]) + def testPixbuf(self): gtk.gdk.Pixbuf() diff --git a/tests/test_source.py b/tests/test_source.py index ad052cc..7530318 100644 --- a/tests/test_source.py +++ b/tests/test_source.py @@ -90,7 +90,7 @@ class TestSource(unittest.TestCase): class TestTimeout(unittest.TestCase): - def test504337(self): + def test504337(self): timeout_source = GLib.Timeout(20) idle_source = GLib.Idle() diff --git a/tests/test_uris.py b/tests/test_uris.py index 8174324..c223d3e 100644 --- a/tests/test_uris.py +++ b/tests/test_uris.py @@ -12,4 +12,3 @@ class TestUris(unittest.TestCase): assert uri_list[0] == "http://www.huh.org/books/foo.html" assert uri_list[1] == "http://www.huh.org/books/foo.pdf" assert uri_list[2] == "ftp://ftp.foo.org/books/foo.txt" - -- 2.7.4