From dbad35177723e19147ab49b59a3728e00fe05875 Mon Sep 17 00:00:00 2001 From: Sergey Poznyakoff Date: Thu, 3 Sep 2009 22:19:03 +0300 Subject: Improve the upgrade conversion script. Update docs. * NEWS: Update. * doc/Makefile.am (check-config, check-sub-config): New goals. (all-check-docs): Depend on the above. * doc/mailfromd.texi: Document syslog-async configuration statement. * doc/pragma-option.texi: Move the ignore block to doc/mailfromd.texi. * doc/upgrade.texi (5x0-600): Describe the changes and the proposed conversion procedure. * mfd/main.c (rename_legacy_file): new variable. (close_change_conf): Improve the created script. (cb_db_expire_interval): Bugfix. (database_section_param): File statement is mu_cfg_callback. (main): Set rename_legacy_file if necessary. --- doc/Makefile.am | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) (limited to 'doc/Makefile.am') diff --git a/doc/Makefile.am b/doc/Makefile.am index 97bff3f..ee522f2 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -62,6 +62,25 @@ check-options: $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) -E - \ $(info_TEXINFOS) +check-config: + @check-docs.sh 'configuration statements' \ + '/mf_cfg_param\[\] *= *{/,/^}/s/[ \t]*{ *"\([^,"]*\)".*/\1/pg' \ + 's/@deffn {Mailfromd Conf} *\([^@,]*\).*/\1/p' \ + $(top_srcdir)/mfd/main.c -- \ + $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) -E - \ + $(info_TEXINFOS) + +check-sub-config: + @list=`sed -n '/mf_cfg_param\[\] *= *{/,/^}/{s/[ \t]*{ *"\([^,"]*\)", *mu_cfg_section *,.*/\1/pg}' $(top_srcdir)/mfd/main.c`; \ + for ident in $$list; do \ + check-docs.sh "$$ident configuration statements" \ + "/$${ident}_section_param"'\[\] *= *{/,/^}/s/[ \t]*{ *"\([^,"]*\)".*/\1/pg' \ + "s/@deffn {$${ident}}"' *\([^@,]*\).*/\1/p' \ + $(top_srcdir)/mfd/main.c -- \ + $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) -E - \ + $(info_TEXINFOS); \ + done + check-builtins: @check-docs.sh builtins \ '/MF_DEFUN/{s/[ \t]*MF_DEFUN *(\([a-zA-Z_][a-zA-Z0-9_]*\),.*/\1/p;s/[ \t]*MF_DEFUN_VARARGS\(_NO_PROM\)\? *(\([a-zA-Z_][a-zA-Z0-9_]*\),.*/\2/p;s/[ \t]*MF_DEFUN_CTYPE *(\([a-zA-Z_][a-zA-Z0-9_]*\))/\1/p}'\ @@ -137,7 +156,10 @@ check-unrevised: rm $@-t; \ fi -all-check-docs: check-format check-options check-pragmas check-builtins check-mflib check-exceptions check-refs check-fixmes check-writeme check-unrevised +all-check-docs: check-format check-options check-pragmas \ + check-config check-sub-config \ + check-builtins check-mflib check-exceptions \ + check-refs check-fixmes check-writeme check-unrevised check-docs: @$(MAKE) -k all-check-docs -- cgit v1.2.1