From: Bruno Haible Date: Mon, 29 Jul 2024 01:35:23 +0000 (+0200) Subject: More updates regarding the 'Useable-in-testdir' sections. X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=4752693455d41fe0625c7bf1355fd159185a6286;p=gnulib.git More updates regarding the 'Useable-in-testdir' sections. * gnulib-tool.sh (sed_extract_prog, sed_extract_field_header): Recognize the 'Useable-in-testdir' sections. * modules/TEMPLATE-EXTENDED: Add a 'Useable-in-testdir' section. * doc/gnulib.texi (Module description): Move new text. --- diff --git a/ChangeLog b/ChangeLog index 0974283d46..a809663d01 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2024-07-28 Bruno Haible + + More updates regarding the 'Useable-in-testdir' sections. + * gnulib-tool.sh (sed_extract_prog, sed_extract_field_header): Recognize + the 'Useable-in-testdir' sections. + * modules/TEMPLATE-EXTENDED: Add a 'Useable-in-testdir' section. + * doc/gnulib.texi (Module description): Move new text. + 2024-07-28 Collin Funk doc: Document the 'Useable-in-testdir' field in module descriptions. diff --git a/doc/gnulib.texi b/doc/gnulib.texi index 3f2d1ee44d..33e82f2907 100644 --- a/doc/gnulib.texi +++ b/doc/gnulib.texi @@ -411,10 +411,6 @@ One sentence is enough. For example, if it defines a single function Gnulib's documentation generator will automatically convert the first part to a hyperlink when it has this form. -@item Usable-in-testdir -This field should contain @samp{no} if the module cannot be used in a -test directory created with @code{gnulib-tool --create-testdir}. - @item Status This field is either empty/absent, or contains the word @samp{obsolete}. In the latter case, @command{gnulib-tool} will, unless the option @@ -439,6 +435,10 @@ is applied to @code{@var{tests_base}/Makefile.am} (normally both @code{Makefile.am}s. This is useful for modules which provide Makefile.am macros rather than compiled source code. +@item Usable-in-testdir +This field should contain @samp{no} if the module cannot be used in a +test directory created with @code{gnulib-tool --create-testdir}. + @item Files This field contains a newline separated list of the files that are part of the module. @code{gnulib-tool} copies these files into the package that diff --git a/gnulib-tool.sh b/gnulib-tool.sh index 0efc25f0dc..de9e3c4b50 100755 --- a/gnulib-tool.sh +++ b/gnulib-tool.sh @@ -1951,6 +1951,7 @@ sed_extract_prog=':[ ]*$/ { s/^Status:[ ]*$// s/^Notice:[ ]*$// s/^Applicability:[ ]*$// + s/^Usable-in-testdir:[ ]*$// s/^Files:[ ]*$// s/^Depends-on:[ ]*$// s/^configure\.ac-early:[ ]*$// @@ -1975,6 +1976,7 @@ sed_extract_field_header=' s/^Status:[ ]*$/status/ s/^Notice:[ ]*$/notice/ s/^Applicability:[ ]*$/applicability/ + s/^Usable-in-testdir:[ ]*$/usability_in_testdir/ s/^Files:[ ]*$/files/ s/^Depends-on:[ ]*$/dependson/ s/^configure\.ac-early:[ ]*$/configureac_early/ diff --git a/modules/TEMPLATE-EXTENDED b/modules/TEMPLATE-EXTENDED index c9e9051895..af91e86b96 100644 --- a/modules/TEMPLATE-EXTENDED +++ b/modules/TEMPLATE-EXTENDED @@ -8,6 +8,8 @@ Notice: Applicability: +Usable-in-testdir: + Files: Depends-on: