diff options
-rw-r--r-- | Makefile.am | 2 | ||||
-rw-r--r-- | NEWS | 10 | ||||
-rw-r--r-- | README | 2 | ||||
-rw-r--r-- | README-hacking | 2 | ||||
-rwxr-xr-x | bootstrap | 3 | ||||
-rw-r--r-- | configure.ac | 6 | ||||
-rw-r--r-- | doc/GNUmakefile | 6 | ||||
-rw-r--r-- | doc/Makefile.am | 10 | ||||
-rw-r--r-- | doc/cfpeek.1 | 2 | ||||
-rw-r--r-- | doc/cfpeek.texi | 2 | ||||
-rw-r--r-- | doc/html.init | 2 | ||||
-rw-r--r-- | doc/macros.texi | 2 | ||||
-rw-r--r-- | doc/sample.conf | 2 | ||||
-rw-r--r-- | doc/togit.scm | 2 | ||||
m--------- | gint | 0 | ||||
m--------- | grecs | 0 | ||||
-rw-r--r-- | src/Makefile.am | 17 | ||||
-rw-r--r-- | src/cfpeek.c | 2 | ||||
-rw-r--r-- | src/cfpeek.h | 2 | ||||
-rw-r--r-- | src/cmdline.opt | 4 | ||||
-rw-r--r-- | src/guile.c | 5 | ||||
-rw-r--r-- | src/script.c | 2 | ||||
-rw-r--r-- | tests/Makefile.am | 2 | ||||
-rw-r--r-- | tests/atlocal.in | 2 | ||||
-rw-r--r-- | tests/gmatch.at | 2 | ||||
-rw-r--r-- | tests/guile-itr.at | 2 | ||||
-rw-r--r-- | tests/guile-list.at | 2 | ||||
-rw-r--r-- | tests/guile-list2.at | 2 | ||||
-rw-r--r-- | tests/list.at | 2 | ||||
-rw-r--r-- | tests/literal.at | 2 | ||||
-rw-r--r-- | tests/locus.at | 2 | ||||
-rw-r--r-- | tests/lookupfail.at | 2 | ||||
-rw-r--r-- | tests/parent.at | 2 | ||||
-rw-r--r-- | tests/path.at | 2 | ||||
-rw-r--r-- | tests/smatch.at | 2 | ||||
-rw-r--r-- | tests/testsuite.at | 2 | ||||
-rw-r--r-- | tests/up.at | 2 | ||||
-rw-r--r-- | tests/value.at | 2 | ||||
-rw-r--r-- | tests/version.at | 2 |
39 files changed, 69 insertions, 50 deletions
diff --git a/Makefile.am b/Makefile.am index c4459f4..b786dcf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ # This file is part of cfpeek -# Copyright (C) 2011-2012, 2015 Sergey Poznyakoff +# Copyright (C) 2011-2021 Sergey Poznyakoff # # Cfpeek is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -1,11 +1,9 @@ -Cfpeek NEWS -- history of user-visible changes. 2015-05-15 -Copyright (C) 2011-2012, 2015 Sergey Poznyakoff +Cfpeek NEWS -- history of user-visible changes. 2021-01-07 See the end of file for copying conditions. Please send cfpeek bug reports to <bug-cfpeek@gnu.org.ua> - -Version 1.1.90 (Git) +Version 1.2, 2021-01-07 * New command line option --done (-d) @@ -17,6 +15,8 @@ main loop has iterated over all nodes in the tree. A parser for dhcpd.conf file. +* Drop support for Guile versions prior to 2.2.0 + Version 1.1, 2012-03-30 @@ -64,7 +64,7 @@ Initial revision ========================================================================= Copyright information: -Copyright (C) 2011, 2012 Sergey Poznyakoff +Copyright (C) 2011-2021 Sergey Poznyakoff Permission is granted to anyone to make or distribute verbatim copies of this document as received, in any medium, provided that the @@ -61,7 +61,7 @@ Send bug reports to <bug-cfpeek@gnu.org.ua>. * Copyright information: -Copyright (C) 2011, 2012, 2015, 2018 Sergey Poznyakoff +Copyright (C) 2011-2021 Sergey Poznyakoff Permission is granted to anyone to make or distribute verbatim copies of this document as received, in any medium, provided that the diff --git a/README-hacking b/README-hacking index a492e37..32555c8 100644 --- a/README-hacking +++ b/README-hacking @@ -36,7 +36,7 @@ Building). * Copyright information -Copyright (C) 2011, 2012, 2015, 2018 Sergey Poznyakoff +Copyright (C) 2011-2021 Sergey Poznyakoff Permission is granted to anyone to make or distribute verbatim copies of this document as received, in any medium, provided that the @@ -1,5 +1,4 @@ #! /bin/sh set -e -git submodule init -git submodule update +git submodule update --init --recursive autoreconf -f -i -s diff --git a/configure.ac b/configure.ac index 48dbb22..297ad27 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ # This file is part of cfpeek -*- autoconf -*- -# Copyright (C) 2011, 2012, 2015 Sergey Poznyakoff +# Copyright (C) 2011-2021 Sergey Poznyakoff # # Cfpeek is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -15,7 +15,7 @@ # along with cfpeek. If not, see <http://www.gnu.org/licenses/>. AC_PREREQ(2.63) -AC_INIT([cfpeek], 1.1.90, [bug-cfpeek@gnu.org.ua],, +AC_INIT([cfpeek], 1.2, [bug-cfpeek@gnu.org.ua],, [http://www.gnu.org.ua/software/cfpeek]) AC_CONFIG_SRCDIR([src/cfpeek.c]) AC_CONFIG_AUX_DIR([build-aux]) @@ -43,7 +43,7 @@ GRECS_SETUP(grecs, [tests getopt git2chg all-parsers syntax-doc]) # GINT -GINT_INIT([gint], [1.8 with-guile doc-distrib], [use_guile=yes], [use_guile=no]) +GINT_INIT([gint], [2.2.0 with-guile doc-distrib], [use_guile=yes], [use_guile=no]) AM_CONDITIONAL([CFPEEK_COND_GUILE],[test $use_guile = yes]) # Imprimatur diff --git a/doc/GNUmakefile b/doc/GNUmakefile index d788b0d..e5cce01 100644 --- a/doc/GNUmakefile +++ b/doc/GNUmakefile @@ -1,5 +1,5 @@ # This file is part of cfpeek -# Copyright (C) 2011, 2012, 2015 Sergey Poznyakoff +# Copyright (C) 2011-2021 Sergey Poznyakoff # # Cfpeek is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,6 +18,10 @@ include Makefile BUILT_SOURCES += $(LISTINGS) scripting.texi +ifneq ($(CFPEEK_GUILE_ENABLED),1) + $(error Please, enable support for Guile when building from Git sources) +endif + scripting.texi: $(top_srcdir)/src/guile-procedures.texi cat $(top_srcdir)/src/guile-procedures.texi | \ tr '\f' '\\' | sed '/^\\/d' > scripting.texi diff --git a/doc/Makefile.am b/doc/Makefile.am index 31d777c..2a3195a 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,5 +1,5 @@ # This file is part of cfpeek -# Copyright (C) 2011, 2012, 2015, 2018 Sergey Poznyakoff +# Copyright (C) 2011-2021 Sergey Poznyakoff # # Cfpeek is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -40,7 +40,13 @@ cfpeek_TEXINFOS=\ BUILT_SOURCES = \ sample.texi -EXTRA_DIST = sample.conf GNUmakefile togit.scm +# The CFPEEK_GUILE_ENABLED variable is used by maintainer's GNUmakefile +# to ensure Guile listing examples are properly built. +if CFPEEK_COND_GUILE + CFPEEK_GUILE_ENABLED=1 +endif + +EXTRA_DIST = sample.conf togit.scm .conf.texi: sed '/^#/d;s/\([{}@]\)/@\1/g' $< > $@ diff --git a/doc/cfpeek.1 b/doc/cfpeek.1 index 4be5bdb..d438659 100644 --- a/doc/cfpeek.1 +++ b/doc/cfpeek.1 @@ -1,5 +1,5 @@ .\" This file is part of cfpeek -*- nroff -*- -.\" Copyright (C) 2011-2012, 2015 Sergey Poznyakoff +.\" Copyright (C) 2011-2021 Sergey Poznyakoff .\" .\" Cfpeek is free software; you can redistribute it and/or modify .\" it under the terms of the GNU General Public License as published by diff --git a/doc/cfpeek.texi b/doc/cfpeek.texi index f7bd656..b0376db 100644 --- a/doc/cfpeek.texi +++ b/doc/cfpeek.texi @@ -33,7 +33,7 @@ @end ifinfo @copying -Copyright @copyright{} 2011, 2012, 2015 Sergey Poznyakoff +Copyright @copyright{} 2011--2021 Sergey Poznyakoff Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or diff --git a/doc/html.init b/doc/html.init index 7613faa..5dadcf9 100644 --- a/doc/html.init +++ b/doc/html.init @@ -1,5 +1,5 @@ # Texi2any configuration for cfpeek documentation. -*- perl -*- -# Copyright (C) 2011, 2015 Sergey Poznyakoff +# Copyright (C) 2011-2021 Sergey Poznyakoff # # Cfpeek is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/doc/macros.texi b/doc/macros.texi index b4b2b3a..f43fd81 100644 --- a/doc/macros.texi +++ b/doc/macros.texi @@ -1,5 +1,5 @@ @c This file is part of the Cfpeek manual. -@c Copyright (C) 2011, 2012, 2015 Sergey Poznyakoff +@c Copyright (C) 2011--2021 Sergey Poznyakoff @c See file cfpeek.texi for copying conditions. @c ******************************************************************* diff --git a/doc/sample.conf b/doc/sample.conf index 8e8cf31..a067758 100644 --- a/doc/sample.conf +++ b/doc/sample.conf @@ -1,5 +1,5 @@ # Example configuration file for use in cfpeek documentation. -# Copyright (C) 2011, 2012, 2015 Sergey Poznyakoff +# Copyright (C) 2011-2021 Sergey Poznyakoff # # Cfpeek is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/doc/togit.scm b/doc/togit.scm index 7648fcd..23ca46c 100644 --- a/doc/togit.scm +++ b/doc/togit.scm @@ -1,5 +1,5 @@ ;;;; This file is part of cfpeek -;;;; Copyright (C) 2011, 2012, 2015 Sergey Poznyakoff +;;;; Copyright (C) 2011-2021 Sergey Poznyakoff ;;;; ;;;; Cfpeek is free software; you can redistribute it and/or modify ;;;; it under the terms of the GNU General Public License as published by diff --git a/gint b/gint -Subproject fd86bf7d44b0c970771830692ae7491447ebe8b +Subproject 170187a26c9788b17f2e2a66ca5b6116e7e7295 diff --git a/grecs b/grecs -Subproject dae43f323db9578e656e3a6c53440e2365421af +Subproject 296aef519859a3babf527789bcbcda7bb0cb317 diff --git a/src/Makefile.am b/src/Makefile.am index 0cf6a08..6355c00 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,5 +1,5 @@ # This file is part of cfpeek -# Copyright (C) 2011,2015 Sergey Poznyakoff +# Copyright (C) 2011-2021 Sergey Poznyakoff # # Cfpeek is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -29,8 +29,19 @@ cfpeek_SOURCES = \ LDADD=@GRECS_LDADD@ @GUILE_LIBS@ AM_CPPFLAGS= \ - -I$(top_srcdir) @GRECS_INCLUDES@ @GUILE_INCLUDES@\ - -DDEFAULT_PREPROCESSOR="$(DEFAULT_PREPROCESSOR)" + -I$(top_srcdir) @GRECS_INCLUDES@ @GUILE_INCLUDES@ + +# As of Guile 2.2.3, guile-snarf preprocesses gcc options in order +# to eliminate some of them. During this stage, each retained option +# is unquoted once. Thus, if an option contains embedded whitespace +# it produces two command line arguments after preprocessing, which +# causes gcc to fail. To avoid this, the AM_CPPFLAGS is split so that +# it contains only options that are unlikely to contain whitespace +# (AM_CPPFLAGS is used during snarfing). The cfpeek_CPPFLAGS variable, +# in contrast, contains all cpp arguments necessary for compilation. + +cfpeek_CPPFLAGS = \ + $(AM_CPPFLAGS) -DDEFAULT_PREPROCESSOR="$(DEFAULT_PREPROCESSOR)" BUILT_SOURCES = cmdline.h EXTRA_DIST = cmdline.h cmdline.opt diff --git a/src/cfpeek.c b/src/cfpeek.c index 6001b9a..ec678b8 100644 --- a/src/cfpeek.c +++ b/src/cfpeek.c @@ -1,5 +1,5 @@ /* This file is part of cfpeek - Copyright (C) 2011, 2012, 2015, 2018 Sergey Poznyakoff + Copyright (C) 2011-2021 Sergey Poznyakoff Cfpeek is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/cfpeek.h b/src/cfpeek.h index 5b6a686..b7147db 100644 --- a/src/cfpeek.h +++ b/src/cfpeek.h @@ -1,5 +1,5 @@ /* This file is part of cfpeek - Copyright (C) 2011, 2012, 2015, 2018 Sergey Poznyakoff + Copyright (C) 2011-2021 Sergey Poznyakoff Cfpeek is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/cmdline.opt b/src/cmdline.opt index 15c0c16..50b8c16 100644 --- a/src/cmdline.opt +++ b/src/cmdline.opt @@ -1,5 +1,5 @@ /* This file is part of cfpeek -*- c -*- - Copyright (C) 2011-2012, 2015 Sergey Poznyakoff + Copyright (C) 2011-2021 Sergey Poznyakoff Cfpeek is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -190,7 +190,7 @@ OPTIONS_BEGIN("cfpeek", [<Get variables from a configuration file>], [<FILE [PATH...]>], [<gnu>], - [<copyright_year=2011-2018>], + [<copyright_year=2011-2021>], [<copyright_holder=Sergey Poznyakoff>]) GROUP(Output control) diff --git a/src/guile.c b/src/guile.c index f9e1e7b..b6871fc 100644 --- a/src/guile.c +++ b/src/guile.c @@ -1,5 +1,5 @@ /* This file is part of cfpeek - Copyright (C) 2011, 2012, 2015 Sergey Poznyakoff + Copyright (C) 2011-2021 Sergey Poznyakoff Cfpeek is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -127,7 +127,7 @@ node_to_scm(struct grecs_node *node) return node_match_to_scm(node, NULL); } -static scm_sizet +static size_t _guile_node_free(SCM smob) { struct _guile_node *np = (struct _guile_node *) SCM_CDR(smob); @@ -807,7 +807,6 @@ guile_init() scm_init_guile(); scm_load_goops(); #include "guile.x" - _guile_init_node(); if (guile_debug) { diff --git a/src/script.c b/src/script.c index f77cd28..b1e97c7 100644 --- a/src/script.c +++ b/src/script.c @@ -1,5 +1,5 @@ /* This file is part of cfpeek - Copyright (C) 2011, 2012, 2015 Sergey Poznyakoff + Copyright (C) 2011-2021 Sergey Poznyakoff Cfpeek is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/tests/Makefile.am b/tests/Makefile.am index a73971d..5229744 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,5 +1,5 @@ # This file is part of cfpeek -# Copyright (C) 2011, 2012, 2015 Sergey Poznyakoff +# Copyright (C) 2011-2021 Sergey Poznyakoff # # Cfpeek is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/atlocal.in b/tests/atlocal.in index 3dfbee1..068024e 100644 --- a/tests/atlocal.in +++ b/tests/atlocal.in @@ -1,6 +1,6 @@ # @configure_input@ -*- shell-script -*- # Configurable variable values for Cfpeek test suite. -# Copyright (C) 2011, 2012, 2015 Sergey Poznyakoff +# Copyright (C) 2011-2021 Sergey Poznyakoff PATH=@abs_top_builddir@/src:$PATH diff --git a/tests/gmatch.at b/tests/gmatch.at index d824f17..1aff558 100644 --- a/tests/gmatch.at +++ b/tests/gmatch.at @@ -1,5 +1,5 @@ # This file is part of cfpeek -*- autotest -*- -# Copyright (C) 2011, 2012, 2015 Sergey Poznyakoff +# Copyright (C) 2011-2021 Sergey Poznyakoff # # Cfpeek is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/guile-itr.at b/tests/guile-itr.at index 47cb660..260c7d7 100644 --- a/tests/guile-itr.at +++ b/tests/guile-itr.at @@ -1,5 +1,5 @@ # This file is part of cfpeek -*- autotest -*- -# Copyright (C) 2011, 2012, 2015 Sergey Poznyakoff +# Copyright (C) 2011-2021 Sergey Poznyakoff # # Cfpeek is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/guile-list.at b/tests/guile-list.at index 409f4ff..777ac44 100644 --- a/tests/guile-list.at +++ b/tests/guile-list.at @@ -1,5 +1,5 @@ # This file is part of cfpeek -*- autotest -*- -# Copyright (C) 2011, 2012, 2015 Sergey Poznyakoff +# Copyright (C) 2011-2021 Sergey Poznyakoff # # Cfpeek is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/guile-list2.at b/tests/guile-list2.at index 6eabae5..ab4bd17 100644 --- a/tests/guile-list2.at +++ b/tests/guile-list2.at @@ -1,5 +1,5 @@ # This file is part of cfpeek -*- autotest -*- -# Copyright (C) 2011, 2012, 2015 Sergey Poznyakoff +# Copyright (C) 2011-2021 Sergey Poznyakoff # # Cfpeek is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/list.at b/tests/list.at index 4725e4a..79c5b63 100644 --- a/tests/list.at +++ b/tests/list.at @@ -1,5 +1,5 @@ # This file is part of cfpeek -# Copyright (C) 2011, 2012, 2015 Sergey Poznyakoff +# Copyright (C) 2011-2021 Sergey Poznyakoff # # Cfpeek is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/literal.at b/tests/literal.at index f5eecb3..e8bb603 100644 --- a/tests/literal.at +++ b/tests/literal.at @@ -1,5 +1,5 @@ # This file is part of cfpeek -*- autotest -*- -# Copyright (C) 2011, 2012, 2015 Sergey Poznyakoff +# Copyright (C) 2011-2021 Sergey Poznyakoff # # Cfpeek is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/locus.at b/tests/locus.at index 7b62efe..cb07784 100644 --- a/tests/locus.at +++ b/tests/locus.at @@ -1,5 +1,5 @@ # This file is part of cfpeek -# Copyright (C) 2011, 2012, 2015 Sergey Poznyakoff +# Copyright (C) 2011-2021 Sergey Poznyakoff # # Cfpeek is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/lookupfail.at b/tests/lookupfail.at index 896fd31..b247834 100644 --- a/tests/lookupfail.at +++ b/tests/lookupfail.at @@ -1,5 +1,5 @@ # This file is part of cfpeek -*- autotest -*- -# Copyright (C) 2011, 2012, 2015 Sergey Poznyakoff +# Copyright (C) 2011-2021 Sergey Poznyakoff # # Cfpeek is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/parent.at b/tests/parent.at index d73dae1..debd6d3 100644 --- a/tests/parent.at +++ b/tests/parent.at @@ -1,5 +1,5 @@ # This file is part of cfpeek -*- autotest -*- -# Copyright (C) 2011, 2012, 2015 Sergey Poznyakoff +# Copyright (C) 2011-2021 Sergey Poznyakoff # # Cfpeek is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/path.at b/tests/path.at index ecde03e..7265c87 100644 --- a/tests/path.at +++ b/tests/path.at @@ -1,5 +1,5 @@ # This file is part of cfpeek -# Copyright (C) 2011, 2012, 2015 Sergey Poznyakoff +# Copyright (C) 2011-2021 Sergey Poznyakoff # # Cfpeek is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/smatch.at b/tests/smatch.at index b2209bd..21f4ac8 100644 --- a/tests/smatch.at +++ b/tests/smatch.at @@ -1,5 +1,5 @@ # This file is part of cfpeek -*- autotest -*- -# Copyright (C) 2011, 2012, 2015 Sergey Poznyakoff +# Copyright (C) 2011-2021 Sergey Poznyakoff # # Cfpeek is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/testsuite.at b/tests/testsuite.at index 511f586..ff48f68 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -1,5 +1,5 @@ # This file is part of cfpeek -# Copyright (C) 2011, 2012, 2015 Sergey Poznyakoff +# Copyright (C) 2011-2021 Sergey Poznyakoff # # Cfpeek is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/up.at b/tests/up.at index 43f4042..c2d3f68 100644 --- a/tests/up.at +++ b/tests/up.at @@ -1,5 +1,5 @@ # This file is part of cfpeek -*- autotest -*- -# Copyright (C) 2011, 2012, 2015 Sergey Poznyakoff +# Copyright (C) 2011-2021 Sergey Poznyakoff # # Cfpeek is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/value.at b/tests/value.at index c610a68..cb51370 100644 --- a/tests/value.at +++ b/tests/value.at @@ -1,5 +1,5 @@ # This file is part of cfpeek -# Copyright (C) 2011, 2012, 2015 Sergey Poznyakoff +# Copyright (C) 2011-2021 Sergey Poznyakoff # # Cfpeek is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/version.at b/tests/version.at index 022ffb9..f1eaf6c 100644 --- a/tests/version.at +++ b/tests/version.at @@ -1,5 +1,5 @@ # This file is part of cfpeek -# Copyright (C) 2011, 2012, 2015 Sergey Poznyakoff +# Copyright (C) 2011-2021 Sergey Poznyakoff # # Cfpeek is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by |