mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-20 11:40:18 +02:00
Code Activity

[build] Refine libguile/*.doc snarfing.

Browse source 
* libguile/guile-snarf-docs.in: Rewrite to incorporate all
  three phases of snarfing: func-name check, cpp, tokenization.
  Also, require/check new command-line syntax.
* libguile/Makefile.am (AM_V_FILTER): Delete var.
  (AM_V_FILTER_, AM_V_FILTER_0): Likewise.
  (.c.doc): Run ./guile-snarf-docs; use new command-line syntax.
This commit is contained in:
Thien-Thi Nguyen 2010-08-26 18:36:48 +02:00
parent d5a1a8cd1b
commit e6d67f1e69
2 changed files with 50 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libguile/Makefile.am
View file

@ -648,14 +648,10 @@ snarfcppopts = $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS)
SUFFIXES = .x .doc
AM_V_FILTER = $(AM_V_FILTER_$(V))
AM_V_FILTER_ = $(AM_V_FILTER_$(AM_DEFAULT_VERBOSITY))
AM_V_FILTER_0 = @echo " FILTER" $@;
.c.x:
$(AM_V_SNARF)$(GUILE_SNARF) -o $@ $< $(snarfcppopts)
.c.doc:
-$(AM_V_FILTER)$(AWK) -f $(srcdir)/guile-func-name-check $< && (./guile-snarf-docs $(snarfcppopts) $< | ./guile_filter_doc_snarfage$(EXEEXT) --filter-snarfage) > $@ || { rm $@; false; }
$(AM_V_SNARF)./guile-snarf-docs -o $@ $< -- $(snarfcppopts)
$(DOT_X_FILES) $(EXTRA_DOT_X_FILES): scmconfig.h snarf.h guile-snarf.in version.h

52
libguile/guile-snarf-docs.in
View file

@ -1,7 +1,8 @@
#!/bin/sh
# Extract the doc stuff for builtin things.
#
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2006 Free Software Foundation, Inc.
# guile-snarf-docs --- Extract the doc stuff for builtin things.
##
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001,
# 2006, 2010 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as
@ -17,10 +18,51 @@
# License along with this software; see the file COPYING.LESSER. If
# not, write to the Free Software Foundation, Inc., 51 Franklin
# Street, Fifth Floor, Boston, MA 02110-1301 USA
##
# Usage: guile-snarf-docs -o DOC SRC -- [CPPSNARFOPTS...]
##
bindir=`dirname $0`
filter='./guile_filter_doc_snarfage@EXEEXT@'
## Let the user override the preprocessor autoconf found.
test -n "${CPP+set}" || CPP="@CPP@"
${CPP} -DSCM_MAGIC_SNARF_DOCS "$@"
## Likewise for AWK.
test -n "${AWK+set}" || AWK="@AWK@"
bummer ()
{
echo 'Bad command-line' $1
exit 1
}
test "x$1" = x-o || bummer
shift
test "x$1" = x && bummer ': missing DOC'
output="$1"
temout="$output"T
shift
test "x$1" && test -r "$1" || bummer ': missing SRC'
input="$1"
shift
test "x$1" = x-- || bummer
shift
# Before snarfing, do the function name check.
${AWK} -f '@srcdir@/guile-func-name-check' "$input" || exit 1
# Snarfing takes two steps: cpp and tokenization.
# If cpp fails, don't bother with tokenization.
if ${CPP} -DSCM_MAGIC_SNARF_DOCS "$@" "$input" > "$temout" ; then
$filter --filter-snarfage < "$temout" > "$output"
rv=0
else
rv=1
fi
rm -f "$temout"
exit $rv
# guile-snarf-docs ends here