From cb3f32383e1291d15648f87c4993e018d7209e25 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 6 Aug 2005 15:26:49 +0000 Subject: [PATCH] Improve ABI checking --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-12 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ glib/abicheck.sh | 4 ++-- glib/glib.symbols | 1 + 6 files changed, 27 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 19baf7b88..ea830de30 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-08-06 Matthias Clasen + + * glib/glib.symbols: Include glib_on_error_halt. + + * glib/abicheck.sh: Also check exported variables. + 2005-08-05 Manish Singh * tests/refcount/closures.c: remove unused n_threads variable. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 19baf7b88..ea830de30 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2005-08-06 Matthias Clasen + + * glib/glib.symbols: Include glib_on_error_halt. + + * glib/abicheck.sh: Also check exported variables. + 2005-08-05 Manish Singh * tests/refcount/closures.c: remove unused n_threads variable. diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 19baf7b88..ea830de30 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,9 @@ +2005-08-06 Matthias Clasen + + * glib/glib.symbols: Include glib_on_error_halt. + + * glib/abicheck.sh: Also check exported variables. + 2005-08-05 Manish Singh * tests/refcount/closures.c: remove unused n_threads variable. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 19baf7b88..ea830de30 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2005-08-06 Matthias Clasen + + * glib/glib.symbols: Include glib_on_error_halt. + + * glib/abicheck.sh: Also check exported variables. + 2005-08-05 Manish Singh * tests/refcount/closures.c: remove unused n_threads variable. diff --git a/glib/abicheck.sh b/glib/abicheck.sh index 65462a751..832c5256d 100755 --- 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 fcaa08c0e..685357e22 100644 --- 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