Improve ABI checking

diff --git a/ChangeLog b/ChangeLog
index 19baf7b8800529991d9947f3d2f455e5786fbbdd..ea830de303cb74564aaafc7efe7f17d4cc3b7338 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-06  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/glib.symbols: Include glib_on_error_halt.
+       
+       * glib/abicheck.sh: Also check exported variables.
+
 2005-08-05  Manish Singh  <yosh@gimp.org>
 
        * tests/refcount/closures.c: remove unused n_threads variable.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 19baf7b8800529991d9947f3d2f455e5786fbbdd..ea830de303cb74564aaafc7efe7f17d4cc3b7338 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2005-08-06  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/glib.symbols: Include glib_on_error_halt.
+       
+       * glib/abicheck.sh: Also check exported variables.
+
 2005-08-05  Manish Singh  <yosh@gimp.org>
 
        * tests/refcount/closures.c: remove unused n_threads variable.

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 19baf7b8800529991d9947f3d2f455e5786fbbdd..ea830de303cb74564aaafc7efe7f17d4cc3b7338 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,9 @@
+2005-08-06  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/glib.symbols: Include glib_on_error_halt.
+       
+       * glib/abicheck.sh: Also check exported variables.
+
 2005-08-05  Manish Singh  <yosh@gimp.org>
 
        * tests/refcount/closures.c: remove unused n_threads variable.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 19baf7b8800529991d9947f3d2f455e5786fbbdd..ea830de303cb74564aaafc7efe7f17d4cc3b7338 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2005-08-06  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/glib.symbols: Include glib_on_error_halt.
+       
+       * glib/abicheck.sh: Also check exported variables.
+
 2005-08-05  Manish Singh  <yosh@gimp.org>
 
        * tests/refcount/closures.c: remove unused n_threads variable.

diff --git a/glib/abicheck.sh b/glib/abicheck.sh
index 65462a751e36db28691372d57857b06069ac0709..832c5256daf091ef8ef461187b43482ac4fb0241 100755 (executable)
--- a/glib/abicheck.sh
+++ b/glib/abicheck.sh
@@ -5,9 +5,9 @@ egrep '^#([^i]|if).*[^\]$' "${top_builddir:-..}/glibconfig.h" > glibconfig.cpp
 INCLUDES="-include ${top_builddir:-..}/config.h"
 INCLUDES="$INCLUDES -include glibconfig.cpp"
 
-cpp -P -DINCLUDE_INTERNAL_SYMBOLS -DG_STDIO_NO_WRAP_ON_UNIX -DALL_FILES $INCLUDES "${srcdir:-.}/glib.symbols" | sed -e '/^$/d' -e 's/ G_GNUC.*$//' -e 's/ PRIVATE$//' | sort > expected-abi
+cpp -P -DINCLUDE_INTERNAL_SYMBOLS -DINCLUDE_VARIABLES -DG_STDIO_NO_WRAP_ON_UNIX -DALL_FILES $INCLUDES "${srcdir:-.}/glib.symbols" | sed -e '/^$/d' -e 's/ G_GNUC.*$//' -e 's/ PRIVATE$//' | sort > expected-abi
 rm glibconfig.cpp
 
-nm -D .libs/libglib-2.0.so | grep " T " | cut -d ' ' -f 3 | sort > actual-abi
+nm -D .libs/libglib-2.0.so | grep -v " [BDTR] " | cut -d ' ' -f 3 | sort > actual-abi
 
 diff -u expected-abi actual-abi && rm expected-abi actual-abi

diff --git a/glib/glib.symbols b/glib/glib.symbols
index fcaa08c0e876f51ebcb950fc4569cb4d76e2bba0..685357e222610fd379e3a24e4d8e6177e9ee390a 100644 (file)
--- a/glib/glib.symbols
+++ b/glib/glib.symbols
@@ -1261,5 +1261,6 @@ glib_major_version
 glib_mem_profiler_table
 glib_micro_version
 glib_minor_version
+glib_on_error_halt
 #endif