[Xfce4-commits] <exo:master> Use portable abicheck.sh from xfconf.

[Nick Schermer]

Updating branch refs/heads/master
         to c2b6da97e520fec742e48a7587a20910482dc53f (commit)
       from 40cf2882217949be8387bb570b370f628a4b7fd3 (commit)

commit c2b6da97e520fec742e48a7587a20910482dc53f
Author: Nick Schermer <nick at xfce.org>
Date:   Sun Mar 27 14:08:54 2011 +0200

    Use portable abicheck.sh from xfconf.

 exo/abicheck.sh |   28 ++++++++++++++--------------
 1 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/exo/abicheck.sh b/exo/abicheck.sh
index 766d17a..262fd04 100755
--- a/exo/abicheck.sh
+++ b/exo/abicheck.sh
@@ -2,23 +2,23 @@
 #
 # Copyright (c) 2004 The GLib Development Team.
 # Copyright (c) 2005 Benedikt Meurer <benny at xfce.org>.
+# Copyright (c) 2011 Guido Berhoerster <gber at opensuse.org>
 #
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Library 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 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; version 2 of the License ONLY.
 #
-# This library is distributed in the hope that it will be useful,
+# 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
-# Library General Public License for more details.
+# 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 Library General Public
-# License along with this library; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 #
 
-cpp -P -DINCLUDE_INTERNAL_SYMBOLS -DINCLUDE_VARIABLES -DALL_FILES ${srcdir:-.}/exo.symbols | sed -e '/^$/d' -e 's/ EXO_GNUC.*$//' -e 's/ G_GNUC.*$//' -e 's/ PRIVATE//' | sort > expected-abi
-nm -D .libs/libexo-1.so | grep " T\|R\|G " | cut -d ' ' -f 3 | grep -v '^_.*' | grep -v '^ *$' | sort > actual-abi
-diff -u expected-abi actual-abi && rm expected-abi actual-abi
+trap 'rm expected-abi actual-abi' EXIT
+${CPP:-cpp} -DINCLUDE_INTERNAL_SYMBOLS -DINCLUDE_VARIABLES -DALL_FILES ${srcdir:-.}/exo.symbols | sed 's/ G_GNUC.*$//;s/ PRIVATE//;/^ *$/d;/^#/d' | sort >expected-abi
+${NM:-nm} -D -g -P .libs/libexo-1.so | awk '$2~/^[DRTG]$/&&$1~/^[^_]/{print $1}' | sort >actual-abi
+diff -u expected-abi actual-abi