This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project wmaker-crm.git.
The branch, next has been updated
via d458304610637ab394f5727fc256d8da4972e58e (commit)
via d12b647069fe4e4d0ae9b197ce8fa670387d3224 (commit)
from 796b557c3a856a627c6fad8de59b26e3d529d08f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://repo.or.cz/w/wmaker-crm.git/commit/d458304610637ab394f5727fc256d8da4972e58e
commit d458304610637ab394f5727fc256d8da4972e58e
Author: Christophe CURIS <christophe.cu...@free.fr>
Date: Mon Jan 5 11:06:31 2015 +0100
wrlib: generate automatically the list of symbols to keep from the API
header
Instead of having to maintain manually the map file for LD with the list of
symbols that we want to keep in the WRaster library (the purpose is to hide
internal symbols), this patch implements a script that parses the public
API header and extracts automatically the list of names that are supposed
to be visible to the user.
The goal is to reduce possible human errors, like for example the function
RCombineAlpha that was forgotten from the list, yet still keep the map file
feature which is considered a good practice (it reduces the risk for name
clash and the risk of mis-use of internal stuff from the library).
Signed-off-by: Christophe CURIS <christophe.cu...@free.fr>
diff --git a/.gitignore b/.gitignore
index bda811c3..384ef46c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -84,6 +84,8 @@ wrlib/wrlib.pc
WINGs/WINGs.pc
WINGs/WUtil.pc
+wrlib/libwraster.map
+
WindowMaker/Defaults/WMRootMenu
WindowMaker/Defaults/WMState
WindowMaker/Defaults/WMWindowAttributes
diff --git a/script/generate-mapfile-from-header.sh
b/script/generate-mapfile-from-header.sh
new file mode 100755
index 00000000..ef5767b9
--- /dev/null
+++ b/script/generate-mapfile-from-header.sh
@@ -0,0 +1,241 @@
+#!/bin/sh
+###########################################################################
+#
+# Window Maker window manager
+#
+# Copyright (c) 2014 Christophe CURIS
+# Copyright (c) 2014 Window Maker Team
+#
+# 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.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+###########################################################################
+#
+# generate-mapfile-from-header.sh:
+# from a list of C header files, extract the name of the functions and
+# global variables that are considered public for a library, and generate
+# a 'version script' for ld with that list, so that all other symbols
+# will be considered local.
+#
+# The goal is that the symbol that are not part of the public API should
+# not be visible to the user because it can be a source of problems (from
+# name clash to evolutivity issues).
+#
+###########################################################################
+#
+# Please note that this script is writen in sh+awk on purpose: this script
+# is gonna be run on the machine of the person who is trying to compile
+# WindowMaker, and as such we cannot be sure to find any scripting language
+# in a known version and that works (python/ruby/tcl/perl/php/you-name-it).
+#
+# So for portability, we stick to the same sh+awk constraint as Autotools
+# to limit the problem, see for example:
+#
http://www.gnu.org/savannah-checkouts/gnu/autoconf/manual/autoconf-2.69/html_node/Portable-Shell.html
+#
+###########################################################################
+
+# Report an error on stderr and exit with status 1 to tell make could not work
+arg_error() {
+ echo "$0: $@" >&2
+ exit 1
+}
+
+# print help and exit with success status
+print_help() {
+ echo "$0: generate a script for ld to keep only the symbols from C header"
+ echo "Usage: $0 [options...] input_file[s]"
+ echo "valid options are:"
+ echo " -l : add symbol's definition line number for debug"
+ echo " -n name : name to use for the library"
+ echo " -v version : set the library version for ld"
+ exit 0
+}
+
+# Extract command line arguments
+while [ $# -gt 0 ]; do
+ case $1 in
+ -l)
+ debug_info=' /* " symbol_type " at " FILENAME ":" NR " */'
+ ;;
+
+ -n)
+ shift
+ echo "$1" | grep '^[A-Za-z][A-Za-z_0-9]*$' > /dev/null ||
arg_error "invalid name "$1" for a library"
+ libname="$1"
+ ;;
+
+ -v)
+ shift
+ # Version may be 'x:y:z', we keep only 'x'
+ version="`echo "$1" | sed -e 's,:.*$,,' `"
+ # the version should only be a number
+ echo "$version" | grep '^[1-9][0-9]*$' > /dev/null || +
arg_error "version "$1" is not valid"
+ ;;
+
+ -h|-help|--help) print_help ;;
+ -*) arg_error "unknow option '$1'" ;;
+
+ *)
+ [ -r "$1" ] || arg_error "source file "$1" is not readable"
+ input_files="$input_files $1"
+ ;;
+ esac
+ shift
+done
+
+# Check consistency of command-line
+[ "x$input_files" = "x" ] && arg_error "no source file given"
+
+# Automatic values
+if [ -z "$libname" ]; then
+ # build the library name from the first header name, remove path stuff,
extension and invalid characters
+ libname="`echo "$input_files" | sed -e 's,^ ,,;s,
.*$,,;s,^.*/([^/]*)$,1,;s,.[^.]*$,,;s,[^A-Za-z_0-9],_,g;s,^_*,,' `"
+fi
+
+# Parse the input file and find the function declarations; extract the names
+# and place them in the 'global' section so that ld will keep the symbols;
+# generate the rest of the script so that other symbols will not be kept.
+awk '
+BEGIN {
+ print "/* Generated version-script for ld */";
+ print "";
+ print "'"$libname$version"'";
+ print "{";
+ print " global:";
+}
+
+/^#[ t]*define/ {
+ # Ignore macro definition because their content could be mis-interpreted
+ while (/\$/) {
+ if (getline == 0) { break; }
+ }
+ next;
+}
+
+//*/ {
+ # Remove comments to avoid mis-detection
+ pos = index($0, "/*");
+ comment = substr($0, pos + 2);
+ $0 = substr($0, 1, pos - 1);
+ while (1) {
+ pos = index(comment, "*/");
+ if (pos > 0) { break; }
+ getline comment;
+ }
+ $0 = $0 substr(comment, pos + 2);
+}
+
+/extern[ t].*;/ {
+ line = $0;
+
+ # Remove everything from the ";"
+ sub(/;.*$/, "", line);
+
+ # Check if it is a global variable
+ nb = split(line, words, /[t *]/);
+
+ valid = 1;
+ for (i = 1; i < nb; i++) {
+ # If the word looks valid, do not abort
+ if (words[i] ~ /^[A-Za-z_0-9]*$/) { continue; }
+
+ # Treat the case were the variable is an array, and there was space(s)
after the name
+ if (words[i] ~ /^[/) { nb = i - 1; break; }
+
+ # If we are here, the word is not valid; we stop processing the line here
but we do
+ # not use "next" so the line may match function prototype handler below
+ valid = 0;
+ break;
+ }
+
+ if (valid) {
+ # Remove array size, if any
+ sub(/[.*$/, "", words[nb]);
+
+ if (words[nb] ~ /^[A-Za-z][A-Za-z_0-9]*$/) {
+ symbol_type = "variable";
+ print " " words[nb] ";'"$debug_info"'";
+ next;
+ }
+ }
+}
+
+/^[ t]*typedef/ {
+ # Skip type definition because they could be mis-interpreted when it
+ # defines a prototype for a callback function
+ nb_braces = 0;
+ while (1) {
+ # Count the number of brace pairs to skip the content of the definition
+ nb = split($0, dummy_array, /{/);
+ nb_braces = nb_braces + nb;
+
+ nb = split($0, dummy_array, /}/);
+ nb_braces = nb_braces - nb;
+
+ # Stop when we have out count of pair of braces and there is the final ";"
+ if ((nb_braces == 0) && (dummy_array[nb] ~ /;/)) { break; }
+
+ if (getline == 0) {
+ break;
+ }
+ }
+ next;
+}
+
+/[t ]**[A-Z_a-z][A-Z_a-z0-9]*[t ]*(/ {
+ # Get everything until the end of the definition, to avoid mis-interpreting
+ # arguments and attributes on next lines
+ while (1) {
+ pos = index($0, ";");
+ if (pos != 0) { break; }
+
+ getline nxt;
+ $0 = $0 nxt;
+ }
+
+ # Remove the argument list
+ sub(/[ t]*(.*$/, "");
+
+ # Trim possible indentation at beginning of line
+ sub(/^[t ]*/, "");
+
+ # If it does not start by a keyword, it is probably not a valid function
+ if (!/^[A-Z_a-z]/) { next; }
+
+ nb = split($0, words, /[t *]/);
+ for (i = 1; i < nb; i++) {
+ # Do not consider "static" because it is used for functions to be inlined
+ if (words[i] == "static") { next; }
+
+ # Allow empty keyword, that were just "*"
+ if (words[i] == "") { continue; }
+
+ # If it does not match, it is unlikely to be a function
+ if (words[i] !~ /^[A-Z_a-z][A-Z_a-z0-9]*$/) { next; }
+ }
+
+ # If we arrived so far, everything looks valid and the last argument of
+ # the array contains the name of the function
+ symbol_type = "function";
+ print " " words[nb] ";'"$debug_info"'";
+}
+
+END {
+ print "";
+ print " local:";
+ print " *;";
+ print "};";
+}
+' $input_files
diff --git a/wrlib/Makefile.am b/wrlib/Makefile.am
index c21c0ced..575a815d 100644
--- a/wrlib/Makefile.am
+++ b/wrlib/Makefile.am
@@ -5,14 +5,16 @@ DIST_SUBDIRS = $(SUBDIRS) tests
AUTOMAKE_OPTIONS =
-EXTRA_DIST = tests libwraster.map get-wraster-flags.in
+EXTRA_DIST = tests get-wraster-flags.in
lib_LTLIBRARIES = libwraster.la
libwraster_la_LDFLAGS = -version-info @WRASTER_VERSION@
if HAVE_LD_VERSION_SCRIPT
-libwraster_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libwraster.map
+libwraster_la_LDFLAGS += -Wl,--version-script=libwraster.map
+EXTRA_libwraster_la_DEPENDENCIES = libwraster.map
+CLEANFILES = libwraster.map
endif
bin_SCRIPTS = get-wraster-flags
@@ -101,3 +103,8 @@ get-wraster-flags: get-wraster-flags.in Makefile
-e 's#$${XLIBS}#$(XLIBS)#;' <
$(abs_srcdir)/get-wraster-flags.in > $@
@chmod 755 $@
+if HAVE_LD_VERSION_SCRIPT
+libwraster.map: $(include_HEADERS)
$(top_srcdir)/script/generate-mapfile-from-header.sh
+ $(AM_V_GEN)$(top_srcdir)/script/generate-mapfile-from-header.sh +
-n LIBWRASTER -v $(WRASTER_VERSION) $(srcdir)/$(include_HEADERS) >
libwraster.map
+endif
diff --git a/wrlib/libwraster.map b/wrlib/libwraster.map
deleted file mode 100644
index 66b4b9dd..00000000
--- a/wrlib/libwraster.map
+++ /dev/null
@@ -1,101 +0,0 @@
-/* libwraster.map - libtool symbol version script for libwraster
- * Copyright (c) 2010 Andreas Metzler
- *
- * This file is part of the Raster graphics library
- *
- * 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 library 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-LIBWRASTER3
-{
- global:
- RBevelImage;
- RBlurImage;
- RClearImage;
- RCloneImage;
- RCombineArea;
- RCombineAreaWithOpaqueness;
- RCombineImages;
- RCombineImagesWithOpaqueness;
- RCombineImageWithColor;
- RConvertImage;
- RConvertImageMask;
- RCopyArea;
- RCreateContext;
- RDestroyContext;
- RCreateImage;
- RCreateImageFromDrawable;
- RCreateImageFromXImage;
- RCreateXImage;
- RDestroyXImage;
- RDrawLine;
- RDrawLines;
- RDrawSegments;
- RErrorCode;
- RFillImage;
- RGetClosestXColor;
- RGetImageFileFormat;
- RGetImageFromXPMData;
- RGetPixel;
- RGetSubImage;
- RGetXImage;
- RHSVtoRGB;
- RLightImage;
- RLoadImage;
- RMakeCenteredImage;
- RMakeTiledImage;
- RMessageForError;
- ROperateLine;
- ROperateLines;
- ROperatePixel;
- ROperatePixels;
- ROperateRectangle;
- ROperateSegments;
- RPutPixel;
- RPutPixels;
- RPutXImage;
- RReleaseImage;
- RRenderGradient;
- RRenderInterwovenGradient;
- RRenderMultiGradient;
- RRetainImage;
- RRGBtoHSV;
- RRotateImage;
- RFlipImage;
- RSaveImage;
- RScaleImage;
- RShutdown;
- RSmoothScaleImage;
- RSupportedFileFormats;
-
- local:
-# _edata
-# _end
-# _fini
-# _init
-# __bss_start
-# calculateCombineArea
-# contrib
-# R_CreateXImageMappedPixmap
-# RLoadGIF
-# RLoadJPEG
-# RLoadPNG
-# RLoadPPM
-# RLoadTIFF
-# RLoadXPM
-# RSaveXPM
-# _wraster_change_filter
-# WRasterLibVersion
- *;
-};
http://repo.or.cz/w/wmaker-crm.git/commit/d12b647069fe4e4d0ae9b197ce8fa670387d3224
commit d12b647069fe4e4d0ae9b197ce8fa670387d3224
Author: Christophe CURIS <christophe.cu...@free.fr>
Date: Mon Jan 5 11:06:30 2015 +0100
updated autoconf macro gl_LD_VERSION_SCRIPT from gnulib to version 4
This new version now checks that version script with syntax error are
rejected, it probably led to mis-detect the option as supported when it was
actually just ignored with at most a warning; it also now implement caching
of the result to speed-up re-run of configure if user enabled it.
Signed-off-by: Christophe CURIS <christophe.cu...@free.fr>
diff --git a/m4/ld-version-script.m4 b/m4/ld-version-script.m4
index 8fd8c899..211d67b9 100644
--- a/m4/ld-version-script.m4
+++ b/m4/ld-version-script.m4
@@ -1,5 +1,5 @@
-# ld-version-script.m4 serial 2
-dnl Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+# ld-version-script.m4 serial 4
+dnl Copyright (C) 2008-2015 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -18,14 +18,18 @@ dnl From Simon Josefsson
AC_DEFUN([gl_LD_VERSION_SCRIPT],
[
AC_ARG_ENABLE([ld-version-script],
- AS_HELP_STRING([--enable-ld-version-script],
- [enable linker version script (default is enabled when possible)]),
- [have_ld_version_script=$enableval], [])
- if test -z "$have_ld_version_script"; then
- AC_MSG_CHECKING([if LD -Wl,--version-script works])
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS -Wl,--version-script=conftest.map"
- cat > conftest.map <<EOF
+ [AS_HELP_STRING([--enable-ld-version-script],
+ [enable linker version script (default is enabled when possible)])],
+ [have_ld_version_script=$enableval],
+ [AC_CACHE_CHECK([if LD -Wl,--version-script works],
+ [gl_cv_sys_ld_version_script],
+ [gl_cv_sys_ld_version_script=no
+ save_LDFLAGS=$LDFLAGS
+ LDFLAGS="$LDFLAGS -Wl,--version-script=conftest.map"
+ echo foo >conftest.map
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
+ [],
+ [cat > conftest.map <<EOF
VERS_1 {
global: sym;
};
@@ -34,11 +38,11 @@ VERS_2 {
global: sym;
} VERS_1;
EOF
- AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
- [have_ld_version_script=yes], [have_ld_version_script=no])
- rm -f conftest.map
- LDFLAGS="$save_LDFLAGS"
- AC_MSG_RESULT($have_ld_version_script)
- fi
- AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$have_ld_version_script" =
"yes")
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
+ [gl_cv_sys_ld_version_script=yes])])
+ rm -f conftest.map
+ LDFLAGS=$save_LDFLAGS])
+ have_ld_version_script=$gl_cv_sys_ld_version_script])
+ AM_CONDITIONAL([HAVE_LD_VERSION_SCRIPT],
+ [test "$have_ld_version_script" = yes])
])
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 2 +
m4/ld-version-script.m4 | 38 +++---
script/generate-mapfile-from-header.sh | 241 ++++++++++++++++++++++++++++++++
wrlib/Makefile.am | 11 ++-
wrlib/libwraster.map | 101 -------------
5 files changed, 273 insertions(+), 120 deletions(-)
create mode 100755 script/generate-mapfile-from-header.sh
delete mode 100644 wrlib/libwraster.map
repo.or.cz automatic notification. Contact project admin crma...@gmail.com
if you want to unsubscribe, or site admin ad...@repo.or.cz if you receive
no reply.
--
wmaker-crm.git ("The Window Maker window manager")
--
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.
