Mercurial > gnulib
annotate gnulib-tool @ 40196:e63f5d3edab5
relocatable-prog: Update documentation.
* doc/relocatable-maint.texi (Supporting Relocation): Update to match
the recent changes.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Sun, 24 Feb 2019 01:49:15 +0100 |
| parents | a7fe9f54c3df |
| children | fab7ce42e03f |
| rev | line source |
|---|---|
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1 #! /bin/sh |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2 # |
|
40057
b06060465f09
maint: Run 'make update-copyright'
Paul Eggert <eggert@cs.ucla.edu>
parents:
39944
diff
changeset
|
3 # Copyright (C) 2002-2019 Free Software Foundation, Inc. |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4 # |
|
9309
bbbbbf4cd1c5
Change copyright notice from GPLv2+ to GPLv3+.
Bruno Haible <bruno@clisp.org>
parents:
9284
diff
changeset
|
5 # This program is free software: you can redistribute it and/or modify |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6 # it under the terms of the GNU General Public License as published by |
|
9309
bbbbbf4cd1c5
Change copyright notice from GPLv2+ to GPLv3+.
Bruno Haible <bruno@clisp.org>
parents:
9284
diff
changeset
|
7 # the Free Software Foundation; either version 3 of the License, or |
|
bbbbbf4cd1c5
Change copyright notice from GPLv2+ to GPLv3+.
Bruno Haible <bruno@clisp.org>
parents:
9284
diff
changeset
|
8 # (at your option) any later version. |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
9 # |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
10 # This program is distributed in the hope that it will be useful, |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
11 # but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
12 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
13 # GNU General Public License for more details. |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
14 # |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
15 # You should have received a copy of the GNU General Public License |
| 19190 | 16 # along with this program. If not, see <https://www.gnu.org/licenses/>. |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
17 # |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
18 |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
19 # This program is meant for authors or maintainers which want to import |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
20 # modules from gnulib into their packages. |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
21 |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
22 progname=$0 |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
23 package=gnulib |
|
7322
46d98b687a87
Speed up presentation of the include files.
Bruno Haible <bruno@clisp.org>
parents:
7321
diff
changeset
|
24 nl=' |
|
46d98b687a87
Speed up presentation of the include files.
Bruno Haible <bruno@clisp.org>
parents:
7321
diff
changeset
|
25 ' |
|
9005
e04f36b292ad
* gnulib-tool (IFS): Initialize early, so we don't set it to
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
9003
diff
changeset
|
26 IFS=" "" $nl" |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
27 |
| 39944 | 28 # You can set AUTOCONFPATH to empty if autoconf 2.63 is already in your PATH. |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
29 AUTOCONFPATH= |
|
5250
46a747db97f2
Comment out private settings.
Bruno Haible <bruno@clisp.org>
parents:
5237
diff
changeset
|
30 #case $USER in |
|
46a747db97f2
Comment out private settings.
Bruno Haible <bruno@clisp.org>
parents:
5237
diff
changeset
|
31 # bruno ) |
| 39944 | 32 # AUTOCONFBINDIR=/arch/x86-linux/gnu-inst-autoconf/2.63/bin |
|
5250
46a747db97f2
Comment out private settings.
Bruno Haible <bruno@clisp.org>
parents:
5237
diff
changeset
|
33 # AUTOCONFPATH="eval env PATH=${AUTOCONFBINDIR}:\$PATH " |
|
46a747db97f2
Comment out private settings.
Bruno Haible <bruno@clisp.org>
parents:
5237
diff
changeset
|
34 # ;; |
|
46a747db97f2
Comment out private settings.
Bruno Haible <bruno@clisp.org>
parents:
5237
diff
changeset
|
35 #esac |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
36 |
| 39943 | 37 # You can set AUTOMAKEPATH to empty if automake 1.11 is already in your PATH. |
|
6547
1a65fb7ddbbb
Don't waste time in a recursive autoreconf.
Bruno Haible <bruno@clisp.org>
parents:
6546
diff
changeset
|
38 AUTOMAKEPATH= |
|
1a65fb7ddbbb
Don't waste time in a recursive autoreconf.
Bruno Haible <bruno@clisp.org>
parents:
6546
diff
changeset
|
39 |
|
7485
0194db3ad154
Handle mismatch between latest gettext release and current gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7484
diff
changeset
|
40 # You can set GETTEXTPATH to empty if autopoint 0.15 is already in your PATH. |
|
0194db3ad154
Handle mismatch between latest gettext release and current gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7484
diff
changeset
|
41 GETTEXTPATH= |
|
0194db3ad154
Handle mismatch between latest gettext release and current gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7484
diff
changeset
|
42 |
|
12978
b7726f620298
gnulib-tool: Add support for --libtool in --create-testdir.
Bruno Haible <bruno@clisp.org>
parents:
12923
diff
changeset
|
43 # You can set LIBTOOLPATH to empty if libtoolize 2.x is already in your PATH. |
|
b7726f620298
gnulib-tool: Add support for --libtool in --create-testdir.
Bruno Haible <bruno@clisp.org>
parents:
12923
diff
changeset
|
44 LIBTOOLPATH= |
|
b7726f620298
gnulib-tool: Add support for --libtool in --create-testdir.
Bruno Haible <bruno@clisp.org>
parents:
12923
diff
changeset
|
45 |
|
6551
d37637700b4e
Make the AUTOCONF etc. commands overridable by the user.
Bruno Haible <bruno@clisp.org>
parents:
6550
diff
changeset
|
46 # If you didn't set AUTOCONFPATH and AUTOMAKEPATH, you can also set the |
|
7485
0194db3ad154
Handle mismatch between latest gettext release and current gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7484
diff
changeset
|
47 # variables AUTOCONF, AUTOHEADER, ACLOCAL, AUTOMAKE, AUTORECONF individually. |
|
6551
d37637700b4e
Make the AUTOCONF etc. commands overridable by the user.
Bruno Haible <bruno@clisp.org>
parents:
6550
diff
changeset
|
48 if test -z "${AUTOCONF}" || test -n "${AUTOCONFPATH}"; then |
|
d37637700b4e
Make the AUTOCONF etc. commands overridable by the user.
Bruno Haible <bruno@clisp.org>
parents:
6550
diff
changeset
|
49 AUTOCONF="${AUTOCONFPATH}autoconf" |
|
d37637700b4e
Make the AUTOCONF etc. commands overridable by the user.
Bruno Haible <bruno@clisp.org>
parents:
6550
diff
changeset
|
50 fi |
|
7485
0194db3ad154
Handle mismatch between latest gettext release and current gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7484
diff
changeset
|
51 if test -z "${AUTOHEADER}" || test -n "${AUTOCONFPATH}"; then |
|
0194db3ad154
Handle mismatch between latest gettext release and current gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7484
diff
changeset
|
52 AUTOHEADER="${AUTOCONFPATH}autoheader" |
|
0194db3ad154
Handle mismatch between latest gettext release and current gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7484
diff
changeset
|
53 fi |
|
6551
d37637700b4e
Make the AUTOCONF etc. commands overridable by the user.
Bruno Haible <bruno@clisp.org>
parents:
6550
diff
changeset
|
54 if test -z "${ACLOCAL}" || test -n "${AUTOMAKEPATH}"; then |
|
d37637700b4e
Make the AUTOCONF etc. commands overridable by the user.
Bruno Haible <bruno@clisp.org>
parents:
6550
diff
changeset
|
55 ACLOCAL="${AUTOMAKEPATH}aclocal" |
|
d37637700b4e
Make the AUTOCONF etc. commands overridable by the user.
Bruno Haible <bruno@clisp.org>
parents:
6550
diff
changeset
|
56 fi |
|
d37637700b4e
Make the AUTOCONF etc. commands overridable by the user.
Bruno Haible <bruno@clisp.org>
parents:
6550
diff
changeset
|
57 if test -z "${AUTOMAKE}" || test -n "${AUTOMAKEPATH}"; then |
|
d37637700b4e
Make the AUTOCONF etc. commands overridable by the user.
Bruno Haible <bruno@clisp.org>
parents:
6550
diff
changeset
|
58 AUTOMAKE="${AUTOMAKEPATH}automake" |
|
d37637700b4e
Make the AUTOCONF etc. commands overridable by the user.
Bruno Haible <bruno@clisp.org>
parents:
6550
diff
changeset
|
59 fi |
|
d37637700b4e
Make the AUTOCONF etc. commands overridable by the user.
Bruno Haible <bruno@clisp.org>
parents:
6550
diff
changeset
|
60 if test -z "${AUTORECONF}" || test -n "${AUTOCONFPATH}"; then |
|
d37637700b4e
Make the AUTOCONF etc. commands overridable by the user.
Bruno Haible <bruno@clisp.org>
parents:
6550
diff
changeset
|
61 AUTORECONF="${AUTOCONFPATH}autoreconf" |
|
d37637700b4e
Make the AUTOCONF etc. commands overridable by the user.
Bruno Haible <bruno@clisp.org>
parents:
6550
diff
changeset
|
62 fi |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
63 |
|
7485
0194db3ad154
Handle mismatch between latest gettext release and current gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7484
diff
changeset
|
64 # If you didn't set GETTEXTPATH, you can also set the variable AUTOPOINT. |
|
0194db3ad154
Handle mismatch between latest gettext release and current gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7484
diff
changeset
|
65 if test -z "${AUTOPOINT}" || test -n "${GETTEXTPATH}"; then |
|
0194db3ad154
Handle mismatch between latest gettext release and current gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7484
diff
changeset
|
66 AUTOPOINT="${GETTEXTPATH}autopoint" |
|
0194db3ad154
Handle mismatch between latest gettext release and current gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7484
diff
changeset
|
67 fi |
|
0194db3ad154
Handle mismatch between latest gettext release and current gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7484
diff
changeset
|
68 |
|
12978
b7726f620298
gnulib-tool: Add support for --libtool in --create-testdir.
Bruno Haible <bruno@clisp.org>
parents:
12923
diff
changeset
|
69 # If you didn't set LIBTOOLPATH, you can also set the variable LIBTOOLIZE. |
|
b7726f620298
gnulib-tool: Add support for --libtool in --create-testdir.
Bruno Haible <bruno@clisp.org>
parents:
12923
diff
changeset
|
70 if test -z "${LIBTOOLIZE}" || test -n "${LIBTOOLPATH}"; then |
|
12979
845824c37d6a
gnulib-tool (LIBTOOLPATH): Fix cut'n'paste bug.
Simon Josefsson <simon@josefsson.org>
parents:
12978
diff
changeset
|
71 LIBTOOLIZE="${LIBTOOLPATH}libtoolize" |
|
12978
b7726f620298
gnulib-tool: Add support for --libtool in --create-testdir.
Bruno Haible <bruno@clisp.org>
parents:
12923
diff
changeset
|
72 fi |
|
b7726f620298
gnulib-tool: Add support for --libtool in --create-testdir.
Bruno Haible <bruno@clisp.org>
parents:
12923
diff
changeset
|
73 |
|
11404
eb725d01cd4c
gnulib-tool: execute $MAKE not make
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
11403
diff
changeset
|
74 # You can set MAKE. |
|
eb725d01cd4c
gnulib-tool: execute $MAKE not make
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
11403
diff
changeset
|
75 if test -z "${MAKE}"; then |
|
eb725d01cd4c
gnulib-tool: execute $MAKE not make
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
11403
diff
changeset
|
76 MAKE=make |
|
eb725d01cd4c
gnulib-tool: execute $MAKE not make
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
11403
diff
changeset
|
77 fi |
|
eb725d01cd4c
gnulib-tool: execute $MAKE not make
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
11403
diff
changeset
|
78 |
|
11249
0a95b8deac2e
Re-enable the use of "sed --posix" with sed >= 4.2.
Bruno Haible <bruno@clisp.org>
parents:
11232
diff
changeset
|
79 # When using GNU sed, turn off as many GNU extensions as possible, |
|
0a95b8deac2e
Re-enable the use of "sed --posix" with sed >= 4.2.
Bruno Haible <bruno@clisp.org>
parents:
11232
diff
changeset
|
80 # to minimize the risk of accidentally using non-portable features. |
|
0a95b8deac2e
Re-enable the use of "sed --posix" with sed >= 4.2.
Bruno Haible <bruno@clisp.org>
parents:
11232
diff
changeset
|
81 # However, do this only for gnulib-tool itself, not for the code that |
|
0a95b8deac2e
Re-enable the use of "sed --posix" with sed >= 4.2.
Bruno Haible <bruno@clisp.org>
parents:
11232
diff
changeset
|
82 # gnulib-tool generates, since we don't want "sed --posix" to leak |
|
0a95b8deac2e
Re-enable the use of "sed --posix" with sed >= 4.2.
Bruno Haible <bruno@clisp.org>
parents:
11232
diff
changeset
|
83 # into makefiles. And do it only for sed versions 4.2 or newer, |
|
0a95b8deac2e
Re-enable the use of "sed --posix" with sed >= 4.2.
Bruno Haible <bruno@clisp.org>
parents:
11232
diff
changeset
|
84 # because "sed --posix" is buggy in GNU sed 4.1.5, see |
|
19439
8bfc20b57265
maint: shorten https://lists.gnu.org/archive/html/... links
Jim Meyering <meyering@fb.com>
parents:
19271
diff
changeset
|
85 # <https://lists.gnu.org/r/bug-gnulib/2009-02/msg00225.html>. |
|
11249
0a95b8deac2e
Re-enable the use of "sed --posix" with sed >= 4.2.
Bruno Haible <bruno@clisp.org>
parents:
11232
diff
changeset
|
86 if (alias) > /dev/null 2>&1 \ |
|
0a95b8deac2e
Re-enable the use of "sed --posix" with sed >= 4.2.
Bruno Haible <bruno@clisp.org>
parents:
11232
diff
changeset
|
87 && echo | sed --posix -e d >/dev/null 2>&1 \ |
|
0a95b8deac2e
Re-enable the use of "sed --posix" with sed >= 4.2.
Bruno Haible <bruno@clisp.org>
parents:
11232
diff
changeset
|
88 && case `sed --version | sed -e 's/^[^0-9]*//' -e 1q` in \ |
|
0a95b8deac2e
Re-enable the use of "sed --posix" with sed >= 4.2.
Bruno Haible <bruno@clisp.org>
parents:
11232
diff
changeset
|
89 [1-3]* | 4.[01]*) false;; \ |
|
0a95b8deac2e
Re-enable the use of "sed --posix" with sed >= 4.2.
Bruno Haible <bruno@clisp.org>
parents:
11232
diff
changeset
|
90 *) true;; \ |
|
0a95b8deac2e
Re-enable the use of "sed --posix" with sed >= 4.2.
Bruno Haible <bruno@clisp.org>
parents:
11232
diff
changeset
|
91 esac \ |
|
0a95b8deac2e
Re-enable the use of "sed --posix" with sed >= 4.2.
Bruno Haible <bruno@clisp.org>
parents:
11232
diff
changeset
|
92 ; then |
|
0a95b8deac2e
Re-enable the use of "sed --posix" with sed >= 4.2.
Bruno Haible <bruno@clisp.org>
parents:
11232
diff
changeset
|
93 # Define sed as an alias. |
|
0a95b8deac2e
Re-enable the use of "sed --posix" with sed >= 4.2.
Bruno Haible <bruno@clisp.org>
parents:
11232
diff
changeset
|
94 # It is not always possible to use aliases. Aliases are guaranteed to work |
|
0a95b8deac2e
Re-enable the use of "sed --posix" with sed >= 4.2.
Bruno Haible <bruno@clisp.org>
parents:
11232
diff
changeset
|
95 # if the executing shell is bash and either it is invoked as /bin/sh or |
|
0a95b8deac2e
Re-enable the use of "sed --posix" with sed >= 4.2.
Bruno Haible <bruno@clisp.org>
parents:
11232
diff
changeset
|
96 # is a version >= 2.0, supporting shopt. This is the common case. |
|
0a95b8deac2e
Re-enable the use of "sed --posix" with sed >= 4.2.
Bruno Haible <bruno@clisp.org>
parents:
11232
diff
changeset
|
97 # Two other approaches (use of a variable $sed or of a function func_sed |
|
0a95b8deac2e
Re-enable the use of "sed --posix" with sed >= 4.2.
Bruno Haible <bruno@clisp.org>
parents:
11232
diff
changeset
|
98 # instead of an alias) require massive, fragile code changes. |
|
0a95b8deac2e
Re-enable the use of "sed --posix" with sed >= 4.2.
Bruno Haible <bruno@clisp.org>
parents:
11232
diff
changeset
|
99 # An other approach (use of function sed) requires `which sed` - but |
|
0a95b8deac2e
Re-enable the use of "sed --posix" with sed >= 4.2.
Bruno Haible <bruno@clisp.org>
parents:
11232
diff
changeset
|
100 # 'which' is hard to emulate, due to missing "test -x" on some platforms. |
|
0a95b8deac2e
Re-enable the use of "sed --posix" with sed >= 4.2.
Bruno Haible <bruno@clisp.org>
parents:
11232
diff
changeset
|
101 if test -n "$BASH_VERSION"; then |
|
0a95b8deac2e
Re-enable the use of "sed --posix" with sed >= 4.2.
Bruno Haible <bruno@clisp.org>
parents:
11232
diff
changeset
|
102 shopt -s expand_aliases >/dev/null 2>&1 |
|
9213
6c916785c03e
Try harder to enable the alias for 'sed'.
Bruno Haible <bruno@clisp.org>
parents:
9189
diff
changeset
|
103 fi |
|
11249
0a95b8deac2e
Re-enable the use of "sed --posix" with sed >= 4.2.
Bruno Haible <bruno@clisp.org>
parents:
11232
diff
changeset
|
104 alias sed='sed --posix' |
|
7737
19ff03763d73
Use "sed --posix" instead of "sed" when possible.
Bruno Haible <bruno@clisp.org>
parents:
7722
diff
changeset
|
105 fi |
|
19ff03763d73
Use "sed --posix" instead of "sed" when possible.
Bruno Haible <bruno@clisp.org>
parents:
7722
diff
changeset
|
106 |
|
10400
817f1418bbde
Make gnulib-tool work with native 'sed' on AIX.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
10380
diff
changeset
|
107 # sed_noop is a sed expression that does nothing. |
| 10401 | 108 # An empty expression does not work with the native 'sed' on AIX 6.1. |
|
10400
817f1418bbde
Make gnulib-tool work with native 'sed' on AIX.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
10380
diff
changeset
|
109 sed_noop='s,x,x,' |
|
817f1418bbde
Make gnulib-tool work with native 'sed' on AIX.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
10380
diff
changeset
|
110 |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
111 # sed_comments is true or false, depending whether 'sed' supports comments. |
|
13562
f304978fb062
Fix gnulib-tool sed script de-commentation for AIX sed.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
13420
diff
changeset
|
112 # AIX 5.3 sed barfs over indented comments. |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
113 if echo fo | sed -e 's/f/g/ |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
114 # s/o/u/ |
|
13562
f304978fb062
Fix gnulib-tool sed script de-commentation for AIX sed.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
13420
diff
changeset
|
115 # indented comment |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
116 s/o/e/' 2>/dev/null | grep ge > /dev/null; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
117 sed_comments=true |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
118 else |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
119 sed_comments=false |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
120 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
121 |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
122 # func_usage |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
123 # outputs to stdout the --help usage message. |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
124 func_usage () |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
125 { |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
126 echo "\ |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
127 Usage: gnulib-tool --list |
|
14385
ed68f818ecca
gnulib-tool: remove use of bold display in help screen
Stefano Lattarini <stefano.lattarini@gmail.com>
parents:
14323
diff
changeset
|
128 gnulib-tool --find filename |
|
5344
c2f5677fc6ed
Initialize supplied_libname. Tweak usage message.
Bruno Haible <bruno@clisp.org>
parents:
5343
diff
changeset
|
129 gnulib-tool --import [module1 ... moduleN] |
|
13638
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
130 gnulib-tool --add-import [module1 ... moduleN] |
|
14385
ed68f818ecca
gnulib-tool: remove use of bold display in help screen
Stefano Lattarini <stefano.lattarini@gmail.com>
parents:
14323
diff
changeset
|
131 gnulib-tool --remove-import [module1 ... moduleN] |
|
6443
1a35941d29ab
Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents:
6425
diff
changeset
|
132 gnulib-tool --update |
|
7484
57fe575409ae
--create-testdir without module names now means to use nearly all modules.
Bruno Haible <bruno@clisp.org>
parents:
7421
diff
changeset
|
133 gnulib-tool --create-testdir --dir=directory [module1 ... moduleN] |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
134 gnulib-tool --create-megatestdir --dir=directory [module1 ... moduleN] |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
135 gnulib-tool --test --dir=directory module1 ... moduleN |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
136 gnulib-tool --megatest --dir=directory [module1 ... moduleN] |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
137 gnulib-tool --extract-description module |
|
13070
71d59ec8c75f
New module description field 'Comment'.
Bruno Haible <bruno@clisp.org>
parents:
13069
diff
changeset
|
138 gnulib-tool --extract-comment module |
|
10743
ec39330cb04e
Modules now have a 'status' attribute.
Bruno Haible <bruno@clisp.org>
parents:
10732
diff
changeset
|
139 gnulib-tool --extract-status module |
|
9189
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
140 gnulib-tool --extract-notice module |
|
12460
282eecca2301
New module attribute 'Applicability'.
Bruno Haible <bruno@clisp.org>
parents:
12417
diff
changeset
|
141 gnulib-tool --extract-applicability module |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
142 gnulib-tool --extract-filelist module |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
143 gnulib-tool --extract-dependencies module |
|
40074
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
144 gnulib-tool --extract-recursive-dependencies module |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
145 gnulib-tool --extract-autoconf-snippet module |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
146 gnulib-tool --extract-automake-snippet module |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
147 gnulib-tool --extract-include-directive module |
|
8055
5c79d44f739d
New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents:
8040
diff
changeset
|
148 gnulib-tool --extract-link-directive module |
|
40074
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
149 gnulib-tool --extract-recursive-link-directive module |
|
5251
42b53a22aee5
Add a license tag to every module.
Bruno Haible <bruno@clisp.org>
parents:
5250
diff
changeset
|
150 gnulib-tool --extract-license module |
| 4197 | 151 gnulib-tool --extract-maintainer module |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
152 gnulib-tool --extract-tests-module module |
|
11461
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
153 gnulib-tool --copy-file file [destination] |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
154 |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
155 Operation modes: |
|
13705
ed2bd36db406
gnulib-tool: Fix --help output.
Bruno Haible <bruno@clisp.org>
parents:
13660
diff
changeset
|
156 |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
157 --list print the available module names |
|
14385
ed68f818ecca
gnulib-tool: remove use of bold display in help screen
Stefano Lattarini <stefano.lattarini@gmail.com>
parents:
14323
diff
changeset
|
158 --find find the modules which contain the specified file |
|
13638
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
159 --import import the given modules into the current package |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
160 --add-import augment the list of imports from gnulib into the |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
161 current package, by adding the given modules; |
|
6745
aca74c06bca0
Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and
Bruno Haible <bruno@clisp.org>
parents:
6633
diff
changeset
|
162 if no modules are specified, update the current |
|
aca74c06bca0
Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and
Bruno Haible <bruno@clisp.org>
parents:
6633
diff
changeset
|
163 package from the current gnulib |
|
13638
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
164 --remove-import reduce the list of imports from gnulib into the |
|
14385
ed68f818ecca
gnulib-tool: remove use of bold display in help screen
Stefano Lattarini <stefano.lattarini@gmail.com>
parents:
14323
diff
changeset
|
165 current package, by removing the given modules |
|
6745
aca74c06bca0
Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and
Bruno Haible <bruno@clisp.org>
parents:
6633
diff
changeset
|
166 --update update the current package, restore files omitted |
|
13636
06064a28d167
gnulib-tool: Don't talk about CVS any more.
Bruno Haible <bruno@clisp.org>
parents:
13634
diff
changeset
|
167 from version control |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
168 --create-testdir create a scratch package with the given modules |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
169 --create-megatestdir create a mega scratch package with the given modules |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
170 one by one and all together |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
171 --test test the combination of the given modules |
| 4197 | 172 (recommended to use CC=\"gcc -Wall\" here) |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
173 --megatest test the given modules one by one and all together |
| 4197 | 174 (recommended to use CC=\"gcc -Wall\" here) |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
175 --extract-description extract the description |
|
13070
71d59ec8c75f
New module description field 'Comment'.
Bruno Haible <bruno@clisp.org>
parents:
13069
diff
changeset
|
176 --extract-comment extract the comment |
|
13080
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
177 --extract-status extract the status (obsolete etc.) |
|
9189
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
178 --extract-notice extract the notice or banner |
|
13069
5a91813baecc
Addendum to 2010-02-07 commit.
Bruno Haible <bruno@clisp.org>
parents:
13067
diff
changeset
|
179 --extract-applicability extract the applicability |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
180 --extract-filelist extract the list of files |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
181 --extract-dependencies extract the dependencies |
|
40074
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
182 --extract-recursive-dependencies extract the dependencies of the module |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
183 and its dependencies, recursively, all |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
184 together, but without the conditions |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
185 --extract-autoconf-snippet extract the snippet for configure.ac |
|
7222
06eec4eaf416
* gnulib-tool (emit_lib_Makefile_am): Don't put $makefile_name
Paul Eggert <eggert@cs.ucla.edu>
parents:
7216
diff
changeset
|
186 --extract-automake-snippet extract the snippet for library makefile |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
187 --extract-include-directive extract the #include directive |
|
8055
5c79d44f739d
New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents:
8040
diff
changeset
|
188 --extract-link-directive extract the linker directive |
|
40074
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
189 --extract-recursive-link-directive extract the linker directive of the |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
190 module and its dependencies, |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
191 recursively, all together |
|
5251
42b53a22aee5
Add a license tag to every module.
Bruno Haible <bruno@clisp.org>
parents:
5250
diff
changeset
|
192 --extract-license report the license terms of the source files |
|
42b53a22aee5
Add a license tag to every module.
Bruno Haible <bruno@clisp.org>
parents:
5250
diff
changeset
|
193 under lib/ |
| 4197 | 194 --extract-maintainer report the maintainer(s) inside gnulib |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
195 --extract-tests-module report the unit test module, if it exists |
|
11461
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
196 --copy-file copy a file that is not part of any module |
|
16377
c06c4d94d8a4
gnulib-tool: Improve usage message.
Bruno Haible <bruno@clisp.org>
parents:
16370
diff
changeset
|
197 --help Show this help text. |
|
c06c4d94d8a4
gnulib-tool: Improve usage message.
Bruno Haible <bruno@clisp.org>
parents:
16370
diff
changeset
|
198 --version Show version and authorship information. |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
199 |
|
7069
0fb5ef99e00f
Split the --help output into several paragraphs.
Bruno Haible <bruno@clisp.org>
parents:
7068
diff
changeset
|
200 General options: |
|
13705
ed2bd36db406
gnulib-tool: Fix --help output.
Bruno Haible <bruno@clisp.org>
parents:
13660
diff
changeset
|
201 |
|
7068
ec1cfcfd352a
Revert the --help output reordering.
Bruno Haible <bruno@clisp.org>
parents:
7067
diff
changeset
|
202 --dir=DIRECTORY Specify the target directory. |
|
ec1cfcfd352a
Revert the --help output reordering.
Bruno Haible <bruno@clisp.org>
parents:
7067
diff
changeset
|
203 For --import, this specifies where your |
|
ec1cfcfd352a
Revert the --help output reordering.
Bruno Haible <bruno@clisp.org>
parents:
7067
diff
changeset
|
204 configure.ac can be found. Defaults to current |
|
ec1cfcfd352a
Revert the --help output reordering.
Bruno Haible <bruno@clisp.org>
parents:
7067
diff
changeset
|
205 directory. |
|
7073
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
206 --local-dir=DIRECTORY Specify a local override directory where to look |
|
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
207 up files before looking in gnulib's directory. |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
208 --cache-modules Enable module caching optimization. |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
209 --no-cache-modules Disable module caching optimization. |
|
9188
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
210 --verbose Increase verbosity. May be repeated. |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
211 --quiet Decrease verbosity. May be repeated. |
|
7069
0fb5ef99e00f
Split the --help output into several paragraphs.
Bruno Haible <bruno@clisp.org>
parents:
7068
diff
changeset
|
212 |
|
13705
ed2bd36db406
gnulib-tool: Fix --help output.
Bruno Haible <bruno@clisp.org>
parents:
13660
diff
changeset
|
213 Options for --import, --add/remove-import, --update: |
|
ed2bd36db406
gnulib-tool: Fix --help output.
Bruno Haible <bruno@clisp.org>
parents:
13660
diff
changeset
|
214 |
|
12986
bfc76977457d
Clarify which options are available for --create-testdir.
Bruno Haible <bruno@clisp.org>
parents:
12983
diff
changeset
|
215 --dry-run Only print what would have been done. |
|
bfc76977457d
Clarify which options are available for --create-testdir.
Bruno Haible <bruno@clisp.org>
parents:
12983
diff
changeset
|
216 |
|
16931
9c0df43d88f4
gnulib-tool: --create-[mega]testdir, --[mega]test implies --with-tests.
Bruno Haible <bruno@clisp.org>
parents:
16925
diff
changeset
|
217 Options for --import, --add/remove-import: |
|
9c0df43d88f4
gnulib-tool: --create-[mega]testdir, --[mega]test implies --with-tests.
Bruno Haible <bruno@clisp.org>
parents:
16925
diff
changeset
|
218 |
|
9c0df43d88f4
gnulib-tool: --create-[mega]testdir, --[mega]test implies --with-tests.
Bruno Haible <bruno@clisp.org>
parents:
16925
diff
changeset
|
219 --with-tests Include unit tests for the included modules. |
|
9c0df43d88f4
gnulib-tool: --create-[mega]testdir, --[mega]test implies --with-tests.
Bruno Haible <bruno@clisp.org>
parents:
16925
diff
changeset
|
220 |
|
9c0df43d88f4
gnulib-tool: --create-[mega]testdir, --[mega]test implies --with-tests.
Bruno Haible <bruno@clisp.org>
parents:
16925
diff
changeset
|
221 Options for --create-[mega]testdir, --[mega]test: |
|
9c0df43d88f4
gnulib-tool: --create-[mega]testdir, --[mega]test implies --with-tests.
Bruno Haible <bruno@clisp.org>
parents:
16925
diff
changeset
|
222 |
|
9c0df43d88f4
gnulib-tool: --create-[mega]testdir, --[mega]test implies --with-tests.
Bruno Haible <bruno@clisp.org>
parents:
16925
diff
changeset
|
223 --without-tests Don't include unit tests for the included modules. |
|
9c0df43d88f4
gnulib-tool: --create-[mega]testdir, --[mega]test implies --with-tests.
Bruno Haible <bruno@clisp.org>
parents:
16925
diff
changeset
|
224 |
|
13705
ed2bd36db406
gnulib-tool: Fix --help output.
Bruno Haible <bruno@clisp.org>
parents:
13660
diff
changeset
|
225 Options for --import, --add/remove-import, |
|
ed2bd36db406
gnulib-tool: Fix --help output.
Bruno Haible <bruno@clisp.org>
parents:
13660
diff
changeset
|
226 --create-[mega]testdir, --[mega]test: |
|
ed2bd36db406
gnulib-tool: Fix --help output.
Bruno Haible <bruno@clisp.org>
parents:
13660
diff
changeset
|
227 |
|
12986
bfc76977457d
Clarify which options are available for --create-testdir.
Bruno Haible <bruno@clisp.org>
parents:
12983
diff
changeset
|
228 --with-obsolete Include obsolete modules when they occur among the |
|
bfc76977457d
Clarify which options are available for --create-testdir.
Bruno Haible <bruno@clisp.org>
parents:
12983
diff
changeset
|
229 dependencies. By default, dependencies to obsolete |
|
bfc76977457d
Clarify which options are available for --create-testdir.
Bruno Haible <bruno@clisp.org>
parents:
12983
diff
changeset
|
230 modules are ignored. |
|
13264
d66e74e6fe48
gnulib-tool: Don't include hairy tests of dependencies in testdirs.
Bruno Haible <bruno@clisp.org>
parents:
13263
diff
changeset
|
231 --with-c++-tests Include even unit tests for C++ interoperability. |
|
16931
9c0df43d88f4
gnulib-tool: --create-[mega]testdir, --[mega]test implies --with-tests.
Bruno Haible <bruno@clisp.org>
parents:
16925
diff
changeset
|
232 --without-c++-tests Exclude unit tests for C++ interoperability. |
|
13264
d66e74e6fe48
gnulib-tool: Don't include hairy tests of dependencies in testdirs.
Bruno Haible <bruno@clisp.org>
parents:
13263
diff
changeset
|
233 --with-longrunning-tests |
|
d66e74e6fe48
gnulib-tool: Don't include hairy tests of dependencies in testdirs.
Bruno Haible <bruno@clisp.org>
parents:
13263
diff
changeset
|
234 Include even unit tests that are long-runners. |
|
16931
9c0df43d88f4
gnulib-tool: --create-[mega]testdir, --[mega]test implies --with-tests.
Bruno Haible <bruno@clisp.org>
parents:
16925
diff
changeset
|
235 --without-longrunning-tests |
|
9c0df43d88f4
gnulib-tool: --create-[mega]testdir, --[mega]test implies --with-tests.
Bruno Haible <bruno@clisp.org>
parents:
16925
diff
changeset
|
236 Exclude unit tests that are long-runners. |
|
13264
d66e74e6fe48
gnulib-tool: Don't include hairy tests of dependencies in testdirs.
Bruno Haible <bruno@clisp.org>
parents:
13263
diff
changeset
|
237 --with-privileged-tests |
|
d66e74e6fe48
gnulib-tool: Don't include hairy tests of dependencies in testdirs.
Bruno Haible <bruno@clisp.org>
parents:
13263
diff
changeset
|
238 Include even unit tests that require root |
|
d66e74e6fe48
gnulib-tool: Don't include hairy tests of dependencies in testdirs.
Bruno Haible <bruno@clisp.org>
parents:
13263
diff
changeset
|
239 privileges. |
|
16931
9c0df43d88f4
gnulib-tool: --create-[mega]testdir, --[mega]test implies --with-tests.
Bruno Haible <bruno@clisp.org>
parents:
16925
diff
changeset
|
240 --without-privileged-tests |
|
9c0df43d88f4
gnulib-tool: --create-[mega]testdir, --[mega]test implies --with-tests.
Bruno Haible <bruno@clisp.org>
parents:
16925
diff
changeset
|
241 Exclude unit tests that require root privileges. |
|
13264
d66e74e6fe48
gnulib-tool: Don't include hairy tests of dependencies in testdirs.
Bruno Haible <bruno@clisp.org>
parents:
13263
diff
changeset
|
242 --with-unportable-tests |
|
d66e74e6fe48
gnulib-tool: Don't include hairy tests of dependencies in testdirs.
Bruno Haible <bruno@clisp.org>
parents:
13263
diff
changeset
|
243 Include even unit tests that fail on some platforms. |
|
16931
9c0df43d88f4
gnulib-tool: --create-[mega]testdir, --[mega]test implies --with-tests.
Bruno Haible <bruno@clisp.org>
parents:
16925
diff
changeset
|
244 --without-unportable-tests |
|
9c0df43d88f4
gnulib-tool: --create-[mega]testdir, --[mega]test implies --with-tests.
Bruno Haible <bruno@clisp.org>
parents:
16925
diff
changeset
|
245 Exclude unit tests that fail on some platforms. |
|
13264
d66e74e6fe48
gnulib-tool: Don't include hairy tests of dependencies in testdirs.
Bruno Haible <bruno@clisp.org>
parents:
13263
diff
changeset
|
246 --with-all-tests Include all kinds of problematic unit tests. |
|
12986
bfc76977457d
Clarify which options are available for --create-testdir.
Bruno Haible <bruno@clisp.org>
parents:
12983
diff
changeset
|
247 --avoid=MODULE Avoid including the given MODULE. Useful if you |
|
bfc76977457d
Clarify which options are available for --create-testdir.
Bruno Haible <bruno@clisp.org>
parents:
12983
diff
changeset
|
248 have code that provides equivalent functionality. |
|
bfc76977457d
Clarify which options are available for --create-testdir.
Bruno Haible <bruno@clisp.org>
parents:
12983
diff
changeset
|
249 This option can be repeated. |
|
14682
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
250 --conditional-dependencies |
|
14833
76127af7039f
Finish the conditional dependencies mechanism.
Bruno Haible <bruno@clisp.org>
parents:
14806
diff
changeset
|
251 Support conditional dependencies (may save configure |
|
76127af7039f
Finish the conditional dependencies mechanism.
Bruno Haible <bruno@clisp.org>
parents:
14806
diff
changeset
|
252 time and object code). |
|
76127af7039f
Finish the conditional dependencies mechanism.
Bruno Haible <bruno@clisp.org>
parents:
14806
diff
changeset
|
253 --no-conditional-dependencies |
|
76127af7039f
Finish the conditional dependencies mechanism.
Bruno Haible <bruno@clisp.org>
parents:
14806
diff
changeset
|
254 Don't use conditional dependencies. |
|
12986
bfc76977457d
Clarify which options are available for --create-testdir.
Bruno Haible <bruno@clisp.org>
parents:
12983
diff
changeset
|
255 --libtool Use libtool rules. |
|
bfc76977457d
Clarify which options are available for --create-testdir.
Bruno Haible <bruno@clisp.org>
parents:
12983
diff
changeset
|
256 --no-libtool Don't use libtool rules. |
|
bfc76977457d
Clarify which options are available for --create-testdir.
Bruno Haible <bruno@clisp.org>
parents:
12983
diff
changeset
|
257 |
|
13705
ed2bd36db406
gnulib-tool: Fix --help output.
Bruno Haible <bruno@clisp.org>
parents:
13660
diff
changeset
|
258 Options for --import, --add/remove-import: |
|
ed2bd36db406
gnulib-tool: Fix --help output.
Bruno Haible <bruno@clisp.org>
parents:
13660
diff
changeset
|
259 |
|
7068
ec1cfcfd352a
Revert the --help output reordering.
Bruno Haible <bruno@clisp.org>
parents:
7067
diff
changeset
|
260 --lib=LIBRARY Specify the library name. Defaults to 'libgnu'. |
|
ec1cfcfd352a
Revert the --help output reordering.
Bruno Haible <bruno@clisp.org>
parents:
7067
diff
changeset
|
261 --source-base=DIRECTORY |
|
ec1cfcfd352a
Revert the --help output reordering.
Bruno Haible <bruno@clisp.org>
parents:
7067
diff
changeset
|
262 Directory relative to --dir where source code is |
|
7069
0fb5ef99e00f
Split the --help output into several paragraphs.
Bruno Haible <bruno@clisp.org>
parents:
7068
diff
changeset
|
263 placed (default \"lib\"). |
|
7068
ec1cfcfd352a
Revert the --help output reordering.
Bruno Haible <bruno@clisp.org>
parents:
7067
diff
changeset
|
264 --m4-base=DIRECTORY Directory relative to --dir where *.m4 macros are |
|
7069
0fb5ef99e00f
Split the --help output into several paragraphs.
Bruno Haible <bruno@clisp.org>
parents:
7068
diff
changeset
|
265 placed (default \"m4\"). |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
266 --po-base=DIRECTORY Directory relative to --dir where *.po files are |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
267 placed (default \"po\"). |
|
7069
0fb5ef99e00f
Split the --help output into several paragraphs.
Bruno Haible <bruno@clisp.org>
parents:
7068
diff
changeset
|
268 --doc-base=DIRECTORY Directory relative to --dir where doc files are |
|
0fb5ef99e00f
Split the --help output into several paragraphs.
Bruno Haible <bruno@clisp.org>
parents:
7068
diff
changeset
|
269 placed (default \"doc\"). |
|
7068
ec1cfcfd352a
Revert the --help output reordering.
Bruno Haible <bruno@clisp.org>
parents:
7067
diff
changeset
|
270 --tests-base=DIRECTORY |
|
ec1cfcfd352a
Revert the --help output reordering.
Bruno Haible <bruno@clisp.org>
parents:
7067
diff
changeset
|
271 Directory relative to --dir where unit tests are |
|
7069
0fb5ef99e00f
Split the --help output into several paragraphs.
Bruno Haible <bruno@clisp.org>
parents:
7068
diff
changeset
|
272 placed (default \"tests\"). |
|
7068
ec1cfcfd352a
Revert the --help output reordering.
Bruno Haible <bruno@clisp.org>
parents:
7067
diff
changeset
|
273 --aux-dir=DIRECTORY Directory relative to --dir where auxiliary build |
|
13705
ed2bd36db406
gnulib-tool: Fix --help output.
Bruno Haible <bruno@clisp.org>
parents:
13660
diff
changeset
|
274 tools are placed (default comes from configure.ac). |
|
18729
9534f71959d1
gnulib-tool: new option --gnu-make
Paul Eggert <eggert@cs.ucla.edu>
parents:
18704
diff
changeset
|
275 --gnu-make Output for GNU Make instead of for the default |
|
9534f71959d1
gnulib-tool: new option --gnu-make
Paul Eggert <eggert@cs.ucla.edu>
parents:
18704
diff
changeset
|
276 Automake |
|
18501
9012a151a519
gnulib-tool: Support for the dual "LGPLv3+ or GPLv2" license.
Bruno Haible <bruno@clisp.org>
parents:
18474
diff
changeset
|
277 --lgpl[=2|=3orGPLv2|=3] |
|
9012a151a519
gnulib-tool: Support for the dual "LGPLv3+ or GPLv2" license.
Bruno Haible <bruno@clisp.org>
parents:
18474
diff
changeset
|
278 Abort if modules aren't available under the LGPL. |
|
7068
ec1cfcfd352a
Revert the --help output reordering.
Bruno Haible <bruno@clisp.org>
parents:
7067
diff
changeset
|
279 Also modify license template from GPL to LGPL. |
|
9417
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
280 The version number of the LGPL can be specified; |
|
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
281 the default is currently LGPLv3. |
|
18729
9534f71959d1
gnulib-tool: new option --gnu-make
Paul Eggert <eggert@cs.ucla.edu>
parents:
18704
diff
changeset
|
282 --makefile-name=NAME Name of makefile in the source-base and tests-base |
|
9534f71959d1
gnulib-tool: new option --gnu-make
Paul Eggert <eggert@cs.ucla.edu>
parents:
18704
diff
changeset
|
283 directories (default \"Makefile.am\", or |
|
9534f71959d1
gnulib-tool: new option --gnu-make
Paul Eggert <eggert@cs.ucla.edu>
parents:
18704
diff
changeset
|
284 \"Makefile.in\" if --gnu-make). |
|
7068
ec1cfcfd352a
Revert the --help output reordering.
Bruno Haible <bruno@clisp.org>
parents:
7067
diff
changeset
|
285 --macro-prefix=PREFIX Specify the prefix of the macros 'gl_EARLY' and |
|
ec1cfcfd352a
Revert the --help output reordering.
Bruno Haible <bruno@clisp.org>
parents:
7067
diff
changeset
|
286 'gl_INIT'. Default is 'gl'. |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
287 --po-domain=NAME Specify the prefix of the i18n domain. Usually use |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
288 the package name. A suffix '-gnulib' is appended. |
|
14894
b22360ddefc4
gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents:
14841
diff
changeset
|
289 --witness-c-macro=NAME Specify the C macro that is defined when the |
|
b22360ddefc4
gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents:
14841
diff
changeset
|
290 sources in this directory are compiled or used. |
|
9810
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
291 --vc-files Update version control related files. |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
292 --no-vc-files Don't update version control related files |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
293 (.gitignore and/or .cvsignore). |
|
7069
0fb5ef99e00f
Split the --help output into several paragraphs.
Bruno Haible <bruno@clisp.org>
parents:
7068
diff
changeset
|
294 |
|
13263
e7d114c00ff9
gnulib-tool: Add --without-*-tests options.
Bruno Haible <bruno@clisp.org>
parents:
13223
diff
changeset
|
295 Options for --create-[mega]testdir, --[mega]test: |
|
13705
ed2bd36db406
gnulib-tool: Fix --help output.
Bruno Haible <bruno@clisp.org>
parents:
13660
diff
changeset
|
296 |
|
14836
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
297 --single-configure Generate a single configure file, not a separate |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
298 configure file for the tests directory. |
|
13263
e7d114c00ff9
gnulib-tool: Add --without-*-tests options.
Bruno Haible <bruno@clisp.org>
parents:
13223
diff
changeset
|
299 |
|
13705
ed2bd36db406
gnulib-tool: Fix --help output.
Bruno Haible <bruno@clisp.org>
parents:
13660
diff
changeset
|
300 Options for --import, --add/remove-import, --update, |
|
ed2bd36db406
gnulib-tool: Fix --help output.
Bruno Haible <bruno@clisp.org>
parents:
13660
diff
changeset
|
301 --create-[mega]testdir, --[mega]test: |
|
ed2bd36db406
gnulib-tool: Fix --help output.
Bruno Haible <bruno@clisp.org>
parents:
13660
diff
changeset
|
302 |
| 6966 | 303 -s, --symbolic, --symlink Make symbolic links instead of copying files. |
|
7643
d67f9dc6019d
New option --local-symlink.
Bruno Haible <bruno@clisp.org>
parents:
7642
diff
changeset
|
304 --local-symlink Make symbolic links instead of copying files, only |
|
d67f9dc6019d
New option --local-symlink.
Bruno Haible <bruno@clisp.org>
parents:
7642
diff
changeset
|
305 for files from the local override directory. |
|
18937
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
306 -h, --hardlink Make hard links instead of copying files. |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
307 --local-hardlink Make hard links instead of copying files, only |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
308 for files from the local override directory. |
|
12986
bfc76977457d
Clarify which options are available for --create-testdir.
Bruno Haible <bruno@clisp.org>
parents:
12983
diff
changeset
|
309 |
|
13705
ed2bd36db406
gnulib-tool: Fix --help output.
Bruno Haible <bruno@clisp.org>
parents:
13660
diff
changeset
|
310 Options for --import, --add/remove-import, --update: |
|
ed2bd36db406
gnulib-tool: Fix --help output.
Bruno Haible <bruno@clisp.org>
parents:
13660
diff
changeset
|
311 |
|
9096
7f1880b27b89
New gnulib-tool option --more-symlinks.
Bruno Haible <bruno@clisp.org>
parents:
9090
diff
changeset
|
312 -S, --more-symlinks Make symbolic links instead of copying files, and |
|
7f1880b27b89
New gnulib-tool option --more-symlinks.
Bruno Haible <bruno@clisp.org>
parents:
9090
diff
changeset
|
313 don't replace copyright notices. |
|
18937
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
314 -H, --more-hardlinks Make hard links instead of copying files, and |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
315 don't replace copyright notices. |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
316 |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
317 Report bugs to <bug-gnulib@gnu.org>." |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
318 } |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
319 |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
320 # func_version |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
321 # outputs to stdout the --version message. |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
322 func_version () |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
323 { |
|
9793
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
324 func_gnulib_dir |
|
9805
d3af04de9f0b
Tweak "gnulib --version" output.
Bruno Haible <bruno@clisp.org>
parents:
9804
diff
changeset
|
325 if test -d "$gnulib_dir"/.git \ |
|
d3af04de9f0b
Tweak "gnulib --version" output.
Bruno Haible <bruno@clisp.org>
parents:
9804
diff
changeset
|
326 && (git --version) >/dev/null 2>/dev/null \ |
|
d3af04de9f0b
Tweak "gnulib --version" output.
Bruno Haible <bruno@clisp.org>
parents:
9804
diff
changeset
|
327 && (date --version) >/dev/null 2>/dev/null; then |
|
d3af04de9f0b
Tweak "gnulib --version" output.
Bruno Haible <bruno@clisp.org>
parents:
9804
diff
changeset
|
328 # gnulib checked out from git. |
|
d3af04de9f0b
Tweak "gnulib --version" output.
Bruno Haible <bruno@clisp.org>
parents:
9804
diff
changeset
|
329 sed_extract_first_date='/^Date/{ |
|
d3af04de9f0b
Tweak "gnulib --version" output.
Bruno Haible <bruno@clisp.org>
parents:
9804
diff
changeset
|
330 s/^Date:[ ]*//p |
|
d3af04de9f0b
Tweak "gnulib --version" output.
Bruno Haible <bruno@clisp.org>
parents:
9804
diff
changeset
|
331 q |
|
d3af04de9f0b
Tweak "gnulib --version" output.
Bruno Haible <bruno@clisp.org>
parents:
9804
diff
changeset
|
332 }' |
|
d3af04de9f0b
Tweak "gnulib --version" output.
Bruno Haible <bruno@clisp.org>
parents:
9804
diff
changeset
|
333 date=`cd "$gnulib_dir" && git log ChangeLog | sed -n -e "$sed_extract_first_date"` |
|
d3af04de9f0b
Tweak "gnulib --version" output.
Bruno Haible <bruno@clisp.org>
parents:
9804
diff
changeset
|
334 # Turn "Fri Mar 21 07:16:51 2008 -0600" into "Mar 21 2008 07:16:51 -0600". |
|
d3af04de9f0b
Tweak "gnulib --version" output.
Bruno Haible <bruno@clisp.org>
parents:
9804
diff
changeset
|
335 sed_year_before_time='s/^[^ ]* \([^ ]*\) \([0-9]*\) \([0-9:]*\) \([0-9]*\) /\1 \2 \4 \3 /' |
|
d3af04de9f0b
Tweak "gnulib --version" output.
Bruno Haible <bruno@clisp.org>
parents:
9804
diff
changeset
|
336 date=`echo "$date" | sed -e "$sed_year_before_time"` |
|
d3af04de9f0b
Tweak "gnulib --version" output.
Bruno Haible <bruno@clisp.org>
parents:
9804
diff
changeset
|
337 # Use GNU date to compute the time in GMT. |
|
d3af04de9f0b
Tweak "gnulib --version" output.
Bruno Haible <bruno@clisp.org>
parents:
9804
diff
changeset
|
338 date=`date -d "$date" -u +"%Y-%m-%d %H:%M:%S"` |
|
10495
78d1bdfaa67e
Make "gnulib-tool --version" work from any directory.
Bruno Haible <bruno@clisp.org>
parents:
10479
diff
changeset
|
339 version=' '`cd "$gnulib_dir" && ./build-aux/git-version-gen /dev/null | sed -e 's/-dirty/-modified/'` |
|
9805
d3af04de9f0b
Tweak "gnulib --version" output.
Bruno Haible <bruno@clisp.org>
parents:
9804
diff
changeset
|
340 else |
|
17378
1d9362a18c34
Assume gnulib is checked out from Git, not CVS
Stefano Lattarini <stefano.lattarini@gmail.com>
parents:
17269
diff
changeset
|
341 # gnulib copy without versioning information. |
|
1d9362a18c34
Assume gnulib is checked out from Git, not CVS
Stefano Lattarini <stefano.lattarini@gmail.com>
parents:
17269
diff
changeset
|
342 date=`sed -e 's/ .*//;q' "$gnulib_dir"/ChangeLog` |
|
9805
d3af04de9f0b
Tweak "gnulib --version" output.
Bruno Haible <bruno@clisp.org>
parents:
9804
diff
changeset
|
343 version= |
|
d3af04de9f0b
Tweak "gnulib --version" output.
Bruno Haible <bruno@clisp.org>
parents:
9804
diff
changeset
|
344 fi |
| 12417 | 345 year=`"$gnulib_dir"/build-aux/mdate-sh "$self_abspathname" | sed -e 's,^.* ,,'` |
|
7347
d86464f614f7
* gnulib-tool (func_version): Create output all at once. This
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7335
diff
changeset
|
346 echo "\ |
|
9805
d3af04de9f0b
Tweak "gnulib --version" output.
Bruno Haible <bruno@clisp.org>
parents:
9804
diff
changeset
|
347 gnulib-tool (GNU $package $date)$version |
|
7347
d86464f614f7
* gnulib-tool (func_version): Create output all at once. This
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7335
diff
changeset
|
348 Copyright (C) $year Free Software Foundation, Inc. |
| 19190 | 349 License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html> |
|
9793
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
350 This is free software: you are free to change and redistribute it. |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
351 There is NO WARRANTY, to the extent permitted by law. |
|
16802
b21cba808f11
gnulib-tool: Fix list of authors.
Bruno Haible <bruno@clisp.org>
parents:
16714
diff
changeset
|
352 " |
|
b21cba808f11
gnulib-tool: Fix list of authors.
Bruno Haible <bruno@clisp.org>
parents:
16714
diff
changeset
|
353 printf "Written by %s, %s, and %s.\n" "Bruno Haible" "Paul Eggert" "Simon Josefsson" |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
354 } |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
355 |
|
6777
d9b10884dc69
* gnulib-tool (func_version): Base copyright year on CVS date.
Eric Blake <ebb9@byu.net>
parents:
6765
diff
changeset
|
356 # func_emit_copyright_notice |
|
d9b10884dc69
* gnulib-tool (func_version): Base copyright year on CVS date.
Eric Blake <ebb9@byu.net>
parents:
6765
diff
changeset
|
357 # outputs to stdout a header for a generated file. |
|
d9b10884dc69
* gnulib-tool (func_version): Base copyright year on CVS date.
Eric Blake <ebb9@byu.net>
parents:
6765
diff
changeset
|
358 func_emit_copyright_notice () |
|
d9b10884dc69
* gnulib-tool (func_version): Base copyright year on CVS date.
Eric Blake <ebb9@byu.net>
parents:
6765
diff
changeset
|
359 { |
| 12417 | 360 sed -n -e '/Copyright/ { |
| 361 p | |
| 362 q | |
| 363 }' < "$self_abspathname" | |
|
6777
d9b10884dc69
* gnulib-tool (func_version): Base copyright year on CVS date.
Eric Blake <ebb9@byu.net>
parents:
6765
diff
changeset
|
364 echo "#" |
|
15790
ccb791a4a8a7
gnulib: use more-standard license notice wording
Paul Eggert <eggert@cs.ucla.edu>
parents:
15482
diff
changeset
|
365 echo "# This file is free software; you can redistribute it and/or modify" |
|
ccb791a4a8a7
gnulib: use more-standard license notice wording
Paul Eggert <eggert@cs.ucla.edu>
parents:
15482
diff
changeset
|
366 echo "# it under the terms of the GNU General Public License as published by" |
|
ccb791a4a8a7
gnulib: use more-standard license notice wording
Paul Eggert <eggert@cs.ucla.edu>
parents:
15482
diff
changeset
|
367 echo "# the Free Software Foundation; either version 3 of the License, or" |
|
ccb791a4a8a7
gnulib: use more-standard license notice wording
Paul Eggert <eggert@cs.ucla.edu>
parents:
15482
diff
changeset
|
368 echo "# (at your option) any later version." |
|
ccb791a4a8a7
gnulib: use more-standard license notice wording
Paul Eggert <eggert@cs.ucla.edu>
parents:
15482
diff
changeset
|
369 echo "#" |
|
ccb791a4a8a7
gnulib: use more-standard license notice wording
Paul Eggert <eggert@cs.ucla.edu>
parents:
15482
diff
changeset
|
370 echo "# This file is distributed in the hope that it will be useful," |
|
ccb791a4a8a7
gnulib: use more-standard license notice wording
Paul Eggert <eggert@cs.ucla.edu>
parents:
15482
diff
changeset
|
371 echo "# but WITHOUT ANY WARRANTY; without even the implied warranty of" |
|
ccb791a4a8a7
gnulib: use more-standard license notice wording
Paul Eggert <eggert@cs.ucla.edu>
parents:
15482
diff
changeset
|
372 echo "# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the" |
|
ccb791a4a8a7
gnulib: use more-standard license notice wording
Paul Eggert <eggert@cs.ucla.edu>
parents:
15482
diff
changeset
|
373 echo "# GNU General Public License for more details." |
|
ccb791a4a8a7
gnulib: use more-standard license notice wording
Paul Eggert <eggert@cs.ucla.edu>
parents:
15482
diff
changeset
|
374 echo "#" |
|
ccb791a4a8a7
gnulib: use more-standard license notice wording
Paul Eggert <eggert@cs.ucla.edu>
parents:
15482
diff
changeset
|
375 echo "# You should have received a copy of the GNU General Public License" |
| 19190 | 376 echo "# along with this file. If not, see <https://www.gnu.org/licenses/>." |
|
15790
ccb791a4a8a7
gnulib: use more-standard license notice wording
Paul Eggert <eggert@cs.ucla.edu>
parents:
15482
diff
changeset
|
377 echo "#" |
|
ccb791a4a8a7
gnulib: use more-standard license notice wording
Paul Eggert <eggert@cs.ucla.edu>
parents:
15482
diff
changeset
|
378 echo "# As a special exception to the GNU General Public License," |
|
ccb791a4a8a7
gnulib: use more-standard license notice wording
Paul Eggert <eggert@cs.ucla.edu>
parents:
15482
diff
changeset
|
379 echo "# this file may be distributed as part of a program that" |
|
ccb791a4a8a7
gnulib: use more-standard license notice wording
Paul Eggert <eggert@cs.ucla.edu>
parents:
15482
diff
changeset
|
380 echo "# contains a configuration script generated by Autoconf, under" |
|
6777
d9b10884dc69
* gnulib-tool (func_version): Base copyright year on CVS date.
Eric Blake <ebb9@byu.net>
parents:
6765
diff
changeset
|
381 echo "# the same distribution terms as the rest of that program." |
|
d9b10884dc69
* gnulib-tool (func_version): Base copyright year on CVS date.
Eric Blake <ebb9@byu.net>
parents:
6765
diff
changeset
|
382 echo "#" |
|
d9b10884dc69
* gnulib-tool (func_version): Base copyright year on CVS date.
Eric Blake <ebb9@byu.net>
parents:
6765
diff
changeset
|
383 echo "# Generated by gnulib-tool." |
|
d9b10884dc69
* gnulib-tool (func_version): Base copyright year on CVS date.
Eric Blake <ebb9@byu.net>
parents:
6765
diff
changeset
|
384 } |
|
d9b10884dc69
* gnulib-tool (func_version): Base copyright year on CVS date.
Eric Blake <ebb9@byu.net>
parents:
6765
diff
changeset
|
385 |
|
7332
dd6e80d0c89e
* gnulib-tool (func_exit): New function, to allow to pass the
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7327
diff
changeset
|
386 # func_exit STATUS |
| 10453 | 387 # exits with a given status. |
| 388 # This function needs to be used, rather than 'exit', when a 'trap' handler is | |
| 389 # in effect that refers to $?. | |
|
7332
dd6e80d0c89e
* gnulib-tool (func_exit): New function, to allow to pass the
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7327
diff
changeset
|
390 func_exit () |
|
dd6e80d0c89e
* gnulib-tool (func_exit): New function, to allow to pass the
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7327
diff
changeset
|
391 { |
|
dd6e80d0c89e
* gnulib-tool (func_exit): New function, to allow to pass the
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7327
diff
changeset
|
392 (exit $1); exit $1 |
|
dd6e80d0c89e
* gnulib-tool (func_exit): New function, to allow to pass the
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7327
diff
changeset
|
393 } |
|
dd6e80d0c89e
* gnulib-tool (func_exit): New function, to allow to pass the
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7327
diff
changeset
|
394 |
|
9793
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
395 # func_gnulib_dir |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
396 # locates the directory where the gnulib repository lives |
|
10501
4e04aaeb17f9
Fix previous patch, and tweak references to $0.
Eric Blake <ebb9@byu.net>
parents:
10495
diff
changeset
|
397 # Input: |
|
4e04aaeb17f9
Fix previous patch, and tweak references to $0.
Eric Blake <ebb9@byu.net>
parents:
10495
diff
changeset
|
398 # - progname name of this program |
|
9793
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
399 # Sets variables |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
400 # - self_abspathname absolute pathname of gnulib-tool |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
401 # - gnulib_dir absolute pathname of gnulib repository |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
402 func_gnulib_dir () |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
403 { |
|
10501
4e04aaeb17f9
Fix previous patch, and tweak references to $0.
Eric Blake <ebb9@byu.net>
parents:
10495
diff
changeset
|
404 case "$progname" in |
|
17812
f84b5489521b
gnulib-tool: recognize x:* as an absolute path
KO Myung-Hun <komh78@gmail.com>
parents:
17754
diff
changeset
|
405 /* | ?:*) self_abspathname="$progname" ;; |
|
10501
4e04aaeb17f9
Fix previous patch, and tweak references to $0.
Eric Blake <ebb9@byu.net>
parents:
10495
diff
changeset
|
406 */*) self_abspathname=`pwd`/"$progname" ;; |
|
9793
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
407 *) |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
408 # Look in $PATH. |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
409 # Iterate through the elements of $PATH. |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
410 # We use IFS=: instead of |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
411 # for d in `echo ":$PATH:" | sed -e 's/:::*/:.:/g' | sed -e 's/:/ /g'` |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
412 # because the latter does not work when some PATH element contains spaces. |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
413 # We use a canonicalized $pathx instead of $PATH, because empty PATH |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
414 # elements are by definition equivalent to '.', however field splitting |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
415 # according to IFS=: loses empty fields in many shells: |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
416 # - /bin/sh on OSF/1 and Solaris loses all empty fields (at the |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
417 # beginning, at the end, and in the middle), |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
418 # - /bin/sh on IRIX and /bin/ksh on IRIX and OSF/1 lose empty fields |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
419 # at the beginning and at the end, |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
420 # - GNU bash, /bin/sh on AIX and HP-UX, and /bin/ksh on AIX, HP-UX, |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
421 # Solaris lose empty fields at the end. |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
422 # The 'case' statement is an optimization, to avoid evaluating the |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
423 # explicit canonicalization command when $PATH contains no empty fields. |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
424 self_abspathname= |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
425 if test "$PATH_SEPARATOR" = ";"; then |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
426 # On Windows, programs are searched in "." before $PATH. |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
427 pathx=".;$PATH" |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
428 else |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
429 # On Unix, we have to convert empty PATH elements to ".". |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
430 pathx="$PATH" |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
431 case :$PATH: in |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
432 *::*) |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
433 pathx=`echo ":$PATH:" | sed -e 's/:::*/:.:/g' -e 's/^://' -e 's/:\$//'` |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
434 ;; |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
435 esac |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
436 fi |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
437 save_IFS="$IFS" |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
438 IFS="$PATH_SEPARATOR" |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
439 for d in $pathx; do |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
440 IFS="$save_IFS" |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
441 test -z "$d" && d=. |
|
10501
4e04aaeb17f9
Fix previous patch, and tweak references to $0.
Eric Blake <ebb9@byu.net>
parents:
10495
diff
changeset
|
442 if test -x "$d/$progname" && test ! -d "$d/$progname"; then |
|
4e04aaeb17f9
Fix previous patch, and tweak references to $0.
Eric Blake <ebb9@byu.net>
parents:
10495
diff
changeset
|
443 self_abspathname="$d/$progname" |
|
9793
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
444 break |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
445 fi |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
446 done |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
447 IFS="$save_IFS" |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
448 if test -z "$self_abspathname"; then |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
449 func_fatal_error "could not locate the gnulib-tool program - how did you invoke it?" |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
450 fi |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
451 ;; |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
452 esac |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
453 while test -h "$self_abspathname"; do |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
454 # Resolve symbolic link. |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
455 linkval=`func_readlink "$self_abspathname"` |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
456 test -n "$linkval" || break |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
457 case "$linkval" in |
|
17812
f84b5489521b
gnulib-tool: recognize x:* as an absolute path
KO Myung-Hun <komh78@gmail.com>
parents:
17754
diff
changeset
|
458 /* | ?:* ) self_abspathname="$linkval" ;; |
|
9793
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
459 * ) self_abspathname=`echo "$self_abspathname" | sed -e 's,/[^/]*$,,'`/"$linkval" ;; |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
460 esac |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
461 done |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
462 gnulib_dir=`echo "$self_abspathname" | sed -e 's,/[^/]*$,,'` |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
463 } |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
464 |
|
6245
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
465 # func_tmpdir |
|
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
466 # creates a temporary directory. |
|
10501
4e04aaeb17f9
Fix previous patch, and tweak references to $0.
Eric Blake <ebb9@byu.net>
parents:
10495
diff
changeset
|
467 # Input: |
|
4e04aaeb17f9
Fix previous patch, and tweak references to $0.
Eric Blake <ebb9@byu.net>
parents:
10495
diff
changeset
|
468 # - progname name of this program |
|
6245
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
469 # Sets variable |
|
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
470 # - tmp pathname of freshly created temporary directory |
|
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
471 func_tmpdir () |
|
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
472 { |
|
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
473 # Use the environment variable TMPDIR, falling back to /tmp. This allows |
|
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
474 # users to specify a different temporary directory, for example, if their |
|
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
475 # /tmp is filled up or too small. |
|
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
476 : ${TMPDIR=/tmp} |
|
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
477 { |
|
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
478 # Use the mktemp program if available. If not available, hide the error |
|
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
479 # message. |
|
6581
bc61a0c9a750
* gnulib-tool, build-aux/csharpcomp.sh.in: Do not pass `-q' to mktemp.
Paul Eggert <eggert@cs.ucla.edu>
parents:
6570
diff
changeset
|
480 tmp=`(umask 077 && mktemp -d "$TMPDIR/glXXXXXX") 2>/dev/null` && |
|
6245
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
481 test -n "$tmp" && test -d "$tmp" |
|
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
482 } || |
|
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
483 { |
|
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
484 # Use a simple mkdir command. It is guaranteed to fail if the directory |
|
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
485 # already exists. $RANDOM is bash specific and expands to empty in shells |
|
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
486 # other than bash, ksh and zsh. Its use does not increase security; |
|
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
487 # rather, it minimizes the probability of failure in a very cluttered /tmp |
|
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
488 # directory. |
|
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
489 tmp=$TMPDIR/gl$$-$RANDOM |
|
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
490 (umask 077 && mkdir "$tmp") |
|
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
491 } || |
|
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
492 { |
|
10501
4e04aaeb17f9
Fix previous patch, and tweak references to $0.
Eric Blake <ebb9@byu.net>
parents:
10495
diff
changeset
|
493 echo "$progname: cannot create a temporary directory in $TMPDIR" >&2 |
|
7332
dd6e80d0c89e
* gnulib-tool (func_exit): New function, to allow to pass the
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7327
diff
changeset
|
494 func_exit 1 |
|
6245
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
495 } |
|
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
496 } |
|
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
497 |
|
7323
7ca0e325d5db
Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents:
7322
diff
changeset
|
498 # func_append var value |
|
7ca0e325d5db
Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents:
7322
diff
changeset
|
499 # appends the given value to the shell variable var. |
|
7ca0e325d5db
Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents:
7322
diff
changeset
|
500 if ( foo=bar; foo+=baz && test "$foo" = barbaz ) >/dev/null 2>&1; then |
|
7ca0e325d5db
Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents:
7322
diff
changeset
|
501 # Use bash's += operator. It reduces complexity of appending repeatedly to |
|
7ca0e325d5db
Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents:
7322
diff
changeset
|
502 # a single variable from O(n^2) to O(n). |
|
7ca0e325d5db
Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents:
7322
diff
changeset
|
503 func_append () |
|
7ca0e325d5db
Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents:
7322
diff
changeset
|
504 { |
|
7ca0e325d5db
Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents:
7322
diff
changeset
|
505 eval "$1+=\"\$2\"" |
|
7ca0e325d5db
Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents:
7322
diff
changeset
|
506 } |
|
10989
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
507 fast_func_append=true |
|
7323
7ca0e325d5db
Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents:
7322
diff
changeset
|
508 else |
|
7ca0e325d5db
Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents:
7322
diff
changeset
|
509 func_append () |
|
7ca0e325d5db
Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents:
7322
diff
changeset
|
510 { |
|
7ca0e325d5db
Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents:
7322
diff
changeset
|
511 eval "$1=\"\$$1\$2\"" |
|
7ca0e325d5db
Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents:
7322
diff
changeset
|
512 } |
|
10989
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
513 fast_func_append=false |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
514 fi |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
515 |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
516 # func_remove_prefix var prefix |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
517 # removes the given prefix from the value of the shell variable var. |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
518 # var should be the name of a shell variable. |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
519 # Its value should not contain a newline and not start or end with whitespace. |
|
11037
d94dc78c3947
Improve func_remove_prefix, func_remove_suffix.
Bruno Haible <bruno@clisp.org>
parents:
10993
diff
changeset
|
520 # prefix should not contain the characters "$`\{}[]^|. |
|
10989
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
521 if ( foo=bar; eval 'test "${foo#b}" = ar' ) >/dev/null 2>&1; then |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
522 func_remove_prefix () |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
523 { |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
524 eval "$1=\${$1#\$2}" |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
525 } |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
526 fast_func_remove_prefix=true |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
527 else |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
528 func_remove_prefix () |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
529 { |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
530 eval "value=\"\$$1\"" |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
531 prefix="$2" |
|
11037
d94dc78c3947
Improve func_remove_prefix, func_remove_suffix.
Bruno Haible <bruno@clisp.org>
parents:
10993
diff
changeset
|
532 case "$prefix" in |
|
d94dc78c3947
Improve func_remove_prefix, func_remove_suffix.
Bruno Haible <bruno@clisp.org>
parents:
10993
diff
changeset
|
533 *.*) |
|
d94dc78c3947
Improve func_remove_prefix, func_remove_suffix.
Bruno Haible <bruno@clisp.org>
parents:
10993
diff
changeset
|
534 sed_escape_dots='s/\([.]\)/\\\1/g' |
|
d94dc78c3947
Improve func_remove_prefix, func_remove_suffix.
Bruno Haible <bruno@clisp.org>
parents:
10993
diff
changeset
|
535 prefix=`echo "$prefix" | sed -e "$sed_escape_dots"` |
|
d94dc78c3947
Improve func_remove_prefix, func_remove_suffix.
Bruno Haible <bruno@clisp.org>
parents:
10993
diff
changeset
|
536 ;; |
|
d94dc78c3947
Improve func_remove_prefix, func_remove_suffix.
Bruno Haible <bruno@clisp.org>
parents:
10993
diff
changeset
|
537 esac |
|
10989
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
538 value=`echo "$value" | sed -e "s|^${prefix}||"` |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
539 eval "$1=\"\$value\"" |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
540 } |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
541 fast_func_remove_prefix=false |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
542 fi |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
543 |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
544 # Determine whether we should use ':' or ';' as PATH_SEPARATOR. |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
545 func_determine_path_separator () |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
546 { |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
547 if test "${PATH_SEPARATOR+set}" != set; then |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
548 # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
549 # contains only /bin. Note that ksh looks also at the FPATH variable, |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
550 # so we have to set that as well for the test. |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
551 PATH_SEPARATOR=: |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
552 (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
553 && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
554 || PATH_SEPARATOR=';' |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
555 } |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
556 fi |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
557 } |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
558 |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
559 # func_path_append pathvar directory |
|
40184
7f0ac0398fae
gnulib-tool: Improve handling of multiple --local-dir options.
Bruno Haible <bruno@clisp.org>
parents:
40128
diff
changeset
|
560 # appends directory to pathvar, delimiting directories by PATH_SEPARATOR. |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
561 func_path_append () |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
562 { |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
563 if eval "test -n \"\$$1\""; then |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
564 func_append "$1" "$PATH_SEPARATOR$2" |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
565 else |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
566 eval "$1=\$2" |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
567 fi |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
568 } |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
569 |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
570 # func_path_foreach_inner |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
571 # helper for func_path_foreach because we need new 'args' array |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
572 # Input: |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
573 # - fpf_dir directory from local_gnulib_path |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
574 # - fpf_cb callback to be run for fpf_dir |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
575 func_path_foreach_inner () |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
576 { |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
577 set %start% "$@" |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
578 for _fpf_arg |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
579 do |
|
40184
7f0ac0398fae
gnulib-tool: Improve handling of multiple --local-dir options.
Bruno Haible <bruno@clisp.org>
parents:
40128
diff
changeset
|
580 case "$_fpf_arg" in |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
581 %start%) |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
582 set dummy |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
583 ;; |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
584 %dir%) |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
585 set "$@" "$fpf_dir" |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
586 ;; |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
587 *) |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
588 set "$@" "$_fpf_arg" |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
589 ;; |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
590 esac |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
591 done |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
592 shift |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
593 |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
594 "$fpf_cb" "$@" |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
595 } |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
596 |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
597 # func_path_foreach path method args |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
598 # Execute method for each directory in path. The method will be called |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
599 # like `method args` while any argument '%dir%' within args will be replaced |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
600 # with processed directory from path. |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
601 func_path_foreach () |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
602 { |
|
40184
7f0ac0398fae
gnulib-tool: Improve handling of multiple --local-dir options.
Bruno Haible <bruno@clisp.org>
parents:
40128
diff
changeset
|
603 fpf_dirs="$1"; shift |
|
7f0ac0398fae
gnulib-tool: Improve handling of multiple --local-dir options.
Bruno Haible <bruno@clisp.org>
parents:
40128
diff
changeset
|
604 fpf_cb="$1"; shift |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
605 fpf_rc=false |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
606 |
|
40184
7f0ac0398fae
gnulib-tool: Improve handling of multiple --local-dir options.
Bruno Haible <bruno@clisp.org>
parents:
40128
diff
changeset
|
607 fpf_save_IFS="$IFS" |
|
7f0ac0398fae
gnulib-tool: Improve handling of multiple --local-dir options.
Bruno Haible <bruno@clisp.org>
parents:
40128
diff
changeset
|
608 IFS="$PATH_SEPARATOR" |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
609 for fpf_dir in $fpf_dirs |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
610 do |
|
40184
7f0ac0398fae
gnulib-tool: Improve handling of multiple --local-dir options.
Bruno Haible <bruno@clisp.org>
parents:
40128
diff
changeset
|
611 IFS="$fpf_save_IFS" |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
612 func_path_foreach_inner "$@" && fpf_rc=: |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
613 done |
|
40184
7f0ac0398fae
gnulib-tool: Improve handling of multiple --local-dir options.
Bruno Haible <bruno@clisp.org>
parents:
40128
diff
changeset
|
614 IFS="$fpf_save_IFS" |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
615 $fpf_rc |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
616 } |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
617 |
|
10989
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
618 # func_remove_suffix var suffix |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
619 # removes the given suffix from the value of the shell variable var. |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
620 # var should be the name of a shell variable. |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
621 # Its value should not contain a newline and not start or end with whitespace. |
|
11037
d94dc78c3947
Improve func_remove_prefix, func_remove_suffix.
Bruno Haible <bruno@clisp.org>
parents:
10993
diff
changeset
|
622 # suffix should not contain the characters "$`\{}[]^|. |
|
10989
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
623 if ( foo=bar; eval 'test "${foo%r}" = ba' ) >/dev/null 2>&1; then |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
624 func_remove_suffix () |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
625 { |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
626 eval "$1=\${$1%\$2}" |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
627 } |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
628 fast_func_remove_suffix=true |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
629 else |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
630 func_remove_suffix () |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
631 { |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
632 eval "value=\"\$$1\"" |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
633 suffix="$2" |
|
11037
d94dc78c3947
Improve func_remove_prefix, func_remove_suffix.
Bruno Haible <bruno@clisp.org>
parents:
10993
diff
changeset
|
634 case "$suffix" in |
|
d94dc78c3947
Improve func_remove_prefix, func_remove_suffix.
Bruno Haible <bruno@clisp.org>
parents:
10993
diff
changeset
|
635 *.*) |
|
d94dc78c3947
Improve func_remove_prefix, func_remove_suffix.
Bruno Haible <bruno@clisp.org>
parents:
10993
diff
changeset
|
636 sed_escape_dots='s/\([.]\)/\\\1/g' |
|
d94dc78c3947
Improve func_remove_prefix, func_remove_suffix.
Bruno Haible <bruno@clisp.org>
parents:
10993
diff
changeset
|
637 suffix=`echo "$suffix" | sed -e "$sed_escape_dots"` |
|
d94dc78c3947
Improve func_remove_prefix, func_remove_suffix.
Bruno Haible <bruno@clisp.org>
parents:
10993
diff
changeset
|
638 ;; |
|
d94dc78c3947
Improve func_remove_prefix, func_remove_suffix.
Bruno Haible <bruno@clisp.org>
parents:
10993
diff
changeset
|
639 esac |
|
10989
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
640 value=`echo "$value" | sed -e "s|${suffix}\$||"` |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
641 eval "$1=\"\$value\"" |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
642 } |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
643 fast_func_remove_suffix=false |
|
7323
7ca0e325d5db
Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents:
7322
diff
changeset
|
644 fi |
|
7ca0e325d5db
Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents:
7322
diff
changeset
|
645 |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
646 # func_fatal_error message |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
647 # outputs to stderr a fatal error message, and terminates the program. |
|
10501
4e04aaeb17f9
Fix previous patch, and tweak references to $0.
Eric Blake <ebb9@byu.net>
parents:
10495
diff
changeset
|
648 # Input: |
|
4e04aaeb17f9
Fix previous patch, and tweak references to $0.
Eric Blake <ebb9@byu.net>
parents:
10495
diff
changeset
|
649 # - progname name of this program |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
650 func_fatal_error () |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
651 { |
|
10501
4e04aaeb17f9
Fix previous patch, and tweak references to $0.
Eric Blake <ebb9@byu.net>
parents:
10495
diff
changeset
|
652 echo "$progname: *** $1" 1>&2 |
|
4e04aaeb17f9
Fix previous patch, and tweak references to $0.
Eric Blake <ebb9@byu.net>
parents:
10495
diff
changeset
|
653 echo "$progname: *** Stop." 1>&2 |
|
7332
dd6e80d0c89e
* gnulib-tool (func_exit): New function, to allow to pass the
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7327
diff
changeset
|
654 func_exit 1 |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
655 } |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
656 |
|
12819
4b5bf4c79e0c
gnulib-tool: Make warning diagnostics consistent.
Bruno Haible <bruno@clisp.org>
parents:
12775
diff
changeset
|
657 # func_warning message |
|
4b5bf4c79e0c
gnulib-tool: Make warning diagnostics consistent.
Bruno Haible <bruno@clisp.org>
parents:
12775
diff
changeset
|
658 # Outputs to stderr a warning message, |
|
4b5bf4c79e0c
gnulib-tool: Make warning diagnostics consistent.
Bruno Haible <bruno@clisp.org>
parents:
12775
diff
changeset
|
659 func_warning () |
|
4b5bf4c79e0c
gnulib-tool: Make warning diagnostics consistent.
Bruno Haible <bruno@clisp.org>
parents:
12775
diff
changeset
|
660 { |
|
4b5bf4c79e0c
gnulib-tool: Make warning diagnostics consistent.
Bruno Haible <bruno@clisp.org>
parents:
12775
diff
changeset
|
661 echo "gnulib-tool: warning: $1" 1>&2 |
|
4b5bf4c79e0c
gnulib-tool: Make warning diagnostics consistent.
Bruno Haible <bruno@clisp.org>
parents:
12775
diff
changeset
|
662 } |
|
4b5bf4c79e0c
gnulib-tool: Make warning diagnostics consistent.
Bruno Haible <bruno@clisp.org>
parents:
12775
diff
changeset
|
663 |
|
6248
ba937772eda4
Portability fix: readlink is not portable.
Bruno Haible <bruno@clisp.org>
parents:
6247
diff
changeset
|
664 # func_readlink SYMLINK |
|
ba937772eda4
Portability fix: readlink is not portable.
Bruno Haible <bruno@clisp.org>
parents:
6247
diff
changeset
|
665 # outputs the target of the given symlink. |
|
16925
eb8ffcf6fd24
Do use readlink if available
Bernd Jendrissek <bernd.jendrissek@gmail.com>
parents:
16808
diff
changeset
|
666 if (type readlink) > /dev/null 2>&1; then |
|
6248
ba937772eda4
Portability fix: readlink is not portable.
Bruno Haible <bruno@clisp.org>
parents:
6247
diff
changeset
|
667 func_readlink () |
|
ba937772eda4
Portability fix: readlink is not portable.
Bruno Haible <bruno@clisp.org>
parents:
6247
diff
changeset
|
668 { |
|
ba937772eda4
Portability fix: readlink is not portable.
Bruno Haible <bruno@clisp.org>
parents:
6247
diff
changeset
|
669 # Use the readlink program from GNU coreutils. |
|
ba937772eda4
Portability fix: readlink is not portable.
Bruno Haible <bruno@clisp.org>
parents:
6247
diff
changeset
|
670 readlink "$1" |
|
ba937772eda4
Portability fix: readlink is not portable.
Bruno Haible <bruno@clisp.org>
parents:
6247
diff
changeset
|
671 } |
|
ba937772eda4
Portability fix: readlink is not portable.
Bruno Haible <bruno@clisp.org>
parents:
6247
diff
changeset
|
672 else |
|
ba937772eda4
Portability fix: readlink is not portable.
Bruno Haible <bruno@clisp.org>
parents:
6247
diff
changeset
|
673 func_readlink () |
|
ba937772eda4
Portability fix: readlink is not portable.
Bruno Haible <bruno@clisp.org>
parents:
6247
diff
changeset
|
674 { |
|
ba937772eda4
Portability fix: readlink is not portable.
Bruno Haible <bruno@clisp.org>
parents:
6247
diff
changeset
|
675 # Use two sed invocations. A single sed -n -e 's,^.* -> \(.*\)$,\1,p' |
|
6263
9750529a8cf5
Sort in a locale-independent way.
Bruno Haible <bruno@clisp.org>
parents:
6262
diff
changeset
|
676 # would do the wrong thing if the link target contains " -> ". |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
677 LC_ALL=C ls -l "$1" | sed -e 's, -> ,#%%#,' | sed -n -e 's,^.*#%%#\(.*\)$,\1,p' |
|
6248
ba937772eda4
Portability fix: readlink is not portable.
Bruno Haible <bruno@clisp.org>
parents:
6247
diff
changeset
|
678 } |
|
ba937772eda4
Portability fix: readlink is not portable.
Bruno Haible <bruno@clisp.org>
parents:
6247
diff
changeset
|
679 fi |
|
ba937772eda4
Portability fix: readlink is not portable.
Bruno Haible <bruno@clisp.org>
parents:
6247
diff
changeset
|
680 |
|
7213
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
681 # func_relativize DIR1 DIR2 |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
682 # computes a relative pathname RELDIR such that DIR1/RELDIR = DIR2. |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
683 # Input: |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
684 # - DIR1 relative pathname, relative to the current directory |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
685 # - DIR2 relative pathname, relative to the current directory |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
686 # Output: |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
687 # - reldir relative pathname of DIR2, relative to DIR1 |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
688 func_relativize () |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
689 { |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
690 dir0=`pwd` |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
691 dir1="$1" |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
692 dir2="$2" |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
693 sed_first='s,^\([^/]*\)/.*$,\1,' |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
694 sed_rest='s,^[^/]*/*,,' |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
695 sed_last='s,^.*/\([^/]*\)$,\1,' |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
696 sed_butlast='s,/*[^/]*$,,' |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
697 while test -n "$dir1"; do |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
698 first=`echo "$dir1" | sed -e "$sed_first"` |
|
7213
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
699 if test "$first" != "."; then |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
700 if test "$first" = ".."; then |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
701 dir2=`echo "$dir0" | sed -e "$sed_last"`/"$dir2" |
|
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
702 dir0=`echo "$dir0" | sed -e "$sed_butlast"` |
|
7213
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
703 else |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
704 first2=`echo "$dir2" | sed -e "$sed_first"` |
|
7213
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
705 if test "$first2" = "$first"; then |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
706 dir2=`echo "$dir2" | sed -e "$sed_rest"` |
|
7213
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
707 else |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
708 dir2="../$dir2" |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
709 fi |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
710 dir0="$dir0"/"$first" |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
711 fi |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
712 fi |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
713 dir1=`echo "$dir1" | sed -e "$sed_rest"` |
|
7213
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
714 done |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
715 reldir="$dir2" |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
716 } |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
717 |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
718 # func_relconcat DIR1 DIR2 |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
719 # computes a relative pathname DIR1/DIR2, with obvious simplifications. |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
720 # Input: |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
721 # - DIR1 relative pathname, relative to the current directory |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
722 # - DIR2 relative pathname, relative to DIR1 |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
723 # Output: |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
724 # - relconcat DIR1/DIR2, relative to the current directory |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
725 func_relconcat () |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
726 { |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
727 dir1="$1" |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
728 dir2="$2" |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
729 sed_first='s,^\([^/]*\)/.*$,\1,' |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
730 sed_rest='s,^[^/]*/*,,' |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
731 sed_last='s,^.*/\([^/]*\)$,\1,' |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
732 sed_butlast='s,/*[^/]*$,,' |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
733 while true; do |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
734 first=`echo "$dir2" | sed -e "$sed_first"` |
|
7213
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
735 if test "$first" = "."; then |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
736 dir2=`echo "$dir2" | sed -e "$sed_rest"` |
|
7213
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
737 if test -z "$dir2"; then |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
738 relconcat="$dir1" |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
739 break |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
740 fi |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
741 else |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
742 last=`echo "$dir1" | sed -e "$sed_last"` |
|
7213
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
743 while test "$last" = "."; do |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
744 dir1=`echo "$dir1" | sed -e "$sed_butlast"` |
|
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
745 last=`echo "$dir1" | sed -e "$sed_last"` |
|
7213
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
746 done |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
747 if test -z "$dir1"; then |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
748 relconcat="$dir2" |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
749 break |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
750 fi |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
751 if test "$first" = ".."; then |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
752 if test "$last" = ".."; then |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
753 relconcat="$dir1/$dir2" |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
754 break |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
755 fi |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
756 dir1=`echo "$dir1" | sed -e "$sed_butlast"` |
|
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
757 dir2=`echo "$dir2" | sed -e "$sed_rest"` |
|
7213
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
758 if test -z "$dir1"; then |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
759 relconcat="$dir2" |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
760 break |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
761 fi |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
762 if test -z "$dir2"; then |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
763 relconcat="$dir1" |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
764 break |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
765 fi |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
766 else |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
767 relconcat="$dir1/$dir2" |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
768 break |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
769 fi |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
770 fi |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
771 done |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
772 } |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
773 |
|
18214
582ba937cae1
gnulib-tool: don't assume ln -s works
Paul Eggert <eggert@cs.ucla.edu>
parents:
18189
diff
changeset
|
774 # func_ln_s SRC DEST |
|
582ba937cae1
gnulib-tool: don't assume ln -s works
Paul Eggert <eggert@cs.ucla.edu>
parents:
18189
diff
changeset
|
775 # Like ln -s, except use cp -p if ln -s fails. |
|
582ba937cae1
gnulib-tool: don't assume ln -s works
Paul Eggert <eggert@cs.ucla.edu>
parents:
18189
diff
changeset
|
776 func_ln_s () |
|
582ba937cae1
gnulib-tool: don't assume ln -s works
Paul Eggert <eggert@cs.ucla.edu>
parents:
18189
diff
changeset
|
777 { |
|
582ba937cae1
gnulib-tool: don't assume ln -s works
Paul Eggert <eggert@cs.ucla.edu>
parents:
18189
diff
changeset
|
778 ln -s "$1" "$2" || { |
|
582ba937cae1
gnulib-tool: don't assume ln -s works
Paul Eggert <eggert@cs.ucla.edu>
parents:
18189
diff
changeset
|
779 echo "$progname: ln -s failed; falling back on cp -p" >&2 |
|
582ba937cae1
gnulib-tool: don't assume ln -s works
Paul Eggert <eggert@cs.ucla.edu>
parents:
18189
diff
changeset
|
780 |
|
582ba937cae1
gnulib-tool: don't assume ln -s works
Paul Eggert <eggert@cs.ucla.edu>
parents:
18189
diff
changeset
|
781 case "$1" in |
|
582ba937cae1
gnulib-tool: don't assume ln -s works
Paul Eggert <eggert@cs.ucla.edu>
parents:
18189
diff
changeset
|
782 /* | ?:*) # SRC is absolute. |
|
18951
232f131e1d0f
gnulib-tool: Fix bug in func_ln_s, from 2016-01-15.
Bruno Haible <bruno@clisp.org>
parents:
18937
diff
changeset
|
783 cp_src="$1" ;; |
|
18214
582ba937cae1
gnulib-tool: don't assume ln -s works
Paul Eggert <eggert@cs.ucla.edu>
parents:
18189
diff
changeset
|
784 *) # SRC is relative to the directory of DEST. |
|
18951
232f131e1d0f
gnulib-tool: Fix bug in func_ln_s, from 2016-01-15.
Bruno Haible <bruno@clisp.org>
parents:
18937
diff
changeset
|
785 case "$2" in |
|
232f131e1d0f
gnulib-tool: Fix bug in func_ln_s, from 2016-01-15.
Bruno Haible <bruno@clisp.org>
parents:
18937
diff
changeset
|
786 */*) cp_src="${2%/*}/$1" ;; |
|
232f131e1d0f
gnulib-tool: Fix bug in func_ln_s, from 2016-01-15.
Bruno Haible <bruno@clisp.org>
parents:
18937
diff
changeset
|
787 *) cp_src="$1" ;; |
|
232f131e1d0f
gnulib-tool: Fix bug in func_ln_s, from 2016-01-15.
Bruno Haible <bruno@clisp.org>
parents:
18937
diff
changeset
|
788 esac |
|
232f131e1d0f
gnulib-tool: Fix bug in func_ln_s, from 2016-01-15.
Bruno Haible <bruno@clisp.org>
parents:
18937
diff
changeset
|
789 ;; |
|
18214
582ba937cae1
gnulib-tool: don't assume ln -s works
Paul Eggert <eggert@cs.ucla.edu>
parents:
18189
diff
changeset
|
790 esac |
|
582ba937cae1
gnulib-tool: don't assume ln -s works
Paul Eggert <eggert@cs.ucla.edu>
parents:
18189
diff
changeset
|
791 |
|
582ba937cae1
gnulib-tool: don't assume ln -s works
Paul Eggert <eggert@cs.ucla.edu>
parents:
18189
diff
changeset
|
792 cp -p "$cp_src" "$2" |
|
582ba937cae1
gnulib-tool: don't assume ln -s works
Paul Eggert <eggert@cs.ucla.edu>
parents:
18189
diff
changeset
|
793 } |
|
582ba937cae1
gnulib-tool: don't assume ln -s works
Paul Eggert <eggert@cs.ucla.edu>
parents:
18189
diff
changeset
|
794 } |
|
582ba937cae1
gnulib-tool: don't assume ln -s works
Paul Eggert <eggert@cs.ucla.edu>
parents:
18189
diff
changeset
|
795 |
|
18952
2f7ab9aaa825
gnulib-tool: Fix bug in func_symlink_if_changed, from 2006-11-13.
Bruno Haible <bruno@clisp.org>
parents:
18951
diff
changeset
|
796 # func_symlink_target SRC DEST |
|
2f7ab9aaa825
gnulib-tool: Fix bug in func_symlink_if_changed, from 2006-11-13.
Bruno Haible <bruno@clisp.org>
parents:
18951
diff
changeset
|
797 # Determines LINK_TARGET such that "ln -s LINK_TARGET DEST" will create a |
|
2f7ab9aaa825
gnulib-tool: Fix bug in func_symlink_if_changed, from 2006-11-13.
Bruno Haible <bruno@clisp.org>
parents:
18951
diff
changeset
|
798 # symbolic link DEST that points to SRC. |
|
2f7ab9aaa825
gnulib-tool: Fix bug in func_symlink_if_changed, from 2006-11-13.
Bruno Haible <bruno@clisp.org>
parents:
18951
diff
changeset
|
799 # Output: |
|
2f7ab9aaa825
gnulib-tool: Fix bug in func_symlink_if_changed, from 2006-11-13.
Bruno Haible <bruno@clisp.org>
parents:
18951
diff
changeset
|
800 # - link_target link target, relative to the directory of DEST |
|
2f7ab9aaa825
gnulib-tool: Fix bug in func_symlink_if_changed, from 2006-11-13.
Bruno Haible <bruno@clisp.org>
parents:
18951
diff
changeset
|
801 func_symlink_target () |
|
2f7ab9aaa825
gnulib-tool: Fix bug in func_symlink_if_changed, from 2006-11-13.
Bruno Haible <bruno@clisp.org>
parents:
18951
diff
changeset
|
802 { |
|
2f7ab9aaa825
gnulib-tool: Fix bug in func_symlink_if_changed, from 2006-11-13.
Bruno Haible <bruno@clisp.org>
parents:
18951
diff
changeset
|
803 case "$1" in |
|
2f7ab9aaa825
gnulib-tool: Fix bug in func_symlink_if_changed, from 2006-11-13.
Bruno Haible <bruno@clisp.org>
parents:
18951
diff
changeset
|
804 /* | ?:*) |
|
2f7ab9aaa825
gnulib-tool: Fix bug in func_symlink_if_changed, from 2006-11-13.
Bruno Haible <bruno@clisp.org>
parents:
18951
diff
changeset
|
805 link_target="$1" ;; |
|
2f7ab9aaa825
gnulib-tool: Fix bug in func_symlink_if_changed, from 2006-11-13.
Bruno Haible <bruno@clisp.org>
parents:
18951
diff
changeset
|
806 *) # SRC is relative. |
|
2f7ab9aaa825
gnulib-tool: Fix bug in func_symlink_if_changed, from 2006-11-13.
Bruno Haible <bruno@clisp.org>
parents:
18951
diff
changeset
|
807 case "$2" in |
|
2f7ab9aaa825
gnulib-tool: Fix bug in func_symlink_if_changed, from 2006-11-13.
Bruno Haible <bruno@clisp.org>
parents:
18951
diff
changeset
|
808 /* | ?:*) |
|
2f7ab9aaa825
gnulib-tool: Fix bug in func_symlink_if_changed, from 2006-11-13.
Bruno Haible <bruno@clisp.org>
parents:
18951
diff
changeset
|
809 link_target="`pwd`/$1" ;; |
|
2f7ab9aaa825
gnulib-tool: Fix bug in func_symlink_if_changed, from 2006-11-13.
Bruno Haible <bruno@clisp.org>
parents:
18951
diff
changeset
|
810 *) # DEST is relative too. |
|
2f7ab9aaa825
gnulib-tool: Fix bug in func_symlink_if_changed, from 2006-11-13.
Bruno Haible <bruno@clisp.org>
parents:
18951
diff
changeset
|
811 ln_destdir=`echo "$2" | sed -e 's,[^/]*$,,'` |
|
2f7ab9aaa825
gnulib-tool: Fix bug in func_symlink_if_changed, from 2006-11-13.
Bruno Haible <bruno@clisp.org>
parents:
18951
diff
changeset
|
812 test -n "$ln_destdir" || ln_destdir="." |
|
2f7ab9aaa825
gnulib-tool: Fix bug in func_symlink_if_changed, from 2006-11-13.
Bruno Haible <bruno@clisp.org>
parents:
18951
diff
changeset
|
813 func_relativize "$ln_destdir" "$1" |
|
2f7ab9aaa825
gnulib-tool: Fix bug in func_symlink_if_changed, from 2006-11-13.
Bruno Haible <bruno@clisp.org>
parents:
18951
diff
changeset
|
814 link_target="$reldir" |
|
2f7ab9aaa825
gnulib-tool: Fix bug in func_symlink_if_changed, from 2006-11-13.
Bruno Haible <bruno@clisp.org>
parents:
18951
diff
changeset
|
815 ;; |
|
2f7ab9aaa825
gnulib-tool: Fix bug in func_symlink_if_changed, from 2006-11-13.
Bruno Haible <bruno@clisp.org>
parents:
18951
diff
changeset
|
816 esac |
|
2f7ab9aaa825
gnulib-tool: Fix bug in func_symlink_if_changed, from 2006-11-13.
Bruno Haible <bruno@clisp.org>
parents:
18951
diff
changeset
|
817 ;; |
|
2f7ab9aaa825
gnulib-tool: Fix bug in func_symlink_if_changed, from 2006-11-13.
Bruno Haible <bruno@clisp.org>
parents:
18951
diff
changeset
|
818 esac |
|
2f7ab9aaa825
gnulib-tool: Fix bug in func_symlink_if_changed, from 2006-11-13.
Bruno Haible <bruno@clisp.org>
parents:
18951
diff
changeset
|
819 } |
|
2f7ab9aaa825
gnulib-tool: Fix bug in func_symlink_if_changed, from 2006-11-13.
Bruno Haible <bruno@clisp.org>
parents:
18951
diff
changeset
|
820 |
|
18937
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
821 # func_symlink SRC DEST |
|
18214
582ba937cae1
gnulib-tool: don't assume ln -s works
Paul Eggert <eggert@cs.ucla.edu>
parents:
18189
diff
changeset
|
822 # Like func_ln_s, except that SRC is given relative to the current directory (or |
|
7642
0878abcc59c9
Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents:
7641
diff
changeset
|
823 # absolute), not given relative to the directory of DEST. |
|
18937
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
824 func_symlink () |
|
7642
0878abcc59c9
Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents:
7641
diff
changeset
|
825 { |
|
18952
2f7ab9aaa825
gnulib-tool: Fix bug in func_symlink_if_changed, from 2006-11-13.
Bruno Haible <bruno@clisp.org>
parents:
18951
diff
changeset
|
826 func_symlink_target "$1" "$2" |
|
2f7ab9aaa825
gnulib-tool: Fix bug in func_symlink_if_changed, from 2006-11-13.
Bruno Haible <bruno@clisp.org>
parents:
18951
diff
changeset
|
827 func_ln_s "$link_target" "$2" |
|
7642
0878abcc59c9
Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents:
7641
diff
changeset
|
828 } |
|
0878abcc59c9
Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents:
7641
diff
changeset
|
829 |
|
18937
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
830 # func_symlink_if_changed SRC DEST |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
831 # Like func_symlink, but avoids munging timestamps if the link is correct. |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
832 # SRC is given relative to the current directory (or absolute). |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
833 func_symlink_if_changed () |
|
7642
0878abcc59c9
Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents:
7641
diff
changeset
|
834 { |
|
0878abcc59c9
Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents:
7641
diff
changeset
|
835 if test $# -ne 2; then |
|
18937
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
836 echo "usage: func_symlink_if_changed SRC DEST" >&2 |
|
7642
0878abcc59c9
Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents:
7641
diff
changeset
|
837 fi |
|
18952
2f7ab9aaa825
gnulib-tool: Fix bug in func_symlink_if_changed, from 2006-11-13.
Bruno Haible <bruno@clisp.org>
parents:
18951
diff
changeset
|
838 func_symlink_target "$1" "$2" |
|
7642
0878abcc59c9
Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents:
7641
diff
changeset
|
839 ln_target=`func_readlink "$2"` |
|
18952
2f7ab9aaa825
gnulib-tool: Fix bug in func_symlink_if_changed, from 2006-11-13.
Bruno Haible <bruno@clisp.org>
parents:
18951
diff
changeset
|
840 if test -h "$2" && test "$link_target" = "$ln_target"; then |
|
7642
0878abcc59c9
Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents:
7641
diff
changeset
|
841 : |
|
0878abcc59c9
Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents:
7641
diff
changeset
|
842 else |
|
0878abcc59c9
Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents:
7641
diff
changeset
|
843 rm -f "$2" |
|
18952
2f7ab9aaa825
gnulib-tool: Fix bug in func_symlink_if_changed, from 2006-11-13.
Bruno Haible <bruno@clisp.org>
parents:
18951
diff
changeset
|
844 func_ln_s "$link_target" "$2" |
|
7642
0878abcc59c9
Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents:
7641
diff
changeset
|
845 fi |
|
0878abcc59c9
Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents:
7641
diff
changeset
|
846 } |
|
0878abcc59c9
Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents:
7641
diff
changeset
|
847 |
|
18937
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
848 # func_hardlink SRC DEST |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
849 # Like ln, except use cp -p if ln fails. |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
850 # SRC is given relative to the current directory (or absolute). |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
851 func_hardlink () |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
852 { |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
853 ln "$1" "$2" || { |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
854 echo "$progname: ln failed; falling back on cp -p" >&2 |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
855 cp -p "$1" "$2" |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
856 } |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
857 } |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
858 |
| 12882 | 859 # Ensure an 'echo' command that |
|
12881
c6e9c683bc41
Really work around around "broken pipe" error message from bash 3.2.
Bruno Haible <bruno@clisp.org>
parents:
12877
diff
changeset
|
860 # 1. does not interpret backslashes and |
|
c6e9c683bc41
Really work around around "broken pipe" error message from bash 3.2.
Bruno Haible <bruno@clisp.org>
parents:
12877
diff
changeset
|
861 # 2. does not print an error message "broken pipe" when writing into a pipe |
|
c6e9c683bc41
Really work around around "broken pipe" error message from bash 3.2.
Bruno Haible <bruno@clisp.org>
parents:
12877
diff
changeset
|
862 # with no writers. |
|
c6e9c683bc41
Really work around around "broken pipe" error message from bash 3.2.
Bruno Haible <bruno@clisp.org>
parents:
12877
diff
changeset
|
863 # |
|
c6e9c683bc41
Really work around around "broken pipe" error message from bash 3.2.
Bruno Haible <bruno@clisp.org>
parents:
12877
diff
changeset
|
864 # Test cases for problem 1: |
|
9003
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
865 # echo '\n' | wc -l prints 1 when OK, 2 when KO |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
866 # echo '\t' | grep t > /dev/null has return code 0 when OK, 1 when KO |
|
12881
c6e9c683bc41
Really work around around "broken pipe" error message from bash 3.2.
Bruno Haible <bruno@clisp.org>
parents:
12877
diff
changeset
|
867 # Test cases for problem 2: |
|
c6e9c683bc41
Really work around around "broken pipe" error message from bash 3.2.
Bruno Haible <bruno@clisp.org>
parents:
12877
diff
changeset
|
868 # echo hi | true frequently prints |
|
c6e9c683bc41
Really work around around "broken pipe" error message from bash 3.2.
Bruno Haible <bruno@clisp.org>
parents:
12877
diff
changeset
|
869 # "bash: echo: write error: Broken pipe" |
|
c6e9c683bc41
Really work around around "broken pipe" error message from bash 3.2.
Bruno Haible <bruno@clisp.org>
parents:
12877
diff
changeset
|
870 # to standard error in bash 3.2. |
|
c6e9c683bc41
Really work around around "broken pipe" error message from bash 3.2.
Bruno Haible <bruno@clisp.org>
parents:
12877
diff
changeset
|
871 # |
|
c6e9c683bc41
Really work around around "broken pipe" error message from bash 3.2.
Bruno Haible <bruno@clisp.org>
parents:
12877
diff
changeset
|
872 # Problem 1 is a weird heritage from SVR4. BSD got it right (except that |
|
9006
0df4abf0cce4
Add better support for bash versions < 2.04.
Bruno Haible <bruno@clisp.org>
parents:
9005
diff
changeset
|
873 # BSD echo interprets '-n' as an option, which is also not desirable). |
|
9003
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
874 # Nowadays the problem occurs in 4 situations: |
|
9006
0df4abf0cce4
Add better support for bash versions < 2.04.
Bruno Haible <bruno@clisp.org>
parents:
9005
diff
changeset
|
875 # - in bash, when the shell option xpg_echo is set (bash >= 2.04) |
|
0df4abf0cce4
Add better support for bash versions < 2.04.
Bruno Haible <bruno@clisp.org>
parents:
9005
diff
changeset
|
876 # or when it was built with --enable-usg-echo-default (bash >= 2.0) |
|
0df4abf0cce4
Add better support for bash versions < 2.04.
Bruno Haible <bruno@clisp.org>
parents:
9005
diff
changeset
|
877 # or when it was built with DEFAULT_ECHO_TO_USG (bash < 2.0), |
|
9003
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
878 # - in zsh, when sh-emulation is not set, |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
879 # - in ksh (e.g. AIX /bin/sh and Solaris /usr/xpg4/bin/sh are ksh instances, |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
880 # and HP-UX /bin/sh and IRIX /bin/sh behave similarly), |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
881 # - in Solaris /bin/sh and OSF/1 /bin/sh. |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
882 # We try the following workarounds: |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
883 # - for all: respawn using $CONFIG_SHELL if that is set and works. |
|
9006
0df4abf0cce4
Add better support for bash versions < 2.04.
Bruno Haible <bruno@clisp.org>
parents:
9005
diff
changeset
|
884 # - for bash >= 2.04: unset the shell option xpg_echo. |
|
0df4abf0cce4
Add better support for bash versions < 2.04.
Bruno Haible <bruno@clisp.org>
parents:
9005
diff
changeset
|
885 # - for bash >= 2.0: define echo to a function that uses the printf built-in. |
|
0df4abf0cce4
Add better support for bash versions < 2.04.
Bruno Haible <bruno@clisp.org>
parents:
9005
diff
changeset
|
886 # - for bash < 2.0: define echo to a function that uses cat of a here document. |
|
9003
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
887 # - for zsh: turn sh-emulation on. |
|
9008
78f53a569f31
Make use of ksh's 'print' built-in.
Bruno Haible <bruno@clisp.org>
parents:
9007
diff
changeset
|
888 # - for ksh: alias echo to 'print -r'. |
|
9003
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
889 # - for ksh: alias echo to a function that uses cat of a here document. |
|
9008
78f53a569f31
Make use of ksh's 'print' built-in.
Bruno Haible <bruno@clisp.org>
parents:
9007
diff
changeset
|
890 # - for Solaris /bin/sh and OSF/1 /bin/sh: respawn using /bin/ksh and rely on |
|
78f53a569f31
Make use of ksh's 'print' built-in.
Bruno Haible <bruno@clisp.org>
parents:
9007
diff
changeset
|
891 # the ksh workaround. |
|
9003
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
892 # - otherwise: respawn using /bin/sh and rely on the workarounds. |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
893 # When respawning, we pass --no-reexec as first argument, so as to avoid |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
894 # turning this script into a fork bomb in unlucky situations. |
|
12881
c6e9c683bc41
Really work around around "broken pipe" error message from bash 3.2.
Bruno Haible <bruno@clisp.org>
parents:
12877
diff
changeset
|
895 # |
|
c6e9c683bc41
Really work around around "broken pipe" error message from bash 3.2.
Bruno Haible <bruno@clisp.org>
parents:
12877
diff
changeset
|
896 # Problem 2 is specific to bash 3.2 and affects the 'echo' built-in, but not |
|
c6e9c683bc41
Really work around around "broken pipe" error message from bash 3.2.
Bruno Haible <bruno@clisp.org>
parents:
12877
diff
changeset
|
897 # the 'printf' built-in. See |
|
19439
8bfc20b57265
maint: shorten https://lists.gnu.org/archive/html/... links
Jim Meyering <meyering@fb.com>
parents:
19271
diff
changeset
|
898 # <https://lists.gnu.org/r/bug-bash/2008-12/msg00050.html> |
|
8bfc20b57265
maint: shorten https://lists.gnu.org/archive/html/... links
Jim Meyering <meyering@fb.com>
parents:
19271
diff
changeset
|
899 # <https://lists.gnu.org/r/bug-gnulib/2010-02/msg00154.html> |
|
12881
c6e9c683bc41
Really work around around "broken pipe" error message from bash 3.2.
Bruno Haible <bruno@clisp.org>
parents:
12877
diff
changeset
|
900 # The workaround is: define echo to a function that uses the printf built-in. |
|
9003
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
901 have_echo= |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
902 if echo '\t' | grep t > /dev/null; then |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
903 have_echo=yes # Lucky! |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
904 fi |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
905 # Try the workarounds. |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
906 # Respawn using $CONFIG_SHELL if that is set and works. |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
907 if test -z "$have_echo" \ |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
908 && test "X$1" != "X--no-reexec" \ |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
909 && test -n "$CONFIG_SHELL" \ |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
910 && test -f "$CONFIG_SHELL" \ |
|
11919
6a1268d2cf2a
Fix test whether $CONFIG_SHELL has a working 'echo' command.
Stefano Lattarini <stefano.lattarini@gmail.com>
parents:
11737
diff
changeset
|
911 && $CONFIG_SHELL -c "echo '\\t' | grep t > /dev/null"; then |
|
9003
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
912 exec $CONFIG_SHELL "$0" --no-reexec "$@" |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
913 exit 127 |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
914 fi |
|
9006
0df4abf0cce4
Add better support for bash versions < 2.04.
Bruno Haible <bruno@clisp.org>
parents:
9005
diff
changeset
|
915 # For bash >= 2.04: unset the shell option xpg_echo. |
|
9003
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
916 if test -z "$have_echo" \ |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
917 && test -n "$BASH_VERSION" \ |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
918 && (shopt -o xpg_echo; echo '\t' | grep t > /dev/null) 2>/dev/null; then |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
919 shopt -o xpg_echo |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
920 have_echo=yes |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
921 fi |
|
9006
0df4abf0cce4
Add better support for bash versions < 2.04.
Bruno Haible <bruno@clisp.org>
parents:
9005
diff
changeset
|
922 # For bash >= 2.0: define echo to a function that uses the printf built-in. |
|
0df4abf0cce4
Add better support for bash versions < 2.04.
Bruno Haible <bruno@clisp.org>
parents:
9005
diff
changeset
|
923 # For bash < 2.0: define echo to a function that uses cat of a here document. |
|
0df4abf0cce4
Add better support for bash versions < 2.04.
Bruno Haible <bruno@clisp.org>
parents:
9005
diff
changeset
|
924 # (There is no win in using 'printf' over 'cat' if it is not a shell built-in.) |
|
12903
82f649e8c371
Fix breakage of gnulib-tool with ksh, introduced on 2010-02-21.
Bruno Haible <bruno@clisp.org>
parents:
12882
diff
changeset
|
925 # Also handle problem 2, specific to bash 3.2, here. |
|
82f649e8c371
Fix breakage of gnulib-tool with ksh, introduced on 2010-02-21.
Bruno Haible <bruno@clisp.org>
parents:
12882
diff
changeset
|
926 if { test -z "$have_echo" \ |
|
82f649e8c371
Fix breakage of gnulib-tool with ksh, introduced on 2010-02-21.
Bruno Haible <bruno@clisp.org>
parents:
12882
diff
changeset
|
927 || case "$BASH_VERSION" in 3.2*) true;; *) false;; esac; \ |
|
82f649e8c371
Fix breakage of gnulib-tool with ksh, introduced on 2010-02-21.
Bruno Haible <bruno@clisp.org>
parents:
12882
diff
changeset
|
928 } \ |
|
9006
0df4abf0cce4
Add better support for bash versions < 2.04.
Bruno Haible <bruno@clisp.org>
parents:
9005
diff
changeset
|
929 && test -n "$BASH_VERSION"; then \ |
|
0df4abf0cce4
Add better support for bash versions < 2.04.
Bruno Haible <bruno@clisp.org>
parents:
9005
diff
changeset
|
930 if type printf 2>/dev/null | grep / > /dev/null; then |
|
0df4abf0cce4
Add better support for bash versions < 2.04.
Bruno Haible <bruno@clisp.org>
parents:
9005
diff
changeset
|
931 # 'printf' is not a shell built-in. |
|
0df4abf0cce4
Add better support for bash versions < 2.04.
Bruno Haible <bruno@clisp.org>
parents:
9005
diff
changeset
|
932 echo () |
|
0df4abf0cce4
Add better support for bash versions < 2.04.
Bruno Haible <bruno@clisp.org>
parents:
9005
diff
changeset
|
933 { |
|
0df4abf0cce4
Add better support for bash versions < 2.04.
Bruno Haible <bruno@clisp.org>
parents:
9005
diff
changeset
|
934 cat <<EOF |
|
0df4abf0cce4
Add better support for bash versions < 2.04.
Bruno Haible <bruno@clisp.org>
parents:
9005
diff
changeset
|
935 $* |
|
0df4abf0cce4
Add better support for bash versions < 2.04.
Bruno Haible <bruno@clisp.org>
parents:
9005
diff
changeset
|
936 EOF |
|
0df4abf0cce4
Add better support for bash versions < 2.04.
Bruno Haible <bruno@clisp.org>
parents:
9005
diff
changeset
|
937 } |
|
0df4abf0cce4
Add better support for bash versions < 2.04.
Bruno Haible <bruno@clisp.org>
parents:
9005
diff
changeset
|
938 else |
| 9007 | 939 # 'printf' is a shell built-in. |
|
9006
0df4abf0cce4
Add better support for bash versions < 2.04.
Bruno Haible <bruno@clisp.org>
parents:
9005
diff
changeset
|
940 echo () |
|
0df4abf0cce4
Add better support for bash versions < 2.04.
Bruno Haible <bruno@clisp.org>
parents:
9005
diff
changeset
|
941 { |
|
0df4abf0cce4
Add better support for bash versions < 2.04.
Bruno Haible <bruno@clisp.org>
parents:
9005
diff
changeset
|
942 printf '%s\n' "$*" |
|
0df4abf0cce4
Add better support for bash versions < 2.04.
Bruno Haible <bruno@clisp.org>
parents:
9005
diff
changeset
|
943 } |
|
0df4abf0cce4
Add better support for bash versions < 2.04.
Bruno Haible <bruno@clisp.org>
parents:
9005
diff
changeset
|
944 fi |
|
0df4abf0cce4
Add better support for bash versions < 2.04.
Bruno Haible <bruno@clisp.org>
parents:
9005
diff
changeset
|
945 if echo '\t' | grep t > /dev/null; then |
|
0df4abf0cce4
Add better support for bash versions < 2.04.
Bruno Haible <bruno@clisp.org>
parents:
9005
diff
changeset
|
946 have_echo=yes |
|
0df4abf0cce4
Add better support for bash versions < 2.04.
Bruno Haible <bruno@clisp.org>
parents:
9005
diff
changeset
|
947 fi |
|
0df4abf0cce4
Add better support for bash versions < 2.04.
Bruno Haible <bruno@clisp.org>
parents:
9005
diff
changeset
|
948 fi |
|
9003
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
949 # For zsh: turn sh-emulation on. |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
950 if test -z "$have_echo" \ |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
951 && test -n "$ZSH_VERSION" \ |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
952 && (emulate sh) >/dev/null 2>&1; then |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
953 emulate sh |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
954 fi |
|
9008
78f53a569f31
Make use of ksh's 'print' built-in.
Bruno Haible <bruno@clisp.org>
parents:
9007
diff
changeset
|
955 # For ksh: alias echo to 'print -r'. |
|
78f53a569f31
Make use of ksh's 'print' built-in.
Bruno Haible <bruno@clisp.org>
parents:
9007
diff
changeset
|
956 if test -z "$have_echo" \ |
|
78f53a569f31
Make use of ksh's 'print' built-in.
Bruno Haible <bruno@clisp.org>
parents:
9007
diff
changeset
|
957 && (type print) >/dev/null 2>&1; then |
|
78f53a569f31
Make use of ksh's 'print' built-in.
Bruno Haible <bruno@clisp.org>
parents:
9007
diff
changeset
|
958 # A 'print' command exists. |
|
78f53a569f31
Make use of ksh's 'print' built-in.
Bruno Haible <bruno@clisp.org>
parents:
9007
diff
changeset
|
959 if type print 2>/dev/null | grep / > /dev/null; then |
|
78f53a569f31
Make use of ksh's 'print' built-in.
Bruno Haible <bruno@clisp.org>
parents:
9007
diff
changeset
|
960 : |
|
78f53a569f31
Make use of ksh's 'print' built-in.
Bruno Haible <bruno@clisp.org>
parents:
9007
diff
changeset
|
961 else |
|
78f53a569f31
Make use of ksh's 'print' built-in.
Bruno Haible <bruno@clisp.org>
parents:
9007
diff
changeset
|
962 # 'print' is a shell built-in. |
|
78f53a569f31
Make use of ksh's 'print' built-in.
Bruno Haible <bruno@clisp.org>
parents:
9007
diff
changeset
|
963 if (print -r '\told' | grep told > /dev/null) 2>/dev/null; then |
|
78f53a569f31
Make use of ksh's 'print' built-in.
Bruno Haible <bruno@clisp.org>
parents:
9007
diff
changeset
|
964 # 'print' is the ksh shell built-in. |
|
78f53a569f31
Make use of ksh's 'print' built-in.
Bruno Haible <bruno@clisp.org>
parents:
9007
diff
changeset
|
965 alias echo='print -r' |
|
78f53a569f31
Make use of ksh's 'print' built-in.
Bruno Haible <bruno@clisp.org>
parents:
9007
diff
changeset
|
966 fi |
|
78f53a569f31
Make use of ksh's 'print' built-in.
Bruno Haible <bruno@clisp.org>
parents:
9007
diff
changeset
|
967 fi |
|
78f53a569f31
Make use of ksh's 'print' built-in.
Bruno Haible <bruno@clisp.org>
parents:
9007
diff
changeset
|
968 fi |
|
78f53a569f31
Make use of ksh's 'print' built-in.
Bruno Haible <bruno@clisp.org>
parents:
9007
diff
changeset
|
969 if test -z "$have_echo" \ |
|
78f53a569f31
Make use of ksh's 'print' built-in.
Bruno Haible <bruno@clisp.org>
parents:
9007
diff
changeset
|
970 && echo '\t' | grep t > /dev/null; then |
|
78f53a569f31
Make use of ksh's 'print' built-in.
Bruno Haible <bruno@clisp.org>
parents:
9007
diff
changeset
|
971 have_echo=yes |
|
78f53a569f31
Make use of ksh's 'print' built-in.
Bruno Haible <bruno@clisp.org>
parents:
9007
diff
changeset
|
972 fi |
|
9003
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
973 # For ksh: alias echo to a function that uses cat of a here document. |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
974 # The ksh manual page says: |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
975 # "Aliasing is performed when scripts are read, not while they are executed. |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
976 # Therefore, for an alias to take effect, the alias definition command has |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
977 # to be executed before the command which references the alias is read." |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
978 # Because of this, we have to play strange tricks with have_echo, to ensure |
|
9006
0df4abf0cce4
Add better support for bash versions < 2.04.
Bruno Haible <bruno@clisp.org>
parents:
9005
diff
changeset
|
979 # that the top-level statement containing the test starts after the 'alias' |
|
9003
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
980 # command. |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
981 if test -z "$have_echo"; then |
|
13658
a597697ae97c
gnulib-tool: Avoid stderr output on IRIX related to 'alias', 'unalias'.
Bruno Haible <bruno@clisp.org>
parents:
13650
diff
changeset
|
982 bsd_echo () |
|
9003
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
983 { |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
984 cat <<EOF |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
985 $* |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
986 EOF |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
987 } |
|
13658
a597697ae97c
gnulib-tool: Avoid stderr output on IRIX related to 'alias', 'unalias'.
Bruno Haible <bruno@clisp.org>
parents:
13650
diff
changeset
|
988 if (alias echo=bsd_echo) 2>/dev/null; then |
|
a597697ae97c
gnulib-tool: Avoid stderr output on IRIX related to 'alias', 'unalias'.
Bruno Haible <bruno@clisp.org>
parents:
13650
diff
changeset
|
989 alias echo=bsd_echo 2>/dev/null |
|
a597697ae97c
gnulib-tool: Avoid stderr output on IRIX related to 'alias', 'unalias'.
Bruno Haible <bruno@clisp.org>
parents:
13650
diff
changeset
|
990 fi |
|
9003
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
991 fi |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
992 if test -z "$have_echo" \ |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
993 && echo '\t' | grep t > /dev/null; then |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
994 have_echo=yes |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
995 fi |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
996 if test -z "$have_echo"; then |
|
13658
a597697ae97c
gnulib-tool: Avoid stderr output on IRIX related to 'alias', 'unalias'.
Bruno Haible <bruno@clisp.org>
parents:
13650
diff
changeset
|
997 if (alias echo=bsd_echo) 2>/dev/null; then |
|
a597697ae97c
gnulib-tool: Avoid stderr output on IRIX related to 'alias', 'unalias'.
Bruno Haible <bruno@clisp.org>
parents:
13650
diff
changeset
|
998 unalias echo 2>/dev/null |
|
a597697ae97c
gnulib-tool: Avoid stderr output on IRIX related to 'alias', 'unalias'.
Bruno Haible <bruno@clisp.org>
parents:
13650
diff
changeset
|
999 fi |
|
9003
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
1000 fi |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
1001 # For Solaris /bin/sh and OSF/1 /bin/sh: respawn using /bin/ksh. |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
1002 if test -z "$have_echo" \ |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
1003 && test "X$1" != "X--no-reexec" \ |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
1004 && test -f /bin/ksh; then |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
1005 exec /bin/ksh "$0" --no-reexec "$@" |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
1006 exit 127 |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
1007 fi |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
1008 # Otherwise: respawn using /bin/sh. |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
1009 if test -z "$have_echo" \ |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
1010 && test "X$1" != "X--no-reexec" \ |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
1011 && test -f /bin/sh; then |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
1012 exec /bin/sh "$0" --no-reexec "$@" |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
1013 exit 127 |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
1014 fi |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
1015 if test -z "$have_echo"; then |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
1016 func_fatal_error "Shell does not support 'echo' correctly. Please install GNU bash and set the environment variable CONFIG_SHELL to point to it." |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
1017 fi |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
1018 if echo '\t' | grep t > /dev/null; then |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
1019 : # Works fine now. |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
1020 else |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
1021 func_fatal_error "Shell does not support 'echo' correctly. Workaround does not work. Please report this as a bug to bug-gnulib@gnu.org." |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
1022 fi |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
1023 if test "X$1" = "X--no-reexec"; then |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
1024 shift |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
1025 fi |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
1026 |
|
17530
c9e3d7edb7cf
gnulib-tool: protect against CDPATH
Jim Meyering <meyering@fb.com>
parents:
17385
diff
changeset
|
1027 # Unset CDPATH. Otherwise, output from 'cd dir' can surprise callers. |
|
c9e3d7edb7cf
gnulib-tool: protect against CDPATH
Jim Meyering <meyering@fb.com>
parents:
17385
diff
changeset
|
1028 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH |
|
c9e3d7edb7cf
gnulib-tool: protect against CDPATH
Jim Meyering <meyering@fb.com>
parents:
17385
diff
changeset
|
1029 |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
1030 # Determine the path separator early because the following option parsing code |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
1031 # requires that. |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
1032 func_determine_path_separator |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
1033 |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1034 # Command-line option processing. |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1035 # Removes the OPTIONS from the arguments. Sets the variables: |
|
16931
9c0df43d88f4
gnulib-tool: --create-[mega]testdir, --[mega]test implies --with-tests.
Bruno Haible <bruno@clisp.org>
parents:
16925
diff
changeset
|
1036 # - mode one of: list, find, import, add-import, remove-import, |
|
9c0df43d88f4
gnulib-tool: --create-[mega]testdir, --[mega]test implies --with-tests.
Bruno Haible <bruno@clisp.org>
parents:
16925
diff
changeset
|
1037 # update, create-testdir, create-megatestdir, test, megatest, |
|
9c0df43d88f4
gnulib-tool: --create-[mega]testdir, --[mega]test implies --with-tests.
Bruno Haible <bruno@clisp.org>
parents:
16925
diff
changeset
|
1038 # copy-file |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1039 # - destdir from --dir |
|
40184
7f0ac0398fae
gnulib-tool: Improve handling of multiple --local-dir options.
Bruno Haible <bruno@clisp.org>
parents:
40128
diff
changeset
|
1040 # - local_gnulib_path from --local-dir, highest priority dir comes first |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1041 # - modcache true or false, from --cache-modules/--no-cache-modules |
|
9188
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
1042 # - verbose integer, default 0, inc/decremented by --verbose/--quiet |
|
5345
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
1043 # - libname, supplied_libname from --lib |
|
5198
9317c9ebe82c
Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4717
diff
changeset
|
1044 # - sourcebase from --source-base |
|
9317c9ebe82c
Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4717
diff
changeset
|
1045 # - m4base from --m4-base |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
1046 # - pobase from --po-base |
|
6955
7715890c929a
* gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents:
6952
diff
changeset
|
1047 # - docbase from --doc-base |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1048 # - testsbase from --tests-base |
|
5798
49900d80eaaf
2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu>
Simon Josefsson <simon@josefsson.org>
parents:
5685
diff
changeset
|
1049 # - auxdir from --aux-dir |
|
16931
9c0df43d88f4
gnulib-tool: --create-[mega]testdir, --[mega]test implies --with-tests.
Bruno Haible <bruno@clisp.org>
parents:
16925
diff
changeset
|
1050 # - inctests true if --with-tests was given, false if --without-tests |
|
9c0df43d88f4
gnulib-tool: --create-[mega]testdir, --[mega]test implies --with-tests.
Bruno Haible <bruno@clisp.org>
parents:
16925
diff
changeset
|
1051 # was given, blank otherwise |
|
10744
7fb7b37150b3
New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents:
10743
diff
changeset
|
1052 # - incobsolete true if --with-obsolete was given, blank otherwise |
|
13080
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
1053 # - inc_cxx_tests true if --with-c++-tests was given, blank otherwise |
|
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
1054 # - inc_longrunning_tests true if --with-longrunning-tests was given, blank |
|
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
1055 # otherwise |
|
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
1056 # - inc_privileged_tests true if --with-privileged-tests was given, blank |
|
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
1057 # otherwise |
|
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
1058 # - inc_unportable_tests true if --with-unportable-tests was given, blank |
|
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
1059 # otherwise |
|
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
1060 # - inc_all_tests true if --with-all-tests was given, blank otherwise |
|
13263
e7d114c00ff9
gnulib-tool: Add --without-*-tests options.
Bruno Haible <bruno@clisp.org>
parents:
13223
diff
changeset
|
1061 # - excl_cxx_tests true if --without-c++-tests was given, blank otherwise |
|
e7d114c00ff9
gnulib-tool: Add --without-*-tests options.
Bruno Haible <bruno@clisp.org>
parents:
13223
diff
changeset
|
1062 # - excl_longrunning_tests true if --without-longrunning-tests was given, |
|
e7d114c00ff9
gnulib-tool: Add --without-*-tests options.
Bruno Haible <bruno@clisp.org>
parents:
13223
diff
changeset
|
1063 # blank otherwise |
|
e7d114c00ff9
gnulib-tool: Add --without-*-tests options.
Bruno Haible <bruno@clisp.org>
parents:
13223
diff
changeset
|
1064 # - excl_privileged_tests true if --without-privileged-tests was given, blank |
|
e7d114c00ff9
gnulib-tool: Add --without-*-tests options.
Bruno Haible <bruno@clisp.org>
parents:
13223
diff
changeset
|
1065 # otherwise |
|
e7d114c00ff9
gnulib-tool: Add --without-*-tests options.
Bruno Haible <bruno@clisp.org>
parents:
13223
diff
changeset
|
1066 # - excl_unportable_tests true if --without-unportable-tests was given, blank |
|
e7d114c00ff9
gnulib-tool: Add --without-*-tests options.
Bruno Haible <bruno@clisp.org>
parents:
13223
diff
changeset
|
1067 # otherwise |
|
14836
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
1068 # - single_configure true if --single-configure was given, false otherwise |
| 5981 | 1069 # - avoidlist list of modules to avoid, from --avoid |
|
14833
76127af7039f
Finish the conditional dependencies mechanism.
Bruno Haible <bruno@clisp.org>
parents:
14806
diff
changeset
|
1070 # - cond_dependencies true if --conditional-dependencies was given, false if |
|
76127af7039f
Finish the conditional dependencies mechanism.
Bruno Haible <bruno@clisp.org>
parents:
14806
diff
changeset
|
1071 # --no-conditional-dependencies was given, blank otherwise |
|
9417
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
1072 # - lgpl yes or a number if --lgpl was given, blank otherwise |
|
18729
9534f71959d1
gnulib-tool: new option --gnu-make
Paul Eggert <eggert@cs.ucla.edu>
parents:
18704
diff
changeset
|
1073 # - gnu_make true if --gnu-make was given, false otherwise |
|
7216
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
1074 # - makefile_name from --makefile-name |
| 7077 | 1075 # - libtool true if --libtool was given, false if --no-libtool was |
| 1076 # given, blank otherwise | |
|
6994
3484a8772427
Add option --assume-autoconf. Default is back to 2.59.
Bruno Haible <bruno@clisp.org>
parents:
6993
diff
changeset
|
1077 # - macro_prefix from --macro-prefix |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
1078 # - po_domain from --po-domain |
|
14894
b22360ddefc4
gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents:
14841
diff
changeset
|
1079 # - witness_c_macro from --witness-c-macro |
|
9810
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
1080 # - vc_files true if --vc-files was given, false if --no-vc-files was |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
1081 # given, blank otherwise |
|
6994
3484a8772427
Add option --assume-autoconf. Default is back to 2.59.
Bruno Haible <bruno@clisp.org>
parents:
6993
diff
changeset
|
1082 # - autoconf_minversion minimum supported autoconf version |
|
6246
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1083 # - doit : if actions shall be executed, false if only to be printed |
|
18937
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
1084 # - copymode symlink if --symlink or --more-symlinks was given, |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
1085 # hardlink if --hardlink or --more-hardlinks was given, |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
1086 # blank otherwise |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
1087 # - lcopymode symlink if --local-symlink was given, |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
1088 # hardlink if --local-hardlink was given, |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
1089 # blank otherwise |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
1090 # - do_copyrights blank if --more-symlinks or --more-hardlinks was given, |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
1091 # true otherwise |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1092 { |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1093 mode= |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1094 destdir= |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
1095 local_gnulib_path= |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1096 modcache=true |
|
9188
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
1097 verbose=0 |
|
5198
9317c9ebe82c
Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4717
diff
changeset
|
1098 libname=libgnu |
|
5344
c2f5677fc6ed
Initialize supplied_libname. Tweak usage message.
Bruno Haible <bruno@clisp.org>
parents:
5343
diff
changeset
|
1099 supplied_libname= |
|
5202
64446bf39961
Use sed instead of autoconf --trace, inspired by
Paul Eggert <eggert@cs.ucla.edu>
parents:
5198
diff
changeset
|
1100 sourcebase= |
|
64446bf39961
Use sed instead of autoconf --trace, inspired by
Paul Eggert <eggert@cs.ucla.edu>
parents:
5198
diff
changeset
|
1101 m4base= |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
1102 pobase= |
|
6955
7715890c929a
* gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents:
6952
diff
changeset
|
1103 docbase= |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1104 testsbase= |
|
5798
49900d80eaaf
2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu>
Simon Josefsson <simon@josefsson.org>
parents:
5685
diff
changeset
|
1105 auxdir= |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1106 inctests= |
|
10744
7fb7b37150b3
New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents:
10743
diff
changeset
|
1107 incobsolete= |
|
13080
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
1108 inc_cxx_tests= |
|
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
1109 inc_longrunning_tests= |
|
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
1110 inc_privileged_tests= |
|
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
1111 inc_unportable_tests= |
|
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
1112 inc_all_tests= |
|
13263
e7d114c00ff9
gnulib-tool: Add --without-*-tests options.
Bruno Haible <bruno@clisp.org>
parents:
13223
diff
changeset
|
1113 excl_cxx_tests= |
|
e7d114c00ff9
gnulib-tool: Add --without-*-tests options.
Bruno Haible <bruno@clisp.org>
parents:
13223
diff
changeset
|
1114 excl_longrunning_tests= |
|
e7d114c00ff9
gnulib-tool: Add --without-*-tests options.
Bruno Haible <bruno@clisp.org>
parents:
13223
diff
changeset
|
1115 excl_privileged_tests= |
|
e7d114c00ff9
gnulib-tool: Add --without-*-tests options.
Bruno Haible <bruno@clisp.org>
parents:
13223
diff
changeset
|
1116 excl_unportable_tests= |
|
14836
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
1117 single_configure=false |
| 5981 | 1118 avoidlist= |
|
14682
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
1119 cond_dependencies= |
| 5981 | 1120 lgpl= |
|
18729
9534f71959d1
gnulib-tool: new option --gnu-make
Paul Eggert <eggert@cs.ucla.edu>
parents:
18704
diff
changeset
|
1121 gnu_make=false |
|
7216
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
1122 makefile_name= |
|
5198
9317c9ebe82c
Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4717
diff
changeset
|
1123 libtool= |
| 6176 | 1124 macro_prefix= |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
1125 po_domain= |
|
14894
b22360ddefc4
gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents:
14841
diff
changeset
|
1126 witness_c_macro= |
|
9810
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
1127 vc_files= |
|
6246
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1128 doit=: |
|
18937
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
1129 copymode= |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
1130 lcopymode= |
|
9096
7f1880b27b89
New gnulib-tool option --more-symlinks.
Bruno Haible <bruno@clisp.org>
parents:
9090
diff
changeset
|
1131 do_copyrights=true |
|
5202
64446bf39961
Use sed instead of autoconf --trace, inspired by
Paul Eggert <eggert@cs.ucla.edu>
parents:
5198
diff
changeset
|
1132 |
|
64446bf39961
Use sed instead of autoconf --trace, inspired by
Paul Eggert <eggert@cs.ucla.edu>
parents:
5198
diff
changeset
|
1133 supplied_opts="$@" |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1134 |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1135 while test $# -gt 0; do |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1136 case "$1" in |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1137 --list | --lis ) |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1138 mode=list |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1139 shift ;; |
|
12876
030a6f5cbffd
Make it easier to find modules. New gnulib-tool option '--find'.
Bruno Haible <bruno@clisp.org>
parents:
12859
diff
changeset
|
1140 --find | --fin | --fi | --f ) |
|
030a6f5cbffd
Make it easier to find modules. New gnulib-tool option '--find'.
Bruno Haible <bruno@clisp.org>
parents:
12859
diff
changeset
|
1141 mode=find |
|
030a6f5cbffd
Make it easier to find modules. New gnulib-tool option '--find'.
Bruno Haible <bruno@clisp.org>
parents:
12859
diff
changeset
|
1142 shift ;; |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1143 --import | --impor | --impo | --imp | --im | --i ) |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1144 mode=import |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1145 shift ;; |
|
13638
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
1146 --add-import | --add-impor | --add-impo | --add-imp | --add-im | --add-i | --add- | --add | --ad ) |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
1147 mode=add-import |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
1148 shift ;; |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
1149 --remove-import | --remove-impor | --remove-impo | --remove-imp | --remove-im | --remove-i | --remove- | --remove | --remov | --remo | --rem | --re | --r ) |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
1150 mode=remove-import |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
1151 shift ;; |
|
6443
1a35941d29ab
Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents:
6425
diff
changeset
|
1152 --update | --updat | --upda | --upd | --up | --u ) |
|
1a35941d29ab
Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents:
6425
diff
changeset
|
1153 mode=update |
|
1a35941d29ab
Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents:
6425
diff
changeset
|
1154 shift ;; |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1155 --create-testdir | --create-testdi | --create-testd | --create-test | --create-tes | --create-te | --create-t ) |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1156 mode=create-testdir |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1157 shift ;; |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1158 --create-megatestdir | --create-megatestdi | --create-megatestd | --create-megatest | --create-megates | --create-megate | --create-megat | --create-mega | --create-meg | --create-me | --create-m ) |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1159 mode=create-megatestdir |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1160 shift ;; |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1161 --test | --tes | --te | --t ) |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1162 mode=test |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1163 shift ;; |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1164 --megatest | --megates | --megate | --megat | --mega | --meg | --me | --m ) |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1165 mode=megatest |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1166 shift ;; |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1167 --extract-* ) |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
1168 mode=`echo "X$1" | sed -e 's/^X--//'` |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1169 shift ;; |
|
14682
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
1170 --copy-file | --copy-fil | --copy-fi | --copy-f | --copy- | --copy | --cop ) |
|
11461
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
1171 mode=copy-file |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
1172 shift ;; |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1173 --dir ) |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1174 shift |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1175 if test $# = 0; then |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1176 func_fatal_error "missing argument for --dir" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1177 fi |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1178 destdir=$1 |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1179 shift ;; |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1180 --dir=* ) |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
1181 destdir=`echo "X$1" | sed -e 's/^X--dir=//'` |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1182 shift ;; |
| 7215 | 1183 --local-dir ) |
| 1184 shift | |
| 1185 if test $# = 0; then | |
| 1186 func_fatal_error "missing argument for --local-dir" | |
| 1187 fi | |
|
40184
7f0ac0398fae
gnulib-tool: Improve handling of multiple --local-dir options.
Bruno Haible <bruno@clisp.org>
parents:
40128
diff
changeset
|
1188 func_path_append local_gnulib_path "$1" |
| 7215 | 1189 shift ;; |
| 1190 --local-dir=* ) | |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
1191 local_dir=`echo "X$1" | sed -e 's/^X--local-dir=//'` |
|
40184
7f0ac0398fae
gnulib-tool: Improve handling of multiple --local-dir options.
Bruno Haible <bruno@clisp.org>
parents:
40128
diff
changeset
|
1192 func_path_append local_gnulib_path "$local_dir" |
| 7215 | 1193 shift ;; |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1194 --cache-modules | --cache-module | --cache-modul | --cache-modu | --cache-mod | --cache-mo | --cache-m | --cache- | --cache | --cach | --cac | --ca ) |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1195 modcache=true |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1196 shift ;; |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1197 --no-cache-modules | --no-cache-module | --no-cache-modul | --no-cache-modu | --no-cache-mod | --no-cache-mo | --no-cache-m | --no-cache- | --no-cache | --no-cach | --no-cac | --no-ca ) |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1198 modcache=false |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1199 shift ;; |
|
9188
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
1200 --verbose | --verbos | --verbo | --verb ) |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
1201 verbose=`expr $verbose + 1` |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
1202 shift ;; |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
1203 --quiet | --quie | --qui | --qu | --q ) |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
1204 verbose=`expr $verbose - 1` |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
1205 shift ;; |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1206 --lib ) |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1207 shift |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1208 if test $# = 0; then |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1209 func_fatal_error "missing argument for --lib" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1210 fi |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1211 libname=$1 |
| 5343 | 1212 supplied_libname=true |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1213 shift ;; |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1214 --lib=* ) |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
1215 libname=`echo "X$1" | sed -e 's/^X--lib=//'` |
| 5343 | 1216 supplied_libname=true |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1217 shift ;; |
|
5198
9317c9ebe82c
Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4717
diff
changeset
|
1218 --source-base ) |
|
9317c9ebe82c
Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4717
diff
changeset
|
1219 shift |
|
9317c9ebe82c
Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4717
diff
changeset
|
1220 if test $# = 0; then |
|
9317c9ebe82c
Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4717
diff
changeset
|
1221 func_fatal_error "missing argument for --source-base" |
|
9317c9ebe82c
Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4717
diff
changeset
|
1222 fi |
|
9317c9ebe82c
Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4717
diff
changeset
|
1223 sourcebase=$1 |
|
9317c9ebe82c
Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4717
diff
changeset
|
1224 shift ;; |
|
9317c9ebe82c
Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4717
diff
changeset
|
1225 --source-base=* ) |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
1226 sourcebase=`echo "X$1" | sed -e 's/^X--source-base=//'` |
|
5198
9317c9ebe82c
Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4717
diff
changeset
|
1227 shift ;; |
|
9317c9ebe82c
Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4717
diff
changeset
|
1228 --m4-base ) |
|
9317c9ebe82c
Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4717
diff
changeset
|
1229 shift |
|
9317c9ebe82c
Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4717
diff
changeset
|
1230 if test $# = 0; then |
|
9317c9ebe82c
Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4717
diff
changeset
|
1231 func_fatal_error "missing argument for --m4-base" |
|
9317c9ebe82c
Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4717
diff
changeset
|
1232 fi |
|
9317c9ebe82c
Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4717
diff
changeset
|
1233 m4base=$1 |
|
9317c9ebe82c
Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4717
diff
changeset
|
1234 shift ;; |
|
9317c9ebe82c
Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4717
diff
changeset
|
1235 --m4-base=* ) |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
1236 m4base=`echo "X$1" | sed -e 's/^X--m4-base=//'` |
|
5198
9317c9ebe82c
Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4717
diff
changeset
|
1237 shift ;; |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
1238 --po-base ) |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
1239 shift |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
1240 if test $# = 0; then |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
1241 func_fatal_error "missing argument for --po-base" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
1242 fi |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
1243 pobase=$1 |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
1244 shift ;; |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
1245 --po-base=* ) |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
1246 pobase=`echo "X$1" | sed -e 's/^X--po-base=//'` |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
1247 shift ;; |
|
6955
7715890c929a
* gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents:
6952
diff
changeset
|
1248 --doc-base ) |
|
7715890c929a
* gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents:
6952
diff
changeset
|
1249 shift |
|
7715890c929a
* gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents:
6952
diff
changeset
|
1250 if test $# = 0; then |
|
7715890c929a
* gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents:
6952
diff
changeset
|
1251 func_fatal_error "missing argument for --doc-base" |
|
7715890c929a
* gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents:
6952
diff
changeset
|
1252 fi |
|
7715890c929a
* gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents:
6952
diff
changeset
|
1253 docbase=$1 |
|
7715890c929a
* gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents:
6952
diff
changeset
|
1254 shift ;; |
|
7715890c929a
* gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents:
6952
diff
changeset
|
1255 --doc-base=* ) |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
1256 docbase=`echo "X$1" | sed -e 's/^X--doc-base=//'` |
|
6955
7715890c929a
* gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents:
6952
diff
changeset
|
1257 shift ;; |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1258 --tests-base ) |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1259 shift |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1260 if test $# = 0; then |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1261 func_fatal_error "missing argument for --tests-base" |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1262 fi |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1263 testsbase=$1 |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1264 shift ;; |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1265 --tests-base=* ) |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
1266 testsbase=`echo "X$1" | sed -e 's/^X--tests-base=//'` |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1267 shift ;; |
|
5798
49900d80eaaf
2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu>
Simon Josefsson <simon@josefsson.org>
parents:
5685
diff
changeset
|
1268 --aux-dir ) |
|
49900d80eaaf
2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu>
Simon Josefsson <simon@josefsson.org>
parents:
5685
diff
changeset
|
1269 shift |
|
49900d80eaaf
2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu>
Simon Josefsson <simon@josefsson.org>
parents:
5685
diff
changeset
|
1270 if test $# = 0; then |
|
49900d80eaaf
2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu>
Simon Josefsson <simon@josefsson.org>
parents:
5685
diff
changeset
|
1271 func_fatal_error "missing argument for --aux-dir" |
|
49900d80eaaf
2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu>
Simon Josefsson <simon@josefsson.org>
parents:
5685
diff
changeset
|
1272 fi |
|
49900d80eaaf
2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu>
Simon Josefsson <simon@josefsson.org>
parents:
5685
diff
changeset
|
1273 auxdir=$1 |
|
49900d80eaaf
2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu>
Simon Josefsson <simon@josefsson.org>
parents:
5685
diff
changeset
|
1274 shift ;; |
|
49900d80eaaf
2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu>
Simon Josefsson <simon@josefsson.org>
parents:
5685
diff
changeset
|
1275 --aux-dir=* ) |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
1276 auxdir=`echo "X$1" | sed -e 's/^X--aux-dir=//'` |
|
5798
49900d80eaaf
2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu>
Simon Josefsson <simon@josefsson.org>
parents:
5685
diff
changeset
|
1277 shift ;; |
|
13080
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
1278 --with-tests | --with-test | --with-tes | --with-te | --with-t) |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1279 inctests=true |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1280 shift ;; |
|
13080
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
1281 --with-obsolete | --with-obsolet | --with-obsole | --with-obsol | --with-obso | --with-obs | --with-ob | --with-o) |
|
10744
7fb7b37150b3
New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents:
10743
diff
changeset
|
1282 incobsolete=true |
|
7fb7b37150b3
New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents:
10743
diff
changeset
|
1283 shift ;; |
|
13080
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
1284 --with-c++-tests | --with-c++-test | --with-c++-tes | --with-c++-te | --with-c++-t | --with-c++- | --with-c++ | --with-c+ | --with-c) |
|
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
1285 inc_cxx_tests=true |
|
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
1286 shift ;; |
|
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
1287 --with-longrunning-tests | --with-longrunning-test | --with-longrunning-tes | --with-longrunning-te | --with-longrunning-t | --with-longrunning- | --with-longrunning | --with-longrunnin | --with-longrunni | --with-longrunn | --with-longrun | --with-longru | --with-longr | --with-long | --with-lon | --with-lo | --with-l) |
|
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
1288 inc_longrunning_tests=true |
|
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
1289 shift ;; |
|
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
1290 --with-privileged-tests | --with-privileged-test | --with-privileged-tes | --with-privileged-te | --with-privileged-t | --with-privileged- | --with-privileged | --with-privilege | --with-privileg | --with-privile | --with-privil | --with-privi | --with-priv | --with-pri | --with-pr | --with-p) |
|
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
1291 inc_privileged_tests=true |
|
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
1292 shift ;; |
|
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
1293 --with-unportable-tests | --with-unportable-test | --with-unportable-tes | --with-unportable-te | --with-unportable-t | --with-unportable- | --with-unportable | --with-unportabl | --with-unportab | --with-unporta | --with-unport | --with-unpor | --with-unpo | --with-unp | --with-un | --with-u) |
|
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
1294 inc_unportable_tests=true |
|
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
1295 shift ;; |
|
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
1296 --with-all-tests | --with-all-test | --with-all-tes | --with-all-te | --with-all-t | --with-all- | --with-all | --with-al | --with-a) |
|
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
1297 inc_all_tests=true |
|
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
1298 shift ;; |
|
16931
9c0df43d88f4
gnulib-tool: --create-[mega]testdir, --[mega]test implies --with-tests.
Bruno Haible <bruno@clisp.org>
parents:
16925
diff
changeset
|
1299 --without-tests | --without-test | --without-tes | --without-te | --without-t) |
|
9c0df43d88f4
gnulib-tool: --create-[mega]testdir, --[mega]test implies --with-tests.
Bruno Haible <bruno@clisp.org>
parents:
16925
diff
changeset
|
1300 inctests=false |
|
9c0df43d88f4
gnulib-tool: --create-[mega]testdir, --[mega]test implies --with-tests.
Bruno Haible <bruno@clisp.org>
parents:
16925
diff
changeset
|
1301 shift ;; |
|
13263
e7d114c00ff9
gnulib-tool: Add --without-*-tests options.
Bruno Haible <bruno@clisp.org>
parents:
13223
diff
changeset
|
1302 --without-c++-tests | --without-c++-test | --without-c++-tes | --without-c++-te | --without-c++-t | --without-c++- | --without-c++ | --without-c+ | --without-c) |
|
e7d114c00ff9
gnulib-tool: Add --without-*-tests options.
Bruno Haible <bruno@clisp.org>
parents:
13223
diff
changeset
|
1303 excl_cxx_tests=true |
|
e7d114c00ff9
gnulib-tool: Add --without-*-tests options.
Bruno Haible <bruno@clisp.org>
parents:
13223
diff
changeset
|
1304 shift ;; |
|
e7d114c00ff9
gnulib-tool: Add --without-*-tests options.
Bruno Haible <bruno@clisp.org>
parents:
13223
diff
changeset
|
1305 --without-longrunning-tests | --without-longrunning-test | --without-longrunning-tes | --without-longrunning-te | --without-longrunning-t | --without-longrunning- | --without-longrunning | --without-longrunnin | --without-longrunni | --without-longrunn | --without-longrun | --without-longru | --without-longr | --without-long | --without-lon | --without-lo | --without-l) |
|
e7d114c00ff9
gnulib-tool: Add --without-*-tests options.
Bruno Haible <bruno@clisp.org>
parents:
13223
diff
changeset
|
1306 excl_longrunning_tests=true |
|
e7d114c00ff9
gnulib-tool: Add --without-*-tests options.
Bruno Haible <bruno@clisp.org>
parents:
13223
diff
changeset
|
1307 shift ;; |
|
e7d114c00ff9
gnulib-tool: Add --without-*-tests options.
Bruno Haible <bruno@clisp.org>
parents:
13223
diff
changeset
|
1308 --without-privileged-tests | --without-privileged-test | --without-privileged-tes | --without-privileged-te | --without-privileged-t | --without-privileged- | --without-privileged | --without-privilege | --without-privileg | --without-privile | --without-privil | --without-privi | --without-priv | --without-pri | --without-pr | --without-p) |
|
e7d114c00ff9
gnulib-tool: Add --without-*-tests options.
Bruno Haible <bruno@clisp.org>
parents:
13223
diff
changeset
|
1309 excl_privileged_tests=true |
|
e7d114c00ff9
gnulib-tool: Add --without-*-tests options.
Bruno Haible <bruno@clisp.org>
parents:
13223
diff
changeset
|
1310 shift ;; |
|
e7d114c00ff9
gnulib-tool: Add --without-*-tests options.
Bruno Haible <bruno@clisp.org>
parents:
13223
diff
changeset
|
1311 --without-unportable-tests | --without-unportable-test | --without-unportable-tes | --without-unportable-te | --without-unportable-t | --without-unportable- | --without-unportable | --without-unportabl | --without-unportab | --without-unporta | --without-unport | --without-unpor | --without-unpo | --without-unp | --without-un | --without-u) |
|
e7d114c00ff9
gnulib-tool: Add --without-*-tests options.
Bruno Haible <bruno@clisp.org>
parents:
13223
diff
changeset
|
1312 excl_unportable_tests=true |
|
e7d114c00ff9
gnulib-tool: Add --without-*-tests options.
Bruno Haible <bruno@clisp.org>
parents:
13223
diff
changeset
|
1313 shift ;; |
|
14836
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
1314 --single-configure | --single-configur | --single-configu | --single-config | --single-confi | --single-conf | --single-con | --single-con | --single-co | --single-c | --single- | --single | --singl | --sing | --sin | --si) |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
1315 single_configure=true |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
1316 shift ;; |
| 5981 | 1317 --avoid ) |
| 1318 shift | |
| 1319 if test $# = 0; then | |
| 1320 func_fatal_error "missing argument for --avoid" | |
| 1321 fi | |
|
7323
7ca0e325d5db
Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents:
7322
diff
changeset
|
1322 func_append avoidlist " $1" |
| 5981 | 1323 shift ;; |
| 1324 --avoid=* ) | |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
1325 arg=`echo "X$1" | sed -e 's/^X--avoid=//'` |
|
7327
6db875979695
* gnulib-tool (avoidlist): Fix typo that broke options like
Paul Eggert <eggert@cs.ucla.edu>
parents:
7326
diff
changeset
|
1326 func_append avoidlist " $arg" |
|
5198
9317c9ebe82c
Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4717
diff
changeset
|
1327 shift ;; |
|
14682
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
1328 --conditional-dependencies | --conditional-dependencie | --conditional-dependenci | --conditional-dependenc | --conditional-dependen | --conditional-depende | --conditional-depend | --conditional-depen | --conditional-depe | --conditional-dep | --conditional-de | --conditional-d | --conditional- | --conditional | --conditiona | --condition | --conditio | --conditi | --condit | --condi | --cond | --con) |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
1329 cond_dependencies=true |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
1330 shift ;; |
|
14833
76127af7039f
Finish the conditional dependencies mechanism.
Bruno Haible <bruno@clisp.org>
parents:
14806
diff
changeset
|
1331 --no-conditional-dependencies | --no-conditional-dependencie | --no-conditional-dependenci | --no-conditional-dependenc | --no-conditional-dependen | --no-conditional-depende | --no-conditional-depend | --no-conditional-depen | --no-conditional-depe | --no-conditional-dep | --no-conditional-de | --no-conditional-d | --no-conditional- | --no-conditional | --no-conditiona | --no-condition | --no-conditio | --no-conditi | --no-condit | --no-condi | --no-cond | --no-con | --no-co) |
|
76127af7039f
Finish the conditional dependencies mechanism.
Bruno Haible <bruno@clisp.org>
parents:
14806
diff
changeset
|
1332 cond_dependencies=false |
|
76127af7039f
Finish the conditional dependencies mechanism.
Bruno Haible <bruno@clisp.org>
parents:
14806
diff
changeset
|
1333 shift ;; |
|
5262
97ed4b64d853
New parameter --lgpl, to asseert that modules are
Paul Eggert <eggert@cs.ucla.edu>
parents:
5255
diff
changeset
|
1334 --lgpl ) |
|
9417
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
1335 lgpl=yes |
|
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
1336 shift ;; |
|
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
1337 --lgpl=* ) |
|
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
1338 arg=`echo "X$1" | sed -e 's/^X--lgpl=//'` |
|
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
1339 case "$arg" in |
|
18501
9012a151a519
gnulib-tool: Support for the dual "LGPLv3+ or GPLv2" license.
Bruno Haible <bruno@clisp.org>
parents:
18474
diff
changeset
|
1340 2 | 3orGPLv2 | 3) ;; |
|
9417
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
1341 *) func_fatal_error "invalid LGPL version number for --lgpl" ;; |
|
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
1342 esac |
|
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
1343 lgpl=$arg |
|
5262
97ed4b64d853
New parameter --lgpl, to asseert that modules are
Paul Eggert <eggert@cs.ucla.edu>
parents:
5255
diff
changeset
|
1344 shift ;; |
|
18729
9534f71959d1
gnulib-tool: new option --gnu-make
Paul Eggert <eggert@cs.ucla.edu>
parents:
18704
diff
changeset
|
1345 --gnu-make ) |
|
9534f71959d1
gnulib-tool: new option --gnu-make
Paul Eggert <eggert@cs.ucla.edu>
parents:
18704
diff
changeset
|
1346 gnu_make=true |
|
9534f71959d1
gnulib-tool: new option --gnu-make
Paul Eggert <eggert@cs.ucla.edu>
parents:
18704
diff
changeset
|
1347 shift ;; |
|
7216
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
1348 --makefile-name ) |
|
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
1349 shift |
|
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
1350 if test $# = 0; then |
|
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
1351 func_fatal_error "missing argument for --makefile-name" |
|
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
1352 fi |
|
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
1353 makefile_name="$1" |
|
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
1354 shift ;; |
|
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
1355 --makefile-name=* ) |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
1356 makefile_name=`echo "X$1" | sed -e 's/^X--makefile-name=//'` |
|
7216
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
1357 shift ;; |
| 5981 | 1358 --libtool ) |
| 1359 libtool=true | |
| 1360 shift ;; | |
| 7077 | 1361 --no-libtool ) |
| 1362 libtool=false | |
| 1363 shift ;; | |
| 6176 | 1364 --macro-prefix ) |
| 1365 shift | |
| 1366 if test $# = 0; then | |
| 1367 func_fatal_error "missing argument for --macro-prefix" | |
| 1368 fi | |
| 1369 macro_prefix="$1" | |
| 1370 shift ;; | |
| 1371 --macro-prefix=* ) | |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
1372 macro_prefix=`echo "X$1" | sed -e 's/^X--macro-prefix=//'` |
| 6176 | 1373 shift ;; |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
1374 --po-domain ) |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
1375 shift |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
1376 if test $# = 0; then |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
1377 func_fatal_error "missing argument for --po-domain" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
1378 fi |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
1379 po_domain="$1" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
1380 shift ;; |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
1381 --po-domain=* ) |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
1382 po_domain=`echo "X$1" | sed -e 's/^X--po-domain=//'` |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
1383 shift ;; |
|
14894
b22360ddefc4
gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents:
14841
diff
changeset
|
1384 --witness-c-macro ) |
|
b22360ddefc4
gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents:
14841
diff
changeset
|
1385 shift |
|
b22360ddefc4
gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents:
14841
diff
changeset
|
1386 if test $# = 0; then |
|
b22360ddefc4
gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents:
14841
diff
changeset
|
1387 func_fatal_error "missing argument for --witness-c-macro" |
|
b22360ddefc4
gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents:
14841
diff
changeset
|
1388 fi |
|
b22360ddefc4
gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents:
14841
diff
changeset
|
1389 witness_c_macro="$1" |
|
b22360ddefc4
gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents:
14841
diff
changeset
|
1390 shift ;; |
|
b22360ddefc4
gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents:
14841
diff
changeset
|
1391 --witness-c-macro=* ) |
|
b22360ddefc4
gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents:
14841
diff
changeset
|
1392 witness_c_macro=`echo "X$1" | sed -e 's/^X--witness-c-macro=//'` |
|
b22360ddefc4
gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents:
14841
diff
changeset
|
1393 shift ;; |
|
9810
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
1394 --vc-files ) |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
1395 vc_files=true |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
1396 shift ;; |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
1397 --no-vc-files ) |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
1398 vc_files=false |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
1399 shift ;; |
|
12855
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1400 --no-changelog | --no-changelo | --no-changel | --no-change | --no-chang | --no-chan | --no-cha | --no-ch ) |
|
17065
e7db46543239
gnulib-tool: Remove no-op option --no-changelog.
Bruno Haible <bruno@clisp.org>
parents:
17047
diff
changeset
|
1401 # A no-op for backward compatibility. |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1402 shift ;; |
|
5202
64446bf39961
Use sed instead of autoconf --trace, inspired by
Paul Eggert <eggert@cs.ucla.edu>
parents:
5198
diff
changeset
|
1403 --dry-run ) |
|
6246
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1404 doit=false |
|
5202
64446bf39961
Use sed instead of autoconf --trace, inspired by
Paul Eggert <eggert@cs.ucla.edu>
parents:
5198
diff
changeset
|
1405 shift ;; |
|
6443
1a35941d29ab
Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents:
6425
diff
changeset
|
1406 -s | --symbolic | --symboli | --symbol | --symbo | --symb | --symlink | --symlin | --symli | --syml | --sym | --sy ) |
|
18937
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
1407 copymode=symlink |
|
5798
49900d80eaaf
2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu>
Simon Josefsson <simon@josefsson.org>
parents:
5685
diff
changeset
|
1408 shift ;; |
|
7643
d67f9dc6019d
New option --local-symlink.
Bruno Haible <bruno@clisp.org>
parents:
7642
diff
changeset
|
1409 --local-symlink | --local-symlin | --local-symli | --local-syml | --local-sym | --local-sy | --local-s ) |
|
18937
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
1410 lcopymode=symlink |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
1411 shift ;; |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
1412 -h | --hardlink | --hardlin | --hardli | --hardl | --hard | --har | --ha ) |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
1413 copymode=hardlink |
|
7643
d67f9dc6019d
New option --local-symlink.
Bruno Haible <bruno@clisp.org>
parents:
7642
diff
changeset
|
1414 shift ;; |
|
18937
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
1415 --local-hardlink | --local-hardlin | --local-hardli | --local-hardl | --local-hard | --local-har | --local-ha | --local-h ) |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
1416 lcopymode=hardlink |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
1417 shift ;; |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
1418 -S | --more-symlinks | --more-symlink | --more-symlin | --more-symli | --more-syml | --more-sym | --more-sy | --more-s ) |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
1419 copymode=symlink |
|
9096
7f1880b27b89
New gnulib-tool option --more-symlinks.
Bruno Haible <bruno@clisp.org>
parents:
9090
diff
changeset
|
1420 do_copyrights= |
|
7f1880b27b89
New gnulib-tool option --more-symlinks.
Bruno Haible <bruno@clisp.org>
parents:
9090
diff
changeset
|
1421 shift ;; |
|
18937
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
1422 -H | --more-hardlinks | --more-hardlink | --more-hardlin | --more-hardli | --more-hardl | --more-hard | --more-har | --more-ha | --more-h ) |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
1423 copymode=hardlink |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
1424 do_copyrights= |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
1425 shift ;; |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
1426 --help | --hel | --he ) |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1427 func_usage |
|
7332
dd6e80d0c89e
* gnulib-tool (func_exit): New function, to allow to pass the
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7327
diff
changeset
|
1428 func_exit $? ;; |
|
9188
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
1429 --version | --versio | --versi | --vers ) |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1430 func_version |
|
7332
dd6e80d0c89e
* gnulib-tool (func_exit): New function, to allow to pass the
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7327
diff
changeset
|
1431 func_exit $? ;; |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1432 -- ) |
|
6264
eaa3b6787ec9
Ignore trailing slashes in --m4-base value etc.
Bruno Haible <bruno@clisp.org>
parents:
6263
diff
changeset
|
1433 # Stop option processing |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1434 shift |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1435 break ;; |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1436 -* ) |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1437 echo "gnulib-tool: unknown option $1" 1>&2 |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1438 echo "Try 'gnulib-tool --help' for more information." 1>&2 |
|
7332
dd6e80d0c89e
* gnulib-tool (func_exit): New function, to allow to pass the
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7327
diff
changeset
|
1439 func_exit 1 ;; |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1440 * ) |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1441 break ;; |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1442 esac |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1443 done |
|
6264
eaa3b6787ec9
Ignore trailing slashes in --m4-base value etc.
Bruno Haible <bruno@clisp.org>
parents:
6263
diff
changeset
|
1444 |
|
13638
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
1445 if case "$mode" in import | add-import | remove-import) true;; *) false;; esac; then |
|
13263
e7d114c00ff9
gnulib-tool: Add --without-*-tests options.
Bruno Haible <bruno@clisp.org>
parents:
13223
diff
changeset
|
1446 if test -n "$excl_cxx_tests" || test -n "$excl_longrunning_tests" \ |
|
14836
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
1447 || test -n "$excl_privileged_tests" || test -n "$excl_unportable_tests" \ |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
1448 || test "$single_configure" != false; then |
|
13638
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
1449 echo "gnulib-tool: invalid options for '$mode' mode" 1>&2 |
|
13263
e7d114c00ff9
gnulib-tool: Add --without-*-tests options.
Bruno Haible <bruno@clisp.org>
parents:
13223
diff
changeset
|
1450 echo "Try 'gnulib-tool --help' for more information." 1>&2 |
|
e7d114c00ff9
gnulib-tool: Add --without-*-tests options.
Bruno Haible <bruno@clisp.org>
parents:
13223
diff
changeset
|
1451 func_exit 1 |
|
e7d114c00ff9
gnulib-tool: Add --without-*-tests options.
Bruno Haible <bruno@clisp.org>
parents:
13223
diff
changeset
|
1452 fi |
|
e7d114c00ff9
gnulib-tool: Add --without-*-tests options.
Bruno Haible <bruno@clisp.org>
parents:
13223
diff
changeset
|
1453 fi |
|
6443
1a35941d29ab
Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents:
6425
diff
changeset
|
1454 if test "$mode" = update; then |
|
1a35941d29ab
Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents:
6425
diff
changeset
|
1455 if test $# != 0; then |
|
1a35941d29ab
Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents:
6425
diff
changeset
|
1456 echo "gnulib-tool: too many arguments in 'update' mode" 1>&2 |
|
1a35941d29ab
Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents:
6425
diff
changeset
|
1457 echo "Try 'gnulib-tool --help' for more information." 1>&2 |
|
1a35941d29ab
Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents:
6425
diff
changeset
|
1458 echo "If you really want to modify the gnulib configuration of your project," 1>&2 |
|
1a35941d29ab
Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents:
6425
diff
changeset
|
1459 echo "you need to use 'gnulib --import' - at your own risk!" 1>&2 |
|
7332
dd6e80d0c89e
* gnulib-tool (func_exit): New function, to allow to pass the
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7327
diff
changeset
|
1460 func_exit 1 |
|
6443
1a35941d29ab
Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents:
6425
diff
changeset
|
1461 fi |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
1462 if test -n "$local_gnulib_path" || test -n "$supplied_libname" \ |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
1463 || test -n "$sourcebase" || test -n "$m4base" || test -n "$pobase" \ |
|
6993
dc8f2a1ff75f
Reorder tests in doc-base patch.
Bruno Haible <bruno@clisp.org>
parents:
6966
diff
changeset
|
1464 || test -n "$docbase" || test -n "$testsbase" || test -n "$auxdir" \ |
|
10744
7fb7b37150b3
New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents:
10743
diff
changeset
|
1465 || test -n "$inctests" || test -n "$incobsolete" \ |
|
13080
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
1466 || test -n "$inc_cxx_tests" || test -n "$inc_longrunning_tests" \ |
|
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
1467 || test -n "$inc_privileged_tests" || test -n "$inc_unportable_tests" \ |
|
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
1468 || test -n "$inc_all_tests" \ |
|
13263
e7d114c00ff9
gnulib-tool: Add --without-*-tests options.
Bruno Haible <bruno@clisp.org>
parents:
13223
diff
changeset
|
1469 || test -n "$excl_cxx_tests" || test -n "$excl_longrunning_tests" \ |
|
e7d114c00ff9
gnulib-tool: Add --without-*-tests options.
Bruno Haible <bruno@clisp.org>
parents:
13223
diff
changeset
|
1470 || test -n "$excl_privileged_tests" || test -n "$excl_unportable_tests" \ |
|
10744
7fb7b37150b3
New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents:
10743
diff
changeset
|
1471 || test -n "$avoidlist" || test -n "$lgpl" || test -n "$makefile_name" \ |
|
7fb7b37150b3
New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents:
10743
diff
changeset
|
1472 || test -n "$macro_prefix" || test -n "$po_domain" \ |
|
14894
b22360ddefc4
gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents:
14841
diff
changeset
|
1473 || test -n "$witness_c_macro" || test -n "$vc_files"; then |
|
6443
1a35941d29ab
Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents:
6425
diff
changeset
|
1474 echo "gnulib-tool: invalid options for 'update' mode" 1>&2 |
|
1a35941d29ab
Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents:
6425
diff
changeset
|
1475 echo "Try 'gnulib-tool --help' for more information." 1>&2 |
|
1a35941d29ab
Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents:
6425
diff
changeset
|
1476 echo "If you really want to modify the gnulib configuration of your project," 1>&2 |
|
1a35941d29ab
Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents:
6425
diff
changeset
|
1477 echo "you need to use 'gnulib --import' - at your own risk!" 1>&2 |
|
7332
dd6e80d0c89e
* gnulib-tool (func_exit): New function, to allow to pass the
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7327
diff
changeset
|
1478 func_exit 1 |
|
6443
1a35941d29ab
Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents:
6425
diff
changeset
|
1479 fi |
|
1a35941d29ab
Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents:
6425
diff
changeset
|
1480 fi |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
1481 if test -n "$pobase" && test -z "$po_domain"; then |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
1482 echo "gnulib-tool: together with --po-base, you need to specify --po-domain" 1>&2 |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
1483 echo "Try 'gnulib-tool --help' for more information." 1>&2 |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
1484 func_exit 1 |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
1485 fi |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
1486 if test -z "$pobase" && test -n "$po_domain"; then |
|
12819
4b5bf4c79e0c
gnulib-tool: Make warning diagnostics consistent.
Bruno Haible <bruno@clisp.org>
parents:
12775
diff
changeset
|
1487 func_warning "--po-domain has no effect without a --po-base option" |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
1488 fi |
|
39737
bf73bd094dbd
gnulib-tool: minor tweaks for --gnu-make
Paul Eggert <eggert@cs.ucla.edu>
parents:
19484
diff
changeset
|
1489 case $mode,$gnu_make in |
|
bf73bd094dbd
gnulib-tool: minor tweaks for --gnu-make
Paul Eggert <eggert@cs.ucla.edu>
parents:
19484
diff
changeset
|
1490 *test*,true) |
|
bf73bd094dbd
gnulib-tool: minor tweaks for --gnu-make
Paul Eggert <eggert@cs.ucla.edu>
parents:
19484
diff
changeset
|
1491 echo "gnulib-tool: --gnu-make not supported when including tests" |
|
bf73bd094dbd
gnulib-tool: minor tweaks for --gnu-make
Paul Eggert <eggert@cs.ucla.edu>
parents:
19484
diff
changeset
|
1492 func_exit 1;; |
|
bf73bd094dbd
gnulib-tool: minor tweaks for --gnu-make
Paul Eggert <eggert@cs.ucla.edu>
parents:
19484
diff
changeset
|
1493 esac |
|
16931
9c0df43d88f4
gnulib-tool: --create-[mega]testdir, --[mega]test implies --with-tests.
Bruno Haible <bruno@clisp.org>
parents:
16925
diff
changeset
|
1494 # Canonicalize the inctests variable. |
|
9c0df43d88f4
gnulib-tool: --create-[mega]testdir, --[mega]test implies --with-tests.
Bruno Haible <bruno@clisp.org>
parents:
16925
diff
changeset
|
1495 case "$mode" in |
|
17004
1a403c75d360
gnulib-tool: Fix handling of inctests variable.
Bruno Haible <bruno@clisp.org>
parents:
16932
diff
changeset
|
1496 import | add-import | remove-import | update) |
|
16931
9c0df43d88f4
gnulib-tool: --create-[mega]testdir, --[mega]test implies --with-tests.
Bruno Haible <bruno@clisp.org>
parents:
16925
diff
changeset
|
1497 if test -z "$inctests"; then |
|
9c0df43d88f4
gnulib-tool: --create-[mega]testdir, --[mega]test implies --with-tests.
Bruno Haible <bruno@clisp.org>
parents:
16925
diff
changeset
|
1498 inctests=false |
|
9c0df43d88f4
gnulib-tool: --create-[mega]testdir, --[mega]test implies --with-tests.
Bruno Haible <bruno@clisp.org>
parents:
16925
diff
changeset
|
1499 fi |
|
9c0df43d88f4
gnulib-tool: --create-[mega]testdir, --[mega]test implies --with-tests.
Bruno Haible <bruno@clisp.org>
parents:
16925
diff
changeset
|
1500 ;; |
|
9c0df43d88f4
gnulib-tool: --create-[mega]testdir, --[mega]test implies --with-tests.
Bruno Haible <bruno@clisp.org>
parents:
16925
diff
changeset
|
1501 create-testdir | create-megatestdir | test | megatest) |
|
9c0df43d88f4
gnulib-tool: --create-[mega]testdir, --[mega]test implies --with-tests.
Bruno Haible <bruno@clisp.org>
parents:
16925
diff
changeset
|
1502 if test -z "$inctests"; then |
|
9c0df43d88f4
gnulib-tool: --create-[mega]testdir, --[mega]test implies --with-tests.
Bruno Haible <bruno@clisp.org>
parents:
16925
diff
changeset
|
1503 inctests=true |
|
9c0df43d88f4
gnulib-tool: --create-[mega]testdir, --[mega]test implies --with-tests.
Bruno Haible <bruno@clisp.org>
parents:
16925
diff
changeset
|
1504 fi |
|
9c0df43d88f4
gnulib-tool: --create-[mega]testdir, --[mega]test implies --with-tests.
Bruno Haible <bruno@clisp.org>
parents:
16925
diff
changeset
|
1505 ;; |
|
9c0df43d88f4
gnulib-tool: --create-[mega]testdir, --[mega]test implies --with-tests.
Bruno Haible <bruno@clisp.org>
parents:
16925
diff
changeset
|
1506 esac |
|
16932
48e8f0679448
gnulib-tool: Refactor inctests variable.
Bruno Haible <bruno@clisp.org>
parents:
16931
diff
changeset
|
1507 # Now the only possible values of "$inctests" are true and false |
|
48e8f0679448
gnulib-tool: Refactor inctests variable.
Bruno Haible <bruno@clisp.org>
parents:
16931
diff
changeset
|
1508 # (or blank but then it is irrelevant). |
|
6443
1a35941d29ab
Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents:
6425
diff
changeset
|
1509 |
|
7071
71c5caf223fc
Remove the --assume-autoconf option.
Bruno Haible <bruno@clisp.org>
parents:
7070
diff
changeset
|
1510 # Determine the minimum supported autoconf version from the project's |
|
71c5caf223fc
Remove the --assume-autoconf option.
Bruno Haible <bruno@clisp.org>
parents:
7070
diff
changeset
|
1511 # configure.ac. |
| 39944 | 1512 DEFAULT_AUTOCONF_MINVERSION="2.63" |
|
7078
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
1513 autoconf_minversion= |
|
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
1514 configure_ac= |
|
13638
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
1515 if case "$mode" in import | add-import | remove-import | update) true;; *) false;; esac \ |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
1516 && test -n "$destdir"; then |
|
7078
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
1517 if test -f "$destdir"/configure.ac; then |
|
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
1518 configure_ac="$destdir/configure.ac" |
|
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
1519 else |
|
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
1520 if test -f "$destdir"/configure.in; then |
|
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
1521 configure_ac="$destdir/configure.in" |
|
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
1522 fi |
|
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
1523 fi |
|
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
1524 else |
|
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
1525 if test -f configure.ac; then |
|
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
1526 configure_ac="configure.ac" |
|
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
1527 else |
|
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
1528 if test -f configure.in; then |
|
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
1529 configure_ac="configure.in" |
|
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
1530 fi |
|
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
1531 fi |
|
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
1532 fi |
|
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
1533 if test -n "$configure_ac"; then |
|
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
1534 # Use sed, not autoconf --trace, to look for the AC_PREREQ invocation, |
|
13636
06064a28d167
gnulib-tool: Don't talk about CVS any more.
Bruno Haible <bruno@clisp.org>
parents:
13634
diff
changeset
|
1535 # because when some m4 files are omitted from a version control repository, |
|
7078
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
1536 # "autoconf --trace=AC_PREREQ" fails with an error message like this: |
|
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
1537 # m4: aclocal.m4:851: Cannot open m4/absolute-header.m4: No such file or directory |
|
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
1538 # autom4te: m4 failed with exit status: 1 |
|
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
1539 prereqs= |
|
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
1540 my_sed_traces=' |
|
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
1541 s,#.*$,, |
|
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
1542 s,^dnl .*$,, |
|
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
1543 s, dnl .*$,, |
|
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
1544 /AC_PREREQ/ { |
|
7767
0339d0fb77b2
* gnulib-tool (SORT): Remove, since we no longer assume GNU sort.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7754
diff
changeset
|
1545 s,^.*AC_PREREQ([[ ]*\([^])]*\).*$,\1,p |
|
7078
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
1546 }' |
|
7767
0339d0fb77b2
* gnulib-tool (SORT): Remove, since we no longer assume GNU sort.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7754
diff
changeset
|
1547 prereqs=`sed -n -e "$my_sed_traces" < "$configure_ac"` |
|
7078
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
1548 if test -n "$prereqs"; then |
|
7767
0339d0fb77b2
* gnulib-tool (SORT): Remove, since we no longer assume GNU sort.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7754
diff
changeset
|
1549 autoconf_minversion=` |
|
0339d0fb77b2
* gnulib-tool (SORT): Remove, since we no longer assume GNU sort.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7754
diff
changeset
|
1550 for version in $prereqs; do echo $version; done | |
| 12417 | 1551 LC_ALL=C sort -nru | sed -e 1q |
|
7767
0339d0fb77b2
* gnulib-tool (SORT): Remove, since we no longer assume GNU sort.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7754
diff
changeset
|
1552 ` |
|
7078
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
1553 fi |
|
7071
71c5caf223fc
Remove the --assume-autoconf option.
Bruno Haible <bruno@clisp.org>
parents:
7070
diff
changeset
|
1554 fi |
|
71c5caf223fc
Remove the --assume-autoconf option.
Bruno Haible <bruno@clisp.org>
parents:
7070
diff
changeset
|
1555 if test -z "$autoconf_minversion"; then |
|
71c5caf223fc
Remove the --assume-autoconf option.
Bruno Haible <bruno@clisp.org>
parents:
7070
diff
changeset
|
1556 autoconf_minversion=$DEFAULT_AUTOCONF_MINVERSION |
|
71c5caf223fc
Remove the --assume-autoconf option.
Bruno Haible <bruno@clisp.org>
parents:
7070
diff
changeset
|
1557 fi |
|
6994
3484a8772427
Add option --assume-autoconf. Default is back to 2.59.
Bruno Haible <bruno@clisp.org>
parents:
6993
diff
changeset
|
1558 case "$autoconf_minversion" in |
| 39944 | 1559 1.* | 2.[0-5]* | 2.6[0-2]*) |
| 1560 func_fatal_error "minimum supported autoconf version is 2.63. Try adding AC_PREREQ([$DEFAULT_AUTOCONF_MINVERSION]) to your configure.ac." ;; | |
|
6994
3484a8772427
Add option --assume-autoconf. Default is back to 2.59.
Bruno Haible <bruno@clisp.org>
parents:
6993
diff
changeset
|
1561 esac |
|
3484a8772427
Add option --assume-autoconf. Default is back to 2.59.
Bruno Haible <bruno@clisp.org>
parents:
6993
diff
changeset
|
1562 |
|
6264
eaa3b6787ec9
Ignore trailing slashes in --m4-base value etc.
Bruno Haible <bruno@clisp.org>
parents:
6263
diff
changeset
|
1563 # Remove trailing slashes from the directory names. This is necessary for |
|
eaa3b6787ec9
Ignore trailing slashes in --m4-base value etc.
Bruno Haible <bruno@clisp.org>
parents:
6263
diff
changeset
|
1564 # m4base (to avoid an error in func_import) and optional for the others. |
|
eaa3b6787ec9
Ignore trailing slashes in --m4-base value etc.
Bruno Haible <bruno@clisp.org>
parents:
6263
diff
changeset
|
1565 sed_trimtrailingslashes='s,\([^/]\)//*$,\1,' |
|
40184
7f0ac0398fae
gnulib-tool: Improve handling of multiple --local-dir options.
Bruno Haible <bruno@clisp.org>
parents:
40128
diff
changeset
|
1566 old_local_gnulib_path="$local_gnulib_path" |
|
7f0ac0398fae
gnulib-tool: Improve handling of multiple --local-dir options.
Bruno Haible <bruno@clisp.org>
parents:
40128
diff
changeset
|
1567 local_gnulib_path= |
|
7f0ac0398fae
gnulib-tool: Improve handling of multiple --local-dir options.
Bruno Haible <bruno@clisp.org>
parents:
40128
diff
changeset
|
1568 save_IFS="$IFS" |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
1569 IFS=: |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
1570 for dir in $old_local_gnulib_path |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
1571 do |
|
40184
7f0ac0398fae
gnulib-tool: Improve handling of multiple --local-dir options.
Bruno Haible <bruno@clisp.org>
parents:
40128
diff
changeset
|
1572 IFS="$save_IFS" |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
1573 case "$dir" in |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
1574 */ ) dir=`echo "$dir" | sed -e "$sed_trimtrailingslashes"` ;; |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
1575 esac |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
1576 func_path_append local_gnulib_path "$dir" |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
1577 done |
|
40184
7f0ac0398fae
gnulib-tool: Improve handling of multiple --local-dir options.
Bruno Haible <bruno@clisp.org>
parents:
40128
diff
changeset
|
1578 IFS="$save_IFS" |
|
6264
eaa3b6787ec9
Ignore trailing slashes in --m4-base value etc.
Bruno Haible <bruno@clisp.org>
parents:
6263
diff
changeset
|
1579 case "$sourcebase" in |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
1580 */ ) sourcebase=`echo "$sourcebase" | sed -e "$sed_trimtrailingslashes"` ;; |
|
6264
eaa3b6787ec9
Ignore trailing slashes in --m4-base value etc.
Bruno Haible <bruno@clisp.org>
parents:
6263
diff
changeset
|
1581 esac |
|
eaa3b6787ec9
Ignore trailing slashes in --m4-base value etc.
Bruno Haible <bruno@clisp.org>
parents:
6263
diff
changeset
|
1582 case "$m4base" in |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
1583 */ ) m4base=`echo "$m4base" | sed -e "$sed_trimtrailingslashes"` ;; |
|
6264
eaa3b6787ec9
Ignore trailing slashes in --m4-base value etc.
Bruno Haible <bruno@clisp.org>
parents:
6263
diff
changeset
|
1584 esac |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
1585 case "$pobase" in |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
1586 */ ) pobase=`echo "$pobase" | sed -e "$sed_trimtrailingslashes"` ;; |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
1587 esac |
|
6955
7715890c929a
* gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents:
6952
diff
changeset
|
1588 case "$docbase" in |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
1589 */ ) docbase=`echo "$docbase" | sed -e "$sed_trimtrailingslashes"` ;; |
|
6955
7715890c929a
* gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents:
6952
diff
changeset
|
1590 esac |
|
6264
eaa3b6787ec9
Ignore trailing slashes in --m4-base value etc.
Bruno Haible <bruno@clisp.org>
parents:
6263
diff
changeset
|
1591 case "$testsbase" in |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
1592 */ ) testsbase=`echo "$testsbase" | sed -e "$sed_trimtrailingslashes"` ;; |
|
6264
eaa3b6787ec9
Ignore trailing slashes in --m4-base value etc.
Bruno Haible <bruno@clisp.org>
parents:
6263
diff
changeset
|
1593 esac |
|
eaa3b6787ec9
Ignore trailing slashes in --m4-base value etc.
Bruno Haible <bruno@clisp.org>
parents:
6263
diff
changeset
|
1594 case "$auxdir" in |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
1595 */ ) auxdir=`echo "$auxdir" | sed -e "$sed_trimtrailingslashes"` ;; |
|
6264
eaa3b6787ec9
Ignore trailing slashes in --m4-base value etc.
Bruno Haible <bruno@clisp.org>
parents:
6263
diff
changeset
|
1596 esac |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1597 } |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1598 |
|
9793
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
1599 func_gnulib_dir |
|
7073
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
1600 func_tmpdir |
|
7332
dd6e80d0c89e
* gnulib-tool (func_exit): New function, to allow to pass the
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7327
diff
changeset
|
1601 trap 'exit_status=$? |
|
dd6e80d0c89e
* gnulib-tool (func_exit): New function, to allow to pass the
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7327
diff
changeset
|
1602 if test "$signal" != 0; then |
|
dd6e80d0c89e
* gnulib-tool (func_exit): New function, to allow to pass the
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7327
diff
changeset
|
1603 echo "caught signal $signal" >&2 |
|
dd6e80d0c89e
* gnulib-tool (func_exit): New function, to allow to pass the
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7327
diff
changeset
|
1604 fi |
|
dd6e80d0c89e
* gnulib-tool (func_exit): New function, to allow to pass the
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7327
diff
changeset
|
1605 rm -rf "$tmp" |
|
dd6e80d0c89e
* gnulib-tool (func_exit): New function, to allow to pass the
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7327
diff
changeset
|
1606 exit $exit_status' 0 |
|
dd6e80d0c89e
* gnulib-tool (func_exit): New function, to allow to pass the
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7327
diff
changeset
|
1607 for signal in 1 2 3 13 15; do |
|
dd6e80d0c89e
* gnulib-tool (func_exit): New function, to allow to pass the
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7327
diff
changeset
|
1608 trap '{ signal='$signal'; func_exit 1; }' $signal |
|
dd6e80d0c89e
* gnulib-tool (func_exit): New function, to allow to pass the
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7327
diff
changeset
|
1609 done |
|
dd6e80d0c89e
* gnulib-tool (func_exit): New function, to allow to pass the
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7327
diff
changeset
|
1610 signal=0 |
|
7073
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
1611 |
|
13638
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
1612 # Note: The 'eval' silences stderr output in dash. |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
1613 if (declare -A x && { x[f/2]='foo'; x[f/3]='bar'; eval test '${x[f/2]}' = foo; }) 2>/dev/null; then |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
1614 # Zsh 4 and Bash 4 have associative arrays. |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
1615 have_associative=true |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
1616 else |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
1617 # For other shells, use 'eval' with computed shell variable names. |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
1618 have_associative=false |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
1619 fi |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
1620 |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
1621 # func_lookup_local_file_cb dir file |
|
40184
7f0ac0398fae
gnulib-tool: Improve handling of multiple --local-dir options.
Bruno Haible <bruno@clisp.org>
parents:
40128
diff
changeset
|
1622 # returns true and sets func_lookup_local_file_result if the file $dir/$file |
|
7f0ac0398fae
gnulib-tool: Improve handling of multiple --local-dir options.
Bruno Haible <bruno@clisp.org>
parents:
40128
diff
changeset
|
1623 # exists. |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
1624 func_lookup_local_file_cb () |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
1625 { |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
1626 test -n "$func_lookup_local_file_result" && return 1 # already found? |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
1627 test -f "$1/$2" || return 1 |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
1628 func_lookup_local_file_result=$1/$2 |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
1629 : |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
1630 } |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
1631 |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
1632 # func_lookup_local_file file |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
1633 # looks up a file in $local_gnulib_path. |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
1634 # Input: |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
1635 # - local_gnulib_path from --local-dir |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
1636 # Output: |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
1637 # - func_lookup_local_file_result name of the file, valid only when the |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
1638 # function succeeded. |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
1639 func_lookup_local_file () |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
1640 { |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
1641 func_lookup_local_file_result= |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
1642 func_path_foreach "$local_gnulib_path" func_lookup_local_file_cb %dir% "$1" |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
1643 } |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
1644 |
|
40184
7f0ac0398fae
gnulib-tool: Improve handling of multiple --local-dir options.
Bruno Haible <bruno@clisp.org>
parents:
40128
diff
changeset
|
1645 # func_lookup_file_cb dir |
|
7f0ac0398fae
gnulib-tool: Improve handling of multiple --local-dir options.
Bruno Haible <bruno@clisp.org>
parents:
40128
diff
changeset
|
1646 # does one step in processing the $local_gnulib_path, looking for $dir/$lkfile |
|
7f0ac0398fae
gnulib-tool: Improve handling of multiple --local-dir options.
Bruno Haible <bruno@clisp.org>
parents:
40128
diff
changeset
|
1647 # and $dir/$lkfile.diff. |
|
7f0ac0398fae
gnulib-tool: Improve handling of multiple --local-dir options.
Bruno Haible <bruno@clisp.org>
parents:
40128
diff
changeset
|
1648 func_lookup_file_cb () |
|
7f0ac0398fae
gnulib-tool: Improve handling of multiple --local-dir options.
Bruno Haible <bruno@clisp.org>
parents:
40128
diff
changeset
|
1649 { |
|
7f0ac0398fae
gnulib-tool: Improve handling of multiple --local-dir options.
Bruno Haible <bruno@clisp.org>
parents:
40128
diff
changeset
|
1650 # If we found the file already in a --local-dir of higher priority, nothing |
|
7f0ac0398fae
gnulib-tool: Improve handling of multiple --local-dir options.
Bruno Haible <bruno@clisp.org>
parents:
40128
diff
changeset
|
1651 # more to do. |
|
7f0ac0398fae
gnulib-tool: Improve handling of multiple --local-dir options.
Bruno Haible <bruno@clisp.org>
parents:
40128
diff
changeset
|
1652 if test -z "$lookedup_file"; then |
|
7f0ac0398fae
gnulib-tool: Improve handling of multiple --local-dir options.
Bruno Haible <bruno@clisp.org>
parents:
40128
diff
changeset
|
1653 # Otherwise, look for $dir/$lkfile and $dir/$lkfile.diff. |
|
7f0ac0398fae
gnulib-tool: Improve handling of multiple --local-dir options.
Bruno Haible <bruno@clisp.org>
parents:
40128
diff
changeset
|
1654 if test -f "$1/$lkfile"; then |
|
7f0ac0398fae
gnulib-tool: Improve handling of multiple --local-dir options.
Bruno Haible <bruno@clisp.org>
parents:
40128
diff
changeset
|
1655 lookedup_file="$1/$lkfile" |
|
7f0ac0398fae
gnulib-tool: Improve handling of multiple --local-dir options.
Bruno Haible <bruno@clisp.org>
parents:
40128
diff
changeset
|
1656 else |
|
7f0ac0398fae
gnulib-tool: Improve handling of multiple --local-dir options.
Bruno Haible <bruno@clisp.org>
parents:
40128
diff
changeset
|
1657 if test -f "$1/$lkfile.diff"; then |
|
7f0ac0398fae
gnulib-tool: Improve handling of multiple --local-dir options.
Bruno Haible <bruno@clisp.org>
parents:
40128
diff
changeset
|
1658 lkpatches="$1/$lkfile.diff${lkpatches:+$PATH_SEPARATOR$lkpatches}" |
|
7f0ac0398fae
gnulib-tool: Improve handling of multiple --local-dir options.
Bruno Haible <bruno@clisp.org>
parents:
40128
diff
changeset
|
1659 fi |
|
7f0ac0398fae
gnulib-tool: Improve handling of multiple --local-dir options.
Bruno Haible <bruno@clisp.org>
parents:
40128
diff
changeset
|
1660 fi |
|
7f0ac0398fae
gnulib-tool: Improve handling of multiple --local-dir options.
Bruno Haible <bruno@clisp.org>
parents:
40128
diff
changeset
|
1661 fi |
|
7f0ac0398fae
gnulib-tool: Improve handling of multiple --local-dir options.
Bruno Haible <bruno@clisp.org>
parents:
40128
diff
changeset
|
1662 } |
|
7f0ac0398fae
gnulib-tool: Improve handling of multiple --local-dir options.
Bruno Haible <bruno@clisp.org>
parents:
40128
diff
changeset
|
1663 |
|
7073
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
1664 # func_lookup_file file |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
1665 # looks up a file in $local_gnulib_path or $gnulib_dir, or combines it through |
|
7073
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
1666 # 'patch'. |
|
7214
eb43edab28c3
Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents:
7213
diff
changeset
|
1667 # Input: |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
1668 # - local_gnulib_path from --local-dir |
|
7073
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
1669 # Output: |
|
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
1670 # - lookedup_file name of the merged (combined) file |
|
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
1671 # - lookedup_tmp true if it is located in the tmp directory, blank otherwise |
|
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
1672 func_lookup_file () |
|
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
1673 { |
|
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
1674 lkfile="$1" |
|
40184
7f0ac0398fae
gnulib-tool: Improve handling of multiple --local-dir options.
Bruno Haible <bruno@clisp.org>
parents:
40128
diff
changeset
|
1675 # Each element in $local_gnulib_path is a directory whose contents overrides |
|
7f0ac0398fae
gnulib-tool: Improve handling of multiple --local-dir options.
Bruno Haible <bruno@clisp.org>
parents:
40128
diff
changeset
|
1676 # or amends the result of the lookup in the rest of $local_gnulib_path and |
|
7f0ac0398fae
gnulib-tool: Improve handling of multiple --local-dir options.
Bruno Haible <bruno@clisp.org>
parents:
40128
diff
changeset
|
1677 # $gnulib_dir. So, the first element of $local_gnulib_path is the highest |
|
7f0ac0398fae
gnulib-tool: Improve handling of multiple --local-dir options.
Bruno Haible <bruno@clisp.org>
parents:
40128
diff
changeset
|
1678 # priority one. |
|
7f0ac0398fae
gnulib-tool: Improve handling of multiple --local-dir options.
Bruno Haible <bruno@clisp.org>
parents:
40128
diff
changeset
|
1679 lookedup_file= |
|
7f0ac0398fae
gnulib-tool: Improve handling of multiple --local-dir options.
Bruno Haible <bruno@clisp.org>
parents:
40128
diff
changeset
|
1680 lkpatches= |
|
7f0ac0398fae
gnulib-tool: Improve handling of multiple --local-dir options.
Bruno Haible <bruno@clisp.org>
parents:
40128
diff
changeset
|
1681 func_path_foreach "$local_gnulib_path" func_lookup_file_cb %dir% |
|
7f0ac0398fae
gnulib-tool: Improve handling of multiple --local-dir options.
Bruno Haible <bruno@clisp.org>
parents:
40128
diff
changeset
|
1682 # Treat $gnulib_dir like a lowest-priority --local-dir, except that here we |
|
7f0ac0398fae
gnulib-tool: Improve handling of multiple --local-dir options.
Bruno Haible <bruno@clisp.org>
parents:
40128
diff
changeset
|
1683 # don't look for .diff files. |
|
7f0ac0398fae
gnulib-tool: Improve handling of multiple --local-dir options.
Bruno Haible <bruno@clisp.org>
parents:
40128
diff
changeset
|
1684 if test -z "$lookedup_file"; then |
|
7073
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
1685 if test -f "$gnulib_dir/$lkfile"; then |
|
40184
7f0ac0398fae
gnulib-tool: Improve handling of multiple --local-dir options.
Bruno Haible <bruno@clisp.org>
parents:
40128
diff
changeset
|
1686 lookedup_file="$gnulib_dir/$lkfile" |
|
7073
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
1687 else |
|
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
1688 func_fatal_error "file $gnulib_dir/$lkfile not found" |
|
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
1689 fi |
|
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
1690 fi |
|
40184
7f0ac0398fae
gnulib-tool: Improve handling of multiple --local-dir options.
Bruno Haible <bruno@clisp.org>
parents:
40128
diff
changeset
|
1691 # Now apply the patches, from lowest-priority to highest-priority. |
|
7f0ac0398fae
gnulib-tool: Improve handling of multiple --local-dir options.
Bruno Haible <bruno@clisp.org>
parents:
40128
diff
changeset
|
1692 lookedup_tmp= |
|
7f0ac0398fae
gnulib-tool: Improve handling of multiple --local-dir options.
Bruno Haible <bruno@clisp.org>
parents:
40128
diff
changeset
|
1693 if test -n "$lkpatches"; then |
|
7f0ac0398fae
gnulib-tool: Improve handling of multiple --local-dir options.
Bruno Haible <bruno@clisp.org>
parents:
40128
diff
changeset
|
1694 lkbase=`echo "$lkfile" | sed -e 's,^.*/,,'` |
|
7f0ac0398fae
gnulib-tool: Improve handling of multiple --local-dir options.
Bruno Haible <bruno@clisp.org>
parents:
40128
diff
changeset
|
1695 rm -f "$tmp/$lkbase" |
|
7f0ac0398fae
gnulib-tool: Improve handling of multiple --local-dir options.
Bruno Haible <bruno@clisp.org>
parents:
40128
diff
changeset
|
1696 cp "$lookedup_file" "$tmp/$lkbase" |
|
7f0ac0398fae
gnulib-tool: Improve handling of multiple --local-dir options.
Bruno Haible <bruno@clisp.org>
parents:
40128
diff
changeset
|
1697 save_IFS="$IFS" |
|
7f0ac0398fae
gnulib-tool: Improve handling of multiple --local-dir options.
Bruno Haible <bruno@clisp.org>
parents:
40128
diff
changeset
|
1698 IFS="$PATH_SEPARATOR" |
|
7f0ac0398fae
gnulib-tool: Improve handling of multiple --local-dir options.
Bruno Haible <bruno@clisp.org>
parents:
40128
diff
changeset
|
1699 for patchfile in $lkpatches; do |
|
7f0ac0398fae
gnulib-tool: Improve handling of multiple --local-dir options.
Bruno Haible <bruno@clisp.org>
parents:
40128
diff
changeset
|
1700 IFS="$save_IFS" |
|
7f0ac0398fae
gnulib-tool: Improve handling of multiple --local-dir options.
Bruno Haible <bruno@clisp.org>
parents:
40128
diff
changeset
|
1701 patch -s "$tmp/$lkbase" < "$patchfile" >&2 \ |
|
7f0ac0398fae
gnulib-tool: Improve handling of multiple --local-dir options.
Bruno Haible <bruno@clisp.org>
parents:
40128
diff
changeset
|
1702 || func_fatal_error "patch file $patchfile didn't apply cleanly" |
|
7f0ac0398fae
gnulib-tool: Improve handling of multiple --local-dir options.
Bruno Haible <bruno@clisp.org>
parents:
40128
diff
changeset
|
1703 done |
|
7f0ac0398fae
gnulib-tool: Improve handling of multiple --local-dir options.
Bruno Haible <bruno@clisp.org>
parents:
40128
diff
changeset
|
1704 IFS="$save_IFS" |
|
7f0ac0398fae
gnulib-tool: Improve handling of multiple --local-dir options.
Bruno Haible <bruno@clisp.org>
parents:
40128
diff
changeset
|
1705 lookedup_file="$tmp/$lkbase" |
|
7f0ac0398fae
gnulib-tool: Improve handling of multiple --local-dir options.
Bruno Haible <bruno@clisp.org>
parents:
40128
diff
changeset
|
1706 lookedup_tmp=true |
|
7f0ac0398fae
gnulib-tool: Improve handling of multiple --local-dir options.
Bruno Haible <bruno@clisp.org>
parents:
40128
diff
changeset
|
1707 fi |
|
7073
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
1708 } |
|
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
1709 |
|
12876
030a6f5cbffd
Make it easier to find modules. New gnulib-tool option '--find'.
Bruno Haible <bruno@clisp.org>
parents:
12859
diff
changeset
|
1710 # func_sanitize_modulelist |
|
030a6f5cbffd
Make it easier to find modules. New gnulib-tool option '--find'.
Bruno Haible <bruno@clisp.org>
parents:
12859
diff
changeset
|
1711 # receives a list of possible module names on standard input, one per line. |
|
030a6f5cbffd
Make it easier to find modules. New gnulib-tool option '--find'.
Bruno Haible <bruno@clisp.org>
parents:
12859
diff
changeset
|
1712 # It removes those which are just file names unrelated to modules, and outputs |
|
030a6f5cbffd
Make it easier to find modules. New gnulib-tool option '--find'.
Bruno Haible <bruno@clisp.org>
parents:
12859
diff
changeset
|
1713 # the resulting list to standard output, one per line. |
|
030a6f5cbffd
Make it easier to find modules. New gnulib-tool option '--find'.
Bruno Haible <bruno@clisp.org>
parents:
12859
diff
changeset
|
1714 func_sanitize_modulelist () |
|
030a6f5cbffd
Make it easier to find modules. New gnulib-tool option '--find'.
Bruno Haible <bruno@clisp.org>
parents:
12859
diff
changeset
|
1715 { |
|
17378
1d9362a18c34
Assume gnulib is checked out from Git, not CVS
Stefano Lattarini <stefano.lattarini@gmail.com>
parents:
17269
diff
changeset
|
1716 sed -e '/^ChangeLog$/d' -e '/\/ChangeLog$/d' \ |
|
12876
030a6f5cbffd
Make it easier to find modules. New gnulib-tool option '--find'.
Bruno Haible <bruno@clisp.org>
parents:
12859
diff
changeset
|
1717 -e '/^COPYING$/d' -e '/\/COPYING$/d' \ |
|
030a6f5cbffd
Make it easier to find modules. New gnulib-tool option '--find'.
Bruno Haible <bruno@clisp.org>
parents:
12859
diff
changeset
|
1718 -e '/^README$/d' -e '/\/README$/d' \ |
|
030a6f5cbffd
Make it easier to find modules. New gnulib-tool option '--find'.
Bruno Haible <bruno@clisp.org>
parents:
12859
diff
changeset
|
1719 -e '/^TEMPLATE$/d' \ |
|
030a6f5cbffd
Make it easier to find modules. New gnulib-tool option '--find'.
Bruno Haible <bruno@clisp.org>
parents:
12859
diff
changeset
|
1720 -e '/^TEMPLATE-EXTENDED$/d' \ |
|
030a6f5cbffd
Make it easier to find modules. New gnulib-tool option '--find'.
Bruno Haible <bruno@clisp.org>
parents:
12859
diff
changeset
|
1721 -e '/^TEMPLATE-TESTS$/d' \ |
|
030a6f5cbffd
Make it easier to find modules. New gnulib-tool option '--find'.
Bruno Haible <bruno@clisp.org>
parents:
12859
diff
changeset
|
1722 -e '/^\..*/d' \ |
|
030a6f5cbffd
Make it easier to find modules. New gnulib-tool option '--find'.
Bruno Haible <bruno@clisp.org>
parents:
12859
diff
changeset
|
1723 -e '/~$/d' |
|
030a6f5cbffd
Make it easier to find modules. New gnulib-tool option '--find'.
Bruno Haible <bruno@clisp.org>
parents:
12859
diff
changeset
|
1724 } |
|
030a6f5cbffd
Make it easier to find modules. New gnulib-tool option '--find'.
Bruno Haible <bruno@clisp.org>
parents:
12859
diff
changeset
|
1725 |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
1726 |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
1727 # func_modules_in_dir dir |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
1728 # outputs all module files in dir to standard output. |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
1729 func_modules_in_dir () |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
1730 { |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
1731 (test -d "$1" && cd "$1" && find modules -type f -print) |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
1732 } |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
1733 |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1734 # func_all_modules |
|
7214
eb43edab28c3
Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents:
7213
diff
changeset
|
1735 # Input: |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
1736 # - local_gnulib_path from --local-dir |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1737 func_all_modules () |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1738 { |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1739 # Filter out metainformation files like README, which are not modules. |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1740 # Filter out unit test modules; they can be retrieved through |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1741 # --extract-tests-module if desired. |
|
7073
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
1742 { |
|
7805
2ee7433618fe
Add support for subdirectories of the 'modules/' directory.
Bruno Haible <bruno@clisp.org>
parents:
7788
diff
changeset
|
1743 (cd "$gnulib_dir" && find modules -type f -print | sed -e 's,^modules/,,') |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
1744 func_path_foreach "$local_gnulib_path" func_modules_in_dir %dir% | sed -e 's,^modules/,,' -e 's,\.diff$,,' |
|
7073
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
1745 } \ |
|
12876
030a6f5cbffd
Make it easier to find modules. New gnulib-tool option '--find'.
Bruno Haible <bruno@clisp.org>
parents:
12859
diff
changeset
|
1746 | func_sanitize_modulelist \ |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
1747 | sed -e '/-tests$/d' \ |
|
7319
1726cc39709b
Use "sort -u" where it makes sense.
Bruno Haible <bruno@clisp.org>
parents:
7299
diff
changeset
|
1748 | LC_ALL=C sort -u |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1749 } |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1750 |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
1751 # func_exists_local_module dir module |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
1752 # returns true if module exists in dir |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
1753 func_exists_local_module () |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
1754 { |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
1755 test -d "$1/modules" && test -f "$1/modules/$2"; |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
1756 } |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
1757 |
|
13081
012563ccbd85
gnulib-tool: Allow 'foo-tests' module even if there is no module 'foo'.
Bruno Haible <bruno@clisp.org>
parents:
13080
diff
changeset
|
1758 # func_exists_module module |
|
012563ccbd85
gnulib-tool: Allow 'foo-tests' module even if there is no module 'foo'.
Bruno Haible <bruno@clisp.org>
parents:
13080
diff
changeset
|
1759 # tests whether a module, given by name, exists |
|
012563ccbd85
gnulib-tool: Allow 'foo-tests' module even if there is no module 'foo'.
Bruno Haible <bruno@clisp.org>
parents:
13080
diff
changeset
|
1760 # Input: |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
1761 # - local_gnulib_path from --local-dir |
|
13081
012563ccbd85
gnulib-tool: Allow 'foo-tests' module even if there is no module 'foo'.
Bruno Haible <bruno@clisp.org>
parents:
13080
diff
changeset
|
1762 func_exists_module () |
|
012563ccbd85
gnulib-tool: Allow 'foo-tests' module even if there is no module 'foo'.
Bruno Haible <bruno@clisp.org>
parents:
13080
diff
changeset
|
1763 { |
|
012563ccbd85
gnulib-tool: Allow 'foo-tests' module even if there is no module 'foo'.
Bruno Haible <bruno@clisp.org>
parents:
13080
diff
changeset
|
1764 { test -f "$gnulib_dir/modules/$1" \ |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
1765 || func_path_foreach "$local_gnulib_path" func_exists_local_module %dir% "$1" ; } \ |
|
13081
012563ccbd85
gnulib-tool: Allow 'foo-tests' module even if there is no module 'foo'.
Bruno Haible <bruno@clisp.org>
parents:
13080
diff
changeset
|
1766 && test "ChangeLog" != "$1" \ |
|
012563ccbd85
gnulib-tool: Allow 'foo-tests' module even if there is no module 'foo'.
Bruno Haible <bruno@clisp.org>
parents:
13080
diff
changeset
|
1767 && test "COPYING" != "$1" \ |
|
012563ccbd85
gnulib-tool: Allow 'foo-tests' module even if there is no module 'foo'.
Bruno Haible <bruno@clisp.org>
parents:
13080
diff
changeset
|
1768 && test "README" != "$1" \ |
|
012563ccbd85
gnulib-tool: Allow 'foo-tests' module even if there is no module 'foo'.
Bruno Haible <bruno@clisp.org>
parents:
13080
diff
changeset
|
1769 && test "TEMPLATE" != "$1" \ |
|
012563ccbd85
gnulib-tool: Allow 'foo-tests' module even if there is no module 'foo'.
Bruno Haible <bruno@clisp.org>
parents:
13080
diff
changeset
|
1770 && test "TEMPLATE-EXTENDED" != "$1" \ |
|
012563ccbd85
gnulib-tool: Allow 'foo-tests' module even if there is no module 'foo'.
Bruno Haible <bruno@clisp.org>
parents:
13080
diff
changeset
|
1771 && test "TEMPLATE-TESTS" != "$1" |
|
012563ccbd85
gnulib-tool: Allow 'foo-tests' module even if there is no module 'foo'.
Bruno Haible <bruno@clisp.org>
parents:
13080
diff
changeset
|
1772 } |
|
012563ccbd85
gnulib-tool: Allow 'foo-tests' module even if there is no module 'foo'.
Bruno Haible <bruno@clisp.org>
parents:
13080
diff
changeset
|
1773 |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1774 # func_verify_module |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1775 # verifies a module name |
|
7214
eb43edab28c3
Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents:
7213
diff
changeset
|
1776 # Input: |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
1777 # - local_gnulib_path from --local-dir |
|
7214
eb43edab28c3
Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents:
7213
diff
changeset
|
1778 # - module module name argument |
|
40074
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
1779 # Output: |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
1780 # - module unchanged if OK, empty if not OK |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
1781 # - lookedup_file if OK: name of the merged (combined) module description file |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
1782 # - lookedup_tmp if OK: true if it is located in the tmp directory, blank otherwise |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1783 func_verify_module () |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1784 { |
|
13081
012563ccbd85
gnulib-tool: Allow 'foo-tests' module even if there is no module 'foo'.
Bruno Haible <bruno@clisp.org>
parents:
13080
diff
changeset
|
1785 if func_exists_module "$module"; then |
|
7168
56632b3512af
Make it work also with Solaris /bin/sh.
Bruno Haible <bruno@clisp.org>
parents:
7142
diff
changeset
|
1786 # OK, $module is a correct module name. |
| 7212 | 1787 # Verify that building the module description with 'patch' succeeds. |
| 1788 func_lookup_file "modules/$module" | |
|
7168
56632b3512af
Make it work also with Solaris /bin/sh.
Bruno Haible <bruno@clisp.org>
parents:
7142
diff
changeset
|
1789 else |
|
12819
4b5bf4c79e0c
gnulib-tool: Make warning diagnostics consistent.
Bruno Haible <bruno@clisp.org>
parents:
12775
diff
changeset
|
1790 func_warning "module $module doesn't exist" |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1791 module= |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1792 fi |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1793 } |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1794 |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1795 # func_verify_nontests_module |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1796 # verifies a module name, excluding tests modules |
|
7214
eb43edab28c3
Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents:
7213
diff
changeset
|
1797 # Input: |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
1798 # - local_gnulib_path from --local-dir |
|
7214
eb43edab28c3
Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents:
7213
diff
changeset
|
1799 # - module module name argument |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1800 func_verify_nontests_module () |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1801 { |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1802 case "$module" in |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1803 *-tests ) module= ;; |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1804 * ) func_verify_module ;; |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1805 esac |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1806 } |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1807 |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1808 # func_verify_tests_module |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1809 # verifies a module name, considering only tests modules |
|
7214
eb43edab28c3
Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents:
7213
diff
changeset
|
1810 # Input: |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
1811 # - local_gnulib_path from --local-dir |
|
7214
eb43edab28c3
Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents:
7213
diff
changeset
|
1812 # - module module name argument |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1813 func_verify_tests_module () |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1814 { |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1815 case "$module" in |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1816 *-tests ) func_verify_module ;; |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1817 * ) module= ;; |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1818 esac |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1819 } |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1820 |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1821 # Suffix of a sed expression that extracts a particular field from a |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1822 # module description. |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1823 # A field starts with a line that contains a keyword, such as 'Description', |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1824 # followed by a colon and optional whitespace. All following lines, up to |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1825 # the next field (or end of file if there is none) form the contents of the |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1826 # field. |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1827 # An absent field is equivalent to a field with empty contents. |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1828 # NOTE: Keep this in sync with sed_extract_cache_prog below! |
|
12855
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1829 sed_extract_prog=':[ ]*$/ { |
|
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1830 :a |
|
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1831 n |
|
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1832 s/^Description:[ ]*$// |
|
13070
71d59ec8c75f
New module description field 'Comment'.
Bruno Haible <bruno@clisp.org>
parents:
13069
diff
changeset
|
1833 s/^Comment:[ ]*$// |
|
12855
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1834 s/^Status:[ ]*$// |
|
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1835 s/^Notice:[ ]*$// |
|
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1836 s/^Applicability:[ ]*$// |
|
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1837 s/^Files:[ ]*$// |
|
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1838 s/^Depends-on:[ ]*$// |
|
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1839 s/^configure\.ac-early:[ ]*$// |
|
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1840 s/^configure\.ac:[ ]*$// |
|
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1841 s/^Makefile\.am:[ ]*$// |
|
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1842 s/^Include:[ ]*$// |
|
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1843 s/^Link:[ ]*$// |
|
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1844 s/^License:[ ]*$// |
|
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1845 s/^Maintainer:[ ]*$// |
|
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1846 tb |
|
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1847 p |
|
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1848 ba |
|
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1849 :b |
|
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1850 }' |
|
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1851 |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1852 # Piece of a sed expression that converts a field header line to a shell |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1853 # variable name, |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1854 # NOTE: Keep this in sync with sed_extract_prog above! |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1855 sed_extract_field_header=' |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1856 s/^Description:[ ]*$/description/ |
|
13070
71d59ec8c75f
New module description field 'Comment'.
Bruno Haible <bruno@clisp.org>
parents:
13069
diff
changeset
|
1857 s/^Comment:[ ]*$/comment/ |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1858 s/^Status:[ ]*$/status/ |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1859 s/^Notice:[ ]*$/notice/ |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1860 s/^Applicability:[ ]*$/applicability/ |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1861 s/^Files:[ ]*$/files/ |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1862 s/^Depends-on:[ ]*$/dependson/ |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1863 s/^configure\.ac-early:[ ]*$/configureac_early/ |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1864 s/^configure\.ac:[ ]*$/configureac/ |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1865 s/^Makefile\.am:[ ]*$/makefile/ |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1866 s/^Include:[ ]*$/include/ |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1867 s/^Link:[ ]*$/link/ |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1868 s/^License:[ ]*$/license/ |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1869 s/^Maintainer:[ ]*$/maintainer/' |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1870 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1871 if $modcache; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1872 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1873 if $have_associative; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1874 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1875 # Declare the associative arrays. |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1876 declare -A modcache_cached |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1877 sed_to_declare_statement='s|^.*/\([a-zA-Z0-9_]*\)/$|declare -A modcache_\1|p' |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1878 declare_script=`echo "$sed_extract_field_header" | sed -n -e "$sed_to_declare_statement"` |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1879 eval "$declare_script" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1880 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1881 else |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1882 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1883 # func_cache_var module |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1884 # computes the cache variable name corresponding to $module. |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1885 # Note: This computation can map different module names to the same |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1886 # cachevar (such as 'foo-bar', 'foo_bar', or 'foo/bar'); the caller has |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1887 # to protect against this case. |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1888 # Output: |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1889 # - cachevar a shell variable name |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1890 if (f=foo; eval echo '${f//o/e}') < /dev/null 2>/dev/null | grep fee >/dev/null; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1891 # Bash 2.0 and newer, ksh, and zsh support the syntax |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1892 # ${param//pattern/replacement} |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1893 # as a shorthand for |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1894 # `echo "$param" | sed -e "s/pattern/replacement/g"`. |
|
13660
6a2c7d3ca5f0
gnulib-tool: work with NetBSD /bin/sh
Eric Blake <eblake@redhat.com>
parents:
13658
diff
changeset
|
1895 # Note: The 'eval' is necessary for dash and NetBSD /bin/sh. |
|
6a2c7d3ca5f0
gnulib-tool: work with NetBSD /bin/sh
Eric Blake <eblake@redhat.com>
parents:
13658
diff
changeset
|
1896 eval 'func_cache_var () |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1897 { |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1898 cachevar=c_${1//[!a-zA-Z0-9_]/_} |
|
13660
6a2c7d3ca5f0
gnulib-tool: work with NetBSD /bin/sh
Eric Blake <eblake@redhat.com>
parents:
13658
diff
changeset
|
1899 }' |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1900 else |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1901 func_cache_var () |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1902 { |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1903 case $1 in |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1904 *[!a-zA-Z0-9_]*) |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1905 cachevar=c_`echo "$1" | LC_ALL=C sed -e 's/[^a-zA-Z0-9_]/_/g'` ;; |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1906 *) |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1907 cachevar=c_$1 ;; |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1908 esac |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1909 } |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1910 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1911 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1912 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1913 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1914 # func_init_sed_convert_to_cache_statements |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1915 # Input: |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1916 # - modcachevar_assignment |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1917 # Output: |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1918 # - sed_convert_to_cache_statements |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1919 func_init_sed_convert_to_cache_statements () |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1920 { |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1921 # 'sed' script that turns a module description into shell script |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1922 # assignments, suitable to be eval'ed. All active characters are escaped. |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1923 # This script turns |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1924 # Description: |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1925 # Some module's description |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1926 # |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1927 # Files: |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1928 # lib/file.h |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1929 # into: |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1930 # modcache_description[$1]=\ |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1931 # 'Some module'"'"'s description |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1932 # ' |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1933 # modcache_files[$1]=\ |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1934 # 'lib/file.h' |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1935 # or: |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1936 # c_MODULE_description_set=set; c_MODULE_description=\ |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1937 # 'Some module'"'"'s description |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1938 # ' |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1939 # c_MODULE_files_set=set; c_MODULE_files=\ |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1940 # 'lib/file.h' |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1941 # The script consists of two parts: |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1942 # 1) Ignore the lines before the first field header. |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1943 # 2) A loop, treating non-field-header lines by escaping single quotes |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1944 # and adding a closing quote in the last line, |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1945 sed_convert_to_cache_statements=" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1946 :llla |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1947 # Here we have not yet seen a field header. |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1948 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1949 # See if the current line contains a field header. |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1950 t llla1 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1951 :llla1 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1952 ${sed_extract_field_header} |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1953 t lllb |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1954 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1955 # No field header. Ignore the line. |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1956 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1957 # Read the next line. Upon EOF, just exit. |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1958 n |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1959 b llla |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1960 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1961 :lllb |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1962 # The current line contains a field header. |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1963 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1964 # Turn it into the beginning of an assignment. |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1965 s/^\\(.*\\)\$/${modcachevar_assignment}\\\\/ |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1966 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1967 # Move it to the hold space. Don't print it yet, |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1968 # because we want no assignment if the field is empty. |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1969 h |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1970 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1971 # Read the next line. |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1972 # Upon EOF, the field was empty. Print no assignment. Just exit. |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1973 n |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1974 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1975 # See if the current line contains a field header. |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1976 t lllb1 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1977 :lllb1 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1978 ${sed_extract_field_header} |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1979 # If it is, the previous field was empty. Print no assignment. |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1980 t lllb |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1981 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1982 # Not a field header. |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1983 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1984 # Print the previous line, held in the hold space. |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1985 x |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1986 p |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1987 x |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1988 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1989 # Transform single quotes. |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1990 s/'/'\"'\"'/g |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1991 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1992 # Prepend a single quote. |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1993 s/^/'/ |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1994 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1995 :lllc |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1996 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1997 # Move it to the hold space. |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1998 h |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1999 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2000 # Read the next line. |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2001 # Upon EOF, branch. |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2002 \${ |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2003 b llle |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2004 } |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2005 n |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2006 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2007 # See if the current line contains a field header. |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2008 t lllc1 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2009 :lllc1 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2010 ${sed_extract_field_header} |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2011 t llld |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2012 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2013 # Print the previous line, held in the hold space. |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2014 x |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2015 p |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2016 x |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2017 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2018 # Transform single quotes. |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2019 s/'/'\"'\"'/g |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2020 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2021 b lllc |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2022 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2023 :llld |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2024 # A field header. |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2025 # Print the previous line, held in the hold space, with a single quote |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2026 # to end the assignment. |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2027 x |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2028 s/\$/'/ |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2029 p |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2030 x |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2031 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2032 b lllb |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2033 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2034 :llle |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2035 # EOF seen. |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2036 # Print the previous line, held in the hold space, with a single quote |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2037 # to end the assignment. |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2038 x |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2039 s/\$/'/ |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2040 p |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2041 # Exit. |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2042 n |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2043 " |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2044 if ! $sed_comments; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2045 # Remove comments. |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2046 sed_convert_to_cache_statements=`echo "$sed_convert_to_cache_statements" \ |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2047 | sed -e 's/^ *//' -e 's/^#.*//'` |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2048 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2049 } |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2050 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2051 if $have_associative; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2052 # sed_convert_to_cache_statements does not depend on the module. |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2053 modcachevar_assignment='modcache_\1[$1]=' |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2054 func_init_sed_convert_to_cache_statements |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2055 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2056 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2057 # func_cache_lookup_module module |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2058 # |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2059 # looks up a module, like 'func_lookup_file modules/$module', and stores all |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2060 # of its relevant data in a cache in the memory of the processing shell. If |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2061 # already cached, it does not look it up again, thus saving file access time. |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2062 # Parameters: |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2063 # - module non-empty string |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2064 # Output if $have_associative: |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2065 # - modcache_cached[$module] set to yes |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2066 # - modcache_description[$module] == |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2067 # - modcache_status[$module] \ set to the field's value, minus the |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2068 # - ... / final newline, |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2069 # - modcache_maintainer[$module] == or unset if the field's value is empty |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2070 # Output if ! $have_associative: |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2071 # - cachevar a shell variable name |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2072 # - ${cachevar}_cached set to $module |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2073 # - ${cachevar}_description == |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2074 # - ${cachevar}_status \ set to the field's value, minus the |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2075 # - ... / final newline, |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2076 # - ${cachevar}_maintainer == or unset if the field's value is empty |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2077 # - ${cachevar}_description_set == |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2078 # - ${cachevar}_status_set \ set to non-empty if the field's value |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2079 # - ... / is non-empty, |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2080 # - ${cachevar}_maintainer_set == or unset if the field's value is empty |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2081 func_cache_lookup_module () |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2082 { |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2083 if $have_associative; then |
|
13660
6a2c7d3ca5f0
gnulib-tool: work with NetBSD /bin/sh
Eric Blake <eblake@redhat.com>
parents:
13658
diff
changeset
|
2084 eval 'cached=${modcache_cached[$1]}' |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2085 else |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2086 func_cache_var "$1" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2087 eval "cached=\"\$${cachevar}_cached\"" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2088 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2089 if test -z "$cached"; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2090 # Not found in cache. Look it up on the file system. |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2091 func_lookup_file "modules/$1" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2092 if $have_associative; then |
|
13660
6a2c7d3ca5f0
gnulib-tool: work with NetBSD /bin/sh
Eric Blake <eblake@redhat.com>
parents:
13658
diff
changeset
|
2093 eval 'modcache_cached[$1]=yes' |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2094 else |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2095 eval "${cachevar}_cached=\"\$1\"" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2096 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2097 if ! $have_associative; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2098 # sed_convert_to_cache_statements depends on the module. |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2099 modcachevar_assignment="${cachevar}"'_\1_set=set; '"${cachevar}"'_\1=' |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2100 func_init_sed_convert_to_cache_statements |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2101 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2102 cache_statements=`LC_ALL=C sed -n -e "$sed_convert_to_cache_statements" < "$lookedup_file"` |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2103 eval "$cache_statements" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2104 else |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2105 if ! $have_associative; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2106 if test "$1" != "$cached"; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2107 func_fatal_error "cache variable collision between $1 and $cached" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2108 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2109 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2110 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2111 } |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2112 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2113 fi |
|
12855
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
2114 |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2115 # func_get_description module |
|
7214
eb43edab28c3
Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents:
7213
diff
changeset
|
2116 # Input: |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
2117 # - local_gnulib_path from --local-dir |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2118 # - modcache true or false, from --cache-modules/--no-cache-modules |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2119 func_get_description () |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2120 { |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2121 if ! $modcache; then |
|
12855
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
2122 func_lookup_file "modules/$1" |
|
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
2123 sed -n -e "/^Description$sed_extract_prog" < "$lookedup_file" |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2124 else |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2125 func_cache_lookup_module "$1" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2126 # Output the field's value, including the final newline (if any). |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2127 if $have_associative; then |
|
13660
6a2c7d3ca5f0
gnulib-tool: work with NetBSD /bin/sh
Eric Blake <eblake@redhat.com>
parents:
13658
diff
changeset
|
2128 if eval 'test -n "${modcache_description[$1]+set}"'; then |
|
6a2c7d3ca5f0
gnulib-tool: work with NetBSD /bin/sh
Eric Blake <eblake@redhat.com>
parents:
13658
diff
changeset
|
2129 eval 'echo "${modcache_description[$1]}"' |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2130 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2131 else |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2132 eval "field_set=\"\$${cachevar}_description_set\"" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2133 if test -n "$field_set"; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2134 eval "field_value=\"\$${cachevar}_description\"" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2135 echo "${field_value}" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2136 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2137 fi |
|
12855
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
2138 fi |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2139 } |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2140 |
|
13070
71d59ec8c75f
New module description field 'Comment'.
Bruno Haible <bruno@clisp.org>
parents:
13069
diff
changeset
|
2141 # func_get_comment module |
|
71d59ec8c75f
New module description field 'Comment'.
Bruno Haible <bruno@clisp.org>
parents:
13069
diff
changeset
|
2142 # Input: |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
2143 # - local_gnulib_path from --local-dir |
|
13070
71d59ec8c75f
New module description field 'Comment'.
Bruno Haible <bruno@clisp.org>
parents:
13069
diff
changeset
|
2144 # - modcache true or false, from --cache-modules/--no-cache-modules |
|
71d59ec8c75f
New module description field 'Comment'.
Bruno Haible <bruno@clisp.org>
parents:
13069
diff
changeset
|
2145 func_get_comment () |
|
71d59ec8c75f
New module description field 'Comment'.
Bruno Haible <bruno@clisp.org>
parents:
13069
diff
changeset
|
2146 { |
|
71d59ec8c75f
New module description field 'Comment'.
Bruno Haible <bruno@clisp.org>
parents:
13069
diff
changeset
|
2147 if ! $modcache; then |
|
71d59ec8c75f
New module description field 'Comment'.
Bruno Haible <bruno@clisp.org>
parents:
13069
diff
changeset
|
2148 func_lookup_file "modules/$1" |
|
71d59ec8c75f
New module description field 'Comment'.
Bruno Haible <bruno@clisp.org>
parents:
13069
diff
changeset
|
2149 sed -n -e "/^Comment$sed_extract_prog" < "$lookedup_file" |
|
71d59ec8c75f
New module description field 'Comment'.
Bruno Haible <bruno@clisp.org>
parents:
13069
diff
changeset
|
2150 else |
|
71d59ec8c75f
New module description field 'Comment'.
Bruno Haible <bruno@clisp.org>
parents:
13069
diff
changeset
|
2151 func_cache_lookup_module "$1" |
|
71d59ec8c75f
New module description field 'Comment'.
Bruno Haible <bruno@clisp.org>
parents:
13069
diff
changeset
|
2152 # Output the field's value, including the final newline (if any). |
|
71d59ec8c75f
New module description field 'Comment'.
Bruno Haible <bruno@clisp.org>
parents:
13069
diff
changeset
|
2153 if $have_associative; then |
|
13660
6a2c7d3ca5f0
gnulib-tool: work with NetBSD /bin/sh
Eric Blake <eblake@redhat.com>
parents:
13658
diff
changeset
|
2154 if eval 'test -n "${modcache_comment[$1]+set}"'; then |
|
6a2c7d3ca5f0
gnulib-tool: work with NetBSD /bin/sh
Eric Blake <eblake@redhat.com>
parents:
13658
diff
changeset
|
2155 eval 'echo "${modcache_comment[$1]}"' |
|
13070
71d59ec8c75f
New module description field 'Comment'.
Bruno Haible <bruno@clisp.org>
parents:
13069
diff
changeset
|
2156 fi |
|
71d59ec8c75f
New module description field 'Comment'.
Bruno Haible <bruno@clisp.org>
parents:
13069
diff
changeset
|
2157 else |
|
71d59ec8c75f
New module description field 'Comment'.
Bruno Haible <bruno@clisp.org>
parents:
13069
diff
changeset
|
2158 eval "field_set=\"\$${cachevar}_comment_set\"" |
|
71d59ec8c75f
New module description field 'Comment'.
Bruno Haible <bruno@clisp.org>
parents:
13069
diff
changeset
|
2159 if test -n "$field_set"; then |
|
71d59ec8c75f
New module description field 'Comment'.
Bruno Haible <bruno@clisp.org>
parents:
13069
diff
changeset
|
2160 eval "field_value=\"\$${cachevar}_comment\"" |
|
71d59ec8c75f
New module description field 'Comment'.
Bruno Haible <bruno@clisp.org>
parents:
13069
diff
changeset
|
2161 echo "${field_value}" |
|
71d59ec8c75f
New module description field 'Comment'.
Bruno Haible <bruno@clisp.org>
parents:
13069
diff
changeset
|
2162 fi |
|
71d59ec8c75f
New module description field 'Comment'.
Bruno Haible <bruno@clisp.org>
parents:
13069
diff
changeset
|
2163 fi |
|
71d59ec8c75f
New module description field 'Comment'.
Bruno Haible <bruno@clisp.org>
parents:
13069
diff
changeset
|
2164 fi |
|
71d59ec8c75f
New module description field 'Comment'.
Bruno Haible <bruno@clisp.org>
parents:
13069
diff
changeset
|
2165 } |
|
71d59ec8c75f
New module description field 'Comment'.
Bruno Haible <bruno@clisp.org>
parents:
13069
diff
changeset
|
2166 |
|
10743
ec39330cb04e
Modules now have a 'status' attribute.
Bruno Haible <bruno@clisp.org>
parents:
10732
diff
changeset
|
2167 # func_get_status module |
|
ec39330cb04e
Modules now have a 'status' attribute.
Bruno Haible <bruno@clisp.org>
parents:
10732
diff
changeset
|
2168 # Input: |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
2169 # - local_gnulib_path from --local-dir |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2170 # - modcache true or false, from --cache-modules/--no-cache-modules |
|
10743
ec39330cb04e
Modules now have a 'status' attribute.
Bruno Haible <bruno@clisp.org>
parents:
10732
diff
changeset
|
2171 func_get_status () |
|
ec39330cb04e
Modules now have a 'status' attribute.
Bruno Haible <bruno@clisp.org>
parents:
10732
diff
changeset
|
2172 { |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2173 if ! $modcache; then |
|
12855
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
2174 func_lookup_file "modules/$1" |
|
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
2175 sed -n -e "/^Status$sed_extract_prog" < "$lookedup_file" |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2176 else |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2177 func_cache_lookup_module "$1" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2178 # Output the field's value, including the final newline (if any). |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2179 if $have_associative; then |
|
13660
6a2c7d3ca5f0
gnulib-tool: work with NetBSD /bin/sh
Eric Blake <eblake@redhat.com>
parents:
13658
diff
changeset
|
2180 if eval 'test -n "${modcache_status[$1]+set}"'; then |
|
6a2c7d3ca5f0
gnulib-tool: work with NetBSD /bin/sh
Eric Blake <eblake@redhat.com>
parents:
13658
diff
changeset
|
2181 eval 'echo "${modcache_status[$1]}"' |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2182 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2183 else |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2184 eval "field_set=\"\$${cachevar}_status_set\"" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2185 if test -n "$field_set"; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2186 eval "field_value=\"\$${cachevar}_status\"" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2187 echo "${field_value}" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2188 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2189 fi |
|
12855
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
2190 fi |
|
10743
ec39330cb04e
Modules now have a 'status' attribute.
Bruno Haible <bruno@clisp.org>
parents:
10732
diff
changeset
|
2191 } |
|
ec39330cb04e
Modules now have a 'status' attribute.
Bruno Haible <bruno@clisp.org>
parents:
10732
diff
changeset
|
2192 |
|
9189
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
2193 # func_get_notice module |
|
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
2194 # Input: |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
2195 # - local_gnulib_path from --local-dir |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2196 # - modcache true or false, from --cache-modules/--no-cache-modules |
|
9189
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
2197 func_get_notice () |
|
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
2198 { |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2199 if ! $modcache; then |
|
12855
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
2200 func_lookup_file "modules/$1" |
|
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
2201 sed -n -e "/^Notice$sed_extract_prog" < "$lookedup_file" |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2202 else |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2203 func_cache_lookup_module "$1" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2204 # Output the field's value, including the final newline (if any). |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2205 if $have_associative; then |
|
13660
6a2c7d3ca5f0
gnulib-tool: work with NetBSD /bin/sh
Eric Blake <eblake@redhat.com>
parents:
13658
diff
changeset
|
2206 if eval 'test -n "${modcache_notice[$1]+set}"'; then |
|
6a2c7d3ca5f0
gnulib-tool: work with NetBSD /bin/sh
Eric Blake <eblake@redhat.com>
parents:
13658
diff
changeset
|
2207 eval 'echo "${modcache_notice[$1]}"' |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2208 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2209 else |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2210 eval "field_set=\"\$${cachevar}_notice_set\"" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2211 if test -n "$field_set"; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2212 eval "field_value=\"\$${cachevar}_notice\"" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2213 echo "${field_value}" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2214 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2215 fi |
|
12855
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
2216 fi |
|
9189
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
2217 } |
|
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
2218 |
|
12460
282eecca2301
New module attribute 'Applicability'.
Bruno Haible <bruno@clisp.org>
parents:
12417
diff
changeset
|
2219 # func_get_applicability module |
|
282eecca2301
New module attribute 'Applicability'.
Bruno Haible <bruno@clisp.org>
parents:
12417
diff
changeset
|
2220 # Input: |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
2221 # - local_gnulib_path from --local-dir |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2222 # - modcache true or false, from --cache-modules/--no-cache-modules |
|
12460
282eecca2301
New module attribute 'Applicability'.
Bruno Haible <bruno@clisp.org>
parents:
12417
diff
changeset
|
2223 # The expected result (on stdout) is either 'main', or 'tests', or 'all'. |
|
282eecca2301
New module attribute 'Applicability'.
Bruno Haible <bruno@clisp.org>
parents:
12417
diff
changeset
|
2224 func_get_applicability () |
|
282eecca2301
New module attribute 'Applicability'.
Bruno Haible <bruno@clisp.org>
parents:
12417
diff
changeset
|
2225 { |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2226 if ! $modcache; then |
|
12855
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
2227 func_lookup_file "modules/$1" |
|
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
2228 my_applicability=`sed -n -e "/^Applicability$sed_extract_prog" < "$lookedup_file"` |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2229 else |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2230 func_cache_lookup_module "$1" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2231 # Get the field's value, without the final newline. |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2232 if $have_associative; then |
|
13660
6a2c7d3ca5f0
gnulib-tool: work with NetBSD /bin/sh
Eric Blake <eblake@redhat.com>
parents:
13658
diff
changeset
|
2233 eval 'my_applicability="${modcache_applicability[$1]}"' |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2234 else |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2235 eval "my_applicability=\"\$${cachevar}_applicability\"" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2236 fi |
|
12855
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
2237 fi |
|
12854
a57c17c10b63
gnulib-tool: cache module metainformation.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12819
diff
changeset
|
2238 if test -n "$my_applicability"; then |
|
a57c17c10b63
gnulib-tool: cache module metainformation.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12819
diff
changeset
|
2239 echo $my_applicability |
|
a57c17c10b63
gnulib-tool: cache module metainformation.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12819
diff
changeset
|
2240 else |
|
12460
282eecca2301
New module attribute 'Applicability'.
Bruno Haible <bruno@clisp.org>
parents:
12417
diff
changeset
|
2241 # The default is 'main' or 'tests', depending on the module's name. |
|
12854
a57c17c10b63
gnulib-tool: cache module metainformation.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12819
diff
changeset
|
2242 case $1 in |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2243 *-tests) echo "tests";; |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2244 *) echo "main";; |
|
12460
282eecca2301
New module attribute 'Applicability'.
Bruno Haible <bruno@clisp.org>
parents:
12417
diff
changeset
|
2245 esac |
|
12854
a57c17c10b63
gnulib-tool: cache module metainformation.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12819
diff
changeset
|
2246 fi |
|
12460
282eecca2301
New module attribute 'Applicability'.
Bruno Haible <bruno@clisp.org>
parents:
12417
diff
changeset
|
2247 } |
|
282eecca2301
New module attribute 'Applicability'.
Bruno Haible <bruno@clisp.org>
parents:
12417
diff
changeset
|
2248 |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2249 # func_get_filelist module |
|
7214
eb43edab28c3
Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents:
7213
diff
changeset
|
2250 # Input: |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
2251 # - local_gnulib_path from --local-dir |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2252 # - modcache true or false, from --cache-modules/--no-cache-modules |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2253 func_get_filelist () |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2254 { |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2255 if ! $modcache; then |
|
12855
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
2256 func_lookup_file "modules/$1" |
|
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
2257 sed -n -e "/^Files$sed_extract_prog" < "$lookedup_file" |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2258 else |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2259 func_cache_lookup_module "$1" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2260 # Output the field's value, including the final newline (if any). |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2261 if $have_associative; then |
|
13660
6a2c7d3ca5f0
gnulib-tool: work with NetBSD /bin/sh
Eric Blake <eblake@redhat.com>
parents:
13658
diff
changeset
|
2262 if eval 'test -n "${modcache_files[$1]+set}"'; then |
|
6a2c7d3ca5f0
gnulib-tool: work with NetBSD /bin/sh
Eric Blake <eblake@redhat.com>
parents:
13658
diff
changeset
|
2263 eval 'echo "${modcache_files[$1]}"' |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2264 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2265 else |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2266 eval "field_set=\"\$${cachevar}_files_set\"" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2267 if test -n "$field_set"; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2268 eval "field_value=\"\$${cachevar}_files\"" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2269 echo "${field_value}" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2270 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2271 fi |
|
12855
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
2272 fi |
|
11094
5e937a2f5647
Backport improved autoconf semantics of AC_DEFUN_ONCE.
Eric Blake <ebb9@byu.net>
parents:
11065
diff
changeset
|
2273 echo m4/00gnulib.m4 |
|
7788
e3424061171f
Back from an automatic module-indicator macro to a module-indicator macro
Bruno Haible <bruno@clisp.org>
parents:
7781
diff
changeset
|
2274 echo m4/gnulib-common.m4 |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2275 } |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2276 |
|
10989
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
2277 # func_filter_filelist outputvar separator filelist prefix suffix removed_prefix removed_suffix [added_prefix [added_suffix]] |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
2278 # stores in outputvar the filtered and processed filelist. Filtering: Only the |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
2279 # elements starting with prefix and ending with suffix are considered. |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
2280 # Processing: removed_prefix and removed_suffix are removed from each element, |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
2281 # added_prefix and added_suffix are added to each element. |
|
12743
3d337755e12c
gnulib-tool: fix filelist for AIX, HP-UX ksh.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12741
diff
changeset
|
2282 # prefix, suffix should not contain shell-special characters. |
|
11037
d94dc78c3947
Improve func_remove_prefix, func_remove_suffix.
Bruno Haible <bruno@clisp.org>
parents:
10993
diff
changeset
|
2283 # removed_prefix, removed_suffix should not contain the characters "$`\{}[]^|. |
|
11421
57b6d75143fd
Fix comment for func_filter_filelist.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
11404
diff
changeset
|
2284 # added_prefix, added_suffix should not contain the characters \|&. |
|
10989
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
2285 func_filter_filelist () |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
2286 { |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
2287 if test "$2" != "$nl" \ |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
2288 || { $fast_func_append \ |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
2289 && { test -z "$6" || $fast_func_remove_prefix; } \ |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
2290 && { test -z "$7" || $fast_func_remove_suffix; }; \ |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
2291 }; then |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
2292 ffflist= |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
2293 for fff in $3; do |
|
12743
3d337755e12c
gnulib-tool: fix filelist for AIX, HP-UX ksh.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12741
diff
changeset
|
2294 # Do not quote possibly-empty parameters in case patterns, |
|
3d337755e12c
gnulib-tool: fix filelist for AIX, HP-UX ksh.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12741
diff
changeset
|
2295 # AIX and HP-UX ksh won't match them if they are empty. |
|
10989
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
2296 case "$fff" in |
|
12743
3d337755e12c
gnulib-tool: fix filelist for AIX, HP-UX ksh.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12741
diff
changeset
|
2297 $4*$5) |
|
10989
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
2298 if test -n "$6"; then |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
2299 func_remove_prefix fff "$6" |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
2300 fi |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
2301 if test -n "$7"; then |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
2302 func_remove_suffix fff "$7" |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
2303 fi |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
2304 fff="$8${fff}$9" |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
2305 if test -z "$ffflist"; then |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
2306 ffflist="${fff}" |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
2307 else |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
2308 func_append ffflist "$2${fff}" |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
2309 fi |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
2310 ;; |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
2311 esac |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
2312 done |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
2313 else |
|
10993
996a5b3859fe
gnulib-tool: fix sed-based filtering
Jim Meyering <meyering@redhat.com>
parents:
10989
diff
changeset
|
2314 sed_fff_filter="s|^$6\(.*\)$7\$|$8\\1$9|" |
|
10989
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
2315 ffflist=`for fff in $3; do |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
2316 case "$fff" in |
|
12743
3d337755e12c
gnulib-tool: fix filelist for AIX, HP-UX ksh.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12741
diff
changeset
|
2317 $4*$5) echo "$fff" ;; |
|
10989
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
2318 esac |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
2319 done | sed -e "$sed_fff_filter"` |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
2320 fi |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
2321 eval "$1=\"\$ffflist\"" |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
2322 } |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
2323 |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2324 # func_get_dependencies module |
|
7214
eb43edab28c3
Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents:
7213
diff
changeset
|
2325 # Input: |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
2326 # - local_gnulib_path from --local-dir |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2327 # - modcache true or false, from --cache-modules/--no-cache-modules |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2328 func_get_dependencies () |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2329 { |
|
13081
012563ccbd85
gnulib-tool: Allow 'foo-tests' module even if there is no module 'foo'.
Bruno Haible <bruno@clisp.org>
parents:
13080
diff
changeset
|
2330 # ${module}-tests implicitly depends on ${module}, if that module exists. |
|
10989
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
2331 case "$1" in |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
2332 *-tests) |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
2333 fgd1="$1" |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
2334 func_remove_suffix fgd1 '-tests' |
|
13081
012563ccbd85
gnulib-tool: Allow 'foo-tests' module even if there is no module 'foo'.
Bruno Haible <bruno@clisp.org>
parents:
13080
diff
changeset
|
2335 if func_exists_module "$fgd1"; then |
|
012563ccbd85
gnulib-tool: Allow 'foo-tests' module even if there is no module 'foo'.
Bruno Haible <bruno@clisp.org>
parents:
13080
diff
changeset
|
2336 echo "$fgd1" |
|
012563ccbd85
gnulib-tool: Allow 'foo-tests' module even if there is no module 'foo'.
Bruno Haible <bruno@clisp.org>
parents:
13080
diff
changeset
|
2337 fi |
|
10989
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
2338 ;; |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
2339 esac |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
2340 # Then the explicit dependencies listed in the module description. |
|
14908
2b58e21ecf3c
gnulib-tool: Allow comments in the 'Depends-on' section.
Bruno Haible <bruno@clisp.org>
parents:
14894
diff
changeset
|
2341 { if ! $modcache; then |
|
2b58e21ecf3c
gnulib-tool: Allow comments in the 'Depends-on' section.
Bruno Haible <bruno@clisp.org>
parents:
14894
diff
changeset
|
2342 func_lookup_file "modules/$1" |
|
2b58e21ecf3c
gnulib-tool: Allow comments in the 'Depends-on' section.
Bruno Haible <bruno@clisp.org>
parents:
14894
diff
changeset
|
2343 sed -n -e "/^Depends-on$sed_extract_prog" < "$lookedup_file" |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2344 else |
|
14908
2b58e21ecf3c
gnulib-tool: Allow comments in the 'Depends-on' section.
Bruno Haible <bruno@clisp.org>
parents:
14894
diff
changeset
|
2345 func_cache_lookup_module "$1" |
|
2b58e21ecf3c
gnulib-tool: Allow comments in the 'Depends-on' section.
Bruno Haible <bruno@clisp.org>
parents:
14894
diff
changeset
|
2346 # Output the field's value, including the final newline (if any). |
|
2b58e21ecf3c
gnulib-tool: Allow comments in the 'Depends-on' section.
Bruno Haible <bruno@clisp.org>
parents:
14894
diff
changeset
|
2347 if $have_associative; then |
|
2b58e21ecf3c
gnulib-tool: Allow comments in the 'Depends-on' section.
Bruno Haible <bruno@clisp.org>
parents:
14894
diff
changeset
|
2348 if eval 'test -n "${modcache_dependson[$1]+set}"'; then |
|
2b58e21ecf3c
gnulib-tool: Allow comments in the 'Depends-on' section.
Bruno Haible <bruno@clisp.org>
parents:
14894
diff
changeset
|
2349 eval 'echo "${modcache_dependson[$1]}"' |
|
2b58e21ecf3c
gnulib-tool: Allow comments in the 'Depends-on' section.
Bruno Haible <bruno@clisp.org>
parents:
14894
diff
changeset
|
2350 fi |
|
2b58e21ecf3c
gnulib-tool: Allow comments in the 'Depends-on' section.
Bruno Haible <bruno@clisp.org>
parents:
14894
diff
changeset
|
2351 else |
|
2b58e21ecf3c
gnulib-tool: Allow comments in the 'Depends-on' section.
Bruno Haible <bruno@clisp.org>
parents:
14894
diff
changeset
|
2352 eval "field_set=\"\$${cachevar}_dependson_set\"" |
|
2b58e21ecf3c
gnulib-tool: Allow comments in the 'Depends-on' section.
Bruno Haible <bruno@clisp.org>
parents:
14894
diff
changeset
|
2353 if test -n "$field_set"; then |
|
2b58e21ecf3c
gnulib-tool: Allow comments in the 'Depends-on' section.
Bruno Haible <bruno@clisp.org>
parents:
14894
diff
changeset
|
2354 eval "field_value=\"\$${cachevar}_dependson\"" |
|
2b58e21ecf3c
gnulib-tool: Allow comments in the 'Depends-on' section.
Bruno Haible <bruno@clisp.org>
parents:
14894
diff
changeset
|
2355 echo "${field_value}" |
|
2b58e21ecf3c
gnulib-tool: Allow comments in the 'Depends-on' section.
Bruno Haible <bruno@clisp.org>
parents:
14894
diff
changeset
|
2356 fi |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2357 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2358 fi |
|
14908
2b58e21ecf3c
gnulib-tool: Allow comments in the 'Depends-on' section.
Bruno Haible <bruno@clisp.org>
parents:
14894
diff
changeset
|
2359 } \ |
|
2b58e21ecf3c
gnulib-tool: Allow comments in the 'Depends-on' section.
Bruno Haible <bruno@clisp.org>
parents:
14894
diff
changeset
|
2360 | sed -e '/^#/d' |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2361 } |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2362 |
|
40074
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2363 sed_dependencies_without_conditions='s/ *\[.*//' |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2364 |
|
8079
0951beec5b89
New module description section 'configure.ac-early'.
Bruno Haible <bruno@clisp.org>
parents:
8055
diff
changeset
|
2365 # func_get_autoconf_early_snippet module |
|
0951beec5b89
New module description section 'configure.ac-early'.
Bruno Haible <bruno@clisp.org>
parents:
8055
diff
changeset
|
2366 # Input: |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
2367 # - local_gnulib_path from --local-dir |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2368 # - modcache true or false, from --cache-modules/--no-cache-modules |
|
8079
0951beec5b89
New module description section 'configure.ac-early'.
Bruno Haible <bruno@clisp.org>
parents:
8055
diff
changeset
|
2369 func_get_autoconf_early_snippet () |
|
0951beec5b89
New module description section 'configure.ac-early'.
Bruno Haible <bruno@clisp.org>
parents:
8055
diff
changeset
|
2370 { |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2371 if ! $modcache; then |
|
12855
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
2372 func_lookup_file "modules/$1" |
|
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
2373 sed -n -e "/^configure\.ac-early$sed_extract_prog" < "$lookedup_file" |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2374 else |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2375 func_cache_lookup_module "$1" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2376 # Output the field's value, including the final newline (if any). |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2377 if $have_associative; then |
|
13660
6a2c7d3ca5f0
gnulib-tool: work with NetBSD /bin/sh
Eric Blake <eblake@redhat.com>
parents:
13658
diff
changeset
|
2378 if eval 'test -n "${modcache_configureac_early[$1]+set}"'; then |
|
6a2c7d3ca5f0
gnulib-tool: work with NetBSD /bin/sh
Eric Blake <eblake@redhat.com>
parents:
13658
diff
changeset
|
2379 eval 'echo "${modcache_configureac_early[$1]}"' |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2380 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2381 else |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2382 eval "field_set=\"\$${cachevar}_configureac_early_set\"" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2383 if test -n "$field_set"; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2384 eval "field_value=\"\$${cachevar}_configureac_early\"" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2385 echo "${field_value}" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2386 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2387 fi |
|
12855
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
2388 fi |
|
8079
0951beec5b89
New module description section 'configure.ac-early'.
Bruno Haible <bruno@clisp.org>
parents:
8055
diff
changeset
|
2389 } |
|
0951beec5b89
New module description section 'configure.ac-early'.
Bruno Haible <bruno@clisp.org>
parents:
8055
diff
changeset
|
2390 |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2391 # func_get_autoconf_snippet module |
|
7214
eb43edab28c3
Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents:
7213
diff
changeset
|
2392 # Input: |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
2393 # - local_gnulib_path from --local-dir |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2394 # - modcache true or false, from --cache-modules/--no-cache-modules |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2395 func_get_autoconf_snippet () |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2396 { |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2397 if ! $modcache; then |
|
12855
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
2398 func_lookup_file "modules/$1" |
|
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
2399 sed -n -e "/^configure\.ac$sed_extract_prog" < "$lookedup_file" |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2400 else |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2401 func_cache_lookup_module "$1" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2402 # Output the field's value, including the final newline (if any). |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2403 if $have_associative; then |
|
13660
6a2c7d3ca5f0
gnulib-tool: work with NetBSD /bin/sh
Eric Blake <eblake@redhat.com>
parents:
13658
diff
changeset
|
2404 if eval 'test -n "${modcache_configureac[$1]+set}"'; then |
|
6a2c7d3ca5f0
gnulib-tool: work with NetBSD /bin/sh
Eric Blake <eblake@redhat.com>
parents:
13658
diff
changeset
|
2405 eval 'echo "${modcache_configureac[$1]}"' |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2406 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2407 else |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2408 eval "field_set=\"\$${cachevar}_configureac_set\"" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2409 if test -n "$field_set"; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2410 eval "field_value=\"\$${cachevar}_configureac\"" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2411 echo "${field_value}" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2412 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2413 fi |
|
12855
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
2414 fi |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2415 } |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2416 |
|
18000
d0c8068a7c6f
gnulib-tool: concatenate lib_SOURCES to a single line
Pádraig Brady <P@draigBrady.com>
parents:
17964
diff
changeset
|
2417 # Concatenate lines with trailing slash. |
|
d0c8068a7c6f
gnulib-tool: concatenate lib_SOURCES to a single line
Pádraig Brady <P@draigBrady.com>
parents:
17964
diff
changeset
|
2418 # $1 is an optional filter to restrict the |
|
d0c8068a7c6f
gnulib-tool: concatenate lib_SOURCES to a single line
Pádraig Brady <P@draigBrady.com>
parents:
17964
diff
changeset
|
2419 # concatenation to groups starting with that expression |
|
d0c8068a7c6f
gnulib-tool: concatenate lib_SOURCES to a single line
Pádraig Brady <P@draigBrady.com>
parents:
17964
diff
changeset
|
2420 combine_lines() { |
|
d0c8068a7c6f
gnulib-tool: concatenate lib_SOURCES to a single line
Pádraig Brady <P@draigBrady.com>
parents:
17964
diff
changeset
|
2421 sed -e "/$1.*"'\\$/{ |
|
d0c8068a7c6f
gnulib-tool: concatenate lib_SOURCES to a single line
Pádraig Brady <P@draigBrady.com>
parents:
17964
diff
changeset
|
2422 :a |
|
d0c8068a7c6f
gnulib-tool: concatenate lib_SOURCES to a single line
Pádraig Brady <P@draigBrady.com>
parents:
17964
diff
changeset
|
2423 N |
|
d0c8068a7c6f
gnulib-tool: concatenate lib_SOURCES to a single line
Pádraig Brady <P@draigBrady.com>
parents:
17964
diff
changeset
|
2424 s/\\\n/ / |
|
d0c8068a7c6f
gnulib-tool: concatenate lib_SOURCES to a single line
Pádraig Brady <P@draigBrady.com>
parents:
17964
diff
changeset
|
2425 s/\\$/\\/ |
|
d0c8068a7c6f
gnulib-tool: concatenate lib_SOURCES to a single line
Pádraig Brady <P@draigBrady.com>
parents:
17964
diff
changeset
|
2426 ta |
|
d0c8068a7c6f
gnulib-tool: concatenate lib_SOURCES to a single line
Pádraig Brady <P@draigBrady.com>
parents:
17964
diff
changeset
|
2427 }' |
|
d0c8068a7c6f
gnulib-tool: concatenate lib_SOURCES to a single line
Pádraig Brady <P@draigBrady.com>
parents:
17964
diff
changeset
|
2428 } |
|
d0c8068a7c6f
gnulib-tool: concatenate lib_SOURCES to a single line
Pádraig Brady <P@draigBrady.com>
parents:
17964
diff
changeset
|
2429 |
|
14682
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2430 # func_get_automake_snippet_conditional module |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2431 # returns the part of the Makefile.am snippet that can be put inside Automake |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2432 # conditionals. |
|
7214
eb43edab28c3
Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents:
7213
diff
changeset
|
2433 # Input: |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
2434 # - local_gnulib_path from --local-dir |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2435 # - modcache true or false, from --cache-modules/--no-cache-modules |
|
14682
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2436 func_get_automake_snippet_conditional () |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2437 { |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2438 if ! $modcache; then |
|
12855
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
2439 func_lookup_file "modules/$1" |
|
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
2440 sed -n -e "/^Makefile\.am$sed_extract_prog" < "$lookedup_file" |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2441 else |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2442 func_cache_lookup_module "$1" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2443 # Output the field's value, including the final newline (if any). |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2444 if $have_associative; then |
|
13660
6a2c7d3ca5f0
gnulib-tool: work with NetBSD /bin/sh
Eric Blake <eblake@redhat.com>
parents:
13658
diff
changeset
|
2445 if eval 'test -n "${modcache_makefile[$1]+set}"'; then |
|
6a2c7d3ca5f0
gnulib-tool: work with NetBSD /bin/sh
Eric Blake <eblake@redhat.com>
parents:
13658
diff
changeset
|
2446 eval 'echo "${modcache_makefile[$1]}"' |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2447 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2448 else |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2449 eval "field_set=\"\$${cachevar}_makefile_set\"" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2450 if test -n "$field_set"; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2451 eval "field_value=\"\$${cachevar}_makefile\"" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2452 echo "${field_value}" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2453 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2454 fi |
|
12855
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
2455 fi |
|
14682
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2456 } |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2457 |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2458 # func_get_automake_snippet_unconditional module |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2459 # returns the part of the Makefile.am snippet that must stay outside of |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2460 # Automake conditionals. |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2461 # Input: |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
2462 # - local_gnulib_path from --local-dir |
|
14682
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2463 # - modcache true or false, from --cache-modules/--no-cache-modules |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2464 func_get_automake_snippet_unconditional () |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2465 { |
|
7497
6a764f23e302
gnulib-tool now synthesizes the EXTRA_DIST line.
Bruno Haible <bruno@clisp.org>
parents:
7486
diff
changeset
|
2466 case "$1" in |
|
6a764f23e302
gnulib-tool now synthesizes the EXTRA_DIST line.
Bruno Haible <bruno@clisp.org>
parents:
7486
diff
changeset
|
2467 *-tests) |
|
6a764f23e302
gnulib-tool now synthesizes the EXTRA_DIST line.
Bruno Haible <bruno@clisp.org>
parents:
7486
diff
changeset
|
2468 # *-tests module live in tests/, not lib/. |
|
9284
afba4e078ebc
Synthesize an EXTRA_DIST augmentation also for tests modules.
Bruno Haible <bruno@clisp.org>
parents:
9275
diff
changeset
|
2469 # Synthesize an EXTRA_DIST augmentation. |
|
afba4e078ebc
Synthesize an EXTRA_DIST augmentation also for tests modules.
Bruno Haible <bruno@clisp.org>
parents:
9275
diff
changeset
|
2470 all_files=`func_get_filelist $1` |
|
10989
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
2471 func_filter_filelist tests_files " " "$all_files" 'tests/' '' 'tests/' '' |
|
9284
afba4e078ebc
Synthesize an EXTRA_DIST augmentation also for tests modules.
Bruno Haible <bruno@clisp.org>
parents:
9275
diff
changeset
|
2472 extra_files="$tests_files" |
|
afba4e078ebc
Synthesize an EXTRA_DIST augmentation also for tests modules.
Bruno Haible <bruno@clisp.org>
parents:
9275
diff
changeset
|
2473 if test -n "$extra_files"; then |
|
afba4e078ebc
Synthesize an EXTRA_DIST augmentation also for tests modules.
Bruno Haible <bruno@clisp.org>
parents:
9275
diff
changeset
|
2474 echo "EXTRA_DIST +=" $extra_files |
|
afba4e078ebc
Synthesize an EXTRA_DIST augmentation also for tests modules.
Bruno Haible <bruno@clisp.org>
parents:
9275
diff
changeset
|
2475 echo |
|
afba4e078ebc
Synthesize an EXTRA_DIST augmentation also for tests modules.
Bruno Haible <bruno@clisp.org>
parents:
9275
diff
changeset
|
2476 fi |
|
7497
6a764f23e302
gnulib-tool now synthesizes the EXTRA_DIST line.
Bruno Haible <bruno@clisp.org>
parents:
7486
diff
changeset
|
2477 ;; |
|
6a764f23e302
gnulib-tool now synthesizes the EXTRA_DIST line.
Bruno Haible <bruno@clisp.org>
parents:
7486
diff
changeset
|
2478 *) |
|
6a764f23e302
gnulib-tool now synthesizes the EXTRA_DIST line.
Bruno Haible <bruno@clisp.org>
parents:
7486
diff
changeset
|
2479 # Synthesize an EXTRA_DIST augmentation. |
|
7754
ed8105720327
* modules/absolute-header: New module.
Eric Blake <ebb9@byu.net>
parents:
7752
diff
changeset
|
2480 sed_extract_mentioned_files='s/^lib_SOURCES[ ]*+=[ ]*//p' |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2481 already_mentioned_files=` \ |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2482 { if ! $modcache; then |
|
14682
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2483 func_lookup_file "modules/$1" |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2484 sed -n -e "/^Makefile\.am$sed_extract_prog" < "$lookedup_file" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2485 else |
|
14682
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2486 func_cache_lookup_module "$1" |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2487 if $have_associative; then |
|
13660
6a2c7d3ca5f0
gnulib-tool: work with NetBSD /bin/sh
Eric Blake <eblake@redhat.com>
parents:
13658
diff
changeset
|
2488 if eval 'test -n "${modcache_makefile[$1]+set}"'; then |
|
6a2c7d3ca5f0
gnulib-tool: work with NetBSD /bin/sh
Eric Blake <eblake@redhat.com>
parents:
13658
diff
changeset
|
2489 eval 'echo "${modcache_makefile[$1]}"' |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2490 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2491 else |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2492 eval 'field_set="$'"${cachevar}"'_makefile_set"' |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2493 if test -n "$field_set"; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2494 eval 'field_value="$'"${cachevar}"'_makefile"' |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2495 echo "${field_value}" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2496 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2497 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2498 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2499 } \ |
|
18000
d0c8068a7c6f
gnulib-tool: concatenate lib_SOURCES to a single line
Pádraig Brady <P@draigBrady.com>
parents:
17964
diff
changeset
|
2500 | combine_lines \ |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2501 | sed -n -e "$sed_extract_mentioned_files" | sed -e 's/#.*//'` |
|
7497
6a764f23e302
gnulib-tool now synthesizes the EXTRA_DIST line.
Bruno Haible <bruno@clisp.org>
parents:
7486
diff
changeset
|
2502 all_files=`func_get_filelist $1` |
|
10989
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
2503 func_filter_filelist lib_files "$nl" "$all_files" 'lib/' '' 'lib/' '' |
|
7497
6a764f23e302
gnulib-tool now synthesizes the EXTRA_DIST line.
Bruno Haible <bruno@clisp.org>
parents:
7486
diff
changeset
|
2504 # Remove $already_mentioned_files from $lib_files. |
|
6a764f23e302
gnulib-tool now synthesizes the EXTRA_DIST line.
Bruno Haible <bruno@clisp.org>
parents:
7486
diff
changeset
|
2505 echo "$lib_files" | LC_ALL=C sort -u > "$tmp"/lib-files |
|
12881
c6e9c683bc41
Really work around around "broken pipe" error message from bash 3.2.
Bruno Haible <bruno@clisp.org>
parents:
12877
diff
changeset
|
2506 extra_files=`for f in $already_mentioned_files; do echo $f; done \ |
|
7497
6a764f23e302
gnulib-tool now synthesizes the EXTRA_DIST line.
Bruno Haible <bruno@clisp.org>
parents:
7486
diff
changeset
|
2507 | LC_ALL=C sort -u | LC_ALL=C join -v 2 - "$tmp"/lib-files` |
|
6a764f23e302
gnulib-tool now synthesizes the EXTRA_DIST line.
Bruno Haible <bruno@clisp.org>
parents:
7486
diff
changeset
|
2508 if test -n "$extra_files"; then |
|
6a764f23e302
gnulib-tool now synthesizes the EXTRA_DIST line.
Bruno Haible <bruno@clisp.org>
parents:
7486
diff
changeset
|
2509 echo "EXTRA_DIST +=" $extra_files |
|
6a764f23e302
gnulib-tool now synthesizes the EXTRA_DIST line.
Bruno Haible <bruno@clisp.org>
parents:
7486
diff
changeset
|
2510 echo |
|
6a764f23e302
gnulib-tool now synthesizes the EXTRA_DIST line.
Bruno Haible <bruno@clisp.org>
parents:
7486
diff
changeset
|
2511 fi |
|
7640
a4d97c9b97de
Synthesize also an EXTRA_lib_SOURCES augmentation.
Bruno Haible <bruno@clisp.org>
parents:
7638
diff
changeset
|
2512 # Synthesize also an EXTRA_lib_SOURCES augmentation. |
|
a4d97c9b97de
Synthesize also an EXTRA_lib_SOURCES augmentation.
Bruno Haible <bruno@clisp.org>
parents:
7638
diff
changeset
|
2513 # This is necessary so that automake can generate the right list of |
|
a4d97c9b97de
Synthesize also an EXTRA_lib_SOURCES augmentation.
Bruno Haible <bruno@clisp.org>
parents:
7638
diff
changeset
|
2514 # dependency rules. |
|
a4d97c9b97de
Synthesize also an EXTRA_lib_SOURCES augmentation.
Bruno Haible <bruno@clisp.org>
parents:
7638
diff
changeset
|
2515 # A possible approach would be to use autom4te --trace of the redefined |
|
a4d97c9b97de
Synthesize also an EXTRA_lib_SOURCES augmentation.
Bruno Haible <bruno@clisp.org>
parents:
7638
diff
changeset
|
2516 # AC_LIBOBJ and AC_REPLACE_FUNCS macros when creating the Makefile.am |
|
a4d97c9b97de
Synthesize also an EXTRA_lib_SOURCES augmentation.
Bruno Haible <bruno@clisp.org>
parents:
7638
diff
changeset
|
2517 # (use autom4te --trace, not just grep, so that AC_LIBOBJ invocations |
|
a4d97c9b97de
Synthesize also an EXTRA_lib_SOURCES augmentation.
Bruno Haible <bruno@clisp.org>
parents:
7638
diff
changeset
|
2518 # inside autoconf's built-in macros are not missed). |
|
a4d97c9b97de
Synthesize also an EXTRA_lib_SOURCES augmentation.
Bruno Haible <bruno@clisp.org>
parents:
7638
diff
changeset
|
2519 # But it's simpler and more robust to do it here, based on the file list. |
|
a4d97c9b97de
Synthesize also an EXTRA_lib_SOURCES augmentation.
Bruno Haible <bruno@clisp.org>
parents:
7638
diff
changeset
|
2520 # If some .c file exists and is not used with AC_LIBOBJ - for example, |
|
a4d97c9b97de
Synthesize also an EXTRA_lib_SOURCES augmentation.
Bruno Haible <bruno@clisp.org>
parents:
7638
diff
changeset
|
2521 # a .c file is preprocessed into another .c file for BUILT_SOURCES -, |
|
a4d97c9b97de
Synthesize also an EXTRA_lib_SOURCES augmentation.
Bruno Haible <bruno@clisp.org>
parents:
7638
diff
changeset
|
2522 # automake will generate a useless dependency; this is harmless. |
|
8356
72f47158c694
Special handling for the 'relocatable-prog-wrapper' module.
Bruno Haible <bruno@clisp.org>
parents:
8079
diff
changeset
|
2523 case "$1" in |
|
72f47158c694
Special handling for the 'relocatable-prog-wrapper' module.
Bruno Haible <bruno@clisp.org>
parents:
8079
diff
changeset
|
2524 relocatable-prog-wrapper) ;; |
|
13759
38b745d4e6a4
gnulib-tool: Fixes for --create-testdir with --libtool.
Bruno Haible <bruno@clisp.org>
parents:
13752
diff
changeset
|
2525 pt_chown) ;; |
|
8356
72f47158c694
Special handling for the 'relocatable-prog-wrapper' module.
Bruno Haible <bruno@clisp.org>
parents:
8079
diff
changeset
|
2526 *) |
|
10989
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
2527 func_filter_filelist extra_files "$nl" "$extra_files" '' '.c' '' '' |
|
8356
72f47158c694
Special handling for the 'relocatable-prog-wrapper' module.
Bruno Haible <bruno@clisp.org>
parents:
8079
diff
changeset
|
2528 if test -n "$extra_files"; then |
|
72f47158c694
Special handling for the 'relocatable-prog-wrapper' module.
Bruno Haible <bruno@clisp.org>
parents:
8079
diff
changeset
|
2529 echo "EXTRA_lib_SOURCES +=" $extra_files |
|
72f47158c694
Special handling for the 'relocatable-prog-wrapper' module.
Bruno Haible <bruno@clisp.org>
parents:
8079
diff
changeset
|
2530 echo |
|
72f47158c694
Special handling for the 'relocatable-prog-wrapper' module.
Bruno Haible <bruno@clisp.org>
parents:
8079
diff
changeset
|
2531 fi |
|
72f47158c694
Special handling for the 'relocatable-prog-wrapper' module.
Bruno Haible <bruno@clisp.org>
parents:
8079
diff
changeset
|
2532 ;; |
|
72f47158c694
Special handling for the 'relocatable-prog-wrapper' module.
Bruno Haible <bruno@clisp.org>
parents:
8079
diff
changeset
|
2533 esac |
|
9107
2878e8c70604
Ensure that also files under build-aux/ are distributed.
Bruno Haible <bruno@clisp.org>
parents:
9096
diff
changeset
|
2534 # Synthesize an EXTRA_DIST augmentation also for the files in build-aux/. |
|
10989
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
2535 func_filter_filelist buildaux_files "$nl" "$all_files" 'build-aux/' '' 'build-aux/' '' |
|
9107
2878e8c70604
Ensure that also files under build-aux/ are distributed.
Bruno Haible <bruno@clisp.org>
parents:
9096
diff
changeset
|
2536 if test -n "$buildaux_files"; then |
|
2878e8c70604
Ensure that also files under build-aux/ are distributed.
Bruno Haible <bruno@clisp.org>
parents:
9096
diff
changeset
|
2537 sed_prepend_auxdir='s,^,$(top_srcdir)/'"$auxdir"'/,' |
|
2878e8c70604
Ensure that also files under build-aux/ are distributed.
Bruno Haible <bruno@clisp.org>
parents:
9096
diff
changeset
|
2538 echo "EXTRA_DIST += "`echo "$buildaux_files" | sed -e "$sed_prepend_auxdir"` |
|
2878e8c70604
Ensure that also files under build-aux/ are distributed.
Bruno Haible <bruno@clisp.org>
parents:
9096
diff
changeset
|
2539 echo |
|
2878e8c70604
Ensure that also files under build-aux/ are distributed.
Bruno Haible <bruno@clisp.org>
parents:
9096
diff
changeset
|
2540 fi |
|
7497
6a764f23e302
gnulib-tool now synthesizes the EXTRA_DIST line.
Bruno Haible <bruno@clisp.org>
parents:
7486
diff
changeset
|
2541 ;; |
|
6a764f23e302
gnulib-tool now synthesizes the EXTRA_DIST line.
Bruno Haible <bruno@clisp.org>
parents:
7486
diff
changeset
|
2542 esac |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2543 } |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2544 |
|
14682
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2545 # func_get_automake_snippet module |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2546 # Input: |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
2547 # - local_gnulib_path from --local-dir |
|
14682
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2548 # - modcache true or false, from --cache-modules/--no-cache-modules |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2549 func_get_automake_snippet () |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2550 { |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2551 func_get_automake_snippet_conditional "$1" |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2552 func_get_automake_snippet_unconditional "$1" |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2553 } |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2554 |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2555 # func_get_include_directive module |
|
7214
eb43edab28c3
Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents:
7213
diff
changeset
|
2556 # Input: |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
2557 # - local_gnulib_path from --local-dir |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2558 # - modcache true or false, from --cache-modules/--no-cache-modules |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2559 func_get_include_directive () |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2560 { |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2561 { |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2562 if ! $modcache; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2563 func_lookup_file "modules/$1" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2564 sed -n -e "/^Include$sed_extract_prog" < "$lookedup_file" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2565 else |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2566 func_cache_lookup_module "$1" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2567 # Output the field's value, including the final newline (if any). |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2568 if $have_associative; then |
|
13660
6a2c7d3ca5f0
gnulib-tool: work with NetBSD /bin/sh
Eric Blake <eblake@redhat.com>
parents:
13658
diff
changeset
|
2569 if eval 'test -n "${modcache_include[$1]+set}"'; then |
|
6a2c7d3ca5f0
gnulib-tool: work with NetBSD /bin/sh
Eric Blake <eblake@redhat.com>
parents:
13658
diff
changeset
|
2570 eval 'echo "${modcache_include[$1]}"' |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2571 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2572 else |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2573 eval "field_set=\"\$${cachevar}_include_set\"" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2574 if test -n "$field_set"; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2575 eval "field_value=\"\$${cachevar}_include\"" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2576 echo "${field_value}" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2577 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2578 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2579 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2580 } | sed -e 's/^\(["<]\)/#include \1/' |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2581 } |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2582 |
|
8055
5c79d44f739d
New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents:
8040
diff
changeset
|
2583 # func_get_link_directive module |
|
5c79d44f739d
New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents:
8040
diff
changeset
|
2584 # Input: |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
2585 # - local_gnulib_path from --local-dir |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2586 # - modcache true or false, from --cache-modules/--no-cache-modules |
|
8055
5c79d44f739d
New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents:
8040
diff
changeset
|
2587 func_get_link_directive () |
|
5c79d44f739d
New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents:
8040
diff
changeset
|
2588 { |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2589 if ! $modcache; then |
|
12855
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
2590 func_lookup_file "modules/$1" |
|
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
2591 sed -n -e "/^Link$sed_extract_prog" < "$lookedup_file" |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2592 else |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2593 func_cache_lookup_module "$1" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2594 # Output the field's value, including the final newline (if any). |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2595 if $have_associative; then |
|
13660
6a2c7d3ca5f0
gnulib-tool: work with NetBSD /bin/sh
Eric Blake <eblake@redhat.com>
parents:
13658
diff
changeset
|
2596 if eval 'test -n "${modcache_link[$1]+set}"'; then |
|
6a2c7d3ca5f0
gnulib-tool: work with NetBSD /bin/sh
Eric Blake <eblake@redhat.com>
parents:
13658
diff
changeset
|
2597 eval 'echo "${modcache_link[$1]}"' |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2598 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2599 else |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2600 eval "field_set=\"\$${cachevar}_link_set\"" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2601 if test -n "$field_set"; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2602 eval "field_value=\"\$${cachevar}_link\"" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2603 echo "${field_value}" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2604 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2605 fi |
|
12855
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
2606 fi |
|
8055
5c79d44f739d
New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents:
8040
diff
changeset
|
2607 } |
|
5c79d44f739d
New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents:
8040
diff
changeset
|
2608 |
|
16153
04717ea7c365
gnulib-tool: Verify that the License field is present and non-empty.
Bruno Haible <bruno@clisp.org>
parents:
16122
diff
changeset
|
2609 # func_get_license_raw module |
|
04717ea7c365
gnulib-tool: Verify that the License field is present and non-empty.
Bruno Haible <bruno@clisp.org>
parents:
16122
diff
changeset
|
2610 # Input: |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
2611 # - local_gnulib_path from --local-dir |
|
16153
04717ea7c365
gnulib-tool: Verify that the License field is present and non-empty.
Bruno Haible <bruno@clisp.org>
parents:
16122
diff
changeset
|
2612 # - modcache true or false, from --cache-modules/--no-cache-modules |
|
04717ea7c365
gnulib-tool: Verify that the License field is present and non-empty.
Bruno Haible <bruno@clisp.org>
parents:
16122
diff
changeset
|
2613 func_get_license_raw () |
|
04717ea7c365
gnulib-tool: Verify that the License field is present and non-empty.
Bruno Haible <bruno@clisp.org>
parents:
16122
diff
changeset
|
2614 { |
|
04717ea7c365
gnulib-tool: Verify that the License field is present and non-empty.
Bruno Haible <bruno@clisp.org>
parents:
16122
diff
changeset
|
2615 if ! $modcache; then |
|
04717ea7c365
gnulib-tool: Verify that the License field is present and non-empty.
Bruno Haible <bruno@clisp.org>
parents:
16122
diff
changeset
|
2616 func_lookup_file "modules/$1" |
|
04717ea7c365
gnulib-tool: Verify that the License field is present and non-empty.
Bruno Haible <bruno@clisp.org>
parents:
16122
diff
changeset
|
2617 sed -n -e "/^License$sed_extract_prog" < "$lookedup_file" |
|
04717ea7c365
gnulib-tool: Verify that the License field is present and non-empty.
Bruno Haible <bruno@clisp.org>
parents:
16122
diff
changeset
|
2618 else |
|
04717ea7c365
gnulib-tool: Verify that the License field is present and non-empty.
Bruno Haible <bruno@clisp.org>
parents:
16122
diff
changeset
|
2619 func_cache_lookup_module "$1" |
|
04717ea7c365
gnulib-tool: Verify that the License field is present and non-empty.
Bruno Haible <bruno@clisp.org>
parents:
16122
diff
changeset
|
2620 # Output the field's value, including the final newline (if any). |
|
04717ea7c365
gnulib-tool: Verify that the License field is present and non-empty.
Bruno Haible <bruno@clisp.org>
parents:
16122
diff
changeset
|
2621 if $have_associative; then |
|
04717ea7c365
gnulib-tool: Verify that the License field is present and non-empty.
Bruno Haible <bruno@clisp.org>
parents:
16122
diff
changeset
|
2622 if eval 'test -n "${modcache_license[$1]+set}"'; then |
|
04717ea7c365
gnulib-tool: Verify that the License field is present and non-empty.
Bruno Haible <bruno@clisp.org>
parents:
16122
diff
changeset
|
2623 eval 'echo "${modcache_license[$1]}"' |
|
04717ea7c365
gnulib-tool: Verify that the License field is present and non-empty.
Bruno Haible <bruno@clisp.org>
parents:
16122
diff
changeset
|
2624 fi |
|
04717ea7c365
gnulib-tool: Verify that the License field is present and non-empty.
Bruno Haible <bruno@clisp.org>
parents:
16122
diff
changeset
|
2625 else |
|
04717ea7c365
gnulib-tool: Verify that the License field is present and non-empty.
Bruno Haible <bruno@clisp.org>
parents:
16122
diff
changeset
|
2626 eval "field_set=\"\$${cachevar}_license_set\"" |
|
04717ea7c365
gnulib-tool: Verify that the License field is present and non-empty.
Bruno Haible <bruno@clisp.org>
parents:
16122
diff
changeset
|
2627 if test -n "$field_set"; then |
|
04717ea7c365
gnulib-tool: Verify that the License field is present and non-empty.
Bruno Haible <bruno@clisp.org>
parents:
16122
diff
changeset
|
2628 eval "field_value=\"\$${cachevar}_license\"" |
|
04717ea7c365
gnulib-tool: Verify that the License field is present and non-empty.
Bruno Haible <bruno@clisp.org>
parents:
16122
diff
changeset
|
2629 echo "${field_value}" |
|
04717ea7c365
gnulib-tool: Verify that the License field is present and non-empty.
Bruno Haible <bruno@clisp.org>
parents:
16122
diff
changeset
|
2630 fi |
|
04717ea7c365
gnulib-tool: Verify that the License field is present and non-empty.
Bruno Haible <bruno@clisp.org>
parents:
16122
diff
changeset
|
2631 fi |
|
04717ea7c365
gnulib-tool: Verify that the License field is present and non-empty.
Bruno Haible <bruno@clisp.org>
parents:
16122
diff
changeset
|
2632 fi |
|
04717ea7c365
gnulib-tool: Verify that the License field is present and non-empty.
Bruno Haible <bruno@clisp.org>
parents:
16122
diff
changeset
|
2633 } |
|
04717ea7c365
gnulib-tool: Verify that the License field is present and non-empty.
Bruno Haible <bruno@clisp.org>
parents:
16122
diff
changeset
|
2634 |
|
5251
42b53a22aee5
Add a license tag to every module.
Bruno Haible <bruno@clisp.org>
parents:
5250
diff
changeset
|
2635 # func_get_license module |
|
7214
eb43edab28c3
Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents:
7213
diff
changeset
|
2636 # Input: |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
2637 # - local_gnulib_path from --local-dir |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2638 # - modcache true or false, from --cache-modules/--no-cache-modules |
|
5251
42b53a22aee5
Add a license tag to every module.
Bruno Haible <bruno@clisp.org>
parents:
5250
diff
changeset
|
2639 func_get_license () |
|
42b53a22aee5
Add a license tag to every module.
Bruno Haible <bruno@clisp.org>
parents:
5250
diff
changeset
|
2640 { |
|
16153
04717ea7c365
gnulib-tool: Verify that the License field is present and non-empty.
Bruno Haible <bruno@clisp.org>
parents:
16122
diff
changeset
|
2641 # Warn if the License field is missing. |
|
04717ea7c365
gnulib-tool: Verify that the License field is present and non-empty.
Bruno Haible <bruno@clisp.org>
parents:
16122
diff
changeset
|
2642 case "$1" in |
|
04717ea7c365
gnulib-tool: Verify that the License field is present and non-empty.
Bruno Haible <bruno@clisp.org>
parents:
16122
diff
changeset
|
2643 *-tests ) ;; |
|
04717ea7c365
gnulib-tool: Verify that the License field is present and non-empty.
Bruno Haible <bruno@clisp.org>
parents:
16122
diff
changeset
|
2644 * ) |
|
04717ea7c365
gnulib-tool: Verify that the License field is present and non-empty.
Bruno Haible <bruno@clisp.org>
parents:
16122
diff
changeset
|
2645 license=`func_get_license_raw "$1"` |
|
04717ea7c365
gnulib-tool: Verify that the License field is present and non-empty.
Bruno Haible <bruno@clisp.org>
parents:
16122
diff
changeset
|
2646 if test -z "$license"; then |
|
04717ea7c365
gnulib-tool: Verify that the License field is present and non-empty.
Bruno Haible <bruno@clisp.org>
parents:
16122
diff
changeset
|
2647 func_warning "module $1 lacks a License" |
|
04717ea7c365
gnulib-tool: Verify that the License field is present and non-empty.
Bruno Haible <bruno@clisp.org>
parents:
16122
diff
changeset
|
2648 fi |
|
04717ea7c365
gnulib-tool: Verify that the License field is present and non-empty.
Bruno Haible <bruno@clisp.org>
parents:
16122
diff
changeset
|
2649 ;; |
|
04717ea7c365
gnulib-tool: Verify that the License field is present and non-empty.
Bruno Haible <bruno@clisp.org>
parents:
16122
diff
changeset
|
2650 esac |
|
18474
1745af1e1b1d
Avoid gnulib-tool warnings about the dependencies of 'parse-datetime'.
Bruno Haible <bruno@clisp.org>
parents:
18471
diff
changeset
|
2651 case "$1" in |
|
1745af1e1b1d
Avoid gnulib-tool warnings about the dependencies of 'parse-datetime'.
Bruno Haible <bruno@clisp.org>
parents:
18471
diff
changeset
|
2652 parse-datetime ) |
|
1745af1e1b1d
Avoid gnulib-tool warnings about the dependencies of 'parse-datetime'.
Bruno Haible <bruno@clisp.org>
parents:
18471
diff
changeset
|
2653 # These modules are under a weaker license only for the purpose of some |
|
1745af1e1b1d
Avoid gnulib-tool warnings about the dependencies of 'parse-datetime'.
Bruno Haible <bruno@clisp.org>
parents:
18471
diff
changeset
|
2654 # users who hand-edit it and don't use gnulib-tool. For the regular |
|
1745af1e1b1d
Avoid gnulib-tool warnings about the dependencies of 'parse-datetime'.
Bruno Haible <bruno@clisp.org>
parents:
18471
diff
changeset
|
2655 # gnulib users they are under a stricter license. |
|
1745af1e1b1d
Avoid gnulib-tool warnings about the dependencies of 'parse-datetime'.
Bruno Haible <bruno@clisp.org>
parents:
18471
diff
changeset
|
2656 echo "GPL" |
|
1745af1e1b1d
Avoid gnulib-tool warnings about the dependencies of 'parse-datetime'.
Bruno Haible <bruno@clisp.org>
parents:
18471
diff
changeset
|
2657 ;; |
|
1745af1e1b1d
Avoid gnulib-tool warnings about the dependencies of 'parse-datetime'.
Bruno Haible <bruno@clisp.org>
parents:
18471
diff
changeset
|
2658 * ) |
|
1745af1e1b1d
Avoid gnulib-tool warnings about the dependencies of 'parse-datetime'.
Bruno Haible <bruno@clisp.org>
parents:
18471
diff
changeset
|
2659 { |
|
1745af1e1b1d
Avoid gnulib-tool warnings about the dependencies of 'parse-datetime'.
Bruno Haible <bruno@clisp.org>
parents:
18471
diff
changeset
|
2660 func_get_license_raw "$1" |
|
1745af1e1b1d
Avoid gnulib-tool warnings about the dependencies of 'parse-datetime'.
Bruno Haible <bruno@clisp.org>
parents:
18471
diff
changeset
|
2661 # The default is GPL. |
|
1745af1e1b1d
Avoid gnulib-tool warnings about the dependencies of 'parse-datetime'.
Bruno Haible <bruno@clisp.org>
parents:
18471
diff
changeset
|
2662 echo "GPL" |
|
1745af1e1b1d
Avoid gnulib-tool warnings about the dependencies of 'parse-datetime'.
Bruno Haible <bruno@clisp.org>
parents:
18471
diff
changeset
|
2663 } | sed -e 's,^ *$,,' | sed -e 1q |
|
1745af1e1b1d
Avoid gnulib-tool warnings about the dependencies of 'parse-datetime'.
Bruno Haible <bruno@clisp.org>
parents:
18471
diff
changeset
|
2664 ;; |
|
1745af1e1b1d
Avoid gnulib-tool warnings about the dependencies of 'parse-datetime'.
Bruno Haible <bruno@clisp.org>
parents:
18471
diff
changeset
|
2665 esac |
|
5251
42b53a22aee5
Add a license tag to every module.
Bruno Haible <bruno@clisp.org>
parents:
5250
diff
changeset
|
2666 } |
|
42b53a22aee5
Add a license tag to every module.
Bruno Haible <bruno@clisp.org>
parents:
5250
diff
changeset
|
2667 |
| 4197 | 2668 # func_get_maintainer module |
|
7214
eb43edab28c3
Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents:
7213
diff
changeset
|
2669 # Input: |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
2670 # - local_gnulib_path from --local-dir |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2671 # - modcache true or false, from --cache-modules/--no-cache-modules |
| 4197 | 2672 func_get_maintainer () |
| 2673 { | |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2674 if ! $modcache; then |
|
12855
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
2675 func_lookup_file "modules/$1" |
|
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
2676 sed -n -e "/^Maintainer$sed_extract_prog" < "$lookedup_file" |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2677 else |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2678 func_cache_lookup_module "$1" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2679 # Output the field's value, including the final newline (if any). |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2680 if $have_associative; then |
|
13660
6a2c7d3ca5f0
gnulib-tool: work with NetBSD /bin/sh
Eric Blake <eblake@redhat.com>
parents:
13658
diff
changeset
|
2681 if eval 'test -n "${modcache_maintainer[$1]+set}"'; then |
|
6a2c7d3ca5f0
gnulib-tool: work with NetBSD /bin/sh
Eric Blake <eblake@redhat.com>
parents:
13658
diff
changeset
|
2682 eval 'echo "${modcache_maintainer[$1]}"' |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2683 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2684 else |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2685 eval "field_set=\"\$${cachevar}_maintainer_set\"" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2686 if test -n "$field_set"; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2687 eval "field_value=\"\$${cachevar}_maintainer\"" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2688 echo "${field_value}" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2689 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2690 fi |
|
12855
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
2691 fi |
| 4197 | 2692 } |
| 2693 | |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
2694 # func_get_tests_module module |
|
7214
eb43edab28c3
Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents:
7213
diff
changeset
|
2695 # Input: |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
2696 # - local_gnulib_path from --local-dir |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
2697 func_get_tests_module () |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
2698 { |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
2699 # The naming convention for tests modules is hardwired: ${module}-tests. |
|
7214
eb43edab28c3
Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents:
7213
diff
changeset
|
2700 if test -f "$gnulib_dir/modules/$1"-tests \ |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
2701 || func_path_foreach "$local_gnulib_path" func_exists_local_module %dir% "$1-tests"; then |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
2702 echo "$1"-tests |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
2703 fi |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
2704 } |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
2705 |
|
40074
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2706 # func_get_dependencies_recursively module |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2707 # Input: |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2708 # - local_gnulib_path from --local-dir |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2709 # - modcache true or false, from --cache-modules/--no-cache-modules |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2710 func_get_dependencies_recursively () |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2711 { |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2712 # In order to process every module only once (for speed), process an "input |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2713 # list" of modules, producing an "output list" of modules. During each round, |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2714 # more modules can be queued in the input list. Once a module on the input |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2715 # list has been processed, it is added to the "handled list", so we can avoid |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2716 # to process it again. |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2717 handledmodules= |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2718 inmodules="$1" |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2719 outmodules= |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2720 while test -n "$inmodules"; do |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2721 inmodules_this_round="$inmodules" |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2722 inmodules= # Accumulator, queue for next round |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2723 for module in $inmodules_this_round; do |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2724 func_verify_module |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2725 if test -n "$module"; then |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2726 func_append outmodules " $module" |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2727 deps=`func_get_dependencies $module | sed -e "$sed_dependencies_without_conditions"` |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2728 for dep in $deps; do |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2729 func_append inmodules " $dep" |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2730 done |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2731 fi |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2732 done |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2733 handledmodules=`for m in $handledmodules $inmodules_this_round; do echo $m; done | LC_ALL=C sort -u` |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2734 # Remove $handledmodules from $inmodules. |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2735 for m in $inmodules; do echo $m; done | LC_ALL=C sort -u > "$tmp"/queued-modules |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2736 inmodules=`echo "$handledmodules" | LC_ALL=C join -v 2 - "$tmp"/queued-modules` |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2737 done |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2738 rm -f "$tmp"/queued-modules |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2739 for m in $outmodules; do echo $m; done | LC_ALL=C sort -u |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2740 } |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2741 |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2742 # func_get_link_directive_recursively module |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2743 # Input: |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2744 # - local_gnulib_path from --local-dir |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2745 # - modcache true or false, from --cache-modules/--no-cache-modules |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2746 func_get_link_directive_recursively () |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2747 { |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2748 # In order to process every module only once (for speed), process an "input |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2749 # list" of modules, producing an "output list" of modules. During each round, |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2750 # more modules can be queued in the input list. Once a module on the input |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2751 # list has been processed, it is added to the "handled list", so we can avoid |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2752 # to process it again. |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2753 handledmodules= |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2754 inmodules="$1" |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2755 outmodules= |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2756 while test -n "$inmodules"; do |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2757 inmodules_this_round="$inmodules" |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2758 inmodules= # Accumulator, queue for next round |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2759 for module in $inmodules_this_round; do |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2760 func_verify_module |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2761 if test -n "$module"; then |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2762 if grep '^Link:[ ]*$' "$lookedup_file" >/dev/null; then |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2763 # The module description has a 'Link:' field. Ignore the dependencies. |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2764 func_append outmodules " $module" |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2765 else |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2766 # The module description has no 'Link:' field. Recurse through the dependencies. |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2767 deps=`func_get_dependencies $module | sed -e "$sed_dependencies_without_conditions"` |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2768 for dep in $deps; do |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2769 func_append inmodules " $dep" |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2770 done |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2771 fi |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2772 fi |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2773 done |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2774 handledmodules=`for m in $handledmodules $inmodules_this_round; do echo $m; done | LC_ALL=C sort -u` |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2775 # Remove $handledmodules from $inmodules. |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2776 for m in $inmodules; do echo $m; done | LC_ALL=C sort -u > "$tmp"/queued-modules |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2777 inmodules=`echo "$handledmodules" | LC_ALL=C join -v 2 - "$tmp"/queued-modules` |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2778 done |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2779 rm -f "$tmp"/queued-modules |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2780 for m in $outmodules; do func_get_link_directive "$m"; done | LC_ALL=C sort -u | sed -e '/^$/d' |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2781 } |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
2782 |
| 5981 | 2783 # func_acceptable module |
| 2784 # tests whether a module is acceptable. | |
| 2785 # Input: | |
| 2786 # - avoidlist list of modules to avoid | |
| 2787 func_acceptable () | |
| 2788 { | |
| 2789 for avoid in $avoidlist; do | |
| 2790 if test "$avoid" = "$1"; then | |
| 2791 return 1 | |
| 2792 fi | |
| 2793 done | |
| 2794 return 0 | |
| 2795 } | |
| 2796 | |
|
14682
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2797 # sed expression to keep the first 32 characters of each line. |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2798 sed_first_32_chars='s/^\(................................\).*/\1/' |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2799 |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2800 # func_module_shellfunc_name module |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2801 # computes the shell function name that will contain the m4 macros for the module. |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2802 # Input: |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2803 # - macro_prefix prefix to use |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2804 # Output: |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2805 # - shellfunc shell function name |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2806 func_module_shellfunc_name () |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2807 { |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2808 case $1 in |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2809 *[!a-zA-Z0-9_]*) |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2810 shellfunc=func_${macro_prefix}_gnulib_m4code_`echo "$1" | md5sum | LC_ALL=C sed -e "$sed_first_32_chars"` ;; |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2811 *) |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2812 shellfunc=func_${macro_prefix}_gnulib_m4code_$1 ;; |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2813 esac |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2814 } |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2815 |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2816 # func_module_shellvar_name module |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2817 # computes the shell variable name the will be set to true once the m4 macros |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2818 # for the module have been executed. |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2819 # Output: |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2820 # - shellvar shell variable name |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2821 func_module_shellvar_name () |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2822 { |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2823 case $1 in |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2824 *[!a-zA-Z0-9_]*) |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2825 shellvar=${macro_prefix}_gnulib_enabled_`echo "$1" | md5sum | LC_ALL=C sed -e "$sed_first_32_chars"` ;; |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2826 *) |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2827 shellvar=${macro_prefix}_gnulib_enabled_$1 ;; |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2828 esac |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2829 } |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2830 |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2831 # func_module_conditional_name module |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2832 # computes the automake conditional name for the module. |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2833 # Output: |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2834 # - conditional name of automake conditional |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2835 func_module_conditional_name () |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2836 { |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2837 case $1 in |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2838 *[!a-zA-Z0-9_]*) |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2839 conditional=${macro_prefix}_GNULIB_ENABLED_`echo "$1" | md5sum | LC_ALL=C sed -e "$sed_first_32_chars"` ;; |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2840 *) |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2841 conditional=${macro_prefix}_GNULIB_ENABLED_$1 ;; |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2842 esac |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2843 } |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2844 |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2845 # func_uncond_add_module B |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2846 # notes the presence of B as an unconditional module. |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2847 # |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2848 # func_conddep_add_module A B cond |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2849 # notes the presence of a conditional dependency from module A to module B, |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2850 # subject to the condition that A is enabled and cond is true. |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2851 # |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2852 # func_cond_module_p B |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2853 # tests whether module B is conditional. |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2854 # |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2855 # func_cond_module_condition A B |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2856 # returns the condition when B should be enabled as a dependency of A, once the |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2857 # m4 code for A has been executed. |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2858 # Output: - condition |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2859 # |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2860 if $have_associative; then |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2861 declare -A conddep_isuncond |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2862 declare -A conddep_dependers |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2863 declare -A conddep_condition |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2864 func_uncond_add_module () |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2865 { |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2866 eval 'conddep_isuncond[$1]=true' |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2867 eval 'unset conddep_dependers[$1]' |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2868 } |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2869 func_conddep_add_module () |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2870 { |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2871 eval 'isuncond="${conddep_isuncond[$2]}"' |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2872 if test -z "$isuncond"; then |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2873 # No unconditional dependency to B known at this point. |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2874 eval 'conddep_dependers[$2]="${conddep_dependers[$2]} $1"' |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2875 eval 'conddep_condition[$1---$2]="$3"' |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2876 fi |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2877 } |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2878 func_cond_module_p () |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2879 { |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2880 eval 'previous_dependers="${conddep_dependers[$1]}"' |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2881 test -n "$previous_dependers" |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2882 } |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2883 func_cond_module_condition () |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2884 { |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2885 eval 'condition="${conddep_condition[$1---$2]}"' |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2886 } |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2887 else |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2888 func_uncond_add_module () |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2889 { |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2890 case $1 in |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2891 *[!a-zA-Z0-9_]*) |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2892 suffix=`echo "$1" | md5sum | LC_ALL=C sed -e "$sed_first_32_chars"` ;; |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2893 *) |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2894 suffix=$1 ;; |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2895 esac |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2896 eval 'conddep_isuncond_'"$suffix"'=true' |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2897 eval 'unset conddep_dependers_'"$suffix" |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2898 } |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2899 func_conddep_add_module () |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2900 { |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2901 case $2 in |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2902 *[!a-zA-Z0-9_]*) |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2903 suffix=`echo "$2" | md5sum | LC_ALL=C sed -e "$sed_first_32_chars"` ;; |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2904 *) |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2905 suffix=$2 ;; |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2906 esac |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2907 eval 'isuncond="${conddep_isuncond_'"$suffix"'}"' |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2908 if test -z "$isuncond"; then |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2909 eval 'conddep_dependers_'"$suffix"'="${conddep_dependers_'"$suffix"'} $1"' |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2910 suffix=`echo "$1---$2" | md5sum | LC_ALL=C sed -e "$sed_first_32_chars"` |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2911 eval 'conddep_condition_'"$suffix"'="$3"' |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2912 fi |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2913 } |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2914 func_cond_module_p () |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2915 { |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2916 case $1 in |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2917 *[!a-zA-Z0-9_]*) |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2918 suffix=`echo "$1" | md5sum | LC_ALL=C sed -e "$sed_first_32_chars"` ;; |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2919 *) |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2920 suffix=$1 ;; |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2921 esac |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2922 eval 'previous_dependers="${conddep_dependers_'"$suffix"'}"' |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2923 test -n "$previous_dependers" |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2924 } |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2925 func_cond_module_condition () |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2926 { |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2927 suffix=`echo "$1---$2" | md5sum | LC_ALL=C sed -e "$sed_first_32_chars"` |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2928 eval 'condition="${conddep_condition_'"$suffix"'}"' |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2929 } |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2930 fi |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2931 |
|
5347
0318c37925dc
Move duplicated code into function func_modules_transitive_closure().
Bruno Haible <bruno@clisp.org>
parents:
5346
diff
changeset
|
2932 # func_modules_transitive_closure |
|
0318c37925dc
Move duplicated code into function func_modules_transitive_closure().
Bruno Haible <bruno@clisp.org>
parents:
5346
diff
changeset
|
2933 # Input: |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
2934 # - local_gnulib_path from --local-dir |
|
18729
9534f71959d1
gnulib-tool: new option --gnu-make
Paul Eggert <eggert@cs.ucla.edu>
parents:
18704
diff
changeset
|
2935 # - gnu_make true if --gnu-make was given, false otherwise |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2936 # - modcache true or false, from --cache-modules/--no-cache-modules |
|
5347
0318c37925dc
Move duplicated code into function func_modules_transitive_closure().
Bruno Haible <bruno@clisp.org>
parents:
5346
diff
changeset
|
2937 # - modules list of specified modules |
|
16932
48e8f0679448
gnulib-tool: Refactor inctests variable.
Bruno Haible <bruno@clisp.org>
parents:
16931
diff
changeset
|
2938 # - inctests true if tests should be included, false otherwise |
|
10744
7fb7b37150b3
New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents:
10743
diff
changeset
|
2939 # - incobsolete true if obsolete modules among dependencies should be |
|
7fb7b37150b3
New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents:
10743
diff
changeset
|
2940 # included, blank otherwise |
|
13080
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
2941 # - inc_cxx_tests true if C++ interoperability tests should be included, |
|
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
2942 # blank otherwise |
|
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
2943 # - inc_longrunning_tests true if long-runnings tests should be included, |
|
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
2944 # blank otherwise |
|
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
2945 # - inc_privileged_tests true if tests that require root privileges should be |
|
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
2946 # included, blank otherwise |
|
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
2947 # - inc_unportable_tests true if tests that fail on some platforms should be |
|
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
2948 # included, blank otherwise |
|
13264
d66e74e6fe48
gnulib-tool: Don't include hairy tests of dependencies in testdirs.
Bruno Haible <bruno@clisp.org>
parents:
13263
diff
changeset
|
2949 # - inc_all_direct_tests true if all kinds of problematic unit tests among |
|
d66e74e6fe48
gnulib-tool: Don't include hairy tests of dependencies in testdirs.
Bruno Haible <bruno@clisp.org>
parents:
13263
diff
changeset
|
2950 # the unit tests of the specified modules should be |
|
d66e74e6fe48
gnulib-tool: Don't include hairy tests of dependencies in testdirs.
Bruno Haible <bruno@clisp.org>
parents:
13263
diff
changeset
|
2951 # included, blank otherwise |
|
d66e74e6fe48
gnulib-tool: Don't include hairy tests of dependencies in testdirs.
Bruno Haible <bruno@clisp.org>
parents:
13263
diff
changeset
|
2952 # - inc_all_indirect_tests true if all kinds of problematic unit tests among |
|
d66e74e6fe48
gnulib-tool: Don't include hairy tests of dependencies in testdirs.
Bruno Haible <bruno@clisp.org>
parents:
13263
diff
changeset
|
2953 # the unit tests of the dependencies should be |
|
d66e74e6fe48
gnulib-tool: Don't include hairy tests of dependencies in testdirs.
Bruno Haible <bruno@clisp.org>
parents:
13263
diff
changeset
|
2954 # included, blank otherwise |
|
13263
e7d114c00ff9
gnulib-tool: Add --without-*-tests options.
Bruno Haible <bruno@clisp.org>
parents:
13223
diff
changeset
|
2955 # - excl_cxx_tests true if C++ interoperability tests should be excluded, |
|
e7d114c00ff9
gnulib-tool: Add --without-*-tests options.
Bruno Haible <bruno@clisp.org>
parents:
13223
diff
changeset
|
2956 # blank otherwise |
|
e7d114c00ff9
gnulib-tool: Add --without-*-tests options.
Bruno Haible <bruno@clisp.org>
parents:
13223
diff
changeset
|
2957 # - excl_longrunning_tests true if long-runnings tests should be excluded, |
|
e7d114c00ff9
gnulib-tool: Add --without-*-tests options.
Bruno Haible <bruno@clisp.org>
parents:
13223
diff
changeset
|
2958 # blank otherwise |
|
e7d114c00ff9
gnulib-tool: Add --without-*-tests options.
Bruno Haible <bruno@clisp.org>
parents:
13223
diff
changeset
|
2959 # - excl_privileged_tests true if tests that require root privileges should be |
|
e7d114c00ff9
gnulib-tool: Add --without-*-tests options.
Bruno Haible <bruno@clisp.org>
parents:
13223
diff
changeset
|
2960 # excluded, blank otherwise |
|
e7d114c00ff9
gnulib-tool: Add --without-*-tests options.
Bruno Haible <bruno@clisp.org>
parents:
13223
diff
changeset
|
2961 # - excl_unportable_tests true if tests that fail on some platforms should be |
|
e7d114c00ff9
gnulib-tool: Add --without-*-tests options.
Bruno Haible <bruno@clisp.org>
parents:
13223
diff
changeset
|
2962 # excluded, blank otherwise |
| 5981 | 2963 # - avoidlist list of modules to avoid |
|
14682
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2964 # - cond_dependencies true if conditional dependencies shall be supported, |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2965 # blank otherwise |
|
7320
9349ee4e633c
Speed up func_modules_transitive_closure.
Bruno Haible <bruno@clisp.org>
parents:
7319
diff
changeset
|
2966 # - tmp pathname of a temporary directory |
|
5347
0318c37925dc
Move duplicated code into function func_modules_transitive_closure().
Bruno Haible <bruno@clisp.org>
parents:
5346
diff
changeset
|
2967 # Output: |
|
0318c37925dc
Move duplicated code into function func_modules_transitive_closure().
Bruno Haible <bruno@clisp.org>
parents:
5346
diff
changeset
|
2968 # - modules list of modules, including dependencies |
|
14682
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2969 # - conddep_dependers, conddep_condition information about conditionally |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2970 # enabled modules |
|
5347
0318c37925dc
Move duplicated code into function func_modules_transitive_closure().
Bruno Haible <bruno@clisp.org>
parents:
5346
diff
changeset
|
2971 func_modules_transitive_closure () |
|
5345
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
2972 { |
|
14682
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2973 sed_escape_dependency='s|\([/.]\)|\\\1|g' |
|
7320
9349ee4e633c
Speed up func_modules_transitive_closure.
Bruno Haible <bruno@clisp.org>
parents:
7319
diff
changeset
|
2974 # In order to process every module only once (for speed), process an "input |
|
9349ee4e633c
Speed up func_modules_transitive_closure.
Bruno Haible <bruno@clisp.org>
parents:
7319
diff
changeset
|
2975 # list" of modules, producing an "output list" of modules. During each round, |
|
9349ee4e633c
Speed up func_modules_transitive_closure.
Bruno Haible <bruno@clisp.org>
parents:
7319
diff
changeset
|
2976 # more modules can be queued in the input list. Once a module on the input |
|
9349ee4e633c
Speed up func_modules_transitive_closure.
Bruno Haible <bruno@clisp.org>
parents:
7319
diff
changeset
|
2977 # list has been processed, it is added to the "handled list", so we can avoid |
|
9349ee4e633c
Speed up func_modules_transitive_closure.
Bruno Haible <bruno@clisp.org>
parents:
7319
diff
changeset
|
2978 # to process it again. |
|
9349ee4e633c
Speed up func_modules_transitive_closure.
Bruno Haible <bruno@clisp.org>
parents:
7319
diff
changeset
|
2979 handledmodules= |
|
9349ee4e633c
Speed up func_modules_transitive_closure.
Bruno Haible <bruno@clisp.org>
parents:
7319
diff
changeset
|
2980 inmodules="$modules" |
|
9349ee4e633c
Speed up func_modules_transitive_closure.
Bruno Haible <bruno@clisp.org>
parents:
7319
diff
changeset
|
2981 outmodules= |
|
13264
d66e74e6fe48
gnulib-tool: Don't include hairy tests of dependencies in testdirs.
Bruno Haible <bruno@clisp.org>
parents:
13263
diff
changeset
|
2982 fmtc_inc_all_tests="$inc_all_direct_tests" |
|
14833
76127af7039f
Finish the conditional dependencies mechanism.
Bruno Haible <bruno@clisp.org>
parents:
14806
diff
changeset
|
2983 if test "$cond_dependencies" = true; then |
|
14682
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2984 for module in $inmodules; do |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2985 func_verify_module |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2986 if test -n "$module"; then |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2987 if func_acceptable $module; then |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2988 func_uncond_add_module $module |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2989 fi |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2990 fi |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2991 done |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
2992 fi |
|
7320
9349ee4e633c
Speed up func_modules_transitive_closure.
Bruno Haible <bruno@clisp.org>
parents:
7319
diff
changeset
|
2993 while test -n "$inmodules"; do |
|
9349ee4e633c
Speed up func_modules_transitive_closure.
Bruno Haible <bruno@clisp.org>
parents:
7319
diff
changeset
|
2994 inmodules_this_round="$inmodules" |
|
9349ee4e633c
Speed up func_modules_transitive_closure.
Bruno Haible <bruno@clisp.org>
parents:
7319
diff
changeset
|
2995 inmodules= # Accumulator, queue for next round |
|
9349ee4e633c
Speed up func_modules_transitive_closure.
Bruno Haible <bruno@clisp.org>
parents:
7319
diff
changeset
|
2996 for module in $inmodules_this_round; do |
|
5345
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
2997 func_verify_module |
|
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
2998 if test -n "$module"; then |
| 5981 | 2999 if func_acceptable $module; then |
|
7323
7ca0e325d5db
Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents:
7322
diff
changeset
|
3000 func_append outmodules " $module" |
|
14833
76127af7039f
Finish the conditional dependencies mechanism.
Bruno Haible <bruno@clisp.org>
parents:
14806
diff
changeset
|
3001 if test "$cond_dependencies" = true; then |
|
18729
9534f71959d1
gnulib-tool: new option --gnu-make
Paul Eggert <eggert@cs.ucla.edu>
parents:
18704
diff
changeset
|
3002 if ! $gnu_make \ |
|
9534f71959d1
gnulib-tool: new option --gnu-make
Paul Eggert <eggert@cs.ucla.edu>
parents:
18704
diff
changeset
|
3003 && func_get_automake_snippet_conditional $module \ |
|
9534f71959d1
gnulib-tool: new option --gnu-make
Paul Eggert <eggert@cs.ucla.edu>
parents:
18704
diff
changeset
|
3004 | grep '^if ' > /dev/null; then |
|
14682
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
3005 # A module whose Makefile.am snippet contains a reference to an |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
3006 # automake conditional. If we were to use it conditionally, we |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
3007 # would get an error |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
3008 # configure: error: conditional "..." was never defined. |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
3009 # because automake 1.11.1 does not handle nested conditionals |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
3010 # correctly. As a workaround, make the module unconditional. |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
3011 func_uncond_add_module $module |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
3012 fi |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
3013 if func_cond_module_p $module; then |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
3014 conditional=true |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
3015 else |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
3016 conditional=false |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
3017 fi |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
3018 fi |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
3019 deps=`func_get_dependencies $module | sed -e "$sed_dependencies_without_conditions"` |
|
7320
9349ee4e633c
Speed up func_modules_transitive_closure.
Bruno Haible <bruno@clisp.org>
parents:
7319
diff
changeset
|
3020 # Duplicate dependencies are harmless, but Jim wants a warning. |
|
9349ee4e633c
Speed up func_modules_transitive_closure.
Bruno Haible <bruno@clisp.org>
parents:
7319
diff
changeset
|
3021 duplicated_deps=`echo "$deps" | LC_ALL=C sort | LC_ALL=C uniq -d` |
|
9349ee4e633c
Speed up func_modules_transitive_closure.
Bruno Haible <bruno@clisp.org>
parents:
7319
diff
changeset
|
3022 if test -n "$duplicated_deps"; then |
|
12819
4b5bf4c79e0c
gnulib-tool: Make warning diagnostics consistent.
Bruno Haible <bruno@clisp.org>
parents:
12775
diff
changeset
|
3023 func_warning "module $module has duplicated dependencies: "`echo $duplicated_deps` |
|
7320
9349ee4e633c
Speed up func_modules_transitive_closure.
Bruno Haible <bruno@clisp.org>
parents:
7319
diff
changeset
|
3024 fi |
|
16932
48e8f0679448
gnulib-tool: Refactor inctests variable.
Bruno Haible <bruno@clisp.org>
parents:
16931
diff
changeset
|
3025 if $inctests; then |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
3026 testsmodule=`func_get_tests_module $module` |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
3027 if test -n "$testsmodule"; then |
|
13299
b50c33cca624
Fix regression from 2010-04-25.
Bruno Haible <bruno@clisp.org>
parents:
13264
diff
changeset
|
3028 deps="$deps $testsmodule" |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
3029 fi |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
3030 fi |
|
13299
b50c33cca624
Fix regression from 2010-04-25.
Bruno Haible <bruno@clisp.org>
parents:
13264
diff
changeset
|
3031 for dep in $deps; do |
|
b50c33cca624
Fix regression from 2010-04-25.
Bruno Haible <bruno@clisp.org>
parents:
13264
diff
changeset
|
3032 # Determine whether to include the dependency or tests module. |
|
b50c33cca624
Fix regression from 2010-04-25.
Bruno Haible <bruno@clisp.org>
parents:
13264
diff
changeset
|
3033 inc=true |
|
b50c33cca624
Fix regression from 2010-04-25.
Bruno Haible <bruno@clisp.org>
parents:
13264
diff
changeset
|
3034 for word in `func_get_status $dep`; do |
|
b50c33cca624
Fix regression from 2010-04-25.
Bruno Haible <bruno@clisp.org>
parents:
13264
diff
changeset
|
3035 case "$word" in |
|
b50c33cca624
Fix regression from 2010-04-25.
Bruno Haible <bruno@clisp.org>
parents:
13264
diff
changeset
|
3036 obsolete) |
|
b50c33cca624
Fix regression from 2010-04-25.
Bruno Haible <bruno@clisp.org>
parents:
13264
diff
changeset
|
3037 test -n "$incobsolete" \ |
|
b50c33cca624
Fix regression from 2010-04-25.
Bruno Haible <bruno@clisp.org>
parents:
13264
diff
changeset
|
3038 || inc=false |
|
b50c33cca624
Fix regression from 2010-04-25.
Bruno Haible <bruno@clisp.org>
parents:
13264
diff
changeset
|
3039 ;; |
|
b50c33cca624
Fix regression from 2010-04-25.
Bruno Haible <bruno@clisp.org>
parents:
13264
diff
changeset
|
3040 c++-test) |
|
b50c33cca624
Fix regression from 2010-04-25.
Bruno Haible <bruno@clisp.org>
parents:
13264
diff
changeset
|
3041 test -z "$excl_cxx_tests" \ |
|
b50c33cca624
Fix regression from 2010-04-25.
Bruno Haible <bruno@clisp.org>
parents:
13264
diff
changeset
|
3042 || inc=false |
|
b50c33cca624
Fix regression from 2010-04-25.
Bruno Haible <bruno@clisp.org>
parents:
13264
diff
changeset
|
3043 test -n "$fmtc_inc_all_tests" || test -n "$inc_cxx_tests" \ |
|
b50c33cca624
Fix regression from 2010-04-25.
Bruno Haible <bruno@clisp.org>
parents:
13264
diff
changeset
|
3044 || inc=false |
|
b50c33cca624
Fix regression from 2010-04-25.
Bruno Haible <bruno@clisp.org>
parents:
13264
diff
changeset
|
3045 ;; |
|
b50c33cca624
Fix regression from 2010-04-25.
Bruno Haible <bruno@clisp.org>
parents:
13264
diff
changeset
|
3046 longrunning-test) |
|
b50c33cca624
Fix regression from 2010-04-25.
Bruno Haible <bruno@clisp.org>
parents:
13264
diff
changeset
|
3047 test -z "$excl_longrunning_tests" \ |
|
b50c33cca624
Fix regression from 2010-04-25.
Bruno Haible <bruno@clisp.org>
parents:
13264
diff
changeset
|
3048 || inc=false |
|
b50c33cca624
Fix regression from 2010-04-25.
Bruno Haible <bruno@clisp.org>
parents:
13264
diff
changeset
|
3049 test -n "$fmtc_inc_all_tests" || test -n "$inc_longrunning_tests" \ |
|
b50c33cca624
Fix regression from 2010-04-25.
Bruno Haible <bruno@clisp.org>
parents:
13264
diff
changeset
|
3050 || inc=false |
|
b50c33cca624
Fix regression from 2010-04-25.
Bruno Haible <bruno@clisp.org>
parents:
13264
diff
changeset
|
3051 ;; |
|
b50c33cca624
Fix regression from 2010-04-25.
Bruno Haible <bruno@clisp.org>
parents:
13264
diff
changeset
|
3052 privileged-test) |
|
b50c33cca624
Fix regression from 2010-04-25.
Bruno Haible <bruno@clisp.org>
parents:
13264
diff
changeset
|
3053 test -z "$excl_privileged_tests" \ |
|
b50c33cca624
Fix regression from 2010-04-25.
Bruno Haible <bruno@clisp.org>
parents:
13264
diff
changeset
|
3054 || inc=false |
|
b50c33cca624
Fix regression from 2010-04-25.
Bruno Haible <bruno@clisp.org>
parents:
13264
diff
changeset
|
3055 test -n "$fmtc_inc_all_tests" || test -n "$inc_privileged_tests" \ |
|
b50c33cca624
Fix regression from 2010-04-25.
Bruno Haible <bruno@clisp.org>
parents:
13264
diff
changeset
|
3056 || inc=false |
|
b50c33cca624
Fix regression from 2010-04-25.
Bruno Haible <bruno@clisp.org>
parents:
13264
diff
changeset
|
3057 ;; |
|
b50c33cca624
Fix regression from 2010-04-25.
Bruno Haible <bruno@clisp.org>
parents:
13264
diff
changeset
|
3058 unportable-test) |
|
b50c33cca624
Fix regression from 2010-04-25.
Bruno Haible <bruno@clisp.org>
parents:
13264
diff
changeset
|
3059 test -z "$excl_unportable_tests" \ |
|
b50c33cca624
Fix regression from 2010-04-25.
Bruno Haible <bruno@clisp.org>
parents:
13264
diff
changeset
|
3060 || inc=false |
|
b50c33cca624
Fix regression from 2010-04-25.
Bruno Haible <bruno@clisp.org>
parents:
13264
diff
changeset
|
3061 test -n "$fmtc_inc_all_tests" || test -n "$inc_unportable_tests" \ |
|
b50c33cca624
Fix regression from 2010-04-25.
Bruno Haible <bruno@clisp.org>
parents:
13264
diff
changeset
|
3062 || inc=false |
|
b50c33cca624
Fix regression from 2010-04-25.
Bruno Haible <bruno@clisp.org>
parents:
13264
diff
changeset
|
3063 ;; |
|
b50c33cca624
Fix regression from 2010-04-25.
Bruno Haible <bruno@clisp.org>
parents:
13264
diff
changeset
|
3064 *-test) |
|
b50c33cca624
Fix regression from 2010-04-25.
Bruno Haible <bruno@clisp.org>
parents:
13264
diff
changeset
|
3065 test -n "$fmtc_inc_all_tests" \ |
|
b50c33cca624
Fix regression from 2010-04-25.
Bruno Haible <bruno@clisp.org>
parents:
13264
diff
changeset
|
3066 || inc=false |
|
b50c33cca624
Fix regression from 2010-04-25.
Bruno Haible <bruno@clisp.org>
parents:
13264
diff
changeset
|
3067 ;; |
|
b50c33cca624
Fix regression from 2010-04-25.
Bruno Haible <bruno@clisp.org>
parents:
13264
diff
changeset
|
3068 esac |
|
b50c33cca624
Fix regression from 2010-04-25.
Bruno Haible <bruno@clisp.org>
parents:
13264
diff
changeset
|
3069 done |
|
15854
d3633bf8b61d
gnulib-tool: Improve last commit.
Bruno Haible <bruno@clisp.org>
parents:
15853
diff
changeset
|
3070 if $inc && func_acceptable "$dep"; then |
|
13299
b50c33cca624
Fix regression from 2010-04-25.
Bruno Haible <bruno@clisp.org>
parents:
13264
diff
changeset
|
3071 func_append inmodules " $dep" |
|
14833
76127af7039f
Finish the conditional dependencies mechanism.
Bruno Haible <bruno@clisp.org>
parents:
14806
diff
changeset
|
3072 if test "$cond_dependencies" = true; then |
|
14682
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
3073 escaped_dep=`echo "$dep" | sed -e "$sed_escape_dependency"` |
|
14806
e551e9a7ef38
gnulib-tool: fix portability problem with MacOS sed
Paul Eggert <eggert@cs.ucla.edu>
parents:
14682
diff
changeset
|
3074 sed_extract_condition1='/^ *'"$escaped_dep"' *$/{ |
|
e551e9a7ef38
gnulib-tool: fix portability problem with MacOS sed
Paul Eggert <eggert@cs.ucla.edu>
parents:
14682
diff
changeset
|
3075 s/^.*$/true/p |
|
e551e9a7ef38
gnulib-tool: fix portability problem with MacOS sed
Paul Eggert <eggert@cs.ucla.edu>
parents:
14682
diff
changeset
|
3076 }' |
|
e551e9a7ef38
gnulib-tool: fix portability problem with MacOS sed
Paul Eggert <eggert@cs.ucla.edu>
parents:
14682
diff
changeset
|
3077 sed_extract_condition2='/^ *'"$escaped_dep"' *\[.*\] *$/{ |
|
e551e9a7ef38
gnulib-tool: fix portability problem with MacOS sed
Paul Eggert <eggert@cs.ucla.edu>
parents:
14682
diff
changeset
|
3078 s/^ *'"$escaped_dep"' *\[\(.*\)\] *$/\1/p |
|
e551e9a7ef38
gnulib-tool: fix portability problem with MacOS sed
Paul Eggert <eggert@cs.ucla.edu>
parents:
14682
diff
changeset
|
3079 }' |
|
14682
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
3080 condition=`func_get_dependencies $module | sed -n -e "$sed_extract_condition1" -e "$sed_extract_condition2"` |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
3081 if test "$condition" = true; then |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
3082 condition= |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
3083 fi |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
3084 if test -n "$condition"; then |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
3085 func_conddep_add_module "$module" "$dep" "$condition" |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
3086 else |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
3087 if $conditional; then |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
3088 func_conddep_add_module "$module" "$dep" true |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
3089 else |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
3090 func_uncond_add_module "$dep" |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
3091 fi |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
3092 fi |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
3093 fi |
|
13299
b50c33cca624
Fix regression from 2010-04-25.
Bruno Haible <bruno@clisp.org>
parents:
13264
diff
changeset
|
3094 fi |
|
b50c33cca624
Fix regression from 2010-04-25.
Bruno Haible <bruno@clisp.org>
parents:
13264
diff
changeset
|
3095 done |
| 5981 | 3096 fi |
|
5345
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
3097 fi |
|
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
3098 done |
|
7320
9349ee4e633c
Speed up func_modules_transitive_closure.
Bruno Haible <bruno@clisp.org>
parents:
7319
diff
changeset
|
3099 handledmodules=`for m in $handledmodules $inmodules_this_round; do echo $m; done | LC_ALL=C sort -u` |
|
9349ee4e633c
Speed up func_modules_transitive_closure.
Bruno Haible <bruno@clisp.org>
parents:
7319
diff
changeset
|
3100 # Remove $handledmodules from $inmodules. |
|
9349ee4e633c
Speed up func_modules_transitive_closure.
Bruno Haible <bruno@clisp.org>
parents:
7319
diff
changeset
|
3101 for m in $inmodules; do echo $m; done | LC_ALL=C sort -u > "$tmp"/queued-modules |
|
12881
c6e9c683bc41
Really work around around "broken pipe" error message from bash 3.2.
Bruno Haible <bruno@clisp.org>
parents:
12877
diff
changeset
|
3102 inmodules=`echo "$handledmodules" | LC_ALL=C join -v 2 - "$tmp"/queued-modules` |
|
13264
d66e74e6fe48
gnulib-tool: Don't include hairy tests of dependencies in testdirs.
Bruno Haible <bruno@clisp.org>
parents:
13263
diff
changeset
|
3103 fmtc_inc_all_tests="$inc_all_indirect_tests" |
|
5345
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
3104 done |
|
7320
9349ee4e633c
Speed up func_modules_transitive_closure.
Bruno Haible <bruno@clisp.org>
parents:
7319
diff
changeset
|
3105 modules=`for m in $outmodules; do echo $m; done | LC_ALL=C sort -u` |
|
9349ee4e633c
Speed up func_modules_transitive_closure.
Bruno Haible <bruno@clisp.org>
parents:
7319
diff
changeset
|
3106 rm -f "$tmp"/queued-modules |
|
5347
0318c37925dc
Move duplicated code into function func_modules_transitive_closure().
Bruno Haible <bruno@clisp.org>
parents:
5346
diff
changeset
|
3107 } |
|
0318c37925dc
Move duplicated code into function func_modules_transitive_closure().
Bruno Haible <bruno@clisp.org>
parents:
5346
diff
changeset
|
3108 |
|
13420
2291a2f3d56c
gnulib-tool: Display specified modules and dependencies differently.
Bruno Haible <bruno@clisp.org>
parents:
13419
diff
changeset
|
3109 # func_show_module_list |
|
2291a2f3d56c
gnulib-tool: Display specified modules and dependencies differently.
Bruno Haible <bruno@clisp.org>
parents:
13419
diff
changeset
|
3110 # Input: |
|
2291a2f3d56c
gnulib-tool: Display specified modules and dependencies differently.
Bruno Haible <bruno@clisp.org>
parents:
13419
diff
changeset
|
3111 # - specified_modules list of specified modules (one per line, sorted) |
|
2291a2f3d56c
gnulib-tool: Display specified modules and dependencies differently.
Bruno Haible <bruno@clisp.org>
parents:
13419
diff
changeset
|
3112 # - modules complete list of modules (one per line, sorted) |
|
2291a2f3d56c
gnulib-tool: Display specified modules and dependencies differently.
Bruno Haible <bruno@clisp.org>
parents:
13419
diff
changeset
|
3113 # - tmp pathname of a temporary directory |
|
2291a2f3d56c
gnulib-tool: Display specified modules and dependencies differently.
Bruno Haible <bruno@clisp.org>
parents:
13419
diff
changeset
|
3114 func_show_module_list () |
|
2291a2f3d56c
gnulib-tool: Display specified modules and dependencies differently.
Bruno Haible <bruno@clisp.org>
parents:
13419
diff
changeset
|
3115 { |
|
2291a2f3d56c
gnulib-tool: Display specified modules and dependencies differently.
Bruno Haible <bruno@clisp.org>
parents:
13419
diff
changeset
|
3116 if case "$TERM" in |
|
2291a2f3d56c
gnulib-tool: Display specified modules and dependencies differently.
Bruno Haible <bruno@clisp.org>
parents:
13419
diff
changeset
|
3117 xterm*) test -t 1;; |
|
2291a2f3d56c
gnulib-tool: Display specified modules and dependencies differently.
Bruno Haible <bruno@clisp.org>
parents:
13419
diff
changeset
|
3118 *) false;; |
|
2291a2f3d56c
gnulib-tool: Display specified modules and dependencies differently.
Bruno Haible <bruno@clisp.org>
parents:
13419
diff
changeset
|
3119 esac; then |
|
2291a2f3d56c
gnulib-tool: Display specified modules and dependencies differently.
Bruno Haible <bruno@clisp.org>
parents:
13419
diff
changeset
|
3120 # Assume xterm compatible escape sequences. |
|
17964
5a6167820a2c
gnulib-tool: output bold attribute more portably
Mats Erik Andersson <gnu@gisladisker.se>
parents:
17888
diff
changeset
|
3121 bold_on=`printf '\033[1m'` |
|
5a6167820a2c
gnulib-tool: output bold attribute more portably
Mats Erik Andersson <gnu@gisladisker.se>
parents:
17888
diff
changeset
|
3122 bold_off=`printf '\033[0m'` |
|
13420
2291a2f3d56c
gnulib-tool: Display specified modules and dependencies differently.
Bruno Haible <bruno@clisp.org>
parents:
13419
diff
changeset
|
3123 else |
|
2291a2f3d56c
gnulib-tool: Display specified modules and dependencies differently.
Bruno Haible <bruno@clisp.org>
parents:
13419
diff
changeset
|
3124 bold_on= |
|
2291a2f3d56c
gnulib-tool: Display specified modules and dependencies differently.
Bruno Haible <bruno@clisp.org>
parents:
13419
diff
changeset
|
3125 bold_off= |
|
2291a2f3d56c
gnulib-tool: Display specified modules and dependencies differently.
Bruno Haible <bruno@clisp.org>
parents:
13419
diff
changeset
|
3126 fi |
|
2291a2f3d56c
gnulib-tool: Display specified modules and dependencies differently.
Bruno Haible <bruno@clisp.org>
parents:
13419
diff
changeset
|
3127 echo "Module list with included dependencies (indented):" |
|
2291a2f3d56c
gnulib-tool: Display specified modules and dependencies differently.
Bruno Haible <bruno@clisp.org>
parents:
13419
diff
changeset
|
3128 echo "$specified_modules" | sed -e '/^$/d' -e 's/$/| /' > "$tmp"/specified-modules |
|
2291a2f3d56c
gnulib-tool: Display specified modules and dependencies differently.
Bruno Haible <bruno@clisp.org>
parents:
13419
diff
changeset
|
3129 echo "$modules" | sed -e '/^$/d' \ |
|
14625
1a2352cb014f
Change gnulib-tool to support NetBSD's join
J.T. Conklin <jtc@acorntoolworks.com>
parents:
14385
diff
changeset
|
3130 | LC_ALL=C join -t '|' -a2 "$tmp"/specified-modules - \ |
|
13420
2291a2f3d56c
gnulib-tool: Display specified modules and dependencies differently.
Bruno Haible <bruno@clisp.org>
parents:
13419
diff
changeset
|
3131 | sed -e 's/^\(.*\)|.*/|\1/' -e 's/^/ /' -e 's/^ |\(.*\)$/ '"${bold_on}"'\1'"${bold_off}"'/' |
|
2291a2f3d56c
gnulib-tool: Display specified modules and dependencies differently.
Bruno Haible <bruno@clisp.org>
parents:
13419
diff
changeset
|
3132 } |
|
2291a2f3d56c
gnulib-tool: Display specified modules and dependencies differently.
Bruno Haible <bruno@clisp.org>
parents:
13419
diff
changeset
|
3133 |
|
14836
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3134 # func_modules_transitive_closure_separately |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3135 # Determine main module list and tests-related module list separately. |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3136 # The main module list is the transitive closure of the specified modules, |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3137 # ignoring tests modules. Its lib/* sources go into $sourcebase/. If --lgpl |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3138 # is specified, it will consist only of LGPLed source. |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3139 # The tests-related module list is the transitive closure of the specified |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3140 # modules, including tests modules, minus the main module list excluding |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3141 # modules of applicability 'all'. Its lib/* sources (brought in through |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3142 # dependencies of *-tests modules) go into $testsbase/. It may contain GPLed |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3143 # source, even if --lgpl is specified. |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3144 # Input: |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
3145 # - local_gnulib_path from --local-dir |
|
14836
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3146 # - modcache true or false, from --cache-modules/--no-cache-modules |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3147 # - specified_modules list of specified modules |
|
16932
48e8f0679448
gnulib-tool: Refactor inctests variable.
Bruno Haible <bruno@clisp.org>
parents:
16931
diff
changeset
|
3148 # - inctests true if tests should be included, false otherwise |
|
14836
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3149 # - incobsolete true if obsolete modules among dependencies should be |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3150 # included, blank otherwise |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3151 # - inc_cxx_tests true if C++ interoperability tests should be included, |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3152 # blank otherwise |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3153 # - inc_longrunning_tests true if long-runnings tests should be included, |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3154 # blank otherwise |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3155 # - inc_privileged_tests true if tests that require root privileges should be |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3156 # included, blank otherwise |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3157 # - inc_unportable_tests true if tests that fail on some platforms should be |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3158 # included, blank otherwise |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3159 # - inc_all_direct_tests true if all kinds of problematic unit tests among |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3160 # the unit tests of the specified modules should be |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3161 # included, blank otherwise |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3162 # - inc_all_indirect_tests true if all kinds of problematic unit tests among |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3163 # the unit tests of the dependencies should be |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3164 # included, blank otherwise |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3165 # - excl_cxx_tests true if C++ interoperability tests should be excluded, |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3166 # blank otherwise |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3167 # - excl_longrunning_tests true if long-runnings tests should be excluded, |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3168 # blank otherwise |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3169 # - excl_privileged_tests true if tests that require root privileges should be |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3170 # excluded, blank otherwise |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3171 # - excl_unportable_tests true if tests that fail on some platforms should be |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3172 # excluded, blank otherwise |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3173 # - avoidlist list of modules to avoid |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3174 # - cond_dependencies true if conditional dependencies shall be supported, |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3175 # blank otherwise |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3176 # - tmp pathname of a temporary directory |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3177 # Output: |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3178 # - main_modules list of modules, including dependencies |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3179 # - testsrelated_modules list of tests-related modules, including dependencies |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3180 # - conddep_dependers, conddep_condition information about conditionally |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3181 # enabled modules |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3182 func_modules_transitive_closure_separately () |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3183 { |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3184 # Determine main module list. |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3185 saved_inctests="$inctests" |
|
16932
48e8f0679448
gnulib-tool: Refactor inctests variable.
Bruno Haible <bruno@clisp.org>
parents:
16931
diff
changeset
|
3186 inctests=false |
|
14836
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3187 modules="$specified_modules" |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3188 func_modules_transitive_closure |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3189 main_modules="$modules" |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3190 inctests="$saved_inctests" |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3191 if test $verbose -ge 1; then |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3192 echo "Main module list:" |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3193 echo "$main_modules" | sed -e 's/^/ /' |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3194 fi |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3195 # Determine tests-related module list. |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3196 echo "$final_modules" | LC_ALL=C sort -u > "$tmp"/final-modules |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3197 testsrelated_modules=`for module in $main_modules; do |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3198 if test \`func_get_applicability $module\` = main; then |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3199 echo $module |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3200 fi |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3201 done \ |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3202 | LC_ALL=C sort -u | LC_ALL=C join -v 2 - "$tmp"/final-modules` |
|
18741
8eca26cecdfe
gnulib-tool: Don't produce a tests directory with only snippet .h files.
Bruno Haible <bruno@clisp.org>
parents:
18734
diff
changeset
|
3203 # If testsrelated_modules consists only of modules with applicability 'all', |
|
8eca26cecdfe
gnulib-tool: Don't produce a tests directory with only snippet .h files.
Bruno Haible <bruno@clisp.org>
parents:
18734
diff
changeset
|
3204 # set it to empty (because such modules are only helper modules for other modules). |
|
8eca26cecdfe
gnulib-tool: Don't produce a tests directory with only snippet .h files.
Bruno Haible <bruno@clisp.org>
parents:
18734
diff
changeset
|
3205 have_nontrivial_testsrelated_modules= |
|
8eca26cecdfe
gnulib-tool: Don't produce a tests directory with only snippet .h files.
Bruno Haible <bruno@clisp.org>
parents:
18734
diff
changeset
|
3206 for module in $testsrelated_modules; do |
|
8eca26cecdfe
gnulib-tool: Don't produce a tests directory with only snippet .h files.
Bruno Haible <bruno@clisp.org>
parents:
18734
diff
changeset
|
3207 if test `func_get_applicability $module` != all; then |
|
8eca26cecdfe
gnulib-tool: Don't produce a tests directory with only snippet .h files.
Bruno Haible <bruno@clisp.org>
parents:
18734
diff
changeset
|
3208 have_nontrivial_testsrelated_modules=yes |
|
8eca26cecdfe
gnulib-tool: Don't produce a tests directory with only snippet .h files.
Bruno Haible <bruno@clisp.org>
parents:
18734
diff
changeset
|
3209 break |
|
8eca26cecdfe
gnulib-tool: Don't produce a tests directory with only snippet .h files.
Bruno Haible <bruno@clisp.org>
parents:
18734
diff
changeset
|
3210 fi |
|
8eca26cecdfe
gnulib-tool: Don't produce a tests directory with only snippet .h files.
Bruno Haible <bruno@clisp.org>
parents:
18734
diff
changeset
|
3211 done |
|
8eca26cecdfe
gnulib-tool: Don't produce a tests directory with only snippet .h files.
Bruno Haible <bruno@clisp.org>
parents:
18734
diff
changeset
|
3212 if test -z "$have_nontrivial_testsrelated_modules"; then |
|
8eca26cecdfe
gnulib-tool: Don't produce a tests directory with only snippet .h files.
Bruno Haible <bruno@clisp.org>
parents:
18734
diff
changeset
|
3213 testsrelated_modules= |
|
8eca26cecdfe
gnulib-tool: Don't produce a tests directory with only snippet .h files.
Bruno Haible <bruno@clisp.org>
parents:
18734
diff
changeset
|
3214 fi |
|
14836
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3215 if test $verbose -ge 1; then |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3216 echo "Tests-related module list:" |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3217 echo "$testsrelated_modules" | sed -e 's/^/ /' |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3218 fi |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3219 } |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3220 |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3221 # func_determine_use_libtests |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3222 # Determines whether a $testsbase/libtests.a is needed. |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3223 # Input: |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
3224 # - local_gnulib_path from --local-dir |
|
14836
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3225 # - modcache true or false, from --cache-modules/--no-cache-modules |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3226 # - testsrelated_modules list of tests-related modules, including dependencies |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3227 # Output: |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3228 # - use_libtests true if a $testsbase/libtests.a is needed, false otherwise |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3229 func_determine_use_libtests () |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3230 { |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3231 use_libtests=false |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3232 for module in $testsrelated_modules; do |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3233 func_verify_nontests_module |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3234 if test -n "$module"; then |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3235 all_files=`func_get_filelist $module` |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3236 # Test whether some file in $all_files lies in lib/. |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3237 for f in $all_files; do |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3238 case $f in |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3239 lib/*) |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3240 use_libtests=true |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3241 break 2 |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3242 ;; |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3243 esac |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3244 done |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3245 fi |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3246 done |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3247 } |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3248 |
|
6550
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
3249 # func_modules_add_dummy |
|
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
3250 # Input: |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
3251 # - local_gnulib_path from --local-dir |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
3252 # - modcache true or false, from --cache-modules/--no-cache-modules |
|
6550
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
3253 # - modules list of modules, including dependencies |
|
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
3254 # Output: |
|
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
3255 # - modules list of modules, including 'dummy' if needed |
|
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
3256 func_modules_add_dummy () |
|
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
3257 { |
|
10985
32537aa6364d
Terminate loops early when possible.
Bruno Haible <bruno@clisp.org>
parents:
10981
diff
changeset
|
3258 # Determine whether any module provides a lib_SOURCES augmentation. |
|
6550
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
3259 have_lib_SOURCES= |
|
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
3260 for module in $modules; do |
|
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
3261 func_verify_nontests_module |
|
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
3262 if test -n "$module"; then |
|
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
3263 # Extract the value of "lib_SOURCES += ...". |
|
18000
d0c8068a7c6f
gnulib-tool: concatenate lib_SOURCES to a single line
Pádraig Brady <P@draigBrady.com>
parents:
17964
diff
changeset
|
3264 for file in `func_get_automake_snippet "$module" | combine_lines | |
|
d0c8068a7c6f
gnulib-tool: concatenate lib_SOURCES to a single line
Pádraig Brady <P@draigBrady.com>
parents:
17964
diff
changeset
|
3265 sed -n -e 's,^lib_SOURCES[ ]*+=\([^#]*\).*$,\1,p'`; do |
|
6550
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
3266 # Ignore .h files since they are not compiled. |
|
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
3267 case "$file" in |
|
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
3268 *.h) ;; |
|
10985
32537aa6364d
Terminate loops early when possible.
Bruno Haible <bruno@clisp.org>
parents:
10981
diff
changeset
|
3269 *) |
|
32537aa6364d
Terminate loops early when possible.
Bruno Haible <bruno@clisp.org>
parents:
10981
diff
changeset
|
3270 have_lib_SOURCES=yes |
|
32537aa6364d
Terminate loops early when possible.
Bruno Haible <bruno@clisp.org>
parents:
10981
diff
changeset
|
3271 break 2 |
|
32537aa6364d
Terminate loops early when possible.
Bruno Haible <bruno@clisp.org>
parents:
10981
diff
changeset
|
3272 ;; |
|
6550
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
3273 esac |
|
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
3274 done |
|
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
3275 fi |
|
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
3276 done |
|
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
3277 # Add the dummy module, to make sure the library will be non-empty. |
|
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
3278 if test -z "$have_lib_SOURCES"; then |
|
8668
9c0fa5819ce3
2007-04-12 Simon Josefsson <simon@josefsson.org>
Simon Josefsson <simon@josefsson.org>
parents:
8626
diff
changeset
|
3279 if func_acceptable "dummy"; then |
|
9c0fa5819ce3
2007-04-12 Simon Josefsson <simon@josefsson.org>
Simon Josefsson <simon@josefsson.org>
parents:
8626
diff
changeset
|
3280 func_append modules " dummy" |
|
9c0fa5819ce3
2007-04-12 Simon Josefsson <simon@josefsson.org>
Simon Josefsson <simon@josefsson.org>
parents:
8626
diff
changeset
|
3281 fi |
|
6550
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
3282 fi |
|
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
3283 } |
|
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
3284 |
|
14836
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3285 # func_modules_add_dummy_separately |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3286 # Input: |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
3287 # - local_gnulib_path from --local-dir |
|
14836
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3288 # - modcache true or false, from --cache-modules/--no-cache-modules |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3289 # - main_modules list of modules, including dependencies |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3290 # - testsrelated_modules list of tests-related modules, including dependencies |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3291 # - use_libtests true if a $testsbase/libtests.a is needed, false otherwise |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3292 # Output: |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3293 # - main_modules list of modules, including 'dummy' if needed |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3294 # - testsrelated_modules list of tests-related modules, including 'dummy' if |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3295 # needed |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3296 func_modules_add_dummy_separately () |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3297 { |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3298 # Add the dummy module to the main module list if needed. |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3299 modules="$main_modules" |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3300 func_modules_add_dummy |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3301 main_modules="$modules" |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3302 |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3303 # Add the dummy module to the tests-related module list if needed. |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3304 if $use_libtests; then |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3305 modules="$testsrelated_modules" |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3306 func_modules_add_dummy |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3307 testsrelated_modules="$modules" |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3308 fi |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3309 } |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3310 |
|
9189
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
3311 # func_modules_notice |
|
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
3312 # Input: |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
3313 # - local_gnulib_path from --local-dir |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
3314 # - modcache true or false, from --cache-modules/--no-cache-modules |
|
9189
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
3315 # - verbose integer, default 0, inc/decremented by --verbose/--quiet |
|
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
3316 # - modules list of modules, including dependencies |
|
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
3317 func_modules_notice () |
|
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
3318 { |
|
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
3319 if test $verbose -ge -1; then |
|
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
3320 for module in $modules; do |
|
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
3321 func_verify_module |
|
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
3322 if test -n "$module"; then |
|
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
3323 msg=`func_get_notice $module` |
|
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
3324 if test -n "$msg"; then |
|
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
3325 echo "Notice from module $module:" |
|
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
3326 echo "$msg" | sed -e 's/^/ /' |
|
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
3327 fi |
|
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
3328 fi |
|
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
3329 done |
|
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
3330 fi |
|
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
3331 } |
|
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
3332 |
|
5348
6afb021e2fc1
Move duplicated code into function func_modules_to_filelist().
Bruno Haible <bruno@clisp.org>
parents:
5347
diff
changeset
|
3333 # func_modules_to_filelist |
|
6afb021e2fc1
Move duplicated code into function func_modules_to_filelist().
Bruno Haible <bruno@clisp.org>
parents:
5347
diff
changeset
|
3334 # Input: |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
3335 # - local_gnulib_path from --local-dir |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
3336 # - modcache true or false, from --cache-modules/--no-cache-modules |
|
5348
6afb021e2fc1
Move duplicated code into function func_modules_to_filelist().
Bruno Haible <bruno@clisp.org>
parents:
5347
diff
changeset
|
3337 # - modules list of modules, including dependencies |
|
6afb021e2fc1
Move duplicated code into function func_modules_to_filelist().
Bruno Haible <bruno@clisp.org>
parents:
5347
diff
changeset
|
3338 # Output: |
|
6afb021e2fc1
Move duplicated code into function func_modules_to_filelist().
Bruno Haible <bruno@clisp.org>
parents:
5347
diff
changeset
|
3339 # - files list of files |
|
6afb021e2fc1
Move duplicated code into function func_modules_to_filelist().
Bruno Haible <bruno@clisp.org>
parents:
5347
diff
changeset
|
3340 func_modules_to_filelist () |
|
6afb021e2fc1
Move duplicated code into function func_modules_to_filelist().
Bruno Haible <bruno@clisp.org>
parents:
5347
diff
changeset
|
3341 { |
|
6afb021e2fc1
Move duplicated code into function func_modules_to_filelist().
Bruno Haible <bruno@clisp.org>
parents:
5347
diff
changeset
|
3342 files= |
|
6afb021e2fc1
Move duplicated code into function func_modules_to_filelist().
Bruno Haible <bruno@clisp.org>
parents:
5347
diff
changeset
|
3343 for module in $modules; do |
|
6afb021e2fc1
Move duplicated code into function func_modules_to_filelist().
Bruno Haible <bruno@clisp.org>
parents:
5347
diff
changeset
|
3344 func_verify_module |
|
6afb021e2fc1
Move duplicated code into function func_modules_to_filelist().
Bruno Haible <bruno@clisp.org>
parents:
5347
diff
changeset
|
3345 if test -n "$module"; then |
|
7323
7ca0e325d5db
Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents:
7322
diff
changeset
|
3346 fs=`func_get_filelist $module` |
|
7ca0e325d5db
Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents:
7322
diff
changeset
|
3347 func_append files " $fs" |
|
5348
6afb021e2fc1
Move duplicated code into function func_modules_to_filelist().
Bruno Haible <bruno@clisp.org>
parents:
5347
diff
changeset
|
3348 fi |
|
6afb021e2fc1
Move duplicated code into function func_modules_to_filelist().
Bruno Haible <bruno@clisp.org>
parents:
5347
diff
changeset
|
3349 done |
|
7319
1726cc39709b
Use "sort -u" where it makes sense.
Bruno Haible <bruno@clisp.org>
parents:
7299
diff
changeset
|
3350 files=`for f in $files; do echo $f; done | LC_ALL=C sort -u` |
|
5348
6afb021e2fc1
Move duplicated code into function func_modules_to_filelist().
Bruno Haible <bruno@clisp.org>
parents:
5347
diff
changeset
|
3351 } |
|
6afb021e2fc1
Move duplicated code into function func_modules_to_filelist().
Bruno Haible <bruno@clisp.org>
parents:
5347
diff
changeset
|
3352 |
|
14836
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3353 # func_modules_to_filelist_separately |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3354 # Determine the final file lists. |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3355 # They must be computed separately, because files in lib/* go into |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3356 # $sourcebase/ if they are in the main file list but into $testsbase/ |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3357 # if they are in the tests-related file list. Furthermore lib/dummy.c |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3358 # can be in both. |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3359 # Input: |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
3360 # - local_gnulib_path from --local-dir |
|
14836
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3361 # - modcache true or false, from --cache-modules/--no-cache-modules |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3362 # - main_modules list of modules, including dependencies |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3363 # - testsrelated_modules list of tests-related modules, including dependencies |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3364 func_modules_to_filelist_separately () |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3365 { |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3366 # Determine final main file list. |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3367 modules="$main_modules" |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3368 func_modules_to_filelist |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3369 main_files="$files" |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3370 # Determine final tests-related file list. |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3371 modules="$testsrelated_modules" |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3372 func_modules_to_filelist |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3373 testsrelated_files=`echo "$files" | sed -e 's,^lib/,tests=lib/,'` |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3374 # Merge both file lists. |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3375 sed_remove_empty_lines='/^$/d' |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3376 files=`{ echo "$main_files"; echo "$testsrelated_files"; } | sed -e "$sed_remove_empty_lines" | LC_ALL=C sort -u` |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3377 if test $verbose -ge 0; then |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3378 echo "File list:" |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3379 sed_prettyprint_files='s,^tests=lib/\(.*\)$,lib/\1 -> tests/\1,' |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3380 echo "$files" | sed -e "$sed_prettyprint_files" -e 's/^/ /' |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3381 fi |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3382 } |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3383 |
|
14840
5f709022a256
Allow multiple gnulib generated include files to be combined.
Bruno Haible <bruno@clisp.org>
parents:
14836
diff
changeset
|
3384 # func_compute_include_guard_prefix |
|
5f709022a256
Allow multiple gnulib generated include files to be combined.
Bruno Haible <bruno@clisp.org>
parents:
14836
diff
changeset
|
3385 # Determine include_guard_prefix. |
|
5f709022a256
Allow multiple gnulib generated include files to be combined.
Bruno Haible <bruno@clisp.org>
parents:
14836
diff
changeset
|
3386 # Input: |
|
5f709022a256
Allow multiple gnulib generated include files to be combined.
Bruno Haible <bruno@clisp.org>
parents:
14836
diff
changeset
|
3387 # - macro_prefix prefix of gl_LIBOBJS macros to use |
|
5f709022a256
Allow multiple gnulib generated include files to be combined.
Bruno Haible <bruno@clisp.org>
parents:
14836
diff
changeset
|
3388 # Output: |
|
5f709022a256
Allow multiple gnulib generated include files to be combined.
Bruno Haible <bruno@clisp.org>
parents:
14836
diff
changeset
|
3389 # - include_guard_prefix replacement for ${gl_include_guard_prefix} |
|
5f709022a256
Allow multiple gnulib generated include files to be combined.
Bruno Haible <bruno@clisp.org>
parents:
14836
diff
changeset
|
3390 # - sed_replace_include_guard_prefix |
|
5f709022a256
Allow multiple gnulib generated include files to be combined.
Bruno Haible <bruno@clisp.org>
parents:
14836
diff
changeset
|
3391 # sed expression for resolving ${gl_include_guard_prefix} |
|
5f709022a256
Allow multiple gnulib generated include files to be combined.
Bruno Haible <bruno@clisp.org>
parents:
14836
diff
changeset
|
3392 func_compute_include_guard_prefix () |
|
5f709022a256
Allow multiple gnulib generated include files to be combined.
Bruno Haible <bruno@clisp.org>
parents:
14836
diff
changeset
|
3393 { |
|
5f709022a256
Allow multiple gnulib generated include files to be combined.
Bruno Haible <bruno@clisp.org>
parents:
14836
diff
changeset
|
3394 if test "$macro_prefix" = gl; then |
|
5f709022a256
Allow multiple gnulib generated include files to be combined.
Bruno Haible <bruno@clisp.org>
parents:
14836
diff
changeset
|
3395 include_guard_prefix='GL' |
|
5f709022a256
Allow multiple gnulib generated include files to be combined.
Bruno Haible <bruno@clisp.org>
parents:
14836
diff
changeset
|
3396 else |
|
5f709022a256
Allow multiple gnulib generated include files to be combined.
Bruno Haible <bruno@clisp.org>
parents:
14836
diff
changeset
|
3397 include_guard_prefix='GL_'`echo "$macro_prefix" | LC_ALL=C tr '[a-z]' '[A-Z]'` |
|
5f709022a256
Allow multiple gnulib generated include files to be combined.
Bruno Haible <bruno@clisp.org>
parents:
14836
diff
changeset
|
3398 fi |
|
5f709022a256
Allow multiple gnulib generated include files to be combined.
Bruno Haible <bruno@clisp.org>
parents:
14836
diff
changeset
|
3399 sed_replace_include_guard_prefix='s/\${gl_include_guard_prefix}/'"${include_guard_prefix}"'/g' |
|
5f709022a256
Allow multiple gnulib generated include files to be combined.
Bruno Haible <bruno@clisp.org>
parents:
14836
diff
changeset
|
3400 } |
|
5f709022a256
Allow multiple gnulib generated include files to be combined.
Bruno Haible <bruno@clisp.org>
parents:
14836
diff
changeset
|
3401 |
|
9188
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
3402 # func_execute_command command [args...] |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
3403 # Executes a command. |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
3404 # Uses also the variables |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
3405 # - verbose integer, default 0, inc/decremented by --verbose/--quiet |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
3406 func_execute_command () |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
3407 { |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
3408 if test $verbose -ge 0; then |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
3409 echo "executing $*" |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
3410 "$@" |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
3411 else |
|
10065
e1449fcc7ecb
* gnulib-tool: Fix various comment typos.
Eric Blake <ebb9@byu.net>
parents:
9887
diff
changeset
|
3412 # Commands like automake produce output to stderr even when they succeed. |
|
9188
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
3413 # Turn this output off if the command succeeds. |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
3414 "$@" > "$tmp"/cmdout 2>&1 |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
3415 cmdret=$? |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
3416 if test $cmdret = 0; then |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
3417 rm -f "$tmp"/cmdout |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
3418 else |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
3419 echo "executing $*" |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
3420 cat "$tmp"/cmdout 1>&2 |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
3421 rm -f "$tmp"/cmdout |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
3422 (exit $cmdret) |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
3423 fi |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
3424 fi |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
3425 } |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
3426 |
|
11461
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3427 # func_dest_tmpfilename file |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3428 # determines the name of a temporary file (file is relative to destdir). |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3429 # Input: |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3430 # - destdir target directory |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3431 # - doit : if actions shall be executed, false if only to be printed |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3432 # - tmp pathname of a temporary directory |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3433 # Sets variable: |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3434 # - tmpfile absolute filename of the temporary file |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3435 func_dest_tmpfilename () |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3436 { |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3437 if $doit; then |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3438 # Put the new contents of $file in a file in the same directory (needed |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3439 # to guarantee that an 'mv' to "$destdir/$file" works). |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3440 tmpfile="$destdir/$1.tmp" |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3441 else |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3442 # Put the new contents of $file in a file in a temporary directory |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3443 # (because the directory of "$file" might not exist). |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3444 tmpfile="$tmp"/`basename "$1"`.tmp |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3445 fi |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3446 } |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3447 |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
3448 # func_is_local_file lookedup_file file |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
3449 # check whether file should be instantiated from local gnulib directory |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
3450 func_is_local_file () |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
3451 { |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
3452 dname=$1 |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
3453 func_remove_suffix dname "/$2" |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
3454 func_path_foreach "$local_gnulib_path" test %dir% = "$dname" |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
3455 } |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
3456 |
|
18937
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
3457 # func_should_link |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
3458 # determines whether the file $f should be copied, symlinked, or hardlinked. |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
3459 # Input: |
|
18937
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
3460 # - copymode copy mode for files in general |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
3461 # - lcopymode copy mode for files from local_gnulib_path |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
3462 # - f the original file name |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
3463 # - lookedup_file name of the merged (combined) file |
|
18937
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
3464 # Sets variable: |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
3465 # - copyaction copy or symlink or hardlink |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
3466 func_should_link () |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
3467 { |
|
18937
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
3468 if test -n "$lcopymode" && func_is_local_file "$lookedup_file" "$f"; then |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
3469 copyaction="$lcopymode" |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
3470 else |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
3471 if test -n "$copymode"; then |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
3472 copyaction="$copymode" |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
3473 else |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
3474 copyaction=copy |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
3475 fi |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
3476 fi |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
3477 } |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
3478 |
|
11461
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3479 # func_add_file |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3480 # copies a file from gnulib into the destination directory. The destination |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3481 # is known to not exist. |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3482 # Input: |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3483 # - destdir target directory |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
3484 # - local_gnulib_path from --local-dir |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
3485 # - modcache true or false, from --cache-modules/--no-cache-modules |
|
11461
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3486 # - f the original file name |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3487 # - lookedup_file name of the merged (combined) file |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3488 # - lookedup_tmp true if it is located in the tmp directory, blank otherwise |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3489 # - g the rewritten file name |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3490 # - tmpfile absolute filename of the temporary file |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3491 # - doit : if actions shall be executed, false if only to be printed |
|
18937
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
3492 # - copymode copy mode for files in general |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
3493 # - lcopymode copy mode for files from local_gnulib_path |
|
11461
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3494 func_add_file () |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3495 { |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3496 if $doit; then |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3497 echo "Copying file $g" |
|
18937
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
3498 func_should_link |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
3499 if test "$copyaction" = symlink \ |
|
11461
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3500 && test -z "$lookedup_tmp" \ |
|
16714
2e2bf6c7bf38
gnulib-tool: Avoid unintended error output from 'cmp'.
Bruno Haible <bruno@clisp.org>
parents:
16713
diff
changeset
|
3501 && cmp -s "$lookedup_file" "$tmpfile"; then |
|
18937
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
3502 func_symlink_if_changed "$lookedup_file" "$destdir/$g" |
|
11461
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3503 else |
|
18937
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
3504 if test "$copyaction" = hardlink \ |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
3505 && test -z "$lookedup_tmp" \ |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
3506 && cmp -s "$lookedup_file" "$tmpfile"; then |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
3507 func_hardlink "$lookedup_file" "$destdir/$g" |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
3508 else |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
3509 mv -f "$tmpfile" "$destdir/${g}" || func_fatal_error "failed" |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
3510 fi |
|
11461
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3511 fi |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3512 else |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3513 echo "Copy file $g" |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3514 fi |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3515 } |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3516 |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3517 # func_update_file |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3518 # copies a file from gnulib into the destination directory. The destination |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3519 # is known to exist. |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3520 # Input: |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3521 # - destdir target directory |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
3522 # - local_gnulib_path from --local-dir |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
3523 # - modcache true or false, from --cache-modules/--no-cache-modules |
|
11461
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3524 # - f the original file name |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3525 # - lookedup_file name of the merged (combined) file |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3526 # - lookedup_tmp true if it is located in the tmp directory, blank otherwise |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3527 # - g the rewritten file name |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3528 # - tmpfile absolute filename of the temporary file |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3529 # - doit : if actions shall be executed, false if only to be printed |
|
18937
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
3530 # - copymode copy mode for files in general |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
3531 # - lcopymode copy mode for files from local_gnulib_path |
|
11461
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3532 # - already_present nonempty if the file should already exist, empty otherwise |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3533 func_update_file () |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3534 { |
|
16714
2e2bf6c7bf38
gnulib-tool: Avoid unintended error output from 'cmp'.
Bruno Haible <bruno@clisp.org>
parents:
16713
diff
changeset
|
3535 if cmp -s "$destdir/$g" "$tmpfile"; then |
|
11461
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3536 : # The file has not changed. |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3537 else |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3538 # Replace the file. |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3539 if $doit; then |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3540 if test -n "$already_present"; then |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3541 echo "Updating file $g (backup in ${g}~)" |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3542 else |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3543 echo "Replacing file $g (non-gnulib code backed up in ${g}~) !!" |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3544 fi |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3545 mv -f "$destdir/$g" "$destdir/${g}~" || func_fatal_error "failed" |
|
18937
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
3546 func_should_link |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
3547 if test "$copyaction" = symlink \ |
|
11461
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3548 && test -z "$lookedup_tmp" \ |
|
16714
2e2bf6c7bf38
gnulib-tool: Avoid unintended error output from 'cmp'.
Bruno Haible <bruno@clisp.org>
parents:
16713
diff
changeset
|
3549 && cmp -s "$lookedup_file" "$tmpfile"; then |
|
18937
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
3550 func_symlink_if_changed "$lookedup_file" "$destdir/$g" |
|
11461
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3551 else |
|
18937
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
3552 if test "$copyaction" = hardlink \ |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
3553 && test -z "$lookedup_tmp" \ |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
3554 && cmp -s "$lookedup_file" "$tmpfile"; then |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
3555 func_hardlink "$lookedup_file" "$destdir/$g" |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
3556 else |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
3557 mv -f "$tmpfile" "$destdir/${g}" || func_fatal_error "failed" |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
3558 fi |
|
11461
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3559 fi |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3560 else |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3561 if test -n "$already_present"; then |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3562 echo "Update file $g (backup in ${g}~)" |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3563 else |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3564 echo "Replace file $g (non-gnulib code backed up in ${g}~) !!" |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3565 fi |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3566 fi |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3567 fi |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3568 } |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3569 |
|
5351
7c565c8ecabc
Move duplicated code into function func_emit_lib_Makefile_am().
Bruno Haible <bruno@clisp.org>
parents:
5350
diff
changeset
|
3570 # func_emit_lib_Makefile_am |
|
7222
06eec4eaf416
* gnulib-tool (emit_lib_Makefile_am): Don't put $makefile_name
Paul Eggert <eggert@cs.ucla.edu>
parents:
7216
diff
changeset
|
3571 # emits the contents of library makefile to standard output. |
|
5351
7c565c8ecabc
Move duplicated code into function func_emit_lib_Makefile_am().
Bruno Haible <bruno@clisp.org>
parents:
5350
diff
changeset
|
3572 # Input: |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
3573 # - local_gnulib_path from --local-dir |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
3574 # - modcache true or false, from --cache-modules/--no-cache-modules |
|
5351
7c565c8ecabc
Move duplicated code into function func_emit_lib_Makefile_am().
Bruno Haible <bruno@clisp.org>
parents:
5350
diff
changeset
|
3575 # - modules list of modules, including dependencies |
|
7c565c8ecabc
Move duplicated code into function func_emit_lib_Makefile_am().
Bruno Haible <bruno@clisp.org>
parents:
5350
diff
changeset
|
3576 # - libname library name |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3577 # - pobase directory relative to destdir where to place *.po files |
|
7644
3c0ece164bab
Replace build-aux/ also in the Makefile snippet.
Bruno Haible <bruno@clisp.org>
parents:
7643
diff
changeset
|
3578 # - auxdir directory relative to destdir where to place build aux files |
|
18729
9534f71959d1
gnulib-tool: new option --gnu-make
Paul Eggert <eggert@cs.ucla.edu>
parents:
18704
diff
changeset
|
3579 # - gnu_make true if --gnu-make was given, false otherwise |
|
7216
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
3580 # - makefile_name from --makefile-name |
| 7077 | 3581 # - libtool true if libtool will be used, false or blank otherwise |
|
7486
46b72819ef52
Add support for multiple gnulib-tool invocations in the scope of a single
Bruno Haible <bruno@clisp.org>
parents:
7485
diff
changeset
|
3582 # - macro_prefix prefix of gl_LIBOBJS macros to use |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3583 # - po_domain prefix of i18n domain to use (without -gnulib suffix) |
|
14894
b22360ddefc4
gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents:
14841
diff
changeset
|
3584 # - witness_c_macro from --witness-c-macro |
|
5351
7c565c8ecabc
Move duplicated code into function func_emit_lib_Makefile_am().
Bruno Haible <bruno@clisp.org>
parents:
5350
diff
changeset
|
3585 # - actioncmd (optional) command that will reproduce this invocation |
|
7981
41421349e26b
In testing directories, link the test programs already during "make", not
Bruno Haible <bruno@clisp.org>
parents:
7911
diff
changeset
|
3586 # - for_test true if creating a package for testing, false otherwise |
|
14840
5f709022a256
Allow multiple gnulib generated include files to be combined.
Bruno Haible <bruno@clisp.org>
parents:
14836
diff
changeset
|
3587 # - sed_replace_include_guard_prefix |
|
5f709022a256
Allow multiple gnulib generated include files to be combined.
Bruno Haible <bruno@clisp.org>
parents:
14836
diff
changeset
|
3588 # sed expression for resolving ${gl_include_guard_prefix} |
|
10476
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
3589 # - destfile filename relative to destdir of makefile being generated |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
3590 # Input/Output: |
|
39815
35efeabe809f
gnulib-tool: Fix build order when $testsbase is a subdir of $sourcebase.
Bruno Haible <bruno@clisp.org>
parents:
39755
diff
changeset
|
3591 # - makefile_am_edits and makefile_am_edit${edit}_{dir,var,val,dotfirst} |
|
10476
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
3592 # list of edits to be done to Makefile.am variables |
|
7641
d6fbdb213b01
Finish support for source files in subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7640
diff
changeset
|
3593 # Output: |
|
d6fbdb213b01
Finish support for source files in subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7640
diff
changeset
|
3594 # - uses_subdirs nonempty if object files in subdirs exist |
|
5351
7c565c8ecabc
Move duplicated code into function func_emit_lib_Makefile_am().
Bruno Haible <bruno@clisp.org>
parents:
5350
diff
changeset
|
3595 func_emit_lib_Makefile_am () |
|
7c565c8ecabc
Move duplicated code into function func_emit_lib_Makefile_am().
Bruno Haible <bruno@clisp.org>
parents:
5350
diff
changeset
|
3596 { |
|
18729
9534f71959d1
gnulib-tool: new option --gnu-make
Paul Eggert <eggert@cs.ucla.edu>
parents:
18704
diff
changeset
|
3597 |
|
9534f71959d1
gnulib-tool: new option --gnu-make
Paul Eggert <eggert@cs.ucla.edu>
parents:
18704
diff
changeset
|
3598 # When using GNU make, or when creating an includable Makefile.am snippet, |
|
9534f71959d1
gnulib-tool: new option --gnu-make
Paul Eggert <eggert@cs.ucla.edu>
parents:
18704
diff
changeset
|
3599 # augment variables with += instead of assigning them. |
|
9534f71959d1
gnulib-tool: new option --gnu-make
Paul Eggert <eggert@cs.ucla.edu>
parents:
18704
diff
changeset
|
3600 if $gnu_make || test -n "$makefile_name"; then |
|
7240
e9d3ace50303
Slightly change the output generated by --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7239
diff
changeset
|
3601 assign='+=' |
|
e9d3ace50303
Slightly change the output generated by --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7239
diff
changeset
|
3602 else |
|
e9d3ace50303
Slightly change the output generated by --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7239
diff
changeset
|
3603 assign='=' |
|
e9d3ace50303
Slightly change the output generated by --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7239
diff
changeset
|
3604 fi |
| 7077 | 3605 if test "$libtool" = true; then |
|
5351
7c565c8ecabc
Move duplicated code into function func_emit_lib_Makefile_am().
Bruno Haible <bruno@clisp.org>
parents:
5350
diff
changeset
|
3606 libext=la |
|
7c565c8ecabc
Move duplicated code into function func_emit_lib_Makefile_am().
Bruno Haible <bruno@clisp.org>
parents:
5350
diff
changeset
|
3607 perhapsLT=LT |
|
10400
817f1418bbde
Make gnulib-tool work with native 'sed' on AIX.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
10380
diff
changeset
|
3608 sed_eliminate_LDFLAGS="$sed_noop" |
|
5351
7c565c8ecabc
Move duplicated code into function func_emit_lib_Makefile_am().
Bruno Haible <bruno@clisp.org>
parents:
5350
diff
changeset
|
3609 else |
|
7c565c8ecabc
Move duplicated code into function func_emit_lib_Makefile_am().
Bruno Haible <bruno@clisp.org>
parents:
5350
diff
changeset
|
3610 libext=a |
|
7c565c8ecabc
Move duplicated code into function func_emit_lib_Makefile_am().
Bruno Haible <bruno@clisp.org>
parents:
5350
diff
changeset
|
3611 perhapsLT= |
| 7335 | 3612 sed_eliminate_LDFLAGS='/^lib_LDFLAGS[ ]*+=/d' |
|
5351
7c565c8ecabc
Move duplicated code into function func_emit_lib_Makefile_am().
Bruno Haible <bruno@clisp.org>
parents:
5350
diff
changeset
|
3613 fi |
|
7981
41421349e26b
In testing directories, link the test programs already during "make", not
Bruno Haible <bruno@clisp.org>
parents:
7911
diff
changeset
|
3614 if $for_test; then |
|
41421349e26b
In testing directories, link the test programs already during "make", not
Bruno Haible <bruno@clisp.org>
parents:
7911
diff
changeset
|
3615 # When creating a package for testing: Attempt to provoke failures, |
|
41421349e26b
In testing directories, link the test programs already during "make", not
Bruno Haible <bruno@clisp.org>
parents:
7911
diff
changeset
|
3616 # especially link errors, already during "make" rather than during |
|
41421349e26b
In testing directories, link the test programs already during "make", not
Bruno Haible <bruno@clisp.org>
parents:
7911
diff
changeset
|
3617 # "make check", because "make check" is not possible in a cross-compiling |
|
41421349e26b
In testing directories, link the test programs already during "make", not
Bruno Haible <bruno@clisp.org>
parents:
7911
diff
changeset
|
3618 # situation. Turn check_PROGRAMS into noinst_PROGRAMS. |
|
41421349e26b
In testing directories, link the test programs already during "make", not
Bruno Haible <bruno@clisp.org>
parents:
7911
diff
changeset
|
3619 sed_transform_check_PROGRAMS='s,check_PROGRAMS,noinst_PROGRAMS,g' |
|
41421349e26b
In testing directories, link the test programs already during "make", not
Bruno Haible <bruno@clisp.org>
parents:
7911
diff
changeset
|
3620 else |
|
10400
817f1418bbde
Make gnulib-tool work with native 'sed' on AIX.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
10380
diff
changeset
|
3621 sed_transform_check_PROGRAMS="$sed_noop" |
|
7981
41421349e26b
In testing directories, link the test programs already during "make", not
Bruno Haible <bruno@clisp.org>
parents:
7911
diff
changeset
|
3622 fi |
|
7421
8bace4b08db5
Mark generated files as "DO NOT EDIT".
Bruno Haible <bruno@clisp.org>
parents:
7391
diff
changeset
|
3623 echo "## DO NOT EDIT! GENERATED AUTOMATICALLY!" |
|
39737
bf73bd094dbd
gnulib-tool: minor tweaks for --gnu-make
Paul Eggert <eggert@cs.ucla.edu>
parents:
19484
diff
changeset
|
3624 $gnu_make || |
|
bf73bd094dbd
gnulib-tool: minor tweaks for --gnu-make
Paul Eggert <eggert@cs.ucla.edu>
parents:
19484
diff
changeset
|
3625 echo "## Process this file with automake to produce Makefile.in." |
|
6777
d9b10884dc69
* gnulib-tool (func_version): Base copyright year on CVS date.
Eric Blake <ebb9@byu.net>
parents:
6765
diff
changeset
|
3626 func_emit_copyright_notice |
|
5351
7c565c8ecabc
Move duplicated code into function func_emit_lib_Makefile_am().
Bruno Haible <bruno@clisp.org>
parents:
5350
diff
changeset
|
3627 if test -n "$actioncmd"; then |
|
39748
912cc79f4d91
gnulib-tool: limit line length for git send-email
Paul Eggert <eggert@cs.ucla.edu>
parents:
39737
diff
changeset
|
3628 printf '# Reproduce by:\n%s\n' "$actioncmd" |
|
5351
7c565c8ecabc
Move duplicated code into function func_emit_lib_Makefile_am().
Bruno Haible <bruno@clisp.org>
parents:
5350
diff
changeset
|
3629 fi |
|
7c565c8ecabc
Move duplicated code into function func_emit_lib_Makefile_am().
Bruno Haible <bruno@clisp.org>
parents:
5350
diff
changeset
|
3630 echo |
|
7641
d6fbdb213b01
Finish support for source files in subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7640
diff
changeset
|
3631 uses_subdirs= |
|
d6fbdb213b01
Finish support for source files in subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7640
diff
changeset
|
3632 { |
|
7169
cb505deddb22
Don't create a $(pkgdatadir) if there's nothing to be installed in it.
Bruno Haible <bruno@clisp.org>
parents:
7168
diff
changeset
|
3633 for module in $modules; do |
|
cb505deddb22
Don't create a $(pkgdatadir) if there's nothing to be installed in it.
Bruno Haible <bruno@clisp.org>
parents:
7168
diff
changeset
|
3634 func_verify_nontests_module |
|
cb505deddb22
Don't create a $(pkgdatadir) if there's nothing to be installed in it.
Bruno Haible <bruno@clisp.org>
parents:
7168
diff
changeset
|
3635 if test -n "$module"; then |
|
cb505deddb22
Don't create a $(pkgdatadir) if there's nothing to be installed in it.
Bruno Haible <bruno@clisp.org>
parents:
7168
diff
changeset
|
3636 { |
|
14682
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
3637 func_get_automake_snippet_conditional "$module" | |
|
12917
66202bb71d56
Fix incorrect Makefile.am generation in German locale.
Bruno Haible <bruno@clisp.org>
parents:
12903
diff
changeset
|
3638 LC_ALL=C \ |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
3639 sed -e 's,lib_LIBRARIES,lib%_LIBRARIES,g' \ |
|
9005
e04f36b292ad
* gnulib-tool (IFS): Initialize early, so we don't set it to
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
9003
diff
changeset
|
3640 -e 's,lib_LTLIBRARIES,lib%_LTLIBRARIES,g' \ |
|
e04f36b292ad
* gnulib-tool (IFS): Initialize early, so we don't set it to
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
9003
diff
changeset
|
3641 -e "$sed_eliminate_LDFLAGS" \ |
|
e04f36b292ad
* gnulib-tool (IFS): Initialize early, so we don't set it to
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
9003
diff
changeset
|
3642 -e 's,lib_\([A-Z][A-Z]*\),'"${libname}_${libext}"'_\1,g' \ |
|
e04f36b292ad
* gnulib-tool (IFS): Initialize early, so we don't set it to
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
9003
diff
changeset
|
3643 -e 's,lib%_LIBRARIES,lib_LIBRARIES,g' \ |
|
e04f36b292ad
* gnulib-tool (IFS): Initialize early, so we don't set it to
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
9003
diff
changeset
|
3644 -e 's,lib%_LTLIBRARIES,lib_LTLIBRARIES,g' \ |
|
14840
5f709022a256
Allow multiple gnulib generated include files to be combined.
Bruno Haible <bruno@clisp.org>
parents:
14836
diff
changeset
|
3645 -e "$sed_transform_check_PROGRAMS" \ |
|
5f709022a256
Allow multiple gnulib generated include files to be combined.
Bruno Haible <bruno@clisp.org>
parents:
14836
diff
changeset
|
3646 -e "$sed_replace_include_guard_prefix" |
|
7169
cb505deddb22
Don't create a $(pkgdatadir) if there's nothing to be installed in it.
Bruno Haible <bruno@clisp.org>
parents:
7168
diff
changeset
|
3647 if test "$module" = 'alloca'; then |
|
cb505deddb22
Don't create a $(pkgdatadir) if there's nothing to be installed in it.
Bruno Haible <bruno@clisp.org>
parents:
7168
diff
changeset
|
3648 echo "${libname}_${libext}_LIBADD += @${perhapsLT}ALLOCA@" |
|
7486
46b72819ef52
Add support for multiple gnulib-tool invocations in the scope of a single
Bruno Haible <bruno@clisp.org>
parents:
7485
diff
changeset
|
3649 echo "${libname}_${libext}_DEPENDENCIES += @${perhapsLT}ALLOCA@" |
|
7169
cb505deddb22
Don't create a $(pkgdatadir) if there's nothing to be installed in it.
Bruno Haible <bruno@clisp.org>
parents:
7168
diff
changeset
|
3650 fi |
|
18000
d0c8068a7c6f
gnulib-tool: concatenate lib_SOURCES to a single line
Pádraig Brady <P@draigBrady.com>
parents:
17964
diff
changeset
|
3651 } | combine_lines "${libname}_${libext}_SOURCES" > "$tmp"/amsnippet1 |
|
14682
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
3652 { |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
3653 func_get_automake_snippet_unconditional "$module" | |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
3654 LC_ALL=C sed -e 's,lib_\([A-Z][A-Z]*\),'"${libname}_${libext}"'_\1,g' |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
3655 } > "$tmp"/amsnippet2 |
|
10065
e1449fcc7ecb
* gnulib-tool: Fix various comment typos.
Eric Blake <ebb9@byu.net>
parents:
9887
diff
changeset
|
3656 # Skip the contents if it's entirely empty. |
|
14682
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
3657 if grep '[^ ]' "$tmp"/amsnippet1 "$tmp"/amsnippet2 > /dev/null ; then |
|
7169
cb505deddb22
Don't create a $(pkgdatadir) if there's nothing to be installed in it.
Bruno Haible <bruno@clisp.org>
parents:
7168
diff
changeset
|
3658 echo "## begin gnulib module $module" |
|
18729
9534f71959d1
gnulib-tool: new option --gnu-make
Paul Eggert <eggert@cs.ucla.edu>
parents:
18704
diff
changeset
|
3659 if $gnu_make; then |
|
9534f71959d1
gnulib-tool: new option --gnu-make
Paul Eggert <eggert@cs.ucla.edu>
parents:
18704
diff
changeset
|
3660 echo "ifeq (,\$(OMIT_GNULIB_MODULE_$module))" |
|
9534f71959d1
gnulib-tool: new option --gnu-make
Paul Eggert <eggert@cs.ucla.edu>
parents:
18704
diff
changeset
|
3661 convert_to_gnu_make='s/^if \(.*\)/ifneq (,$(\1))/' |
|
9534f71959d1
gnulib-tool: new option --gnu-make
Paul Eggert <eggert@cs.ucla.edu>
parents:
18704
diff
changeset
|
3662 else |
|
9534f71959d1
gnulib-tool: new option --gnu-make
Paul Eggert <eggert@cs.ucla.edu>
parents:
18704
diff
changeset
|
3663 convert_to_gnu_make= |
|
9534f71959d1
gnulib-tool: new option --gnu-make
Paul Eggert <eggert@cs.ucla.edu>
parents:
18704
diff
changeset
|
3664 fi |
|
7169
cb505deddb22
Don't create a $(pkgdatadir) if there's nothing to be installed in it.
Bruno Haible <bruno@clisp.org>
parents:
7168
diff
changeset
|
3665 echo |
|
14833
76127af7039f
Finish the conditional dependencies mechanism.
Bruno Haible <bruno@clisp.org>
parents:
14806
diff
changeset
|
3666 if test "$cond_dependencies" = true; then |
|
14682
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
3667 if func_cond_module_p "$module"; then |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
3668 func_module_conditional_name "$module" |
|
18729
9534f71959d1
gnulib-tool: new option --gnu-make
Paul Eggert <eggert@cs.ucla.edu>
parents:
18704
diff
changeset
|
3669 if $gnu_make; then |
|
9534f71959d1
gnulib-tool: new option --gnu-make
Paul Eggert <eggert@cs.ucla.edu>
parents:
18704
diff
changeset
|
3670 echo "ifneq (,\$($conditional))" |
|
9534f71959d1
gnulib-tool: new option --gnu-make
Paul Eggert <eggert@cs.ucla.edu>
parents:
18704
diff
changeset
|
3671 else |
|
9534f71959d1
gnulib-tool: new option --gnu-make
Paul Eggert <eggert@cs.ucla.edu>
parents:
18704
diff
changeset
|
3672 echo "if $conditional" |
|
9534f71959d1
gnulib-tool: new option --gnu-make
Paul Eggert <eggert@cs.ucla.edu>
parents:
18704
diff
changeset
|
3673 fi |
|
14682
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
3674 fi |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
3675 fi |
|
18729
9534f71959d1
gnulib-tool: new option --gnu-make
Paul Eggert <eggert@cs.ucla.edu>
parents:
18704
diff
changeset
|
3676 sed "$convert_to_gnu_make" "$tmp"/amsnippet1 |
|
14833
76127af7039f
Finish the conditional dependencies mechanism.
Bruno Haible <bruno@clisp.org>
parents:
14806
diff
changeset
|
3677 if test "$cond_dependencies" = true; then |
|
14682
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
3678 if func_cond_module_p "$module"; then |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
3679 echo "endif" |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
3680 fi |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
3681 fi |
|
18729
9534f71959d1
gnulib-tool: new option --gnu-make
Paul Eggert <eggert@cs.ucla.edu>
parents:
18704
diff
changeset
|
3682 sed "$convert_to_gnu_make" "$tmp"/amsnippet2 |
|
9534f71959d1
gnulib-tool: new option --gnu-make
Paul Eggert <eggert@cs.ucla.edu>
parents:
18704
diff
changeset
|
3683 if $gnu_make; then |
|
9534f71959d1
gnulib-tool: new option --gnu-make
Paul Eggert <eggert@cs.ucla.edu>
parents:
18704
diff
changeset
|
3684 echo "endif" |
|
9534f71959d1
gnulib-tool: new option --gnu-make
Paul Eggert <eggert@cs.ucla.edu>
parents:
18704
diff
changeset
|
3685 fi |
|
7169
cb505deddb22
Don't create a $(pkgdatadir) if there's nothing to be installed in it.
Bruno Haible <bruno@clisp.org>
parents:
7168
diff
changeset
|
3686 echo "## end gnulib module $module" |
|
cb505deddb22
Don't create a $(pkgdatadir) if there's nothing to be installed in it.
Bruno Haible <bruno@clisp.org>
parents:
7168
diff
changeset
|
3687 echo |
|
cb505deddb22
Don't create a $(pkgdatadir) if there's nothing to be installed in it.
Bruno Haible <bruno@clisp.org>
parents:
7168
diff
changeset
|
3688 fi |
|
14682
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
3689 rm -f "$tmp"/amsnippet1 "$tmp"/amsnippet2 |
|
7641
d6fbdb213b01
Finish support for source files in subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7640
diff
changeset
|
3690 # Test whether there are some source files in subdirectories. |
|
d6fbdb213b01
Finish support for source files in subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7640
diff
changeset
|
3691 for f in `func_get_filelist "$module"`; do |
|
d6fbdb213b01
Finish support for source files in subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7640
diff
changeset
|
3692 case $f in |
|
10985
32537aa6364d
Terminate loops early when possible.
Bruno Haible <bruno@clisp.org>
parents:
10981
diff
changeset
|
3693 lib/*/*.c) |
|
32537aa6364d
Terminate loops early when possible.
Bruno Haible <bruno@clisp.org>
parents:
10981
diff
changeset
|
3694 uses_subdirs=yes |
|
32537aa6364d
Terminate loops early when possible.
Bruno Haible <bruno@clisp.org>
parents:
10981
diff
changeset
|
3695 break |
|
32537aa6364d
Terminate loops early when possible.
Bruno Haible <bruno@clisp.org>
parents:
10981
diff
changeset
|
3696 ;; |
|
7641
d6fbdb213b01
Finish support for source files in subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7640
diff
changeset
|
3697 esac |
|
d6fbdb213b01
Finish support for source files in subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7640
diff
changeset
|
3698 done |
|
7169
cb505deddb22
Don't create a $(pkgdatadir) if there's nothing to be installed in it.
Bruno Haible <bruno@clisp.org>
parents:
7168
diff
changeset
|
3699 fi |
|
cb505deddb22
Don't create a $(pkgdatadir) if there's nothing to be installed in it.
Bruno Haible <bruno@clisp.org>
parents:
7168
diff
changeset
|
3700 done |
|
12741
12d8c6b23748
gnulib-tool: avoid writing in the current directory.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12559
diff
changeset
|
3701 } > "$tmp"/allsnippets |
|
7641
d6fbdb213b01
Finish support for source files in subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7640
diff
changeset
|
3702 if test -z "$makefile_name"; then |
|
d6fbdb213b01
Finish support for source files in subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7640
diff
changeset
|
3703 # If there are source files in subdirectories, prevent collision of the |
|
d6fbdb213b01
Finish support for source files in subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7640
diff
changeset
|
3704 # object files (example: hash.c and libxml/hash.c). |
|
d6fbdb213b01
Finish support for source files in subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7640
diff
changeset
|
3705 subdir_options= |
|
d6fbdb213b01
Finish support for source files in subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7640
diff
changeset
|
3706 if test -n "$uses_subdirs"; then |
|
d6fbdb213b01
Finish support for source files in subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7640
diff
changeset
|
3707 subdir_options=' subdir-objects' |
|
d6fbdb213b01
Finish support for source files in subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7640
diff
changeset
|
3708 fi |
| 39943 | 3709 echo "AUTOMAKE_OPTIONS = 1.11 gnits${subdir_options}" |
|
7641
d6fbdb213b01
Finish support for source files in subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7640
diff
changeset
|
3710 fi |
|
d6fbdb213b01
Finish support for source files in subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7640
diff
changeset
|
3711 echo |
|
7246
4a748ab30907
* gnulib-tool (func_emit_lib_Makefile_am): Fix typos in
Paul Eggert <eggert@cs.ucla.edu>
parents:
7245
diff
changeset
|
3712 if test -z "$makefile_name"; then |
|
10476
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
3713 echo "SUBDIRS =" |
|
7240
e9d3ace50303
Slightly change the output generated by --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7239
diff
changeset
|
3714 echo "noinst_HEADERS =" |
|
7701
c59b96cb52c7
Fix double initialization of noinst_LTLIBRARIES.
Bruno Haible <bruno@clisp.org>
parents:
7691
diff
changeset
|
3715 echo "noinst_LIBRARIES =" |
|
7691
33b654c2cba8
Initialize also noinst_LTLIBRARIES.
Bruno Haible <bruno@clisp.org>
parents:
7660
diff
changeset
|
3716 echo "noinst_LTLIBRARIES =" |
|
16713
5090324ee0c8
gnulib-tool: fix imprecise comments w.r.t. an automake bug
Stefano Lattarini <stefano.lattarini@gmail.com>
parents:
16377
diff
changeset
|
3717 # Automake versions < 1.11.4 create an empty pkgdatadir at |
|
5090324ee0c8
gnulib-tool: fix imprecise comments w.r.t. an automake bug
Stefano Lattarini <stefano.lattarini@gmail.com>
parents:
16377
diff
changeset
|
3718 # installation time if you specify pkgdata_DATA to empty. |
|
5090324ee0c8
gnulib-tool: fix imprecise comments w.r.t. an automake bug
Stefano Lattarini <stefano.lattarini@gmail.com>
parents:
16377
diff
changeset
|
3719 # See automake bugs #10997 and #11030: |
| 19190 | 3720 # * https://debbugs.gnu.org/10997 |
| 3721 # * https://debbugs.gnu.org/11030 | |
|
16713
5090324ee0c8
gnulib-tool: fix imprecise comments w.r.t. an automake bug
Stefano Lattarini <stefano.lattarini@gmail.com>
parents:
16377
diff
changeset
|
3722 # So we need this workaround. |
|
12741
12d8c6b23748
gnulib-tool: avoid writing in the current directory.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12559
diff
changeset
|
3723 if grep '^pkgdata_DATA *+=' "$tmp"/allsnippets > /dev/null; then |
|
7240
e9d3ace50303
Slightly change the output generated by --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7239
diff
changeset
|
3724 echo "pkgdata_DATA =" |
|
e9d3ace50303
Slightly change the output generated by --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7239
diff
changeset
|
3725 fi |
|
e9d3ace50303
Slightly change the output generated by --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7239
diff
changeset
|
3726 echo "EXTRA_DIST =" |
|
e9d3ace50303
Slightly change the output generated by --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7239
diff
changeset
|
3727 echo "BUILT_SOURCES =" |
|
e9d3ace50303
Slightly change the output generated by --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7239
diff
changeset
|
3728 echo "SUFFIXES =" |
|
7169
cb505deddb22
Don't create a $(pkgdatadir) if there's nothing to be installed in it.
Bruno Haible <bruno@clisp.org>
parents:
7168
diff
changeset
|
3729 fi |
|
7240
e9d3ace50303
Slightly change the output generated by --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7239
diff
changeset
|
3730 echo "MOSTLYCLEANFILES $assign core *.stackdump" |
|
7246
4a748ab30907
* gnulib-tool (func_emit_lib_Makefile_am): Fix typos in
Paul Eggert <eggert@cs.ucla.edu>
parents:
7245
diff
changeset
|
3731 if test -z "$makefile_name"; then |
|
7240
e9d3ace50303
Slightly change the output generated by --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7239
diff
changeset
|
3732 echo "MOSTLYCLEANDIRS =" |
|
e9d3ace50303
Slightly change the output generated by --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7239
diff
changeset
|
3733 echo "CLEANFILES =" |
|
e9d3ace50303
Slightly change the output generated by --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7239
diff
changeset
|
3734 echo "DISTCLEANFILES =" |
|
e9d3ace50303
Slightly change the output generated by --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7239
diff
changeset
|
3735 echo "MAINTAINERCLEANFILES =" |
|
10476
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
3736 fi |
|
18729
9534f71959d1
gnulib-tool: new option --gnu-make
Paul Eggert <eggert@cs.ucla.edu>
parents:
18704
diff
changeset
|
3737 if $gnu_make; then |
|
9534f71959d1
gnulib-tool: new option --gnu-make
Paul Eggert <eggert@cs.ucla.edu>
parents:
18704
diff
changeset
|
3738 echo "# Start of GNU Make output." |
|
18910
5f711c62458f
gnulib-tool: improve GNU Make debugging
Paul Eggert <eggert@cs.ucla.edu>
parents:
18786
diff
changeset
|
3739 |
|
5f711c62458f
gnulib-tool: improve GNU Make debugging
Paul Eggert <eggert@cs.ucla.edu>
parents:
18786
diff
changeset
|
3740 # Put autoconf output into a temporary file, so that its exit status |
|
5f711c62458f
gnulib-tool: improve GNU Make debugging
Paul Eggert <eggert@cs.ucla.edu>
parents:
18786
diff
changeset
|
3741 # can be checked from the shell. Signal any error by putting a |
|
5f711c62458f
gnulib-tool: improve GNU Make debugging
Paul Eggert <eggert@cs.ucla.edu>
parents:
18786
diff
changeset
|
3742 # syntax error into the output makefile. |
|
5f711c62458f
gnulib-tool: improve GNU Make debugging
Paul Eggert <eggert@cs.ucla.edu>
parents:
18786
diff
changeset
|
3743 ${AUTOCONF} -t 'AC_SUBST:$1 = @$1@' "$configure_ac" \ |
|
5f711c62458f
gnulib-tool: improve GNU Make debugging
Paul Eggert <eggert@cs.ucla.edu>
parents:
18786
diff
changeset
|
3744 >"$tmp"/makeout 2>"$tmp"/makeout2 && |
|
5f711c62458f
gnulib-tool: improve GNU Make debugging
Paul Eggert <eggert@cs.ucla.edu>
parents:
18786
diff
changeset
|
3745 LC_ALL=C sort -u "$tmp"/makeout || { |
|
5f711c62458f
gnulib-tool: improve GNU Make debugging
Paul Eggert <eggert@cs.ucla.edu>
parents:
18786
diff
changeset
|
3746 echo "== gnulib-tool GNU Make output failed as follows ==" |
|
5f711c62458f
gnulib-tool: improve GNU Make debugging
Paul Eggert <eggert@cs.ucla.edu>
parents:
18786
diff
changeset
|
3747 sed 's/^/# stderr: /' "$tmp"/makeout2 |
|
5f711c62458f
gnulib-tool: improve GNU Make debugging
Paul Eggert <eggert@cs.ucla.edu>
parents:
18786
diff
changeset
|
3748 } |
|
5f711c62458f
gnulib-tool: improve GNU Make debugging
Paul Eggert <eggert@cs.ucla.edu>
parents:
18786
diff
changeset
|
3749 rm -f "$tmp"/makeout "$tmp"/makeout2 |
|
5f711c62458f
gnulib-tool: improve GNU Make debugging
Paul Eggert <eggert@cs.ucla.edu>
parents:
18786
diff
changeset
|
3750 |
|
18729
9534f71959d1
gnulib-tool: new option --gnu-make
Paul Eggert <eggert@cs.ucla.edu>
parents:
18704
diff
changeset
|
3751 echo "# End of GNU Make output." |
|
9534f71959d1
gnulib-tool: new option --gnu-make
Paul Eggert <eggert@cs.ucla.edu>
parents:
18704
diff
changeset
|
3752 else |
|
9534f71959d1
gnulib-tool: new option --gnu-make
Paul Eggert <eggert@cs.ucla.edu>
parents:
18704
diff
changeset
|
3753 echo "# No GNU Make output." |
|
9534f71959d1
gnulib-tool: new option --gnu-make
Paul Eggert <eggert@cs.ucla.edu>
parents:
18704
diff
changeset
|
3754 fi |
|
10476
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
3755 # Execute edits that apply to the Makefile.am being generated. |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
3756 edit=0 |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
3757 while test $edit != $makefile_am_edits; do |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
3758 edit=`expr $edit + 1` |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
3759 eval dir=\"\$makefile_am_edit${edit}_dir\" |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
3760 eval var=\"\$makefile_am_edit${edit}_var\" |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
3761 eval val=\"\$makefile_am_edit${edit}_val\" |
|
39815
35efeabe809f
gnulib-tool: Fix build order when $testsbase is a subdir of $sourcebase.
Bruno Haible <bruno@clisp.org>
parents:
39755
diff
changeset
|
3762 eval dotfirst=\"\$makefile_am_edit${edit}_dotfirst\" |
|
10476
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
3763 if test -n "$var"; then |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
3764 if test "${dir}Makefile.am" = "$destfile" || test "./${dir}Makefile.am" = "$destfile"; then |
|
39815
35efeabe809f
gnulib-tool: Fix build order when $testsbase is a subdir of $sourcebase.
Bruno Haible <bruno@clisp.org>
parents:
39755
diff
changeset
|
3765 if test "${var}" = SUBDIRS && test -n "$dotfirst"; then |
|
35efeabe809f
gnulib-tool: Fix build order when $testsbase is a subdir of $sourcebase.
Bruno Haible <bruno@clisp.org>
parents:
39755
diff
changeset
|
3766 # The added subdirectory ${val} needs to be mentioned after '.'. |
|
35efeabe809f
gnulib-tool: Fix build order when $testsbase is a subdir of $sourcebase.
Bruno Haible <bruno@clisp.org>
parents:
39755
diff
changeset
|
3767 # Since we don't have '.' among SUBDIRS so far, add it now. |
|
35efeabe809f
gnulib-tool: Fix build order when $testsbase is a subdir of $sourcebase.
Bruno Haible <bruno@clisp.org>
parents:
39755
diff
changeset
|
3768 val=". ${val}" |
|
35efeabe809f
gnulib-tool: Fix build order when $testsbase is a subdir of $sourcebase.
Bruno Haible <bruno@clisp.org>
parents:
39755
diff
changeset
|
3769 fi |
|
10476
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
3770 echo "${var} += ${val}" |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
3771 eval "makefile_am_edit${edit}_var=" |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
3772 fi |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
3773 fi |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
3774 done |
|
14917
42a9e4eb100a
gnulib-tool: Addendum to 2011-06-08 commit.
Bruno Haible <bruno@clisp.org>
parents:
14908
diff
changeset
|
3775 if test -n "$witness_c_macro"; then |
|
42a9e4eb100a
gnulib-tool: Addendum to 2011-06-08 commit.
Bruno Haible <bruno@clisp.org>
parents:
14908
diff
changeset
|
3776 cppflags_part1=" -D$witness_c_macro=1" |
|
42a9e4eb100a
gnulib-tool: Addendum to 2011-06-08 commit.
Bruno Haible <bruno@clisp.org>
parents:
14908
diff
changeset
|
3777 else |
|
42a9e4eb100a
gnulib-tool: Addendum to 2011-06-08 commit.
Bruno Haible <bruno@clisp.org>
parents:
14908
diff
changeset
|
3778 cppflags_part1= |
|
42a9e4eb100a
gnulib-tool: Addendum to 2011-06-08 commit.
Bruno Haible <bruno@clisp.org>
parents:
14908
diff
changeset
|
3779 fi |
|
42a9e4eb100a
gnulib-tool: Addendum to 2011-06-08 commit.
Bruno Haible <bruno@clisp.org>
parents:
14908
diff
changeset
|
3780 if $for_test; then |
|
42a9e4eb100a
gnulib-tool: Addendum to 2011-06-08 commit.
Bruno Haible <bruno@clisp.org>
parents:
14908
diff
changeset
|
3781 cppflags_part2=" -DGNULIB_STRICT_CHECKING=1" |
|
42a9e4eb100a
gnulib-tool: Addendum to 2011-06-08 commit.
Bruno Haible <bruno@clisp.org>
parents:
14908
diff
changeset
|
3782 else |
|
42a9e4eb100a
gnulib-tool: Addendum to 2011-06-08 commit.
Bruno Haible <bruno@clisp.org>
parents:
14908
diff
changeset
|
3783 cppflags_part2= |
|
42a9e4eb100a
gnulib-tool: Addendum to 2011-06-08 commit.
Bruno Haible <bruno@clisp.org>
parents:
14908
diff
changeset
|
3784 fi |
|
10476
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
3785 if test -z "$makefile_name"; then |
|
7240
e9d3ace50303
Slightly change the output generated by --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7239
diff
changeset
|
3786 echo |
|
14894
b22360ddefc4
gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents:
14841
diff
changeset
|
3787 echo "AM_CPPFLAGS =$cppflags_part1$cppflags_part2" |
|
11261
f0359b41944f
Make it easier to use the 'visibility' module.
Bruno Haible <bruno@clisp.org>
parents:
11249
diff
changeset
|
3788 echo "AM_CFLAGS =" |
|
14917
42a9e4eb100a
gnulib-tool: Addendum to 2011-06-08 commit.
Bruno Haible <bruno@clisp.org>
parents:
14908
diff
changeset
|
3789 else |
|
42a9e4eb100a
gnulib-tool: Addendum to 2011-06-08 commit.
Bruno Haible <bruno@clisp.org>
parents:
14908
diff
changeset
|
3790 if test -n "$cppflags_part1$cppflags_part2"; then |
|
42a9e4eb100a
gnulib-tool: Addendum to 2011-06-08 commit.
Bruno Haible <bruno@clisp.org>
parents:
14908
diff
changeset
|
3791 echo |
|
42a9e4eb100a
gnulib-tool: Addendum to 2011-06-08 commit.
Bruno Haible <bruno@clisp.org>
parents:
14908
diff
changeset
|
3792 echo "AM_CPPFLAGS +=$cppflags_part1$cppflags_part2" |
|
42a9e4eb100a
gnulib-tool: Addendum to 2011-06-08 commit.
Bruno Haible <bruno@clisp.org>
parents:
14908
diff
changeset
|
3793 fi |
|
7240
e9d3ace50303
Slightly change the output generated by --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7239
diff
changeset
|
3794 fi |
|
6750
608add4e5b80
Support for packages that use "gettextize --intl". From Claudio Fontana.
Bruno Haible <bruno@clisp.org>
parents:
6745
diff
changeset
|
3795 echo |
|
12741
12d8c6b23748
gnulib-tool: avoid writing in the current directory.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12559
diff
changeset
|
3796 if LC_ALL=C grep "^[a-zA-Z0-9_]*_${perhapsLT}LIBRARIES *+\{0,1\}= *$libname\\.$libext\$" "$tmp"/allsnippets > /dev/null \ |
|
11463
9b74d1d0b267
Make it easier to distribute gnulib-built libraries.
Bruno Haible <bruno@clisp.org>
parents:
11461
diff
changeset
|
3797 || { test -n "$makefile_name" \ |
|
9b74d1d0b267
Make it easier to distribute gnulib-built libraries.
Bruno Haible <bruno@clisp.org>
parents:
11461
diff
changeset
|
3798 && test -f "$sourcebase/Makefile.am" \ |
|
9b74d1d0b267
Make it easier to distribute gnulib-built libraries.
Bruno Haible <bruno@clisp.org>
parents:
11461
diff
changeset
|
3799 && LC_ALL=C grep "^[a-zA-Z0-9_]*_${perhapsLT}LIBRARIES *+\{0,1\}= *$libname\\.$libext\$" "$sourcebase/Makefile.am" > /dev/null; \ |
|
9b74d1d0b267
Make it easier to distribute gnulib-built libraries.
Bruno Haible <bruno@clisp.org>
parents:
11461
diff
changeset
|
3800 }; then |
|
9b74d1d0b267
Make it easier to distribute gnulib-built libraries.
Bruno Haible <bruno@clisp.org>
parents:
11461
diff
changeset
|
3801 # One of the snippets or the user's Makefile.am already specifies an |
|
9b74d1d0b267
Make it easier to distribute gnulib-built libraries.
Bruno Haible <bruno@clisp.org>
parents:
11461
diff
changeset
|
3802 # installation location for the library. Don't confuse automake by saying |
|
9b74d1d0b267
Make it easier to distribute gnulib-built libraries.
Bruno Haible <bruno@clisp.org>
parents:
11461
diff
changeset
|
3803 # it should not be installed. |
|
7701
c59b96cb52c7
Fix double initialization of noinst_LTLIBRARIES.
Bruno Haible <bruno@clisp.org>
parents:
7691
diff
changeset
|
3804 : |
|
c59b96cb52c7
Fix double initialization of noinst_LTLIBRARIES.
Bruno Haible <bruno@clisp.org>
parents:
7691
diff
changeset
|
3805 else |
|
c59b96cb52c7
Fix double initialization of noinst_LTLIBRARIES.
Bruno Haible <bruno@clisp.org>
parents:
7691
diff
changeset
|
3806 # By default, the generated library should not be installed. |
|
c59b96cb52c7
Fix double initialization of noinst_LTLIBRARIES.
Bruno Haible <bruno@clisp.org>
parents:
7691
diff
changeset
|
3807 echo "noinst_${perhapsLT}LIBRARIES += $libname.$libext" |
|
c59b96cb52c7
Fix double initialization of noinst_LTLIBRARIES.
Bruno Haible <bruno@clisp.org>
parents:
7691
diff
changeset
|
3808 fi |
|
c59b96cb52c7
Fix double initialization of noinst_LTLIBRARIES.
Bruno Haible <bruno@clisp.org>
parents:
7691
diff
changeset
|
3809 echo |
|
c59b96cb52c7
Fix double initialization of noinst_LTLIBRARIES.
Bruno Haible <bruno@clisp.org>
parents:
7691
diff
changeset
|
3810 echo "${libname}_${libext}_SOURCES =" |
|
c59b96cb52c7
Fix double initialization of noinst_LTLIBRARIES.
Bruno Haible <bruno@clisp.org>
parents:
7691
diff
changeset
|
3811 # Here we use $(LIBOBJS), not @LIBOBJS@. The value is the same. However, |
|
10065
e1449fcc7ecb
* gnulib-tool: Fix various comment typos.
Eric Blake <ebb9@byu.net>
parents:
9887
diff
changeset
|
3812 # automake during its analysis looks for $(LIBOBJS), not for @LIBOBJS@. |
|
7701
c59b96cb52c7
Fix double initialization of noinst_LTLIBRARIES.
Bruno Haible <bruno@clisp.org>
parents:
7691
diff
changeset
|
3813 echo "${libname}_${libext}_LIBADD = \$(${macro_prefix}_${perhapsLT}LIBOBJS)" |
|
c59b96cb52c7
Fix double initialization of noinst_LTLIBRARIES.
Bruno Haible <bruno@clisp.org>
parents:
7691
diff
changeset
|
3814 echo "${libname}_${libext}_DEPENDENCIES = \$(${macro_prefix}_${perhapsLT}LIBOBJS)" |
|
c59b96cb52c7
Fix double initialization of noinst_LTLIBRARIES.
Bruno Haible <bruno@clisp.org>
parents:
7691
diff
changeset
|
3815 echo "EXTRA_${libname}_${libext}_SOURCES =" |
|
c59b96cb52c7
Fix double initialization of noinst_LTLIBRARIES.
Bruno Haible <bruno@clisp.org>
parents:
7691
diff
changeset
|
3816 if test "$libtool" = true; then |
|
c59b96cb52c7
Fix double initialization of noinst_LTLIBRARIES.
Bruno Haible <bruno@clisp.org>
parents:
7691
diff
changeset
|
3817 echo "${libname}_${libext}_LDFLAGS = \$(AM_LDFLAGS)" |
|
13763
064af6542c0a
gnulib-tool: Synthesize appropriate _LDFLAGS for a libtool library.
Bruno Haible <bruno@clisp.org>
parents:
13759
diff
changeset
|
3818 echo "${libname}_${libext}_LDFLAGS += -no-undefined" |
|
064af6542c0a
gnulib-tool: Synthesize appropriate _LDFLAGS for a libtool library.
Bruno Haible <bruno@clisp.org>
parents:
13759
diff
changeset
|
3819 # Synthesize an ${libname}_${libext}_LDFLAGS augmentation by combining |
|
064af6542c0a
gnulib-tool: Synthesize appropriate _LDFLAGS for a libtool library.
Bruno Haible <bruno@clisp.org>
parents:
13759
diff
changeset
|
3820 # the link dependencies of all modules. |
|
064af6542c0a
gnulib-tool: Synthesize appropriate _LDFLAGS for a libtool library.
Bruno Haible <bruno@clisp.org>
parents:
13759
diff
changeset
|
3821 for module in $modules; do |
|
064af6542c0a
gnulib-tool: Synthesize appropriate _LDFLAGS for a libtool library.
Bruno Haible <bruno@clisp.org>
parents:
13759
diff
changeset
|
3822 func_verify_nontests_module |
|
064af6542c0a
gnulib-tool: Synthesize appropriate _LDFLAGS for a libtool library.
Bruno Haible <bruno@clisp.org>
parents:
13759
diff
changeset
|
3823 if test -n "$module"; then |
|
064af6542c0a
gnulib-tool: Synthesize appropriate _LDFLAGS for a libtool library.
Bruno Haible <bruno@clisp.org>
parents:
13759
diff
changeset
|
3824 func_get_link_directive "$module" |
|
064af6542c0a
gnulib-tool: Synthesize appropriate _LDFLAGS for a libtool library.
Bruno Haible <bruno@clisp.org>
parents:
13759
diff
changeset
|
3825 fi |
|
064af6542c0a
gnulib-tool: Synthesize appropriate _LDFLAGS for a libtool library.
Bruno Haible <bruno@clisp.org>
parents:
13759
diff
changeset
|
3826 done \ |
|
064af6542c0a
gnulib-tool: Synthesize appropriate _LDFLAGS for a libtool library.
Bruno Haible <bruno@clisp.org>
parents:
13759
diff
changeset
|
3827 | LC_ALL=C sed -e '/^$/d' -e 's/ when linking with libtool.*//' \ |
|
064af6542c0a
gnulib-tool: Synthesize appropriate _LDFLAGS for a libtool library.
Bruno Haible <bruno@clisp.org>
parents:
13759
diff
changeset
|
3828 | LC_ALL=C sort -u \ |
|
064af6542c0a
gnulib-tool: Synthesize appropriate _LDFLAGS for a libtool library.
Bruno Haible <bruno@clisp.org>
parents:
13759
diff
changeset
|
3829 | LC_ALL=C sed -e 's/^/'"${libname}_${libext}"'_LDFLAGS += /' |
|
7701
c59b96cb52c7
Fix double initialization of noinst_LTLIBRARIES.
Bruno Haible <bruno@clisp.org>
parents:
7691
diff
changeset
|
3830 fi |
|
c59b96cb52c7
Fix double initialization of noinst_LTLIBRARIES.
Bruno Haible <bruno@clisp.org>
parents:
7691
diff
changeset
|
3831 echo |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3832 if test -n "$pobase"; then |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3833 echo "AM_CPPFLAGS += -DDEFAULT_TEXT_DOMAIN=\\\"${po_domain}-gnulib\\\"" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3834 echo |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3835 fi |
|
12741
12d8c6b23748
gnulib-tool: avoid writing in the current directory.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12559
diff
changeset
|
3836 cat "$tmp"/allsnippets \ |
|
14273
8f6d3e05c7e2
libposix: Revert the unreviewed part of yesterday's big merge.
Bruce Korb <bkorb@gnu.org>
parents:
14271
diff
changeset
|
3837 | sed -e 's|\$(top_srcdir)/build-aux/|$(top_srcdir)/'"$auxdir"'/|g' |
|
5357
8bce169f70cc
Fix comments. Fix parse problem.
Simon Josefsson <simon@josefsson.org>
parents:
5356
diff
changeset
|
3838 echo |
| 7086 | 3839 echo "mostlyclean-local: mostlyclean-generic" |
|
7545
fade8d6feee3
Avoid syntax error from bash 2.00 ... 2.05.
Bruno Haible <bruno@clisp.org>
parents:
7533
diff
changeset
|
3840 echo " @for dir in '' \$(MOSTLYCLEANDIRS); do \\" |
|
fade8d6feee3
Avoid syntax error from bash 2.00 ... 2.05.
Bruno Haible <bruno@clisp.org>
parents:
7533
diff
changeset
|
3841 echo " if test -n \"\$\$dir\" && test -d \$\$dir; then \\" |
|
fade8d6feee3
Avoid syntax error from bash 2.00 ... 2.05.
Bruno Haible <bruno@clisp.org>
parents:
7533
diff
changeset
|
3842 echo " echo \"rmdir \$\$dir\"; rmdir \$\$dir; \\" |
|
fade8d6feee3
Avoid syntax error from bash 2.00 ... 2.05.
Bruno Haible <bruno@clisp.org>
parents:
7533
diff
changeset
|
3843 echo " fi; \\" |
|
9010
03602a916a9a
Don't let the 'mostlyclean' target fail because of a nonempty directory.
Bruno Haible <bruno@clisp.org>
parents:
9009
diff
changeset
|
3844 echo " done; \\" |
|
03602a916a9a
Don't let the 'mostlyclean' target fail because of a nonempty directory.
Bruno Haible <bruno@clisp.org>
parents:
9009
diff
changeset
|
3845 echo " :" |
|
12741
12d8c6b23748
gnulib-tool: avoid writing in the current directory.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12559
diff
changeset
|
3846 rm -f "$tmp"/allsnippets |
|
5351
7c565c8ecabc
Move duplicated code into function func_emit_lib_Makefile_am().
Bruno Haible <bruno@clisp.org>
parents:
5350
diff
changeset
|
3847 } |
|
7c565c8ecabc
Move duplicated code into function func_emit_lib_Makefile_am().
Bruno Haible <bruno@clisp.org>
parents:
5350
diff
changeset
|
3848 |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3849 # func_emit_po_Makevars |
|
10065
e1449fcc7ecb
* gnulib-tool: Fix various comment typos.
Eric Blake <ebb9@byu.net>
parents:
9887
diff
changeset
|
3850 # emits the contents of po/ makefile parameterization to standard output. |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3851 # Input: |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
3852 # - local_gnulib_path from --local-dir |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
3853 # - modcache true or false, from --cache-modules/--no-cache-modules |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3854 # - sourcebase directory relative to destdir where to place source code |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3855 # - pobase directory relative to destdir where to place *.po files |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3856 # - po_domain prefix of i18n domain to use (without -gnulib suffix) |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3857 func_emit_po_Makevars () |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3858 { |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3859 echo "## DO NOT EDIT! GENERATED AUTOMATICALLY!" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3860 func_emit_copyright_notice |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3861 echo |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3862 echo "# Usually the message domain is the same as the package name." |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3863 echo "# But here it has a '-gnulib' suffix." |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3864 echo "DOMAIN = ${po_domain}-gnulib" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3865 echo |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3866 echo "# These two variables depend on the location of this directory." |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3867 echo "subdir = ${pobase}" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3868 echo "top_builddir = "`echo "$pobase" | sed -e 's,//*,/,g' -e 's,[^/][^/]*,..,g'` |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3869 echo |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3870 cat <<\EOF |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3871 # These options get passed to xgettext. |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3872 XGETTEXT_OPTIONS = \ |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3873 --keyword=_ --flag=_:1:pass-c-format \ |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3874 --keyword=N_ --flag=N_:1:pass-c-format \ |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3875 --keyword='proper_name:1,"This is a proper name. See the gettext manual, section Names."' \ |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3876 --keyword='proper_name_utf8:1,"This is a proper name. See the gettext manual, section Names."' \ |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3877 --flag=error:3:c-format --flag=error_at_line:5:c-format |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3878 |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3879 # This is the copyright holder that gets inserted into the header of the |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3880 # $(DOMAIN).pot file. gnulib is copyrighted by the FSF. |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3881 COPYRIGHT_HOLDER = Free Software Foundation, Inc. |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3882 |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3883 # This is the email address or URL to which the translators shall report |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3884 # bugs in the untranslated strings: |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3885 # - Strings which are not entire sentences, see the maintainer guidelines |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3886 # in the GNU gettext documentation, section 'Preparing Strings'. |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3887 # - Strings which use unclear terms or require additional context to be |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3888 # understood. |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3889 # - Strings which make invalid assumptions about notation of date, time or |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3890 # money. |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3891 # - Pluralisation problems. |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3892 # - Incorrect English spelling. |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3893 # - Incorrect formatting. |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3894 # It can be your email address, or a mailing list address where translators |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3895 # can write to without being subscribed, or the URL of a web page through |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3896 # which the translators can contact you. |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3897 MSGID_BUGS_ADDRESS = bug-gnulib@gnu.org |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3898 |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3899 # This is the list of locale categories, beyond LC_MESSAGES, for which the |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3900 # message catalogs shall be used. It is usually empty. |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3901 EXTRA_LOCALE_CATEGORIES = |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3902 |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3903 # This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt' |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3904 # context. Possible values are "yes" and "no". Set this to yes if the |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3905 # package uses functions taking also a message context, like pgettext(), or |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3906 # if in $(XGETTEXT_OPTIONS) you define keywords with a context argument. |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3907 USE_MSGCTXT = no |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3908 EOF |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3909 } |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3910 |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3911 # func_emit_po_POTFILES_in |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3912 # emits the file list to be passed to xgettext to standard output. |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3913 # Input: |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
3914 # - local_gnulib_path from --local-dir |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
3915 # - modcache true or false, from --cache-modules/--no-cache-modules |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3916 # - sourcebase directory relative to destdir where to place source code |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3917 # - files list of new files |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3918 func_emit_po_POTFILES_in () |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3919 { |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3920 echo "## DO NOT EDIT! GENERATED AUTOMATICALLY!" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3921 func_emit_copyright_notice |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3922 echo |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3923 echo "# List of files which contain translatable strings." |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3924 echo "$files" | sed -n -e "s,^lib/,$sourcebase/,p" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3925 } |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3926 |
|
13067
0e829091f9c0
Avoid side effects from tests-related modules on the compilation of lib.
Bruno Haible <bruno@clisp.org>
parents:
12986
diff
changeset
|
3927 # func_emit_tests_Makefile_am witness_macro |
|
7222
06eec4eaf416
* gnulib-tool (emit_lib_Makefile_am): Don't put $makefile_name
Paul Eggert <eggert@cs.ucla.edu>
parents:
7216
diff
changeset
|
3928 # emits the contents of tests makefile to standard output. |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
3929 # Input: |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
3930 # - local_gnulib_path from --local-dir |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
3931 # - modcache true or false, from --cache-modules/--no-cache-modules |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
3932 # - modules list of modules, including dependencies |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
3933 # - libname library name |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3934 # - auxdir directory relative to destdir where to place build aux files |
|
18729
9534f71959d1
gnulib-tool: new option --gnu-make
Paul Eggert <eggert@cs.ucla.edu>
parents:
18704
diff
changeset
|
3935 # - gnu_make true if --gnu-make was given, false otherwise |
|
7216
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
3936 # - makefile_name from --makefile-name |
| 7077 | 3937 # - libtool true if libtool will be used, false or blank otherwise |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
3938 # - sourcebase relative directory containing lib source code |
|
6250
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
3939 # - m4base relative directory containing autoconf macros |
|
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
3940 # - testsbase relative directory containing unit test code |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3941 # - macro_prefix prefix of gl_LIBOBJS macros to use |
|
14894
b22360ddefc4
gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents:
14841
diff
changeset
|
3942 # - witness_c_macro from --witness-c-macro |
|
7981
41421349e26b
In testing directories, link the test programs already during "make", not
Bruno Haible <bruno@clisp.org>
parents:
7911
diff
changeset
|
3943 # - for_test true if creating a package for testing, false otherwise |
|
14836
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3944 # - single_configure true if a single configure file should be generated, |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3945 # false for a separate configure file for the tests |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3946 # - use_libtests true if a libtests.a should be built, false otherwise |
|
14840
5f709022a256
Allow multiple gnulib generated include files to be combined.
Bruno Haible <bruno@clisp.org>
parents:
14836
diff
changeset
|
3947 # - sed_replace_include_guard_prefix |
|
5f709022a256
Allow multiple gnulib generated include files to be combined.
Bruno Haible <bruno@clisp.org>
parents:
14836
diff
changeset
|
3948 # sed expression for resolving ${gl_include_guard_prefix} |
|
10476
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
3949 # - destfile filename relative to destdir of makefile being generated |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
3950 # Input/Output: |
|
39815
35efeabe809f
gnulib-tool: Fix build order when $testsbase is a subdir of $sourcebase.
Bruno Haible <bruno@clisp.org>
parents:
39755
diff
changeset
|
3951 # - makefile_am_edits and makefile_am_edit${edit}_{dir,var,val,dotfirst} |
|
10476
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
3952 # list of edits to be done to Makefile.am variables |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3953 # Output: |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3954 # - uses_subdirs nonempty if object files in subdirs exist |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
3955 func_emit_tests_Makefile_am () |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
3956 { |
|
13067
0e829091f9c0
Avoid side effects from tests-related modules on the compilation of lib.
Bruno Haible <bruno@clisp.org>
parents:
12986
diff
changeset
|
3957 witness_macro="$1" |
| 7077 | 3958 if test "$libtool" = true; then |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
3959 libext=la |
|
17047
458e7152e580
gnulib-tool: Improve coding style.
Bruno Haible <bruno@clisp.org>
parents:
17046
diff
changeset
|
3960 perhapsLT=LT |
|
10400
817f1418bbde
Make gnulib-tool work with native 'sed' on AIX.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
10380
diff
changeset
|
3961 sed_eliminate_LDFLAGS="$sed_noop" |
|
7286
727bb5526bad
For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents:
7270
diff
changeset
|
3962 else |
|
727bb5526bad
For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents:
7270
diff
changeset
|
3963 libext=a |
|
17047
458e7152e580
gnulib-tool: Improve coding style.
Bruno Haible <bruno@clisp.org>
parents:
17046
diff
changeset
|
3964 perhapsLT= |
| 7335 | 3965 sed_eliminate_LDFLAGS='/^lib_LDFLAGS[ ]*+=/d' |
|
7286
727bb5526bad
For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents:
7270
diff
changeset
|
3966 fi |
|
7981
41421349e26b
In testing directories, link the test programs already during "make", not
Bruno Haible <bruno@clisp.org>
parents:
7911
diff
changeset
|
3967 if $for_test; then |
|
41421349e26b
In testing directories, link the test programs already during "make", not
Bruno Haible <bruno@clisp.org>
parents:
7911
diff
changeset
|
3968 # When creating a package for testing: Attempt to provoke failures, |
|
41421349e26b
In testing directories, link the test programs already during "make", not
Bruno Haible <bruno@clisp.org>
parents:
7911
diff
changeset
|
3969 # especially link errors, already during "make" rather than during |
|
41421349e26b
In testing directories, link the test programs already during "make", not
Bruno Haible <bruno@clisp.org>
parents:
7911
diff
changeset
|
3970 # "make check", because "make check" is not possible in a cross-compiling |
|
41421349e26b
In testing directories, link the test programs already during "make", not
Bruno Haible <bruno@clisp.org>
parents:
7911
diff
changeset
|
3971 # situation. Turn check_PROGRAMS into noinst_PROGRAMS. |
|
41421349e26b
In testing directories, link the test programs already during "make", not
Bruno Haible <bruno@clisp.org>
parents:
7911
diff
changeset
|
3972 sed_transform_check_PROGRAMS='s,check_PROGRAMS,noinst_PROGRAMS,g' |
|
41421349e26b
In testing directories, link the test programs already during "make", not
Bruno Haible <bruno@clisp.org>
parents:
7911
diff
changeset
|
3973 else |
|
10400
817f1418bbde
Make gnulib-tool work with native 'sed' on AIX.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
10380
diff
changeset
|
3974 sed_transform_check_PROGRAMS="$sed_noop" |
|
7981
41421349e26b
In testing directories, link the test programs already during "make", not
Bruno Haible <bruno@clisp.org>
parents:
7911
diff
changeset
|
3975 fi |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
3976 testsbase_inverse=`echo "$testsbase" | sed -e 's,/$,,' | sed -e 's,[^/][^/]*,..,g'` |
|
7421
8bace4b08db5
Mark generated files as "DO NOT EDIT".
Bruno Haible <bruno@clisp.org>
parents:
7391
diff
changeset
|
3977 echo "## DO NOT EDIT! GENERATED AUTOMATICALLY!" |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
3978 echo "## Process this file with automake to produce Makefile.in." |
|
6777
d9b10884dc69
* gnulib-tool (func_version): Base copyright year on CVS date.
Eric Blake <ebb9@byu.net>
parents:
6765
diff
changeset
|
3979 func_emit_copyright_notice |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
3980 echo |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3981 uses_subdirs= |
|
12054
1c9a8901e75c
Fix value of uses_subdirs in tests/Makefile.am.
Bruno Haible <bruno@clisp.org>
parents:
12021
diff
changeset
|
3982 { |
|
7169
cb505deddb22
Don't create a $(pkgdatadir) if there's nothing to be installed in it.
Bruno Haible <bruno@clisp.org>
parents:
7168
diff
changeset
|
3983 for module in $modules; do |
|
14836
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
3984 if $for_test && ! $single_configure; then |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3985 func_verify_tests_module |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3986 else |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3987 func_verify_module |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3988 fi |
|
7169
cb505deddb22
Don't create a $(pkgdatadir) if there's nothing to be installed in it.
Bruno Haible <bruno@clisp.org>
parents:
7168
diff
changeset
|
3989 if test -n "$module"; then |
|
7286
727bb5526bad
For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents:
7270
diff
changeset
|
3990 { |
|
727bb5526bad
For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents:
7270
diff
changeset
|
3991 func_get_automake_snippet "$module" | |
|
12917
66202bb71d56
Fix incorrect Makefile.am generation in German locale.
Bruno Haible <bruno@clisp.org>
parents:
12903
diff
changeset
|
3992 LC_ALL=C \ |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
3993 sed -e 's,lib_LIBRARIES,lib%_LIBRARIES,g' \ |
|
9005
e04f36b292ad
* gnulib-tool (IFS): Initialize early, so we don't set it to
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
9003
diff
changeset
|
3994 -e 's,lib_LTLIBRARIES,lib%_LTLIBRARIES,g' \ |
|
e04f36b292ad
* gnulib-tool (IFS): Initialize early, so we don't set it to
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
9003
diff
changeset
|
3995 -e "$sed_eliminate_LDFLAGS" \ |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3996 -e 's,lib_\([A-Z][A-Z]*\),libtests_a_\1,g' \ |
|
9005
e04f36b292ad
* gnulib-tool (IFS): Initialize early, so we don't set it to
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
9003
diff
changeset
|
3997 -e 's,lib%_LIBRARIES,lib_LIBRARIES,g' \ |
|
e04f36b292ad
* gnulib-tool (IFS): Initialize early, so we don't set it to
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
9003
diff
changeset
|
3998 -e 's,lib%_LTLIBRARIES,lib_LTLIBRARIES,g' \ |
|
14840
5f709022a256
Allow multiple gnulib generated include files to be combined.
Bruno Haible <bruno@clisp.org>
parents:
14836
diff
changeset
|
3999 -e "$sed_transform_check_PROGRAMS" \ |
|
5f709022a256
Allow multiple gnulib generated include files to be combined.
Bruno Haible <bruno@clisp.org>
parents:
14836
diff
changeset
|
4000 -e "$sed_replace_include_guard_prefix" |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4001 if $use_libtests && test "$module" = 'alloca'; then |
|
18913
680cbae5afc0
gnulib-tool: Fix generated code when libtests contains module 'alloca'.
Bruno Haible <bruno@clisp.org>
parents:
18910
diff
changeset
|
4002 echo "libtests_a_LIBADD += @ALLOCA@" |
|
680cbae5afc0
gnulib-tool: Fix generated code when libtests contains module 'alloca'.
Bruno Haible <bruno@clisp.org>
parents:
18910
diff
changeset
|
4003 echo "libtests_a_DEPENDENCIES += @ALLOCA@" |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4004 fi |
|
12741
12d8c6b23748
gnulib-tool: avoid writing in the current directory.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12559
diff
changeset
|
4005 } > "$tmp"/amsnippet |
|
10065
e1449fcc7ecb
* gnulib-tool: Fix various comment typos.
Eric Blake <ebb9@byu.net>
parents:
9887
diff
changeset
|
4006 # Skip the contents if it's entirely empty. |
|
12741
12d8c6b23748
gnulib-tool: avoid writing in the current directory.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12559
diff
changeset
|
4007 if grep '[^ ]' "$tmp"/amsnippet > /dev/null ; then |
|
13111
1af4e2d31f2a
gnulib-tool: Ensure that long-running tests are executed last.
Bruno Haible <bruno@clisp.org>
parents:
13110
diff
changeset
|
4008 # Mention long-running tests at the end. |
|
1af4e2d31f2a
gnulib-tool: Ensure that long-running tests are executed last.
Bruno Haible <bruno@clisp.org>
parents:
13110
diff
changeset
|
4009 ofd=3 |
|
1af4e2d31f2a
gnulib-tool: Ensure that long-running tests are executed last.
Bruno Haible <bruno@clisp.org>
parents:
13110
diff
changeset
|
4010 for word in `func_get_status "$module"`; do |
|
1af4e2d31f2a
gnulib-tool: Ensure that long-running tests are executed last.
Bruno Haible <bruno@clisp.org>
parents:
13110
diff
changeset
|
4011 if test "$word" = 'longrunning-test'; then |
|
1af4e2d31f2a
gnulib-tool: Ensure that long-running tests are executed last.
Bruno Haible <bruno@clisp.org>
parents:
13110
diff
changeset
|
4012 ofd=4 |
|
1af4e2d31f2a
gnulib-tool: Ensure that long-running tests are executed last.
Bruno Haible <bruno@clisp.org>
parents:
13110
diff
changeset
|
4013 break |
|
1af4e2d31f2a
gnulib-tool: Ensure that long-running tests are executed last.
Bruno Haible <bruno@clisp.org>
parents:
13110
diff
changeset
|
4014 fi |
|
1af4e2d31f2a
gnulib-tool: Ensure that long-running tests are executed last.
Bruno Haible <bruno@clisp.org>
parents:
13110
diff
changeset
|
4015 done |
|
1af4e2d31f2a
gnulib-tool: Ensure that long-running tests are executed last.
Bruno Haible <bruno@clisp.org>
parents:
13110
diff
changeset
|
4016 { echo "## begin gnulib module $module" |
|
18729
9534f71959d1
gnulib-tool: new option --gnu-make
Paul Eggert <eggert@cs.ucla.edu>
parents:
18704
diff
changeset
|
4017 if $gnu_make; then |
|
9534f71959d1
gnulib-tool: new option --gnu-make
Paul Eggert <eggert@cs.ucla.edu>
parents:
18704
diff
changeset
|
4018 echo "ifeq (,\$(OMIT_GNULIB_MODULE_$module))" |
|
9534f71959d1
gnulib-tool: new option --gnu-make
Paul Eggert <eggert@cs.ucla.edu>
parents:
18704
diff
changeset
|
4019 fi |
|
13111
1af4e2d31f2a
gnulib-tool: Ensure that long-running tests are executed last.
Bruno Haible <bruno@clisp.org>
parents:
13110
diff
changeset
|
4020 echo |
|
1af4e2d31f2a
gnulib-tool: Ensure that long-running tests are executed last.
Bruno Haible <bruno@clisp.org>
parents:
13110
diff
changeset
|
4021 cat "$tmp"/amsnippet |
|
18729
9534f71959d1
gnulib-tool: new option --gnu-make
Paul Eggert <eggert@cs.ucla.edu>
parents:
18704
diff
changeset
|
4022 if $gnu_make; then |
|
9534f71959d1
gnulib-tool: new option --gnu-make
Paul Eggert <eggert@cs.ucla.edu>
parents:
18704
diff
changeset
|
4023 echo "endif" |
|
9534f71959d1
gnulib-tool: new option --gnu-make
Paul Eggert <eggert@cs.ucla.edu>
parents:
18704
diff
changeset
|
4024 fi |
|
13111
1af4e2d31f2a
gnulib-tool: Ensure that long-running tests are executed last.
Bruno Haible <bruno@clisp.org>
parents:
13110
diff
changeset
|
4025 echo "## end gnulib module $module" |
|
1af4e2d31f2a
gnulib-tool: Ensure that long-running tests are executed last.
Bruno Haible <bruno@clisp.org>
parents:
13110
diff
changeset
|
4026 echo |
|
1af4e2d31f2a
gnulib-tool: Ensure that long-running tests are executed last.
Bruno Haible <bruno@clisp.org>
parents:
13110
diff
changeset
|
4027 } >&$ofd |
|
7169
cb505deddb22
Don't create a $(pkgdatadir) if there's nothing to be installed in it.
Bruno Haible <bruno@clisp.org>
parents:
7168
diff
changeset
|
4028 fi |
|
12741
12d8c6b23748
gnulib-tool: avoid writing in the current directory.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12559
diff
changeset
|
4029 rm -f "$tmp"/amsnippet |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4030 # Test whether there are some source files in subdirectories. |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4031 for f in `func_get_filelist "$module"`; do |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4032 case $f in |
|
10985
32537aa6364d
Terminate loops early when possible.
Bruno Haible <bruno@clisp.org>
parents:
10981
diff
changeset
|
4033 lib/*/*.c | tests/*/*.c) |
|
32537aa6364d
Terminate loops early when possible.
Bruno Haible <bruno@clisp.org>
parents:
10981
diff
changeset
|
4034 uses_subdirs=yes |
|
32537aa6364d
Terminate loops early when possible.
Bruno Haible <bruno@clisp.org>
parents:
10981
diff
changeset
|
4035 break |
|
32537aa6364d
Terminate loops early when possible.
Bruno Haible <bruno@clisp.org>
parents:
10981
diff
changeset
|
4036 ;; |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4037 esac |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4038 done |
|
7169
cb505deddb22
Don't create a $(pkgdatadir) if there's nothing to be installed in it.
Bruno Haible <bruno@clisp.org>
parents:
7168
diff
changeset
|
4039 fi |
|
cb505deddb22
Don't create a $(pkgdatadir) if there's nothing to be installed in it.
Bruno Haible <bruno@clisp.org>
parents:
7168
diff
changeset
|
4040 done |
|
13111
1af4e2d31f2a
gnulib-tool: Ensure that long-running tests are executed last.
Bruno Haible <bruno@clisp.org>
parents:
13110
diff
changeset
|
4041 } 3> "$tmp"/main_snippets 4> "$tmp"/longrunning_snippets |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4042 # Generate dependencies here, since it eases the debugging of test failures. |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4043 # If there are source files in subdirectories, prevent collision of the |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4044 # object files (example: hash.c and libxml/hash.c). |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4045 subdir_options= |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4046 if test -n "$uses_subdirs"; then |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4047 subdir_options=' subdir-objects' |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4048 fi |
| 39943 | 4049 echo "AUTOMAKE_OPTIONS = 1.11 foreign${subdir_options}" |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4050 echo |
|
14836
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
4051 if $for_test && ! $single_configure; then |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4052 echo "ACLOCAL_AMFLAGS = -I ${testsbase_inverse}/${m4base}" |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4053 echo |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4054 fi |
|
6533
6bc4290ca85f
Avoid an automake error regarding the 'gettext' module.
Bruno Haible <bruno@clisp.org>
parents:
6512
diff
changeset
|
4055 # Nothing is being added to SUBDIRS; nevertheless the existence of this |
|
6bc4290ca85f
Avoid an automake error regarding the 'gettext' module.
Bruno Haible <bruno@clisp.org>
parents:
6512
diff
changeset
|
4056 # variable is needed to avoid an error from automake: |
|
6bc4290ca85f
Avoid an automake error regarding the 'gettext' module.
Bruno Haible <bruno@clisp.org>
parents:
6512
diff
changeset
|
4057 # "AM_GNU_GETTEXT used but SUBDIRS not defined" |
|
13110
48f80c38f0ed
gnulib-tool: Ensure the tests in the main directory are executed first.
Bruno Haible <bruno@clisp.org>
parents:
13107
diff
changeset
|
4058 echo "SUBDIRS = ." |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
4059 echo "TESTS =" |
|
12295
b8c65d432a3e
Add xalloc-die self-test.
Simon Josefsson <simon@josefsson.org>
parents:
12288
diff
changeset
|
4060 echo "XFAIL_TESTS =" |
|
10732
a97c57b9b48e
argp: Use standard gnulib idiom for EXEEXT.
Simon Josefsson <simon@josefsson.org>
parents:
10729
diff
changeset
|
4061 echo "TESTS_ENVIRONMENT =" |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
4062 echo "noinst_PROGRAMS =" |
|
7981
41421349e26b
In testing directories, link the test programs already during "make", not
Bruno Haible <bruno@clisp.org>
parents:
7911
diff
changeset
|
4063 if ! $for_test; then |
|
41421349e26b
In testing directories, link the test programs already during "make", not
Bruno Haible <bruno@clisp.org>
parents:
7911
diff
changeset
|
4064 echo "check_PROGRAMS =" |
|
41421349e26b
In testing directories, link the test programs already during "make", not
Bruno Haible <bruno@clisp.org>
parents:
7911
diff
changeset
|
4065 fi |
|
18786
f2fc38f20336
verify tests: Fix spurious failure with parallel make.
Bruno Haible <bruno@clisp.org>
parents:
18741
diff
changeset
|
4066 echo "EXTRA_PROGRAMS =" |
|
6548
060487c0b13c
Initialize also noinst_HEADERS to empty.
Bruno Haible <bruno@clisp.org>
parents:
6547
diff
changeset
|
4067 echo "noinst_HEADERS =" |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4068 echo "noinst_LIBRARIES =" |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4069 if $use_libtests; then |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4070 if $for_test; then |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4071 echo "noinst_LIBRARIES += libtests.a" |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4072 else |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4073 echo "check_LIBRARIES = libtests.a" |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4074 fi |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4075 fi |
|
16713
5090324ee0c8
gnulib-tool: fix imprecise comments w.r.t. an automake bug
Stefano Lattarini <stefano.lattarini@gmail.com>
parents:
16377
diff
changeset
|
4076 # Automake versions < 1.11.4 create an empty pkgdatadir at |
|
5090324ee0c8
gnulib-tool: fix imprecise comments w.r.t. an automake bug
Stefano Lattarini <stefano.lattarini@gmail.com>
parents:
16377
diff
changeset
|
4077 # installation time if you specify pkgdata_DATA to empty. |
|
5090324ee0c8
gnulib-tool: fix imprecise comments w.r.t. an automake bug
Stefano Lattarini <stefano.lattarini@gmail.com>
parents:
16377
diff
changeset
|
4078 # See automake bugs #10997 and #11030: |
| 19190 | 4079 # * https://debbugs.gnu.org/10997 |
| 4080 # * https://debbugs.gnu.org/11030 | |
|
16713
5090324ee0c8
gnulib-tool: fix imprecise comments w.r.t. an automake bug
Stefano Lattarini <stefano.lattarini@gmail.com>
parents:
16377
diff
changeset
|
4081 # So we need this workaround. |
|
13111
1af4e2d31f2a
gnulib-tool: Ensure that long-running tests are executed last.
Bruno Haible <bruno@clisp.org>
parents:
13110
diff
changeset
|
4082 if grep '^pkgdata_DATA *+=' "$tmp"/main_snippets "$tmp"/longrunning_snippets > /dev/null; then |
|
7169
cb505deddb22
Don't create a $(pkgdatadir) if there's nothing to be installed in it.
Bruno Haible <bruno@clisp.org>
parents:
7168
diff
changeset
|
4083 echo "pkgdata_DATA =" |
|
cb505deddb22
Don't create a $(pkgdatadir) if there's nothing to be installed in it.
Bruno Haible <bruno@clisp.org>
parents:
7168
diff
changeset
|
4084 fi |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
4085 echo "EXTRA_DIST =" |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
4086 echo "BUILT_SOURCES =" |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
4087 echo "SUFFIXES =" |
| 7079 | 4088 echo "MOSTLYCLEANFILES = core *.stackdump" |
| 6862 | 4089 echo "MOSTLYCLEANDIRS =" |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
4090 echo "CLEANFILES =" |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
4091 echo "DISTCLEANFILES =" |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
4092 echo "MAINTAINERCLEANFILES =" |
|
10476
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
4093 # Execute edits that apply to the Makefile.am being generated. |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
4094 edit=0 |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
4095 while test $edit != $makefile_am_edits; do |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
4096 edit=`expr $edit + 1` |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
4097 eval dir=\"\$makefile_am_edit${edit}_dir\" |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
4098 eval var=\"\$makefile_am_edit${edit}_var\" |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
4099 eval val=\"\$makefile_am_edit${edit}_val\" |
|
39815
35efeabe809f
gnulib-tool: Fix build order when $testsbase is a subdir of $sourcebase.
Bruno Haible <bruno@clisp.org>
parents:
39755
diff
changeset
|
4100 eval dotfirst=\"\$makefile_am_edit${edit}_dotfirst\" |
|
10476
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
4101 if test -n "$var"; then |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
4102 if test "${dir}Makefile.am" = "$destfile" || test "./${dir}Makefile.am" = "$destfile"; then |
|
39815
35efeabe809f
gnulib-tool: Fix build order when $testsbase is a subdir of $sourcebase.
Bruno Haible <bruno@clisp.org>
parents:
39755
diff
changeset
|
4103 if test "${var}" = SUBDIRS && test -n "$dotfirst"; then |
|
35efeabe809f
gnulib-tool: Fix build order when $testsbase is a subdir of $sourcebase.
Bruno Haible <bruno@clisp.org>
parents:
39755
diff
changeset
|
4104 # The added subdirectory ${val} needs to be mentioned after '.'. |
|
35efeabe809f
gnulib-tool: Fix build order when $testsbase is a subdir of $sourcebase.
Bruno Haible <bruno@clisp.org>
parents:
39755
diff
changeset
|
4105 # But we have '.' among SUBDIRS already, so do nothing. |
|
35efeabe809f
gnulib-tool: Fix build order when $testsbase is a subdir of $sourcebase.
Bruno Haible <bruno@clisp.org>
parents:
39755
diff
changeset
|
4106 : |
|
35efeabe809f
gnulib-tool: Fix build order when $testsbase is a subdir of $sourcebase.
Bruno Haible <bruno@clisp.org>
parents:
39755
diff
changeset
|
4107 fi |
|
10476
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
4108 echo "${var} += ${val}" |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
4109 eval "makefile_am_edit${edit}_var=" |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
4110 fi |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
4111 fi |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
4112 done |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
4113 echo |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
4114 echo "AM_CPPFLAGS = \\" |
|
13217
885b58a1c02f
Stricter declaration checking in testdirs.
Bruno Haible <bruno@clisp.org>
parents:
13111
diff
changeset
|
4115 if $for_test; then |
|
885b58a1c02f
Stricter declaration checking in testdirs.
Bruno Haible <bruno@clisp.org>
parents:
13111
diff
changeset
|
4116 echo " -DGNULIB_STRICT_CHECKING=1 \\" |
|
885b58a1c02f
Stricter declaration checking in testdirs.
Bruno Haible <bruno@clisp.org>
parents:
13111
diff
changeset
|
4117 fi |
|
14894
b22360ddefc4
gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents:
14841
diff
changeset
|
4118 if test -n "$witness_c_macro"; then |
|
b22360ddefc4
gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents:
14841
diff
changeset
|
4119 echo " -D$witness_c_macro=1 \\" |
|
b22360ddefc4
gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents:
14841
diff
changeset
|
4120 fi |
|
13067
0e829091f9c0
Avoid side effects from tests-related modules on the compilation of lib.
Bruno Haible <bruno@clisp.org>
parents:
12986
diff
changeset
|
4121 if test -n "${witness_macro}"; then |
|
0e829091f9c0
Avoid side effects from tests-related modules on the compilation of lib.
Bruno Haible <bruno@clisp.org>
parents:
12986
diff
changeset
|
4122 echo " -D@${witness_macro}@=1 \\" |
|
0e829091f9c0
Avoid side effects from tests-related modules on the compilation of lib.
Bruno Haible <bruno@clisp.org>
parents:
12986
diff
changeset
|
4123 fi |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
4124 echo " -I. -I\$(srcdir) \\" |
|
6250
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
4125 echo " -I${testsbase_inverse} -I\$(srcdir)/${testsbase_inverse} \\" |
|
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
4126 echo " -I${testsbase_inverse}/${sourcebase-lib} -I\$(srcdir)/${testsbase_inverse}/${sourcebase-lib}" |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
4127 echo |
|
9540
56fe79dce87d
Remove unnecessary -l options from LDFLAGS.
Bruno Haible <bruno@clisp.org>
parents:
9523
diff
changeset
|
4128 local_ldadd_before='' |
|
56fe79dce87d
Remove unnecessary -l options from LDFLAGS.
Bruno Haible <bruno@clisp.org>
parents:
9523
diff
changeset
|
4129 local_ldadd_after='' |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4130 if $use_libtests; then |
|
9540
56fe79dce87d
Remove unnecessary -l options from LDFLAGS.
Bruno Haible <bruno@clisp.org>
parents:
9523
diff
changeset
|
4131 # All test programs need to be linked with libtests.a. |
|
56fe79dce87d
Remove unnecessary -l options from LDFLAGS.
Bruno Haible <bruno@clisp.org>
parents:
9523
diff
changeset
|
4132 # It needs to be passed to the linker before ${libname}.${libext}, since |
|
56fe79dce87d
Remove unnecessary -l options from LDFLAGS.
Bruno Haible <bruno@clisp.org>
parents:
9523
diff
changeset
|
4133 # the tests-related modules depend on the main modules. |
|
56fe79dce87d
Remove unnecessary -l options from LDFLAGS.
Bruno Haible <bruno@clisp.org>
parents:
9523
diff
changeset
|
4134 # It also needs to be passed to the linker after ${libname}.${libext} |
|
56fe79dce87d
Remove unnecessary -l options from LDFLAGS.
Bruno Haible <bruno@clisp.org>
parents:
9523
diff
changeset
|
4135 # because the latter might contain incomplete modules (such as the 'error' |
|
56fe79dce87d
Remove unnecessary -l options from LDFLAGS.
Bruno Haible <bruno@clisp.org>
parents:
9523
diff
changeset
|
4136 # module whose dependency to 'progname' is voluntarily omitted). |
|
56fe79dce87d
Remove unnecessary -l options from LDFLAGS.
Bruno Haible <bruno@clisp.org>
parents:
9523
diff
changeset
|
4137 # The LIBTESTS_LIBDEPS can be passed to the linker once or twice, it does |
|
56fe79dce87d
Remove unnecessary -l options from LDFLAGS.
Bruno Haible <bruno@clisp.org>
parents:
9523
diff
changeset
|
4138 # not matter. |
|
56fe79dce87d
Remove unnecessary -l options from LDFLAGS.
Bruno Haible <bruno@clisp.org>
parents:
9523
diff
changeset
|
4139 local_ldadd_before=' libtests.a' |
|
56fe79dce87d
Remove unnecessary -l options from LDFLAGS.
Bruno Haible <bruno@clisp.org>
parents:
9523
diff
changeset
|
4140 local_ldadd_after=' libtests.a $(LIBTESTS_LIBDEPS)' |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4141 fi |
|
9540
56fe79dce87d
Remove unnecessary -l options from LDFLAGS.
Bruno Haible <bruno@clisp.org>
parents:
9523
diff
changeset
|
4142 echo "LDADD =${local_ldadd_before} ${testsbase_inverse}/${sourcebase-lib}/${libname}.${libext}${local_ldadd_after}" |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
4143 echo |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4144 if $use_libtests; then |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4145 echo "libtests_a_SOURCES =" |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4146 # Here we use $(LIBOBJS), not @LIBOBJS@. The value is the same. However, |
|
10065
e1449fcc7ecb
* gnulib-tool: Fix various comment typos.
Eric Blake <ebb9@byu.net>
parents:
9887
diff
changeset
|
4147 # automake during its analysis looks for $(LIBOBJS), not for @LIBOBJS@. |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4148 echo "libtests_a_LIBADD = \$(${macro_prefix}tests_LIBOBJS)" |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4149 echo "libtests_a_DEPENDENCIES = \$(${macro_prefix}tests_LIBOBJS)" |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4150 echo "EXTRA_libtests_a_SOURCES =" |
|
9523
49f7561fc2d3
Allow circular dependency of separate libtests.a
Eric Blake <ebb9@byu.net>
parents:
9520
diff
changeset
|
4151 # The circular dependency in LDADD requires this. |
|
49f7561fc2d3
Allow circular dependency of separate libtests.a
Eric Blake <ebb9@byu.net>
parents:
9520
diff
changeset
|
4152 echo "AM_LIBTOOLFLAGS = --preserve-dup-deps" |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4153 echo |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4154 fi |
|
12775
03aab12b3f15
Provide EXEEXT and srcdir in TESTS_ENVIRONMENT by default.
Bruno Haible <bruno@clisp.org>
parents:
12743
diff
changeset
|
4155 # Many test scripts use ${EXEEXT} or ${srcdir}. |
|
03aab12b3f15
Provide EXEEXT and srcdir in TESTS_ENVIRONMENT by default.
Bruno Haible <bruno@clisp.org>
parents:
12743
diff
changeset
|
4156 # EXEEXT is defined by AC_PROG_CC through autoconf. |
|
03aab12b3f15
Provide EXEEXT and srcdir in TESTS_ENVIRONMENT by default.
Bruno Haible <bruno@clisp.org>
parents:
12743
diff
changeset
|
4157 # srcdir is defined by autoconf and automake. |
|
03aab12b3f15
Provide EXEEXT and srcdir in TESTS_ENVIRONMENT by default.
Bruno Haible <bruno@clisp.org>
parents:
12743
diff
changeset
|
4158 echo "TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' srcdir='\$(srcdir)'" |
|
03aab12b3f15
Provide EXEEXT and srcdir in TESTS_ENVIRONMENT by default.
Bruno Haible <bruno@clisp.org>
parents:
12743
diff
changeset
|
4159 echo |
|
13111
1af4e2d31f2a
gnulib-tool: Ensure that long-running tests are executed last.
Bruno Haible <bruno@clisp.org>
parents:
13110
diff
changeset
|
4160 cat "$tmp"/main_snippets "$tmp"/longrunning_snippets \ |
|
9515
b0f1495adfd8
Fix references to the build-aux directory in the generated tests/Makefile.am.
Bruno Haible <bruno@clisp.org>
parents:
9514
diff
changeset
|
4161 | sed -e 's|\$(top_srcdir)/build-aux/|$(top_srcdir)/'"$auxdir"'/|g' |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
4162 echo "# Clean up after Solaris cc." |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
4163 echo "clean-local:" |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
4164 echo " rm -rf SunWS_cache" |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
4165 echo |
| 7086 | 4166 echo "mostlyclean-local: mostlyclean-generic" |
|
7545
fade8d6feee3
Avoid syntax error from bash 2.00 ... 2.05.
Bruno Haible <bruno@clisp.org>
parents:
7533
diff
changeset
|
4167 echo " @for dir in '' \$(MOSTLYCLEANDIRS); do \\" |
|
fade8d6feee3
Avoid syntax error from bash 2.00 ... 2.05.
Bruno Haible <bruno@clisp.org>
parents:
7533
diff
changeset
|
4168 echo " if test -n \"\$\$dir\" && test -d \$\$dir; then \\" |
|
fade8d6feee3
Avoid syntax error from bash 2.00 ... 2.05.
Bruno Haible <bruno@clisp.org>
parents:
7533
diff
changeset
|
4169 echo " echo \"rmdir \$\$dir\"; rmdir \$\$dir; \\" |
|
fade8d6feee3
Avoid syntax error from bash 2.00 ... 2.05.
Bruno Haible <bruno@clisp.org>
parents:
7533
diff
changeset
|
4170 echo " fi; \\" |
|
9010
03602a916a9a
Don't let the 'mostlyclean' target fail because of a nonempty directory.
Bruno Haible <bruno@clisp.org>
parents:
9009
diff
changeset
|
4171 echo " done; \\" |
|
03602a916a9a
Don't let the 'mostlyclean' target fail because of a nonempty directory.
Bruno Haible <bruno@clisp.org>
parents:
9009
diff
changeset
|
4172 echo " :" |
|
13111
1af4e2d31f2a
gnulib-tool: Ensure that long-running tests are executed last.
Bruno Haible <bruno@clisp.org>
parents:
13110
diff
changeset
|
4173 rm -f "$tmp"/main_snippets "$tmp"/longrunning_snippets |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
4174 } |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
4175 |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4176 # func_emit_initmacro_start macro_prefix |
|
7486
46b72819ef52
Add support for multiple gnulib-tool invocations in the scope of a single
Bruno Haible <bruno@clisp.org>
parents:
7485
diff
changeset
|
4177 # emits the first few statements of the gl_INIT macro to standard output. |
|
46b72819ef52
Add support for multiple gnulib-tool invocations in the scope of a single
Bruno Haible <bruno@clisp.org>
parents:
7485
diff
changeset
|
4178 # - macro_prefix prefix of gl_EARLY, gl_INIT macros to use |
|
46b72819ef52
Add support for multiple gnulib-tool invocations in the scope of a single
Bruno Haible <bruno@clisp.org>
parents:
7485
diff
changeset
|
4179 func_emit_initmacro_start () |
|
46b72819ef52
Add support for multiple gnulib-tool invocations in the scope of a single
Bruno Haible <bruno@clisp.org>
parents:
7485
diff
changeset
|
4180 { |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4181 macro_prefix_arg="$1" |
|
7646
33bd42644eec
Override also AC_LIBSOURCES. Works around an automake error
Bruno Haible <bruno@clisp.org>
parents:
7644
diff
changeset
|
4182 # Overriding AC_LIBOBJ and AC_REPLACE_FUNCS has the effect of storing |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4183 # platform-dependent object files in ${macro_prefix_arg}_LIBOBJS instead of |
|
7646
33bd42644eec
Override also AC_LIBSOURCES. Works around an automake error
Bruno Haible <bruno@clisp.org>
parents:
7644
diff
changeset
|
4184 # LIBOBJS. The purpose is to allow several gnulib instantiations under |
|
33bd42644eec
Override also AC_LIBSOURCES. Works around an automake error
Bruno Haible <bruno@clisp.org>
parents:
7644
diff
changeset
|
4185 # a single configure.ac file. (AC_CONFIG_LIBOBJ_DIR does not allow this |
|
33bd42644eec
Override also AC_LIBSOURCES. Works around an automake error
Bruno Haible <bruno@clisp.org>
parents:
7644
diff
changeset
|
4186 # flexibility.) |
|
33bd42644eec
Override also AC_LIBSOURCES. Works around an automake error
Bruno Haible <bruno@clisp.org>
parents:
7644
diff
changeset
|
4187 # Furthermore it avoids an automake error like this when a Makefile.am |
|
33bd42644eec
Override also AC_LIBSOURCES. Works around an automake error
Bruno Haible <bruno@clisp.org>
parents:
7644
diff
changeset
|
4188 # that uses pieces of gnulib also uses $(LIBOBJ): |
|
33bd42644eec
Override also AC_LIBSOURCES. Works around an automake error
Bruno Haible <bruno@clisp.org>
parents:
7644
diff
changeset
|
4189 # automatically discovered file `error.c' should not be explicitly mentioned |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4190 echo " m4_pushdef([AC_LIBOBJ], m4_defn([${macro_prefix_arg}_LIBOBJ]))" |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4191 echo " m4_pushdef([AC_REPLACE_FUNCS], m4_defn([${macro_prefix_arg}_REPLACE_FUNCS]))" |
|
7646
33bd42644eec
Override also AC_LIBSOURCES. Works around an automake error
Bruno Haible <bruno@clisp.org>
parents:
7644
diff
changeset
|
4192 # Overriding AC_LIBSOURCES has the same purpose of avoiding the automake |
|
33bd42644eec
Override also AC_LIBSOURCES. Works around an automake error
Bruno Haible <bruno@clisp.org>
parents:
7644
diff
changeset
|
4193 # error when a Makefile.am that uses pieces of gnulib also uses $(LIBOBJ): |
|
33bd42644eec
Override also AC_LIBSOURCES. Works around an automake error
Bruno Haible <bruno@clisp.org>
parents:
7644
diff
changeset
|
4194 # automatically discovered file `error.c' should not be explicitly mentioned |
|
33bd42644eec
Override also AC_LIBSOURCES. Works around an automake error
Bruno Haible <bruno@clisp.org>
parents:
7644
diff
changeset
|
4195 # We let automake know about the files to be distributed through the |
|
33bd42644eec
Override also AC_LIBSOURCES. Works around an automake error
Bruno Haible <bruno@clisp.org>
parents:
7644
diff
changeset
|
4196 # EXTRA_lib_SOURCES variable. |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4197 echo " m4_pushdef([AC_LIBSOURCES], m4_defn([${macro_prefix_arg}_LIBSOURCES]))" |
|
10066
9a2a9c43db65
Reduce number of forks required during autoconf.
Eric Blake <ebb9@byu.net>
parents:
10065
diff
changeset
|
4198 # Create data variables for checking the presence of files that are mentioned |
|
9a2a9c43db65
Reduce number of forks required during autoconf.
Eric Blake <ebb9@byu.net>
parents:
10065
diff
changeset
|
4199 # as AC_LIBSOURCES arguments. These are m4 variables, not shell variables, |
|
9a2a9c43db65
Reduce number of forks required during autoconf.
Eric Blake <ebb9@byu.net>
parents:
10065
diff
changeset
|
4200 # because we want the check to happen when the configure file is created, |
|
9a2a9c43db65
Reduce number of forks required during autoconf.
Eric Blake <ebb9@byu.net>
parents:
10065
diff
changeset
|
4201 # not when it is run. ${macro_prefix_arg}_LIBSOURCES_LIST is the list of |
|
9a2a9c43db65
Reduce number of forks required during autoconf.
Eric Blake <ebb9@byu.net>
parents:
10065
diff
changeset
|
4202 # files to check for. ${macro_prefix_arg}_LIBSOURCES_DIR is the subdirectory |
|
9a2a9c43db65
Reduce number of forks required during autoconf.
Eric Blake <ebb9@byu.net>
parents:
10065
diff
changeset
|
4203 # in which to expect them. |
|
9a2a9c43db65
Reduce number of forks required during autoconf.
Eric Blake <ebb9@byu.net>
parents:
10065
diff
changeset
|
4204 echo " m4_pushdef([${macro_prefix_arg}_LIBSOURCES_LIST], [])" |
|
9a2a9c43db65
Reduce number of forks required during autoconf.
Eric Blake <ebb9@byu.net>
parents:
10065
diff
changeset
|
4205 echo " m4_pushdef([${macro_prefix_arg}_LIBSOURCES_DIR], [])" |
|
9887
f2408973947f
Fix __GNUC_STDC_INLINE__ predefine with Apple GCC on MacOS X 10.5.
Bruno Haible <bruno@clisp.org>
parents:
9879
diff
changeset
|
4206 echo " gl_COMMON" |
|
7486
46b72819ef52
Add support for multiple gnulib-tool invocations in the scope of a single
Bruno Haible <bruno@clisp.org>
parents:
7485
diff
changeset
|
4207 } |
|
46b72819ef52
Add support for multiple gnulib-tool invocations in the scope of a single
Bruno Haible <bruno@clisp.org>
parents:
7485
diff
changeset
|
4208 |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4209 # func_emit_initmacro_end macro_prefix |
|
7486
46b72819ef52
Add support for multiple gnulib-tool invocations in the scope of a single
Bruno Haible <bruno@clisp.org>
parents:
7485
diff
changeset
|
4210 # emits the last few statements of the gl_INIT macro to standard output. |
|
46b72819ef52
Add support for multiple gnulib-tool invocations in the scope of a single
Bruno Haible <bruno@clisp.org>
parents:
7485
diff
changeset
|
4211 # - macro_prefix prefix of gl_EARLY, gl_INIT macros to use |
|
46b72819ef52
Add support for multiple gnulib-tool invocations in the scope of a single
Bruno Haible <bruno@clisp.org>
parents:
7485
diff
changeset
|
4212 func_emit_initmacro_end () |
|
46b72819ef52
Add support for multiple gnulib-tool invocations in the scope of a single
Bruno Haible <bruno@clisp.org>
parents:
7485
diff
changeset
|
4213 { |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4214 macro_prefix_arg="$1" |
|
10066
9a2a9c43db65
Reduce number of forks required during autoconf.
Eric Blake <ebb9@byu.net>
parents:
10065
diff
changeset
|
4215 # Check the presence of files that are mentioned as AC_LIBSOURCES arguments. |
|
9a2a9c43db65
Reduce number of forks required during autoconf.
Eric Blake <ebb9@byu.net>
parents:
10065
diff
changeset
|
4216 # The check is performed only when autoconf is run from the directory where |
|
9a2a9c43db65
Reduce number of forks required during autoconf.
Eric Blake <ebb9@byu.net>
parents:
10065
diff
changeset
|
4217 # the configure.ac resides; if it is run from a different directory, the |
|
9a2a9c43db65
Reduce number of forks required during autoconf.
Eric Blake <ebb9@byu.net>
parents:
10065
diff
changeset
|
4218 # check is skipped. |
|
10067
40a8c0b4f5e0
Oops, fix small mistake in last commit.
Bruno Haible <bruno@clisp.org>
parents:
10066
diff
changeset
|
4219 echo " m4_ifval(${macro_prefix_arg}_LIBSOURCES_LIST, [" |
| 10261 | 4220 echo " m4_syscmd([test ! -d ]m4_defn([${macro_prefix_arg}_LIBSOURCES_DIR])[ ||" |
|
10066
9a2a9c43db65
Reduce number of forks required during autoconf.
Eric Blake <ebb9@byu.net>
parents:
10065
diff
changeset
|
4221 echo " for gl_file in ]${macro_prefix_arg}_LIBSOURCES_LIST[ ; do" |
| 10261 | 4222 echo " if test ! -r ]m4_defn([${macro_prefix_arg}_LIBSOURCES_DIR])[/\$gl_file ; then" |
| 4223 echo " echo \"missing file ]m4_defn([${macro_prefix_arg}_LIBSOURCES_DIR])[/\$gl_file\" >&2" | |
|
10066
9a2a9c43db65
Reduce number of forks required during autoconf.
Eric Blake <ebb9@byu.net>
parents:
10065
diff
changeset
|
4224 echo " exit 1" |
|
9a2a9c43db65
Reduce number of forks required during autoconf.
Eric Blake <ebb9@byu.net>
parents:
10065
diff
changeset
|
4225 echo " fi" |
|
9a2a9c43db65
Reduce number of forks required during autoconf.
Eric Blake <ebb9@byu.net>
parents:
10065
diff
changeset
|
4226 echo " done])dnl" |
|
9a2a9c43db65
Reduce number of forks required during autoconf.
Eric Blake <ebb9@byu.net>
parents:
10065
diff
changeset
|
4227 echo " m4_if(m4_sysval, [0], []," |
|
9a2a9c43db65
Reduce number of forks required during autoconf.
Eric Blake <ebb9@byu.net>
parents:
10065
diff
changeset
|
4228 echo " [AC_FATAL([expected source file, required through AC_LIBSOURCES, not found])])" |
|
9a2a9c43db65
Reduce number of forks required during autoconf.
Eric Blake <ebb9@byu.net>
parents:
10065
diff
changeset
|
4229 echo " ])" |
|
9a2a9c43db65
Reduce number of forks required during autoconf.
Eric Blake <ebb9@byu.net>
parents:
10065
diff
changeset
|
4230 echo " m4_popdef([${macro_prefix_arg}_LIBSOURCES_DIR])" |
|
9a2a9c43db65
Reduce number of forks required during autoconf.
Eric Blake <ebb9@byu.net>
parents:
10065
diff
changeset
|
4231 echo " m4_popdef([${macro_prefix_arg}_LIBSOURCES_LIST])" |
|
7646
33bd42644eec
Override also AC_LIBSOURCES. Works around an automake error
Bruno Haible <bruno@clisp.org>
parents:
7644
diff
changeset
|
4232 echo " m4_popdef([AC_LIBSOURCES])" |
|
7486
46b72819ef52
Add support for multiple gnulib-tool invocations in the scope of a single
Bruno Haible <bruno@clisp.org>
parents:
7485
diff
changeset
|
4233 echo " m4_popdef([AC_REPLACE_FUNCS])" |
|
46b72819ef52
Add support for multiple gnulib-tool invocations in the scope of a single
Bruno Haible <bruno@clisp.org>
parents:
7485
diff
changeset
|
4234 echo " m4_popdef([AC_LIBOBJ])" |
|
46b72819ef52
Add support for multiple gnulib-tool invocations in the scope of a single
Bruno Haible <bruno@clisp.org>
parents:
7485
diff
changeset
|
4235 echo " AC_CONFIG_COMMANDS_PRE([" |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4236 echo " ${macro_prefix_arg}_libobjs=" |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4237 echo " ${macro_prefix_arg}_ltlibobjs=" |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4238 echo " if test -n \"\$${macro_prefix_arg}_LIBOBJS\"; then" |
|
7528
472795eea368
Remove duplicates from the gl_LIBOBJS list.
Bruno Haible <bruno@clisp.org>
parents:
7497
diff
changeset
|
4239 echo " # Remove the extension." |
|
472795eea368
Remove duplicates from the gl_LIBOBJS list.
Bruno Haible <bruno@clisp.org>
parents:
7497
diff
changeset
|
4240 echo " sed_drop_objext='s/\\.o\$//;s/\\.obj\$//'" |
| 12417 | 4241 echo " for i in \`for i in \$${macro_prefix_arg}_LIBOBJS; do echo \"\$i\"; done | sed -e \"\$sed_drop_objext\" | sort | uniq\`; do" |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4242 echo " ${macro_prefix_arg}_libobjs=\"\$${macro_prefix_arg}_libobjs \$i.\$ac_objext\"" |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4243 echo " ${macro_prefix_arg}_ltlibobjs=\"\$${macro_prefix_arg}_ltlibobjs \$i.lo\"" |
|
7486
46b72819ef52
Add support for multiple gnulib-tool invocations in the scope of a single
Bruno Haible <bruno@clisp.org>
parents:
7485
diff
changeset
|
4244 echo " done" |
|
46b72819ef52
Add support for multiple gnulib-tool invocations in the scope of a single
Bruno Haible <bruno@clisp.org>
parents:
7485
diff
changeset
|
4245 echo " fi" |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4246 echo " AC_SUBST([${macro_prefix_arg}_LIBOBJS], [\$${macro_prefix_arg}_libobjs])" |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4247 echo " AC_SUBST([${macro_prefix_arg}_LTLIBOBJS], [\$${macro_prefix_arg}_ltlibobjs])" |
|
7486
46b72819ef52
Add support for multiple gnulib-tool invocations in the scope of a single
Bruno Haible <bruno@clisp.org>
parents:
7485
diff
changeset
|
4248 echo " ])" |
|
46b72819ef52
Add support for multiple gnulib-tool invocations in the scope of a single
Bruno Haible <bruno@clisp.org>
parents:
7485
diff
changeset
|
4249 } |
|
46b72819ef52
Add support for multiple gnulib-tool invocations in the scope of a single
Bruno Haible <bruno@clisp.org>
parents:
7485
diff
changeset
|
4250 |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4251 # func_emit_initmacro_done macro_prefix sourcebase |
|
7486
46b72819ef52
Add support for multiple gnulib-tool invocations in the scope of a single
Bruno Haible <bruno@clisp.org>
parents:
7485
diff
changeset
|
4252 # emits a few statements after the gl_INIT macro to standard output. |
|
46b72819ef52
Add support for multiple gnulib-tool invocations in the scope of a single
Bruno Haible <bruno@clisp.org>
parents:
7485
diff
changeset
|
4253 # - macro_prefix prefix of gl_EARLY, gl_INIT macros to use |
|
9232
01d4e199e19f
Enforce that AC_REPLACE_FUNCS files exist.
Eric Blake <ebb9@byu.net>
parents:
9215
diff
changeset
|
4254 # - sourcebase directory relative to destdir where to place source code |
|
7486
46b72819ef52
Add support for multiple gnulib-tool invocations in the scope of a single
Bruno Haible <bruno@clisp.org>
parents:
7485
diff
changeset
|
4255 func_emit_initmacro_done () |
|
46b72819ef52
Add support for multiple gnulib-tool invocations in the scope of a single
Bruno Haible <bruno@clisp.org>
parents:
7485
diff
changeset
|
4256 { |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4257 macro_prefix_arg="$1" |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4258 sourcebase_arg="$2" |
|
7486
46b72819ef52
Add support for multiple gnulib-tool invocations in the scope of a single
Bruno Haible <bruno@clisp.org>
parents:
7485
diff
changeset
|
4259 echo |
|
46b72819ef52
Add support for multiple gnulib-tool invocations in the scope of a single
Bruno Haible <bruno@clisp.org>
parents:
7485
diff
changeset
|
4260 echo "# Like AC_LIBOBJ, except that the module name goes" |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4261 echo "# into ${macro_prefix_arg}_LIBOBJS instead of into LIBOBJS." |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4262 echo "AC_DEFUN([${macro_prefix_arg}_LIBOBJ], [" |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4263 echo " AS_LITERAL_IF([\$1], [${macro_prefix_arg}_LIBSOURCES([\$1.c])])dnl" |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4264 echo " ${macro_prefix_arg}_LIBOBJS=\"\$${macro_prefix_arg}_LIBOBJS \$1.\$ac_objext\"" |
|
9237
aeb8e2d99afa
m4 macro indentation.
Bruno Haible <bruno@linuix.haible.de>
parents:
9232
diff
changeset
|
4265 echo "])" |
|
7486
46b72819ef52
Add support for multiple gnulib-tool invocations in the scope of a single
Bruno Haible <bruno@clisp.org>
parents:
7485
diff
changeset
|
4266 echo |
|
46b72819ef52
Add support for multiple gnulib-tool invocations in the scope of a single
Bruno Haible <bruno@clisp.org>
parents:
7485
diff
changeset
|
4267 echo "# Like AC_REPLACE_FUNCS, except that the module name goes" |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4268 echo "# into ${macro_prefix_arg}_LIBOBJS instead of into LIBOBJS." |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4269 echo "AC_DEFUN([${macro_prefix_arg}_REPLACE_FUNCS], [" |
|
9237
aeb8e2d99afa
m4 macro indentation.
Bruno Haible <bruno@linuix.haible.de>
parents:
9232
diff
changeset
|
4270 echo " m4_foreach_w([gl_NAME], [\$1], [AC_LIBSOURCES(gl_NAME[.c])])dnl" |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4271 echo " AC_CHECK_FUNCS([\$1], , [${macro_prefix_arg}_LIBOBJ(\$ac_func)])" |
|
9237
aeb8e2d99afa
m4 macro indentation.
Bruno Haible <bruno@linuix.haible.de>
parents:
9232
diff
changeset
|
4272 echo "])" |
|
7646
33bd42644eec
Override also AC_LIBSOURCES. Works around an automake error
Bruno Haible <bruno@clisp.org>
parents:
7644
diff
changeset
|
4273 echo |
|
9275
1c749136a76e
AC_LIBSOURCES([alloca.c]) must be a no-op, otherwise it breaks the 'alloca-opt'
Bruno Haible <bruno@clisp.org>
parents:
9237
diff
changeset
|
4274 echo "# Like AC_LIBSOURCES, except the directory where the source file is" |
|
10065
e1449fcc7ecb
* gnulib-tool: Fix various comment typos.
Eric Blake <ebb9@byu.net>
parents:
9887
diff
changeset
|
4275 echo "# expected is derived from the gnulib-tool parameterization," |
|
9275
1c749136a76e
AC_LIBSOURCES([alloca.c]) must be a no-op, otherwise it breaks the 'alloca-opt'
Bruno Haible <bruno@clisp.org>
parents:
9237
diff
changeset
|
4276 echo "# and alloca is special cased (for the alloca-opt module)." |
|
1c749136a76e
AC_LIBSOURCES([alloca.c]) must be a no-op, otherwise it breaks the 'alloca-opt'
Bruno Haible <bruno@clisp.org>
parents:
9237
diff
changeset
|
4277 echo "# We could also entirely rely on EXTRA_lib..._SOURCES." |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4278 echo "AC_DEFUN([${macro_prefix_arg}_LIBSOURCES], [" |
|
9237
aeb8e2d99afa
m4 macro indentation.
Bruno Haible <bruno@linuix.haible.de>
parents:
9232
diff
changeset
|
4279 echo " m4_foreach([_gl_NAME], [\$1], [" |
|
9275
1c749136a76e
AC_LIBSOURCES([alloca.c]) must be a no-op, otherwise it breaks the 'alloca-opt'
Bruno Haible <bruno@clisp.org>
parents:
9237
diff
changeset
|
4280 echo " m4_if(_gl_NAME, [alloca.c], [], [" |
|
10066
9a2a9c43db65
Reduce number of forks required during autoconf.
Eric Blake <ebb9@byu.net>
parents:
10065
diff
changeset
|
4281 echo " m4_define([${macro_prefix_arg}_LIBSOURCES_DIR], [$sourcebase_arg])" |
|
10070
61be13abdf14
Avoid quadratic growth in gl_LIBSOURCES.
Eric Blake <ebb9@byu.net>
parents:
10067
diff
changeset
|
4282 echo " m4_append([${macro_prefix_arg}_LIBSOURCES_LIST], _gl_NAME, [ ])" |
|
9275
1c749136a76e
AC_LIBSOURCES([alloca.c]) must be a no-op, otherwise it breaks the 'alloca-opt'
Bruno Haible <bruno@clisp.org>
parents:
9237
diff
changeset
|
4283 echo " ])" |
|
9237
aeb8e2d99afa
m4 macro indentation.
Bruno Haible <bruno@linuix.haible.de>
parents:
9232
diff
changeset
|
4284 echo " ])" |
|
aeb8e2d99afa
m4 macro indentation.
Bruno Haible <bruno@linuix.haible.de>
parents:
9232
diff
changeset
|
4285 echo "])" |
|
7486
46b72819ef52
Add support for multiple gnulib-tool invocations in the scope of a single
Bruno Haible <bruno@clisp.org>
parents:
7485
diff
changeset
|
4286 } |
|
46b72819ef52
Add support for multiple gnulib-tool invocations in the scope of a single
Bruno Haible <bruno@clisp.org>
parents:
7485
diff
changeset
|
4287 |
| 14672 | 4288 # func_emit_autoconf_snippet indentation |
| 4289 # emits the autoconf snippet of a module. | |
|
14669
7d7930e97930
gnulib-tool: Reduce code duplication.
Bruno Haible <bruno@clisp.org>
parents:
14625
diff
changeset
|
4290 # Input: |
|
17042
61736e6c8fbe
gnulib-tool: Fix indentation of generated gnulib-comp.m4 file.
Bruno Haible <bruno@clisp.org>
parents:
17039
diff
changeset
|
4291 # - indentation spaces to prepend on each line |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
4292 # - local_gnulib_path from --local-dir |
|
14669
7d7930e97930
gnulib-tool: Reduce code duplication.
Bruno Haible <bruno@clisp.org>
parents:
14625
diff
changeset
|
4293 # - modcache true or false, from --cache-modules/--no-cache-modules |
|
7d7930e97930
gnulib-tool: Reduce code duplication.
Bruno Haible <bruno@clisp.org>
parents:
14625
diff
changeset
|
4294 # - sed_replace_build_aux sed expression that replaces reference to build-aux |
|
16122
e3e8e2fc21a9
Fix conflict between two instantiations of module 'unistd'.
Bruno Haible <bruno@clisp.org>
parents:
15854
diff
changeset
|
4295 # - sed_replace_include_guard_prefix |
|
e3e8e2fc21a9
Fix conflict between two instantiations of module 'unistd'.
Bruno Haible <bruno@clisp.org>
parents:
15854
diff
changeset
|
4296 # sed expression for resolving ${gl_include_guard_prefix} |
| 14672 | 4297 # - module the module name |
| 4298 # - toplevel true or false. 'false' means a subordinate use of | |
| 4299 # gnulib-tool. | |
| 4300 # - disable_libtool true or false. It tells whether to disable libtool | |
| 4301 # handling even if it has been specified through the | |
| 4302 # command line options. | |
| 4303 # - disable_gettext true or false. It tells whether to disable AM_GNU_GETTEXT | |
| 4304 # invocations. | |
| 4305 func_emit_autoconf_snippet () | |
| 4306 { | |
|
17042
61736e6c8fbe
gnulib-tool: Fix indentation of generated gnulib-comp.m4 file.
Bruno Haible <bruno@clisp.org>
parents:
17039
diff
changeset
|
4307 indentation="$1" |
| 14672 | 4308 if { case $module in |
| 4309 gnumakefile | maintainer-makefile) | |
| 4310 # These modules are meant to be used only in the top-level directory. | |
| 4311 $toplevel ;; | |
| 4312 *) | |
| 4313 true ;; | |
| 4314 esac | |
| 4315 }; then | |
| 4316 func_get_autoconf_snippet "$module" \ | |
| 4317 | sed -e '/^$/d;' -e "s/^/$indentation/" \ | |
| 4318 -e "$sed_replace_build_aux" \ | |
|
16122
e3e8e2fc21a9
Fix conflict between two instantiations of module 'unistd'.
Bruno Haible <bruno@clisp.org>
parents:
15854
diff
changeset
|
4319 -e "$sed_replace_include_guard_prefix" \ |
| 14672 | 4320 | { if $disable_libtool; then |
| 4321 sed -e 's/\$gl_cond_libtool/false/g' \ | |
| 4322 -e 's/gl_libdeps/gltests_libdeps/g' \ | |
| 4323 -e 's/gl_ltlibdeps/gltests_ltlibdeps/g' | |
| 4324 else | |
| 4325 cat | |
| 4326 fi | |
| 4327 } \ | |
| 4328 | { if $disable_gettext; then | |
| 4329 sed -e 's/AM_GNU_GETTEXT(\[external\])/dnl you must add AM_GNU_GETTEXT([external]) or similar to configure.ac./' | |
| 4330 else | |
|
17269
c9d7491e3e78
gnulib-tool: fix incompatibility with autopoint 0.18.2
Paul Eggert <eggert@cs.ucla.edu>
parents:
17249
diff
changeset
|
4331 # Don't indent AM_GNU_GETTEXT_VERSION line, as that confuses |
|
c9d7491e3e78
gnulib-tool: fix incompatibility with autopoint 0.18.2
Paul Eggert <eggert@cs.ucla.edu>
parents:
17249
diff
changeset
|
4332 # autopoint through at least GNU gettext version 0.18.2. |
|
c9d7491e3e78
gnulib-tool: fix incompatibility with autopoint 0.18.2
Paul Eggert <eggert@cs.ucla.edu>
parents:
17249
diff
changeset
|
4333 sed -e 's/^ *AM_GNU_GETTEXT_VERSION/AM_GNU_GETTEXT_VERSION/' |
| 14672 | 4334 fi |
| 4335 } | |
| 4336 if test "$module" = 'alloca' && test "$libtool" = true && ! $disable_libtool; then | |
| 4337 echo 'changequote(,)dnl' | |
| 4338 echo 'LTALLOCA=`echo "$ALLOCA" | sed -e '"'"'s/\.[^.]* /.lo /g;s/\.[^.]*$/.lo/'"'"'`' | |
| 4339 echo 'changequote([, ])dnl' | |
| 4340 echo 'AC_SUBST([LTALLOCA])' | |
| 4341 fi | |
| 4342 fi | |
| 4343 } | |
| 4344 | |
|
19478
fef1e0e56d65
gnulib-tool: Make --conditional-dependencies work better.
Bruno Haible <bruno@clisp.org>
parents:
19439
diff
changeset
|
4345 # func_emit_autoconf_snippets modules referenceable_modules verifier toplevel disable_libtool disable_gettext |
| 14672 | 4346 # collects and emit the autoconf snippets of a set of modules. |
| 4347 # Input: | |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
4348 # - local_gnulib_path from --local-dir |
| 14672 | 4349 # - modcache true or false, from --cache-modules/--no-cache-modules |
| 4350 # - sed_replace_build_aux sed expression that replaces reference to build-aux | |
|
16122
e3e8e2fc21a9
Fix conflict between two instantiations of module 'unistd'.
Bruno Haible <bruno@clisp.org>
parents:
15854
diff
changeset
|
4351 # - sed_replace_include_guard_prefix |
|
e3e8e2fc21a9
Fix conflict between two instantiations of module 'unistd'.
Bruno Haible <bruno@clisp.org>
parents:
15854
diff
changeset
|
4352 # sed expression for resolving ${gl_include_guard_prefix} |
| 14672 | 4353 # - modules the list of modules. |
|
19478
fef1e0e56d65
gnulib-tool: Make --conditional-dependencies work better.
Bruno Haible <bruno@clisp.org>
parents:
19439
diff
changeset
|
4354 # - referenceable_modules the list of modules which may be referenced as dependencies. |
| 14672 | 4355 # - verifier one of func_verify_module, func_verify_nontests_module, |
| 4356 # func_verify_tests_module. It selects the subset of | |
| 4357 # $modules to consider. | |
| 4358 # - toplevel true or false. 'false' means a subordinate use of | |
| 4359 # gnulib-tool. | |
| 4360 # - disable_libtool true or false. It tells whether to disable libtool | |
| 4361 # handling even if it has been specified through the | |
| 4362 # command line options. | |
| 4363 # - disable_gettext true or false. It tells whether to disable AM_GNU_GETTEXT | |
| 4364 # invocations. | |
|
14669
7d7930e97930
gnulib-tool: Reduce code duplication.
Bruno Haible <bruno@clisp.org>
parents:
14625
diff
changeset
|
4365 func_emit_autoconf_snippets () |
|
7d7930e97930
gnulib-tool: Reduce code duplication.
Bruno Haible <bruno@clisp.org>
parents:
14625
diff
changeset
|
4366 { |
|
19478
fef1e0e56d65
gnulib-tool: Make --conditional-dependencies work better.
Bruno Haible <bruno@clisp.org>
parents:
19439
diff
changeset
|
4367 referenceable_modules="$2" |
|
fef1e0e56d65
gnulib-tool: Make --conditional-dependencies work better.
Bruno Haible <bruno@clisp.org>
parents:
19439
diff
changeset
|
4368 verifier="$3" |
|
fef1e0e56d65
gnulib-tool: Make --conditional-dependencies work better.
Bruno Haible <bruno@clisp.org>
parents:
19439
diff
changeset
|
4369 toplevel="$4" |
|
fef1e0e56d65
gnulib-tool: Make --conditional-dependencies work better.
Bruno Haible <bruno@clisp.org>
parents:
19439
diff
changeset
|
4370 disable_libtool="$5" |
|
fef1e0e56d65
gnulib-tool: Make --conditional-dependencies work better.
Bruno Haible <bruno@clisp.org>
parents:
19439
diff
changeset
|
4371 disable_gettext="$6" |
|
14833
76127af7039f
Finish the conditional dependencies mechanism.
Bruno Haible <bruno@clisp.org>
parents:
14806
diff
changeset
|
4372 if test "$cond_dependencies" = true; then |
|
19478
fef1e0e56d65
gnulib-tool: Make --conditional-dependencies work better.
Bruno Haible <bruno@clisp.org>
parents:
19439
diff
changeset
|
4373 for m in $referenceable_modules; do echo $m; done | LC_ALL=C sort -u > "$tmp"/modules |
|
14682
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4374 # Emit the autoconf code for the unconditional modules. |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4375 for module in $1; do |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4376 eval $verifier |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4377 if test -n "$module"; then |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4378 if func_cond_module_p "$module"; then |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4379 : |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4380 else |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4381 func_emit_autoconf_snippet " " |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4382 fi |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4383 fi |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4384 done |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4385 # Initialize the shell variables indicating that the modules are enabled. |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4386 for module in $1; do |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4387 eval $verifier |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4388 if test -n "$module"; then |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4389 if func_cond_module_p "$module"; then |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4390 func_module_shellvar_name "$module" |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4391 echo " $shellvar=false" |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4392 fi |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4393 fi |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4394 done |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4395 # Emit the autoconf code for the conditional modules, each in a separate |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4396 # function. This makes it possible to support cycles among conditional |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4397 # modules. |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4398 for module in $1; do |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4399 eval $verifier |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4400 if test -n "$module"; then |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4401 if func_cond_module_p "$module"; then |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4402 func_module_shellfunc_name "$module" |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4403 func_module_shellvar_name "$module" |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4404 echo " $shellfunc ()" |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4405 echo ' {' |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4406 echo " if ! \$$shellvar; then" |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4407 func_emit_autoconf_snippet " " |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4408 echo " $shellvar=true" |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4409 deps=`func_get_dependencies $module | sed -e "$sed_dependencies_without_conditions"` |
|
15854
d3633bf8b61d
gnulib-tool: Improve last commit.
Bruno Haible <bruno@clisp.org>
parents:
15853
diff
changeset
|
4410 # Intersect $deps with the modules list $1. |
|
d3633bf8b61d
gnulib-tool: Improve last commit.
Bruno Haible <bruno@clisp.org>
parents:
15853
diff
changeset
|
4411 deps=`for m in $deps; do echo $m; done | LC_ALL=C sort -u | LC_ALL=C join - "$tmp"/modules` |
|
14682
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4412 for dep in $deps; do |
|
15854
d3633bf8b61d
gnulib-tool: Improve last commit.
Bruno Haible <bruno@clisp.org>
parents:
15853
diff
changeset
|
4413 if func_cond_module_p "$dep"; then |
|
14682
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4414 func_module_shellfunc_name "$dep" |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4415 func_cond_module_condition "$module" "$dep" |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4416 if test "$condition" != true; then |
|
15852
44740f4ef8e2
gnulib-tool: fix typo that broke Emacs on powerpc-apple-darwin9.8.0.
Paul Eggert <eggert@cs.ucla.edu>
parents:
15801
diff
changeset
|
4417 echo " if $condition; then" |
|
14682
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4418 echo " $shellfunc" |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4419 echo ' fi' |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4420 else |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4421 echo " $shellfunc" |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4422 fi |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4423 else |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4424 # The autoconf code for $dep has already been emitted above and |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4425 # therefore is already executed when this function is run. |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4426 : |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4427 fi |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4428 done |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4429 echo ' fi' |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4430 echo ' }' |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4431 fi |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4432 fi |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4433 done |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4434 # Emit the dependencies from the unconditional to the conditional modules. |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4435 for module in $1; do |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4436 eval $verifier |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4437 if test -n "$module"; then |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4438 if func_cond_module_p "$module"; then |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4439 : |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4440 else |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4441 deps=`func_get_dependencies $module | sed -e "$sed_dependencies_without_conditions"` |
|
15854
d3633bf8b61d
gnulib-tool: Improve last commit.
Bruno Haible <bruno@clisp.org>
parents:
15853
diff
changeset
|
4442 # Intersect $deps with the modules list $1. |
|
d3633bf8b61d
gnulib-tool: Improve last commit.
Bruno Haible <bruno@clisp.org>
parents:
15853
diff
changeset
|
4443 deps=`for m in $deps; do echo $m; done | LC_ALL=C sort -u | LC_ALL=C join - "$tmp"/modules` |
|
14682
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4444 for dep in $deps; do |
|
15854
d3633bf8b61d
gnulib-tool: Improve last commit.
Bruno Haible <bruno@clisp.org>
parents:
15853
diff
changeset
|
4445 if func_cond_module_p "$dep"; then |
|
14682
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4446 func_module_shellfunc_name "$dep" |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4447 func_cond_module_condition "$module" "$dep" |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4448 if test "$condition" != true; then |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4449 echo " if $condition; then" |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4450 echo " $shellfunc" |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4451 echo ' fi' |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4452 else |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4453 echo " $shellfunc" |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4454 fi |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4455 else |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4456 # The autoconf code for $dep has already been emitted above and |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4457 # therefore is already executed when this code is run. |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4458 : |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4459 fi |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4460 done |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4461 fi |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4462 fi |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4463 done |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4464 # Define the Automake conditionals. |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4465 echo " m4_pattern_allow([^${macro_prefix}_GNULIB_ENABLED_])" |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4466 for module in $1; do |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4467 eval $verifier |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4468 if test -n "$module"; then |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4469 if func_cond_module_p "$module"; then |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4470 func_module_conditional_name "$module" |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4471 func_module_shellvar_name "$module" |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4472 echo " AM_CONDITIONAL([$conditional], [\$$shellvar])" |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4473 fi |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4474 fi |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4475 done |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4476 else |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4477 # Ignore the conditions, and enable all modules unconditionally. |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4478 for module in $1; do |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4479 eval $verifier |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4480 if test -n "$module"; then |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4481 func_emit_autoconf_snippet " " |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4482 fi |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4483 done |
|
af0bb23f406a
Support for conditional dependencies.
Bruno Haible <bruno@clisp.org>
parents:
14672
diff
changeset
|
4484 fi |
|
14669
7d7930e97930
gnulib-tool: Reduce code duplication.
Bruno Haible <bruno@clisp.org>
parents:
14625
diff
changeset
|
4485 } |
|
7d7930e97930
gnulib-tool: Reduce code duplication.
Bruno Haible <bruno@clisp.org>
parents:
14625
diff
changeset
|
4486 |
|
18124
ef6cdfd2e603
gnulib-tool: fix tests of 'extensions' module
Pavel Raiskup <praiskup@redhat.com>
parents:
18114
diff
changeset
|
4487 # func_emit_pre_early_macros require indentation modules |
|
ef6cdfd2e603
gnulib-tool: fix tests of 'extensions' module
Pavel Raiskup <praiskup@redhat.com>
parents:
18114
diff
changeset
|
4488 # The require parameter can be ':' (AC_REQUIRE) or 'false' (direct call). |
|
ef6cdfd2e603
gnulib-tool: fix tests of 'extensions' module
Pavel Raiskup <praiskup@redhat.com>
parents:
18114
diff
changeset
|
4489 func_emit_pre_early_macros () |
|
ef6cdfd2e603
gnulib-tool: fix tests of 'extensions' module
Pavel Raiskup <praiskup@redhat.com>
parents:
18114
diff
changeset
|
4490 { |
|
ef6cdfd2e603
gnulib-tool: fix tests of 'extensions' module
Pavel Raiskup <praiskup@redhat.com>
parents:
18114
diff
changeset
|
4491 echo |
|
ef6cdfd2e603
gnulib-tool: fix tests of 'extensions' module
Pavel Raiskup <praiskup@redhat.com>
parents:
18114
diff
changeset
|
4492 echo "${2}# Pre-early section." |
|
ef6cdfd2e603
gnulib-tool: fix tests of 'extensions' module
Pavel Raiskup <praiskup@redhat.com>
parents:
18114
diff
changeset
|
4493 if $1; then |
|
ef6cdfd2e603
gnulib-tool: fix tests of 'extensions' module
Pavel Raiskup <praiskup@redhat.com>
parents:
18114
diff
changeset
|
4494 _pre_early_snippet="echo \"${2}AC_REQUIRE([\$_pre_early_macro])\"" |
|
ef6cdfd2e603
gnulib-tool: fix tests of 'extensions' module
Pavel Raiskup <praiskup@redhat.com>
parents:
18114
diff
changeset
|
4495 else |
|
ef6cdfd2e603
gnulib-tool: fix tests of 'extensions' module
Pavel Raiskup <praiskup@redhat.com>
parents:
18114
diff
changeset
|
4496 _pre_early_snippet="echo \"${2}\$_pre_early_macro\"" |
|
ef6cdfd2e603
gnulib-tool: fix tests of 'extensions' module
Pavel Raiskup <praiskup@redhat.com>
parents:
18114
diff
changeset
|
4497 fi |
|
ef6cdfd2e603
gnulib-tool: fix tests of 'extensions' module
Pavel Raiskup <praiskup@redhat.com>
parents:
18114
diff
changeset
|
4498 |
|
ef6cdfd2e603
gnulib-tool: fix tests of 'extensions' module
Pavel Raiskup <praiskup@redhat.com>
parents:
18114
diff
changeset
|
4499 # We need to call gl_USE_SYSTEM_EXTENSIONS before gl_PROG_AR_RANLIB. Doing |
|
ef6cdfd2e603
gnulib-tool: fix tests of 'extensions' module
Pavel Raiskup <praiskup@redhat.com>
parents:
18114
diff
changeset
|
4500 # AC_REQUIRE in configure-ac.early is not early enough. |
|
ef6cdfd2e603
gnulib-tool: fix tests of 'extensions' module
Pavel Raiskup <praiskup@redhat.com>
parents:
18114
diff
changeset
|
4501 _pre_early_macro="gl_USE_SYSTEM_EXTENSIONS" |
|
ef6cdfd2e603
gnulib-tool: fix tests of 'extensions' module
Pavel Raiskup <praiskup@redhat.com>
parents:
18114
diff
changeset
|
4502 case "${nl}${3}${nl}" in |
|
ef6cdfd2e603
gnulib-tool: fix tests of 'extensions' module
Pavel Raiskup <praiskup@redhat.com>
parents:
18114
diff
changeset
|
4503 *${nl}extensions${nl}*) eval "$_pre_early_snippet" ;; |
|
ef6cdfd2e603
gnulib-tool: fix tests of 'extensions' module
Pavel Raiskup <praiskup@redhat.com>
parents:
18114
diff
changeset
|
4504 esac |
|
ef6cdfd2e603
gnulib-tool: fix tests of 'extensions' module
Pavel Raiskup <praiskup@redhat.com>
parents:
18114
diff
changeset
|
4505 |
|
ef6cdfd2e603
gnulib-tool: fix tests of 'extensions' module
Pavel Raiskup <praiskup@redhat.com>
parents:
18114
diff
changeset
|
4506 _pre_early_macro="gl_PROG_AR_RANLIB" |
|
ef6cdfd2e603
gnulib-tool: fix tests of 'extensions' module
Pavel Raiskup <praiskup@redhat.com>
parents:
18114
diff
changeset
|
4507 eval "$_pre_early_snippet" |
|
ef6cdfd2e603
gnulib-tool: fix tests of 'extensions' module
Pavel Raiskup <praiskup@redhat.com>
parents:
18114
diff
changeset
|
4508 echo |
|
ef6cdfd2e603
gnulib-tool: fix tests of 'extensions' module
Pavel Raiskup <praiskup@redhat.com>
parents:
18114
diff
changeset
|
4509 } |
|
ef6cdfd2e603
gnulib-tool: fix tests of 'extensions' module
Pavel Raiskup <praiskup@redhat.com>
parents:
18114
diff
changeset
|
4510 |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
4511 # func_reconstruct_cached_dir |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
4512 # callback for func_reconstruct_cached_local_gnulib_path |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
4513 # Input: |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
4514 # - destdir from --dir |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
4515 # Output: |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
4516 # - local_gnulib_path restored '--local-dir' path from cache |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
4517 func_reconstruct_cached_dir () |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
4518 { |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
4519 cached_dir=$1 |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
4520 if test -n "$cached_dir"; then |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
4521 case "$destdir" in |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
4522 /*) |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
4523 func_path_append local_gnulib_path "$destdir/$cached_dir" ;; |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
4524 *) |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
4525 case "$cached_dir" in |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
4526 /*) |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
4527 func_path_append local_gnulib_path "$destdir/$cached_dir" ;; |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
4528 *) |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
4529 func_relconcat "$destdir" "$cached_dir" |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
4530 func_path_append local_gnulib_path "$relconcat" ;; |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
4531 esac ;; |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
4532 esac |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
4533 fi |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
4534 } |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
4535 |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
4536 # func_reconstruct_cached_local_gnulib_path |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
4537 # reconstruct local_gnulib_path from cached_local_gnulib_path to be set |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
4538 # relatively to $destdir again. |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
4539 # Input: |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
4540 # - cached_local_gnulib_path local_gnulib_path stored within gnulib-cache.m4 |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
4541 # - destdir from --dir |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
4542 # Output: |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
4543 # - local_gnulib_path restored '--local-dir' path from cache |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
4544 func_reconstruct_cached_local_gnulib_path () |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
4545 { |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
4546 func_path_foreach "$cached_local_gnulib_path" func_reconstruct_cached_dir %dir% |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
4547 } |
|
18124
ef6cdfd2e603
gnulib-tool: fix tests of 'extensions' module
Pavel Raiskup <praiskup@redhat.com>
parents:
18114
diff
changeset
|
4548 |
|
5347
0318c37925dc
Move duplicated code into function func_modules_transitive_closure().
Bruno Haible <bruno@clisp.org>
parents:
5346
diff
changeset
|
4549 # func_import modules |
|
0318c37925dc
Move duplicated code into function func_modules_transitive_closure().
Bruno Haible <bruno@clisp.org>
parents:
5346
diff
changeset
|
4550 # Uses also the variables |
|
13638
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4551 # - mode import or add-import or remove-import or update |
|
5347
0318c37925dc
Move duplicated code into function func_modules_transitive_closure().
Bruno Haible <bruno@clisp.org>
parents:
5346
diff
changeset
|
4552 # - destdir target directory |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
4553 # - local_gnulib_path from --local-dir |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
4554 # - modcache true or false, from --cache-modules/--no-cache-modules |
|
9188
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
4555 # - verbose integer, default 0, inc/decremented by --verbose/--quiet |
|
5347
0318c37925dc
Move duplicated code into function func_modules_transitive_closure().
Bruno Haible <bruno@clisp.org>
parents:
5346
diff
changeset
|
4556 # - libname library name |
|
13632
09362ffa0085
gnulib-tool: Avoid error when run in a package without Makefile.am.
Bruno Haible <bruno@clisp.org>
parents:
13625
diff
changeset
|
4557 # - supplied_libname true if --lib was given, blank otherwise |
|
5347
0318c37925dc
Move duplicated code into function func_modules_transitive_closure().
Bruno Haible <bruno@clisp.org>
parents:
5346
diff
changeset
|
4558 # - sourcebase directory relative to destdir where to place source code |
|
0318c37925dc
Move duplicated code into function func_modules_transitive_closure().
Bruno Haible <bruno@clisp.org>
parents:
5346
diff
changeset
|
4559 # - m4base directory relative to destdir where to place *.m4 macros |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
4560 # - pobase directory relative to destdir where to place *.po files |
|
6955
7715890c929a
* gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents:
6952
diff
changeset
|
4561 # - docbase directory relative to destdir where to place doc files |
|
6250
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
4562 # - testsbase directory relative to destdir where to place unit test code |
|
6109
a52f596fdf00
Generalize support for --aux-dir.
Bruno Haible <bruno@clisp.org>
parents:
6108
diff
changeset
|
4563 # - auxdir directory relative to destdir where to place build aux files |
|
16932
48e8f0679448
gnulib-tool: Refactor inctests variable.
Bruno Haible <bruno@clisp.org>
parents:
16931
diff
changeset
|
4564 # - inctests true if --with-tests was given, false otherwise |
|
10744
7fb7b37150b3
New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents:
10743
diff
changeset
|
4565 # - incobsolete true if --with-obsolete was given, blank otherwise |
|
13080
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
4566 # - inc_cxx_tests true if --with-c++-tests was given, blank otherwise |
|
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
4567 # - inc_longrunning_tests true if --with-longrunning-tests was given, blank |
|
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
4568 # otherwise |
|
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
4569 # - inc_privileged_tests true if --with-privileged-tests was given, blank |
|
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
4570 # otherwise |
|
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
4571 # - inc_unportable_tests true if --with-unportable-tests was given, blank |
|
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
4572 # otherwise |
|
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
4573 # - inc_all_tests true if --with-all-tests was given, blank otherwise |
| 5981 | 4574 # - avoidlist list of modules to avoid, from --avoid |
|
14833
76127af7039f
Finish the conditional dependencies mechanism.
Bruno Haible <bruno@clisp.org>
parents:
14806
diff
changeset
|
4575 # - cond_dependencies true if --conditional-dependencies was given, false if |
|
76127af7039f
Finish the conditional dependencies mechanism.
Bruno Haible <bruno@clisp.org>
parents:
14806
diff
changeset
|
4576 # --no-conditional-dependencies was given, blank otherwise |
|
9417
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
4577 # - lgpl yes or a number if library's license shall be LGPL, |
|
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
4578 # blank otherwise |
|
7216
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
4579 # - makefile_name from --makefile-name |
| 7077 | 4580 # - libtool true if --libtool was given, false if --no-libtool was |
| 4581 # given, blank otherwise | |
| 4582 # - guessed_libtool true if the configure.ac file uses libtool, false otherwise | |
| 6176 | 4583 # - macro_prefix prefix of gl_EARLY, gl_INIT macros to use |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
4584 # - po_domain prefix of i18n domain to use (without -gnulib suffix) |
|
14894
b22360ddefc4
gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents:
14841
diff
changeset
|
4585 # - witness_c_macro from --witness-c-macro |
|
9810
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
4586 # - vc_files true if --vc-files was given, false if --no-vc-files was |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
4587 # given, blank otherwise |
|
6994
3484a8772427
Add option --assume-autoconf. Default is back to 2.59.
Bruno Haible <bruno@clisp.org>
parents:
6993
diff
changeset
|
4588 # - autoconf_minversion minimum supported autoconf version |
|
6246
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
4589 # - doit : if actions shall be executed, false if only to be printed |
|
18937
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
4590 # - copymode copy mode for files in general |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
4591 # - lcopymode copy mode for files from local_gnulib_path |
|
9096
7f1880b27b89
New gnulib-tool option --more-symlinks.
Bruno Haible <bruno@clisp.org>
parents:
9090
diff
changeset
|
4592 # - do_copyrights true if copyright notices in files should be replaced, |
|
7f1880b27b89
New gnulib-tool option --more-symlinks.
Bruno Haible <bruno@clisp.org>
parents:
9090
diff
changeset
|
4593 # blank otherwise |
|
5347
0318c37925dc
Move duplicated code into function func_modules_transitive_closure().
Bruno Haible <bruno@clisp.org>
parents:
5346
diff
changeset
|
4594 func_import () |
|
0318c37925dc
Move duplicated code into function func_modules_transitive_closure().
Bruno Haible <bruno@clisp.org>
parents:
5346
diff
changeset
|
4595 { |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
4596 # Get the cached settings. |
|
13638
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4597 # In 'import' mode, we read them only for the purpose of knowing the old |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4598 # installed file list, and don't use them as defaults. |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
4599 cached_local_gnulib_path= |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
4600 cached_specified_modules= |
|
10744
7fb7b37150b3
New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents:
10743
diff
changeset
|
4601 cached_incobsolete= |
|
13080
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
4602 cached_inc_cxx_tests= |
|
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
4603 cached_inc_longrunning_tests= |
|
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
4604 cached_inc_privileged_tests= |
|
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
4605 cached_inc_unportable_tests= |
|
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
4606 cached_inc_all_tests= |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
4607 cached_avoidlist= |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
4608 cached_sourcebase= |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
4609 cached_m4base= |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
4610 cached_pobase= |
|
6955
7715890c929a
* gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents:
6952
diff
changeset
|
4611 cached_docbase= |
|
6250
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
4612 cached_testsbase= |
|
8890
576d3e4f31c2
Remember the presence of the --with-tests command-line option through
Bruno Haible <bruno@clisp.org>
parents:
8672
diff
changeset
|
4613 cached_inctests= |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
4614 cached_libname= |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
4615 cached_lgpl= |
|
7216
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
4616 cached_makefile_name= |
|
14833
76127af7039f
Finish the conditional dependencies mechanism.
Bruno Haible <bruno@clisp.org>
parents:
14806
diff
changeset
|
4617 cached_cond_dependencies= |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
4618 cached_libtool= |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
4619 cached_macro_prefix= |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
4620 cached_po_domain= |
|
14894
b22360ddefc4
gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents:
14841
diff
changeset
|
4621 cached_witness_c_macro= |
|
9810
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
4622 cached_vc_files= |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
4623 cached_files= |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
4624 if test -f "$destdir"/$m4base/gnulib-cache.m4; then |
| 7077 | 4625 cached_libtool=false |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
4626 my_sed_traces=' |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
4627 s,#.*$,, |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
4628 s,^dnl .*$,, |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
4629 s, dnl .*$,, |
|
7213
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
4630 /gl_LOCAL_DIR(/ { |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
4631 s,^.*gl_LOCAL_DIR([[ ]*\([^]"$`\\)]*\).*$,cached_local_gnulib_path="\1",p |
|
7213
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
4632 } |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
4633 /gl_MODULES(/ { |
|
10293
3c624b3d1039
Make a sed program more robust.
Bruno Haible <bruno@clisp.org>
parents:
10261
diff
changeset
|
4634 ta |
|
10246
50a9076d476d
Make gnulib-cache.m4 easier to diff.
Eric Blake <ebb9@byu.net>
parents:
10157
diff
changeset
|
4635 :a |
|
50a9076d476d
Make gnulib-cache.m4 easier to diff.
Eric Blake <ebb9@byu.net>
parents:
10157
diff
changeset
|
4636 s/)/)/ |
|
50a9076d476d
Make gnulib-cache.m4 easier to diff.
Eric Blake <ebb9@byu.net>
parents:
10157
diff
changeset
|
4637 tb |
|
50a9076d476d
Make gnulib-cache.m4 easier to diff.
Eric Blake <ebb9@byu.net>
parents:
10157
diff
changeset
|
4638 N |
|
50a9076d476d
Make gnulib-cache.m4 easier to diff.
Eric Blake <ebb9@byu.net>
parents:
10157
diff
changeset
|
4639 ba |
|
50a9076d476d
Make gnulib-cache.m4 easier to diff.
Eric Blake <ebb9@byu.net>
parents:
10157
diff
changeset
|
4640 :b |
| 10987 | 4641 s,^.*gl_MODULES([[ ]*\([^]"$`\\)]*\).*$,cached_specified_modules="\1",p |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
4642 } |
|
10744
7fb7b37150b3
New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents:
10743
diff
changeset
|
4643 /gl_WITH_OBSOLETE/ { |
|
7fb7b37150b3
New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents:
10743
diff
changeset
|
4644 s,^.*$,cached_incobsolete=true,p |
|
7fb7b37150b3
New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents:
10743
diff
changeset
|
4645 } |
|
13080
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
4646 /gl_WITH_CXX_TESTS/ { |
|
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
4647 s,^.*$,cached_inc_cxx_tests=true,p |
|
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
4648 } |
|
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
4649 /gl_WITH_LONGRUNNING_TESTS/ { |
|
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
4650 s,^.*$,cached_inc_longrunning_tests=true,p |
|
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
4651 } |
|
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
4652 /gl_WITH_PRIVILEGED_TESTS/ { |
|
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
4653 s,^.*$,cached_inc_privileged_tests=true,p |
|
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
4654 } |
|
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
4655 /gl_WITH_UNPORTABLE_TESTS/ { |
|
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
4656 s,^.*$,cached_inc_unportable_tests=true,p |
|
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
4657 } |
|
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
4658 /gl_WITH_ALL_TESTS/ { |
|
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
4659 s,^.*$,cached_inc_all_tests=true,p |
|
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
4660 } |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
4661 /gl_AVOID(/ { |
| 10987 | 4662 s,^.*gl_AVOID([[ ]*\([^]"$`\\)]*\).*$,cached_avoidlist="\1",p |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
4663 } |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
4664 /gl_SOURCE_BASE(/ { |
| 10987 | 4665 s,^.*gl_SOURCE_BASE([[ ]*\([^]"$`\\)]*\).*$,cached_sourcebase="\1",p |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
4666 } |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
4667 /gl_M4_BASE(/ { |
| 10987 | 4668 s,^.*gl_M4_BASE([[ ]*\([^]"$`\\)]*\).*$,cached_m4base="\1",p |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
4669 } |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
4670 /gl_PO_BASE(/ { |
| 10987 | 4671 s,^.*gl_PO_BASE([[ ]*\([^]"$`\\)]*\).*$,cached_pobase="\1",p |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
4672 } |
|
6955
7715890c929a
* gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents:
6952
diff
changeset
|
4673 /gl_DOC_BASE(/ { |
| 10987 | 4674 s,^.*gl_DOC_BASE([[ ]*\([^]"$`\\)]*\).*$,cached_docbase="\1",p |
|
6955
7715890c929a
* gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents:
6952
diff
changeset
|
4675 } |
|
6250
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
4676 /gl_TESTS_BASE(/ { |
| 10987 | 4677 s,^.*gl_TESTS_BASE([[ ]*\([^]"$`\\)]*\).*$,cached_testsbase="\1",p |
|
6250
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
4678 } |
|
8890
576d3e4f31c2
Remember the presence of the --with-tests command-line option through
Bruno Haible <bruno@clisp.org>
parents:
8672
diff
changeset
|
4679 /gl_WITH_TESTS/ { |
|
576d3e4f31c2
Remember the presence of the --with-tests command-line option through
Bruno Haible <bruno@clisp.org>
parents:
8672
diff
changeset
|
4680 s,^.*$,cached_inctests=true,p |
|
576d3e4f31c2
Remember the presence of the --with-tests command-line option through
Bruno Haible <bruno@clisp.org>
parents:
8672
diff
changeset
|
4681 } |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
4682 /gl_LIB(/ { |
| 10987 | 4683 s,^.*gl_LIB([[ ]*\([^]"$`\\)]*\).*$,cached_libname="\1",p |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
4684 } |
|
9417
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
4685 /gl_LGPL(/ { |
| 10987 | 4686 s,^.*gl_LGPL([[ ]*\([^]"$`\\)]*\).*$,cached_lgpl="\1",p |
|
9417
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
4687 } |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
4688 /gl_LGPL/ { |
|
9417
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
4689 s,^.*$,cached_lgpl=yes,p |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
4690 } |
|
7216
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
4691 /gl_MAKEFILE_NAME(/ { |
| 10987 | 4692 s,^.*gl_MAKEFILE_NAME([[ ]*\([^]"$`\\)]*\).*$,cached_makefile_name="\1",p |
|
7216
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
4693 } |
|
14833
76127af7039f
Finish the conditional dependencies mechanism.
Bruno Haible <bruno@clisp.org>
parents:
14806
diff
changeset
|
4694 /gl_CONDITIONAL_DEPENDENCIES/ { |
|
76127af7039f
Finish the conditional dependencies mechanism.
Bruno Haible <bruno@clisp.org>
parents:
14806
diff
changeset
|
4695 s,^.*$,cached_cond_dependencies=true,p |
|
76127af7039f
Finish the conditional dependencies mechanism.
Bruno Haible <bruno@clisp.org>
parents:
14806
diff
changeset
|
4696 } |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
4697 /gl_LIBTOOL/ { |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
4698 s,^.*$,cached_libtool=true,p |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
4699 } |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
4700 /gl_MACRO_PREFIX(/ { |
| 10987 | 4701 s,^.*gl_MACRO_PREFIX([[ ]*\([^]"$`\\)]*\).*$,cached_macro_prefix="\1",p |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
4702 } |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
4703 /gl_PO_DOMAIN(/ { |
| 10987 | 4704 s,^.*gl_PO_DOMAIN([[ ]*\([^]"$`\\)]*\).*$,cached_po_domain="\1",p |
|
9810
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
4705 } |
|
14894
b22360ddefc4
gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents:
14841
diff
changeset
|
4706 /gl_WITNESS_C_MACRO(/ { |
|
b22360ddefc4
gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents:
14841
diff
changeset
|
4707 s,^.*gl_WITNESS_C_MACRO([[ ]*\([^]"$`\\)]*\).*$,cached_witness_c_macro="\1",p |
|
b22360ddefc4
gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents:
14841
diff
changeset
|
4708 } |
|
9810
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
4709 /gl_VC_FILES(/ { |
| 10987 | 4710 s,^.*gl_VC_FILES([[ ]*\([^]"$`\\)]*\).*$,cached_vc_files="\1",p |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
4711 }' |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
4712 eval `sed -n -e "$my_sed_traces" < "$destdir"/$m4base/gnulib-cache.m4` |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
4713 if test -f "$destdir"/$m4base/gnulib-comp.m4; then |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
4714 my_sed_traces=' |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
4715 s,#.*$,, |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
4716 s,^dnl .*$,, |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
4717 s, dnl .*$,, |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
4718 /AC_DEFUN(\['"${cached_macro_prefix}"'_FILE_LIST\], \[/ { |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
4719 s,^.*$,cached_files=",p |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
4720 n |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
4721 ta |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
4722 :a |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
4723 s,^\]).*$,", |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
4724 tb |
| 10987 | 4725 s,["$`\\],,g |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
4726 p |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
4727 n |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
4728 ba |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
4729 :b |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
4730 p |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
4731 }' |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
4732 eval `sed -n -e "$my_sed_traces" < "$destdir"/$m4base/gnulib-comp.m4` |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
4733 fi |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
4734 fi |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
4735 |
|
13638
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4736 if test "$mode" = import; then |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4737 # In 'import' mode, the new set of specified modules overrides the cached |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4738 # set of modules. Ignore the cached settings. |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4739 specified_modules="$1" |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4740 else |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4741 # Merge the cached settings with the specified ones. |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4742 # The m4base must be the same as expected from the pathname. |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4743 if test -n "$cached_m4base" && test "$cached_m4base" != "$m4base"; then |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4744 func_fatal_error "$m4base/gnulib-cache.m4 is expected to contain gl_M4_BASE([$m4base])" |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4745 fi |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
4746 # The local_gnulib_path defaults to the cached one. Recall that the cached one |
|
13638
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4747 # is relative to $destdir, whereas the one we use is relative to . or absolute. |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
4748 if test -z "$local_gnulib_path"; then |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
4749 func_reconstruct_cached_local_gnulib_path |
|
13638
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4750 fi |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4751 case $mode in |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4752 add-import) |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4753 # Append the cached and the specified module names. So that |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4754 # "gnulib-tool --add-import foo" means to add the module foo. |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4755 specified_modules="$cached_specified_modules $1" |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4756 ;; |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4757 remove-import) |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4758 # Take the cached module names, minus the specified module names. |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4759 specified_modules= |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4760 if $have_associative; then |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4761 # Use an associative array, for O(N) worst-case run time. |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4762 declare -A to_remove |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4763 for m in $1; do |
|
13660
6a2c7d3ca5f0
gnulib-tool: work with NetBSD /bin/sh
Eric Blake <eblake@redhat.com>
parents:
13658
diff
changeset
|
4764 eval 'to_remove[$m]=yes' |
|
13638
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4765 done |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4766 for module in $cached_specified_modules; do |
|
13660
6a2c7d3ca5f0
gnulib-tool: work with NetBSD /bin/sh
Eric Blake <eblake@redhat.com>
parents:
13658
diff
changeset
|
4767 if eval 'test -z "${to_remove[$module]}"'; then |
|
13638
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4768 func_append specified_modules "$module " |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4769 fi |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4770 done |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4771 else |
|
18109
244355088b86
maint: add coding cookies to non-ASCII sources
Paul Eggert <eggert@cs.ucla.edu>
parents:
18080
diff
changeset
|
4772 # This loop has O(N**2) worst-case run time. |
|
13638
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4773 for module in $cached_specified_modules; do |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4774 to_remove= |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4775 for m in $1; do |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4776 if test "$m" = "$module"; then |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4777 to_remove=yes |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4778 break |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4779 fi |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4780 done |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4781 if test -z "$to_remove"; then |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4782 func_append specified_modules "$module " |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4783 fi |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4784 done |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4785 fi |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4786 ;; |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4787 update) |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4788 # Take the cached module names. There are no specified module names. |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4789 specified_modules="$cached_specified_modules" |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4790 ;; |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4791 esac |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4792 # Included obsolete modules among the dependencies if specified either way. |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4793 if test -z "$incobsolete"; then |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4794 incobsolete="$cached_incobsolete" |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4795 fi |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4796 # Included special kinds of tests modules among the dependencies if specified |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4797 # either way. |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4798 if test -z "$inc_cxx_tests"; then |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4799 inc_cxx_tests="$cached_inc_cxx_tests" |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4800 fi |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4801 if test -z "$inc_longrunning_tests"; then |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4802 inc_longrunning_tests="$cached_inc_longrunning_tests" |
|
7213
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
4803 fi |
|
13638
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4804 if test -z "$inc_privileged_tests"; then |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4805 inc_privileged_tests="$cached_inc_privileged_tests" |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4806 fi |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4807 if test -z "$inc_unportable_tests"; then |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4808 inc_unportable_tests="$cached_inc_unportable_tests" |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4809 fi |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4810 if test -z "$inc_all_tests"; then |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4811 inc_all_tests="$cached_inc_all_tests" |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4812 fi |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4813 # Append the cached and the specified avoidlist. This is probably better |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4814 # than dropping the cached one when --avoid is specified at least once. |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4815 avoidlist=`for m in $cached_avoidlist $avoidlist; do echo $m; done | LC_ALL=C sort -u` |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4816 avoidlist=`echo $avoidlist` |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4817 |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4818 # The sourcebase defaults to the cached one. |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4819 if test -z "$sourcebase"; then |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4820 sourcebase="$cached_sourcebase" |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4821 if test -z "$sourcebase"; then |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4822 func_fatal_error "missing --source-base option" |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4823 fi |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4824 fi |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4825 # The pobase defaults to the cached one. |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4826 if test -z "$pobase"; then |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4827 pobase="$cached_pobase" |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4828 fi |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4829 # The docbase defaults to the cached one. |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4830 if test -z "$docbase"; then |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4831 docbase="$cached_docbase" |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4832 if test -z "$docbase"; then |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4833 func_fatal_error "missing --doc-base option. --doc-base has been introduced on 2006-07-11; if your last invocation of 'gnulib-tool --import' is before that date, you need to run 'gnulib-tool --import' once, with a --doc-base option." |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4834 fi |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4835 fi |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4836 # The testsbase defaults to the cached one. |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4837 if test -z "$testsbase"; then |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4838 testsbase="$cached_testsbase" |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4839 if test -z "$testsbase"; then |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4840 func_fatal_error "missing --tests-base option" |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4841 fi |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4842 fi |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4843 # Require the tests if specified either way. |
|
16932
48e8f0679448
gnulib-tool: Refactor inctests variable.
Bruno Haible <bruno@clisp.org>
parents:
16931
diff
changeset
|
4844 if ! $inctests; then |
|
13638
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4845 inctests="$cached_inctests" |
|
16932
48e8f0679448
gnulib-tool: Refactor inctests variable.
Bruno Haible <bruno@clisp.org>
parents:
16931
diff
changeset
|
4846 if test -z "$inctests"; then |
|
48e8f0679448
gnulib-tool: Refactor inctests variable.
Bruno Haible <bruno@clisp.org>
parents:
16931
diff
changeset
|
4847 inctests=false |
|
48e8f0679448
gnulib-tool: Refactor inctests variable.
Bruno Haible <bruno@clisp.org>
parents:
16931
diff
changeset
|
4848 fi |
|
13638
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4849 fi |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4850 # The libname defaults to the cached one. |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4851 if test -z "$supplied_libname"; then |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4852 libname="$cached_libname" |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4853 if test -z "$libname"; then |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4854 func_fatal_error "missing --lib option" |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4855 fi |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4856 fi |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4857 # Require LGPL if specified either way. |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4858 if test -z "$lgpl"; then |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4859 lgpl="$cached_lgpl" |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4860 fi |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4861 # The makefile_name defaults to the cached one. |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4862 if test -z "$makefile_name"; then |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4863 makefile_name="$cached_makefile_name" |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4864 fi |
|
14833
76127af7039f
Finish the conditional dependencies mechanism.
Bruno Haible <bruno@clisp.org>
parents:
14806
diff
changeset
|
4865 # Use conditional dependencies if specified either way. |
|
76127af7039f
Finish the conditional dependencies mechanism.
Bruno Haible <bruno@clisp.org>
parents:
14806
diff
changeset
|
4866 if test -z "$cond_dependencies"; then |
|
76127af7039f
Finish the conditional dependencies mechanism.
Bruno Haible <bruno@clisp.org>
parents:
14806
diff
changeset
|
4867 cond_dependencies="$cached_cond_dependencies" |
|
76127af7039f
Finish the conditional dependencies mechanism.
Bruno Haible <bruno@clisp.org>
parents:
14806
diff
changeset
|
4868 fi |
|
13638
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4869 # Use libtool if specified either way, or if guessed. |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4870 if test -z "$libtool"; then |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4871 if test -n "$cached_m4base"; then |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4872 libtool="$cached_libtool" |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4873 else |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4874 libtool="$guessed_libtool" |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4875 fi |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4876 fi |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4877 # The macro_prefix defaults to the cached one. |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4878 if test -z "$macro_prefix"; then |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4879 macro_prefix="$cached_macro_prefix" |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4880 if test -z "$macro_prefix"; then |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4881 func_fatal_error "missing --macro-prefix option" |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4882 fi |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4883 fi |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4884 # The po_domain defaults to the cached one. |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4885 if test -z "$po_domain"; then |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4886 po_domain="$cached_po_domain" |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4887 fi |
|
14894
b22360ddefc4
gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents:
14841
diff
changeset
|
4888 # The witness_c_macro defaults to the cached one. |
|
b22360ddefc4
gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents:
14841
diff
changeset
|
4889 if test -z "$witness_c_macro"; then |
|
b22360ddefc4
gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents:
14841
diff
changeset
|
4890 witness_c_macro="$cached_witness_c_macro" |
|
b22360ddefc4
gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents:
14841
diff
changeset
|
4891 fi |
|
13638
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4892 # The vc_files defaults to the cached one. |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4893 if test -z "$vc_files"; then |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4894 vc_files="$cached_vc_files" |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
4895 fi |
|
14833
76127af7039f
Finish the conditional dependencies mechanism.
Bruno Haible <bruno@clisp.org>
parents:
14806
diff
changeset
|
4896 # Ensure constraints. |
|
16932
48e8f0679448
gnulib-tool: Refactor inctests variable.
Bruno Haible <bruno@clisp.org>
parents:
16931
diff
changeset
|
4897 if test "$cond_dependencies" = true && $inctests; then |
|
14833
76127af7039f
Finish the conditional dependencies mechanism.
Bruno Haible <bruno@clisp.org>
parents:
14806
diff
changeset
|
4898 echo "gnulib-tool: option --conditional-dependencies is not supported with --with-tests" 1>&2 |
|
76127af7039f
Finish the conditional dependencies mechanism.
Bruno Haible <bruno@clisp.org>
parents:
14806
diff
changeset
|
4899 func_exit 1 |
|
76127af7039f
Finish the conditional dependencies mechanism.
Bruno Haible <bruno@clisp.org>
parents:
14806
diff
changeset
|
4900 fi |
|
13080
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
4901 fi |
|
13263
e7d114c00ff9
gnulib-tool: Add --without-*-tests options.
Bruno Haible <bruno@clisp.org>
parents:
13223
diff
changeset
|
4902 # --without-*-tests options are not supported here. |
|
e7d114c00ff9
gnulib-tool: Add --without-*-tests options.
Bruno Haible <bruno@clisp.org>
parents:
13223
diff
changeset
|
4903 excl_cxx_tests= |
|
e7d114c00ff9
gnulib-tool: Add --without-*-tests options.
Bruno Haible <bruno@clisp.org>
parents:
13223
diff
changeset
|
4904 excl_longrunning_tests= |
|
e7d114c00ff9
gnulib-tool: Add --without-*-tests options.
Bruno Haible <bruno@clisp.org>
parents:
13223
diff
changeset
|
4905 excl_privileged_tests= |
|
e7d114c00ff9
gnulib-tool: Add --without-*-tests options.
Bruno Haible <bruno@clisp.org>
parents:
13223
diff
changeset
|
4906 excl_unportable_tests= |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
4907 |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
4908 # Canonicalize the list of specified modules. |
|
7319
1726cc39709b
Use "sort -u" where it makes sense.
Bruno Haible <bruno@clisp.org>
parents:
7299
diff
changeset
|
4909 specified_modules=`for m in $specified_modules; do echo $m; done | LC_ALL=C sort -u` |
|
5347
0318c37925dc
Move duplicated code into function func_modules_transitive_closure().
Bruno Haible <bruno@clisp.org>
parents:
5346
diff
changeset
|
4910 |
|
13264
d66e74e6fe48
gnulib-tool: Don't include hairy tests of dependencies in testdirs.
Bruno Haible <bruno@clisp.org>
parents:
13263
diff
changeset
|
4911 # Include all kinds of tests modules if --with-all-tests was specified. |
|
d66e74e6fe48
gnulib-tool: Don't include hairy tests of dependencies in testdirs.
Bruno Haible <bruno@clisp.org>
parents:
13263
diff
changeset
|
4912 inc_all_direct_tests="$inc_all_tests" |
|
d66e74e6fe48
gnulib-tool: Don't include hairy tests of dependencies in testdirs.
Bruno Haible <bruno@clisp.org>
parents:
13263
diff
changeset
|
4913 inc_all_indirect_tests="$inc_all_tests" |
|
d66e74e6fe48
gnulib-tool: Don't include hairy tests of dependencies in testdirs.
Bruno Haible <bruno@clisp.org>
parents:
13263
diff
changeset
|
4914 |
|
5347
0318c37925dc
Move duplicated code into function func_modules_transitive_closure().
Bruno Haible <bruno@clisp.org>
parents:
5346
diff
changeset
|
4915 # Determine final module list. |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
4916 modules="$specified_modules" |
|
5347
0318c37925dc
Move duplicated code into function func_modules_transitive_closure().
Bruno Haible <bruno@clisp.org>
parents:
5346
diff
changeset
|
4917 func_modules_transitive_closure |
|
9188
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
4918 if test $verbose -ge 0; then |
|
13420
2291a2f3d56c
gnulib-tool: Display specified modules and dependencies differently.
Bruno Haible <bruno@clisp.org>
parents:
13419
diff
changeset
|
4919 func_show_module_list |
|
9188
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
4920 fi |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4921 final_modules="$modules" |
|
5345
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
4922 |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4923 # Determine main module list and tests-related module list separately. |
|
14836
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
4924 func_modules_transitive_closure_separately |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4925 |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4926 # Determine whether a $testsbase/libtests.a is needed. |
|
14836
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
4927 func_determine_use_libtests |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
4928 |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
4929 # Add the dummy module to the main module list or to the tests-related module |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
4930 # list if needed. |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
4931 func_modules_add_dummy_separately |
|
6550
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
4932 |
|
7235
3dbbe645b976
* MODULES.html.sh (Support for building documentation): Add gpl, lgpl.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7222
diff
changeset
|
4933 # If --lgpl, verify that the licenses of modules are compatible. |
|
5345
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
4934 if test -n "$lgpl"; then |
|
10479
74885eaea206
Report all license incompatibilities during --import.
Bruno Haible <bruno@clisp.org>
parents:
10478
diff
changeset
|
4935 license_incompatibilities= |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4936 for module in $main_modules; do |
| 5346 | 4937 license=`func_get_license $module` |
|
5963
6fb8c48c4dcd
* gnulib-tool (func_import): Add support for 'public domain' license.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5848
diff
changeset
|
4938 case $license in |
|
9417
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
4939 'GPLed build tool') ;; |
| 7245 | 4940 'public domain' | 'unlimited' | 'unmodifiable license text') ;; |
|
9417
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
4941 *) |
|
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
4942 case "$lgpl" in |
|
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
4943 yes | 3) |
|
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
4944 case $license in |
|
18501
9012a151a519
gnulib-tool: Support for the dual "LGPLv3+ or GPLv2" license.
Bruno Haible <bruno@clisp.org>
parents:
18474
diff
changeset
|
4945 LGPLv2+ | 'LGPLv3+ or GPLv2' | LGPLv3+ | LGPL) ;; |
|
9012a151a519
gnulib-tool: Support for the dual "LGPLv3+ or GPLv2" license.
Bruno Haible <bruno@clisp.org>
parents:
18474
diff
changeset
|
4946 *) func_append license_incompatibilities "$module $license$nl" ;; |
|
9012a151a519
gnulib-tool: Support for the dual "LGPLv3+ or GPLv2" license.
Bruno Haible <bruno@clisp.org>
parents:
18474
diff
changeset
|
4947 esac |
|
9012a151a519
gnulib-tool: Support for the dual "LGPLv3+ or GPLv2" license.
Bruno Haible <bruno@clisp.org>
parents:
18474
diff
changeset
|
4948 ;; |
|
9012a151a519
gnulib-tool: Support for the dual "LGPLv3+ or GPLv2" license.
Bruno Haible <bruno@clisp.org>
parents:
18474
diff
changeset
|
4949 3orGPLv2) |
|
9012a151a519
gnulib-tool: Support for the dual "LGPLv3+ or GPLv2" license.
Bruno Haible <bruno@clisp.org>
parents:
18474
diff
changeset
|
4950 case $license in |
|
9012a151a519
gnulib-tool: Support for the dual "LGPLv3+ or GPLv2" license.
Bruno Haible <bruno@clisp.org>
parents:
18474
diff
changeset
|
4951 LGPLv2+ | 'LGPLv3+ or GPLv2') ;; |
|
10479
74885eaea206
Report all license incompatibilities during --import.
Bruno Haible <bruno@clisp.org>
parents:
10478
diff
changeset
|
4952 *) func_append license_incompatibilities "$module $license$nl" ;; |
|
9417
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
4953 esac |
|
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
4954 ;; |
|
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
4955 2) |
|
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
4956 case $license in |
|
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
4957 LGPLv2+) ;; |
|
10479
74885eaea206
Report all license incompatibilities during --import.
Bruno Haible <bruno@clisp.org>
parents:
10478
diff
changeset
|
4958 *) func_append license_incompatibilities "$module $license$nl" ;; |
|
9417
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
4959 esac |
|
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
4960 ;; |
|
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
4961 *) func_fatal_error "invalid value lgpl=$lgpl" ;; |
|
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
4962 esac |
|
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
4963 ;; |
|
5963
6fb8c48c4dcd
* gnulib-tool (func_import): Add support for 'public domain' license.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5848
diff
changeset
|
4964 esac |
|
5345
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
4965 done |
|
10479
74885eaea206
Report all license incompatibilities during --import.
Bruno Haible <bruno@clisp.org>
parents:
10478
diff
changeset
|
4966 if test -n "$license_incompatibilities"; then |
|
74885eaea206
Report all license incompatibilities during --import.
Bruno Haible <bruno@clisp.org>
parents:
10478
diff
changeset
|
4967 # Format the license incompatibilities as a table. |
|
74885eaea206
Report all license incompatibilities during --import.
Bruno Haible <bruno@clisp.org>
parents:
10478
diff
changeset
|
4968 sed_expand_column1_width50_indent17='s,^\([^ ]*\) ,\1 , |
|
74885eaea206
Report all license incompatibilities during --import.
Bruno Haible <bruno@clisp.org>
parents:
10478
diff
changeset
|
4969 s,^\(.................................................[^ ]*\) *, \1 ,' |
|
74885eaea206
Report all license incompatibilities during --import.
Bruno Haible <bruno@clisp.org>
parents:
10478
diff
changeset
|
4970 license_incompatibilities=`echo "$license_incompatibilities" | sed -e "$sed_expand_column1_width50_indent17"` |
|
74885eaea206
Report all license incompatibilities during --import.
Bruno Haible <bruno@clisp.org>
parents:
10478
diff
changeset
|
4971 func_fatal_error "incompatible license on modules:$nl$license_incompatibilities" |
|
74885eaea206
Report all license incompatibilities during --import.
Bruno Haible <bruno@clisp.org>
parents:
10478
diff
changeset
|
4972 fi |
|
5345
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
4973 fi |
|
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
4974 |
|
9189
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
4975 # Show banner notice of every module. |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4976 modules="$main_modules" |
|
9189
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
4977 func_modules_notice |
|
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
4978 |
|
7199
85ef7b18536b
New config-h module, so that "make" output needn't be cluttered
Paul Eggert <eggert@cs.ucla.edu>
parents:
7195
diff
changeset
|
4979 # Determine script to apply to imported library files. |
|
85ef7b18536b
New config-h module, so that "make" output needn't be cluttered
Paul Eggert <eggert@cs.ucla.edu>
parents:
7195
diff
changeset
|
4980 sed_transform_lib_file= |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4981 for module in $main_modules; do |
| 7245 | 4982 if test $module = config-h; then |
|
7199
85ef7b18536b
New config-h module, so that "make" output needn't be cluttered
Paul Eggert <eggert@cs.ucla.edu>
parents:
7195
diff
changeset
|
4983 # Assume config.h exists, and that -DHAVE_CONFIG_H is omitted. |
|
85ef7b18536b
New config-h module, so that "make" output needn't be cluttered
Paul Eggert <eggert@cs.ucla.edu>
parents:
7195
diff
changeset
|
4984 sed_transform_lib_file=$sed_transform_lib_file' |
| 7245 | 4985 s/^#ifdef[ ]*HAVE_CONFIG_H[ ]*$/#if 1/ |
| 4986 ' | |
| 4987 break | |
| 4988 fi | |
| 4989 done | |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4990 sed_transform_main_lib_file="$sed_transform_lib_file" |
|
9096
7f1880b27b89
New gnulib-tool option --more-symlinks.
Bruno Haible <bruno@clisp.org>
parents:
9090
diff
changeset
|
4991 if test -n "$do_copyrights"; then |
|
7f1880b27b89
New gnulib-tool option --more-symlinks.
Bruno Haible <bruno@clisp.org>
parents:
9090
diff
changeset
|
4992 if test -n "$lgpl"; then |
|
7f1880b27b89
New gnulib-tool option --more-symlinks.
Bruno Haible <bruno@clisp.org>
parents:
9090
diff
changeset
|
4993 # Update license. |
|
9417
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
4994 case "$lgpl" in |
|
18542
017f1e6e1dd1
gnulib-tool: properly list the LGPL3orGPLv2 license
Nikos Mavrogiannopoulos <nmav@gnutls.org>
parents:
18501
diff
changeset
|
4995 yes | 3) |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4996 sed_transform_main_lib_file=$sed_transform_main_lib_file' |
|
9417
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
4997 s/GNU General/GNU Lesser General/g |
|
14323
c1410c31aa51
gnulib-tool: Make copyright notice adjustment more robust.
Bruno Haible <bruno@clisp.org>
parents:
14273
diff
changeset
|
4998 s/General Public License/Lesser General Public License/g |
|
c1410c31aa51
gnulib-tool: Make copyright notice adjustment more robust.
Bruno Haible <bruno@clisp.org>
parents:
14273
diff
changeset
|
4999 s/Lesser Lesser General Public License/Lesser General Public License/g |
|
9417
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
5000 ' |
|
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
5001 ;; |
|
18542
017f1e6e1dd1
gnulib-tool: properly list the LGPL3orGPLv2 license
Nikos Mavrogiannopoulos <nmav@gnutls.org>
parents:
18501
diff
changeset
|
5002 3orGPLv2) |
|
017f1e6e1dd1
gnulib-tool: properly list the LGPL3orGPLv2 license
Nikos Mavrogiannopoulos <nmav@gnutls.org>
parents:
18501
diff
changeset
|
5003 sed_transform_main_lib_file=$sed_transform_main_lib_file' |
|
18544
38ff2272f689
gnulib-tool: fix the previous change
Daiki Ueno <ueno@gnu.org>
parents:
18543
diff
changeset
|
5004 /^ *This program is free software/i\ |
|
38ff2272f689
gnulib-tool: fix the previous change
Daiki Ueno <ueno@gnu.org>
parents:
18543
diff
changeset
|
5005 This program is free software: you can redistribute it and\/or\ |
|
38ff2272f689
gnulib-tool: fix the previous change
Daiki Ueno <ueno@gnu.org>
parents:
18543
diff
changeset
|
5006 modify it under the terms of either:\ |
|
18542
017f1e6e1dd1
gnulib-tool: properly list the LGPL3orGPLv2 license
Nikos Mavrogiannopoulos <nmav@gnutls.org>
parents:
18501
diff
changeset
|
5007 \ |
|
017f1e6e1dd1
gnulib-tool: properly list the LGPL3orGPLv2 license
Nikos Mavrogiannopoulos <nmav@gnutls.org>
parents:
18501
diff
changeset
|
5008 * the GNU Lesser General Public License as published by the Free\ |
|
017f1e6e1dd1
gnulib-tool: properly list the LGPL3orGPLv2 license
Nikos Mavrogiannopoulos <nmav@gnutls.org>
parents:
18501
diff
changeset
|
5009 Software Foundation; either version 3 of the License, or (at your\ |
|
017f1e6e1dd1
gnulib-tool: properly list the LGPL3orGPLv2 license
Nikos Mavrogiannopoulos <nmav@gnutls.org>
parents:
18501
diff
changeset
|
5010 option) any later version.\ |
|
017f1e6e1dd1
gnulib-tool: properly list the LGPL3orGPLv2 license
Nikos Mavrogiannopoulos <nmav@gnutls.org>
parents:
18501
diff
changeset
|
5011 \ |
|
017f1e6e1dd1
gnulib-tool: properly list the LGPL3orGPLv2 license
Nikos Mavrogiannopoulos <nmav@gnutls.org>
parents:
18501
diff
changeset
|
5012 or\ |
|
017f1e6e1dd1
gnulib-tool: properly list the LGPL3orGPLv2 license
Nikos Mavrogiannopoulos <nmav@gnutls.org>
parents:
18501
diff
changeset
|
5013 \ |
|
017f1e6e1dd1
gnulib-tool: properly list the LGPL3orGPLv2 license
Nikos Mavrogiannopoulos <nmav@gnutls.org>
parents:
18501
diff
changeset
|
5014 * the GNU General Public License as published by the Free\ |
|
017f1e6e1dd1
gnulib-tool: properly list the LGPL3orGPLv2 license
Nikos Mavrogiannopoulos <nmav@gnutls.org>
parents:
18501
diff
changeset
|
5015 Software Foundation; either version 2 of the License, or (at your\ |
|
017f1e6e1dd1
gnulib-tool: properly list the LGPL3orGPLv2 license
Nikos Mavrogiannopoulos <nmav@gnutls.org>
parents:
18501
diff
changeset
|
5016 option) any later version.\ |
|
017f1e6e1dd1
gnulib-tool: properly list the LGPL3orGPLv2 license
Nikos Mavrogiannopoulos <nmav@gnutls.org>
parents:
18501
diff
changeset
|
5017 \ |
|
017f1e6e1dd1
gnulib-tool: properly list the LGPL3orGPLv2 license
Nikos Mavrogiannopoulos <nmav@gnutls.org>
parents:
18501
diff
changeset
|
5018 or both in parallel, as here. |
|
18544
38ff2272f689
gnulib-tool: fix the previous change
Daiki Ueno <ueno@gnu.org>
parents:
18543
diff
changeset
|
5019 /^ *This program is free software/,/^$/d |
|
18542
017f1e6e1dd1
gnulib-tool: properly list the LGPL3orGPLv2 license
Nikos Mavrogiannopoulos <nmav@gnutls.org>
parents:
18501
diff
changeset
|
5020 ' |
|
017f1e6e1dd1
gnulib-tool: properly list the LGPL3orGPLv2 license
Nikos Mavrogiannopoulos <nmav@gnutls.org>
parents:
18501
diff
changeset
|
5021 ;; |
|
9417
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
5022 2) |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
5023 sed_transform_main_lib_file=$sed_transform_main_lib_file' |
|
9417
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
5024 s/GNU General/GNU Lesser General/g |
|
14323
c1410c31aa51
gnulib-tool: Make copyright notice adjustment more robust.
Bruno Haible <bruno@clisp.org>
parents:
14273
diff
changeset
|
5025 s/General Public License/Lesser General Public License/g |
|
c1410c31aa51
gnulib-tool: Make copyright notice adjustment more robust.
Bruno Haible <bruno@clisp.org>
parents:
14273
diff
changeset
|
5026 s/Lesser Lesser General Public License/Lesser General Public License/g |
|
c1410c31aa51
gnulib-tool: Make copyright notice adjustment more robust.
Bruno Haible <bruno@clisp.org>
parents:
14273
diff
changeset
|
5027 |
|
9417
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
5028 s/version [23]\([ ,]\)/version 2.1\1/g |
|
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
5029 ' |
|
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
5030 ;; |
|
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
5031 *) func_fatal_error "invalid value lgpl=$lgpl" ;; |
|
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
5032 esac |
|
9424
d852c1c185e4
If --lgpl is not specified, convert copyright headers to GPLv3+.
Bruno Haible <bruno@clisp.org>
parents:
9417
diff
changeset
|
5033 else |
|
d852c1c185e4
If --lgpl is not specified, convert copyright headers to GPLv3+.
Bruno Haible <bruno@clisp.org>
parents:
9417
diff
changeset
|
5034 # Update license. |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
5035 sed_transform_main_lib_file=$sed_transform_main_lib_file' |
|
9424
d852c1c185e4
If --lgpl is not specified, convert copyright headers to GPLv3+.
Bruno Haible <bruno@clisp.org>
parents:
9417
diff
changeset
|
5036 s/GNU Lesser General/GNU General/g |
|
14323
c1410c31aa51
gnulib-tool: Make copyright notice adjustment more robust.
Bruno Haible <bruno@clisp.org>
parents:
14273
diff
changeset
|
5037 s/Lesser General Public License/General Public License/g |
|
c1410c31aa51
gnulib-tool: Make copyright notice adjustment more robust.
Bruno Haible <bruno@clisp.org>
parents:
14273
diff
changeset
|
5038 |
|
9424
d852c1c185e4
If --lgpl is not specified, convert copyright headers to GPLv3+.
Bruno Haible <bruno@clisp.org>
parents:
9417
diff
changeset
|
5039 s/GNU Library General/GNU General/g |
|
14323
c1410c31aa51
gnulib-tool: Make copyright notice adjustment more robust.
Bruno Haible <bruno@clisp.org>
parents:
14273
diff
changeset
|
5040 s/Library General Public License/General Public License/g |
|
c1410c31aa51
gnulib-tool: Make copyright notice adjustment more robust.
Bruno Haible <bruno@clisp.org>
parents:
14273
diff
changeset
|
5041 |
|
11592
345504ca672e
gnulib-tool: Don't use non-POSIX regexps.
Simon Josefsson <simon@josefsson.org>
parents:
11560
diff
changeset
|
5042 s/version 2\(.1\)\{0,1\}\([ ,]\)/version 3\2/g |
|
9424
d852c1c185e4
If --lgpl is not specified, convert copyright headers to GPLv3+.
Bruno Haible <bruno@clisp.org>
parents:
9417
diff
changeset
|
5043 ' |
|
9096
7f1880b27b89
New gnulib-tool option --more-symlinks.
Bruno Haible <bruno@clisp.org>
parents:
9090
diff
changeset
|
5044 fi |
|
7199
85ef7b18536b
New config-h module, so that "make" output needn't be cluttered
Paul Eggert <eggert@cs.ucla.edu>
parents:
7195
diff
changeset
|
5045 fi |
|
85ef7b18536b
New config-h module, so that "make" output needn't be cluttered
Paul Eggert <eggert@cs.ucla.edu>
parents:
7195
diff
changeset
|
5046 |
|
11594
36af7f748bb9
Don't do HAVE_CONFIG_H replacements on build-aux/ files.
Bruno Haible <bruno@clisp.org>
parents:
11593
diff
changeset
|
5047 # Determine script to apply to auxiliary files that go into $auxdir/. |
|
36af7f748bb9
Don't do HAVE_CONFIG_H replacements on build-aux/ files.
Bruno Haible <bruno@clisp.org>
parents:
11593
diff
changeset
|
5048 sed_transform_build_aux_file= |
|
11593
476a58fbc9b9
gnulib-tool: Transform license on build-aux/ files too.
Simon Josefsson <simon@josefsson.org>
parents:
11592
diff
changeset
|
5049 if test -n "$do_copyrights"; then |
|
476a58fbc9b9
gnulib-tool: Transform license on build-aux/ files too.
Simon Josefsson <simon@josefsson.org>
parents:
11592
diff
changeset
|
5050 # Update license. |
|
476a58fbc9b9
gnulib-tool: Transform license on build-aux/ files too.
Simon Josefsson <simon@josefsson.org>
parents:
11592
diff
changeset
|
5051 sed_transform_build_aux_file=$sed_transform_build_aux_file' |
|
476a58fbc9b9
gnulib-tool: Transform license on build-aux/ files too.
Simon Josefsson <simon@josefsson.org>
parents:
11592
diff
changeset
|
5052 s/GNU Lesser General/GNU General/g |
|
14323
c1410c31aa51
gnulib-tool: Make copyright notice adjustment more robust.
Bruno Haible <bruno@clisp.org>
parents:
14273
diff
changeset
|
5053 s/Lesser General Public License/General Public License/g |
|
c1410c31aa51
gnulib-tool: Make copyright notice adjustment more robust.
Bruno Haible <bruno@clisp.org>
parents:
14273
diff
changeset
|
5054 |
|
11593
476a58fbc9b9
gnulib-tool: Transform license on build-aux/ files too.
Simon Josefsson <simon@josefsson.org>
parents:
11592
diff
changeset
|
5055 s/GNU Library General/GNU General/g |
|
14323
c1410c31aa51
gnulib-tool: Make copyright notice adjustment more robust.
Bruno Haible <bruno@clisp.org>
parents:
14273
diff
changeset
|
5056 s/Library General Public License/General Public License/g |
|
c1410c31aa51
gnulib-tool: Make copyright notice adjustment more robust.
Bruno Haible <bruno@clisp.org>
parents:
14273
diff
changeset
|
5057 |
|
11593
476a58fbc9b9
gnulib-tool: Transform license on build-aux/ files too.
Simon Josefsson <simon@josefsson.org>
parents:
11592
diff
changeset
|
5058 s/version 2\(.1\)\{0,1\}\([ ,]\)/version 3\2/g |
|
476a58fbc9b9
gnulib-tool: Transform license on build-aux/ files too.
Simon Josefsson <simon@josefsson.org>
parents:
11592
diff
changeset
|
5059 ' |
|
476a58fbc9b9
gnulib-tool: Transform license on build-aux/ files too.
Simon Josefsson <simon@josefsson.org>
parents:
11592
diff
changeset
|
5060 fi |
|
476a58fbc9b9
gnulib-tool: Transform license on build-aux/ files too.
Simon Josefsson <simon@josefsson.org>
parents:
11592
diff
changeset
|
5061 |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
5062 # Determine script to apply to library files that go into $testsbase/. |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
5063 sed_transform_testsrelated_lib_file="$sed_transform_lib_file" |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
5064 if test -n "$do_copyrights"; then |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
5065 # Update license. |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
5066 sed_transform_testsrelated_lib_file=$sed_transform_testsrelated_lib_file' |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
5067 s/GNU Lesser General/GNU General/g |
|
14323
c1410c31aa51
gnulib-tool: Make copyright notice adjustment more robust.
Bruno Haible <bruno@clisp.org>
parents:
14273
diff
changeset
|
5068 s/Lesser General Public License/General Public License/g |
|
c1410c31aa51
gnulib-tool: Make copyright notice adjustment more robust.
Bruno Haible <bruno@clisp.org>
parents:
14273
diff
changeset
|
5069 |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
5070 s/GNU Library General/GNU General/g |
|
14323
c1410c31aa51
gnulib-tool: Make copyright notice adjustment more robust.
Bruno Haible <bruno@clisp.org>
parents:
14273
diff
changeset
|
5071 s/Library General Public License/General Public License/g |
|
c1410c31aa51
gnulib-tool: Make copyright notice adjustment more robust.
Bruno Haible <bruno@clisp.org>
parents:
14273
diff
changeset
|
5072 |
|
11592
345504ca672e
gnulib-tool: Don't use non-POSIX regexps.
Simon Josefsson <simon@josefsson.org>
parents:
11560
diff
changeset
|
5073 s/version 2\(.1\)\{0,1\}\([ ,]\)/version 3\2/g |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
5074 ' |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
5075 fi |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
5076 |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
5077 # Determine the final file lists. |
|
14836
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
5078 func_modules_to_filelist_separately |
|
5345
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
5079 |
|
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
5080 test -n "$files" \ |
|
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
5081 || func_fatal_error "refusing to do nothing" |
|
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
5082 |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
5083 # Add m4/gnulib-tool.m4 to the file list. It is not part of any module. |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
5084 new_files="$files m4/gnulib-tool.m4" |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
5085 old_files="$cached_files" |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
5086 if test -f "$destdir"/$m4base/gnulib-tool.m4; then |
|
7323
7ca0e325d5db
Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents:
7322
diff
changeset
|
5087 func_append old_files " m4/gnulib-tool.m4" |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
5088 fi |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
5089 |
|
11560
987b2dec97b7
Fix the rewriting rules for file names.
Bruno Haible <bruno@clisp.org>
parents:
11533
diff
changeset
|
5090 rewritten='%REWRITTEN%' |
|
7605
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
5091 sed_rewrite_old_files="\ |
|
11560
987b2dec97b7
Fix the rewriting rules for file names.
Bruno Haible <bruno@clisp.org>
parents:
11533
diff
changeset
|
5092 s,^build-aux/,$rewritten$auxdir/, |
|
987b2dec97b7
Fix the rewriting rules for file names.
Bruno Haible <bruno@clisp.org>
parents:
11533
diff
changeset
|
5093 s,^doc/,$rewritten$cached_docbase/, |
|
987b2dec97b7
Fix the rewriting rules for file names.
Bruno Haible <bruno@clisp.org>
parents:
11533
diff
changeset
|
5094 s,^lib/,$rewritten$cached_sourcebase/, |
|
987b2dec97b7
Fix the rewriting rules for file names.
Bruno Haible <bruno@clisp.org>
parents:
11533
diff
changeset
|
5095 s,^m4/,$rewritten$cached_m4base/, |
|
987b2dec97b7
Fix the rewriting rules for file names.
Bruno Haible <bruno@clisp.org>
parents:
11533
diff
changeset
|
5096 s,^tests/,$rewritten$cached_testsbase/, |
|
987b2dec97b7
Fix the rewriting rules for file names.
Bruno Haible <bruno@clisp.org>
parents:
11533
diff
changeset
|
5097 s,^tests=lib/,$rewritten$cached_testsbase/, |
|
987b2dec97b7
Fix the rewriting rules for file names.
Bruno Haible <bruno@clisp.org>
parents:
11533
diff
changeset
|
5098 s,^top/,$rewritten, |
|
987b2dec97b7
Fix the rewriting rules for file names.
Bruno Haible <bruno@clisp.org>
parents:
11533
diff
changeset
|
5099 s,^$rewritten,," |
|
7605
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
5100 sed_rewrite_new_files="\ |
|
11560
987b2dec97b7
Fix the rewriting rules for file names.
Bruno Haible <bruno@clisp.org>
parents:
11533
diff
changeset
|
5101 s,^build-aux/,$rewritten$auxdir/, |
|
987b2dec97b7
Fix the rewriting rules for file names.
Bruno Haible <bruno@clisp.org>
parents:
11533
diff
changeset
|
5102 s,^doc/,$rewritten$docbase/, |
|
987b2dec97b7
Fix the rewriting rules for file names.
Bruno Haible <bruno@clisp.org>
parents:
11533
diff
changeset
|
5103 s,^lib/,$rewritten$sourcebase/, |
|
987b2dec97b7
Fix the rewriting rules for file names.
Bruno Haible <bruno@clisp.org>
parents:
11533
diff
changeset
|
5104 s,^m4/,$rewritten$m4base/, |
|
987b2dec97b7
Fix the rewriting rules for file names.
Bruno Haible <bruno@clisp.org>
parents:
11533
diff
changeset
|
5105 s,^tests/,$rewritten$testsbase/, |
|
987b2dec97b7
Fix the rewriting rules for file names.
Bruno Haible <bruno@clisp.org>
parents:
11533
diff
changeset
|
5106 s,^tests=lib/,$rewritten$testsbase/, |
|
987b2dec97b7
Fix the rewriting rules for file names.
Bruno Haible <bruno@clisp.org>
parents:
11533
diff
changeset
|
5107 s,^top/,$rewritten, |
|
987b2dec97b7
Fix the rewriting rules for file names.
Bruno Haible <bruno@clisp.org>
parents:
11533
diff
changeset
|
5108 s,^$rewritten,," |
|
7605
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
5109 |
|
40185
a7fe9f54c3df
gnulib-tool: Support --import with just a few tests, not --with-tests.
Bruno Haible <bruno@clisp.org>
parents:
40184
diff
changeset
|
5110 # Determine whether to put anything into $testsbase. |
|
a7fe9f54c3df
gnulib-tool: Support --import with just a few tests, not --with-tests.
Bruno Haible <bruno@clisp.org>
parents:
40184
diff
changeset
|
5111 testsfiles=`echo "$files" | sed -n -e 's,^tests/,,p' -e 's,^tests=lib/,,p'` |
|
a7fe9f54c3df
gnulib-tool: Support --import with just a few tests, not --with-tests.
Bruno Haible <bruno@clisp.org>
parents:
40184
diff
changeset
|
5112 if test -n "$testsfiles"; then |
|
a7fe9f54c3df
gnulib-tool: Support --import with just a few tests, not --with-tests.
Bruno Haible <bruno@clisp.org>
parents:
40184
diff
changeset
|
5113 gentests=true |
|
a7fe9f54c3df
gnulib-tool: Support --import with just a few tests, not --with-tests.
Bruno Haible <bruno@clisp.org>
parents:
40184
diff
changeset
|
5114 else |
|
a7fe9f54c3df
gnulib-tool: Support --import with just a few tests, not --with-tests.
Bruno Haible <bruno@clisp.org>
parents:
40184
diff
changeset
|
5115 gentests=false |
|
a7fe9f54c3df
gnulib-tool: Support --import with just a few tests, not --with-tests.
Bruno Haible <bruno@clisp.org>
parents:
40184
diff
changeset
|
5116 fi |
|
a7fe9f54c3df
gnulib-tool: Support --import with just a few tests, not --with-tests.
Bruno Haible <bruno@clisp.org>
parents:
40184
diff
changeset
|
5117 |
|
6183
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
5118 # Create directories. |
|
7605
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
5119 { echo "$sourcebase" |
|
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
5120 echo "$m4base" |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5121 if test -n "$pobase"; then |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5122 echo "$pobase" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5123 fi |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
5124 docfiles=`echo "$files" | sed -n -e 's,^doc/,,p'` |
|
7605
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
5125 if test -n "$docfiles"; then |
|
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
5126 echo "$docbase" |
|
6246
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
5127 fi |
|
40185
a7fe9f54c3df
gnulib-tool: Support --import with just a few tests, not --with-tests.
Bruno Haible <bruno@clisp.org>
parents:
40184
diff
changeset
|
5128 if $gentests; then |
|
7605
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
5129 echo "$testsbase" |
|
6955
7715890c929a
* gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents:
6952
diff
changeset
|
5130 fi |
|
7605
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
5131 echo "$auxdir" |
|
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
5132 for f in $files; do echo $f; done \ |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
5133 | sed -e "$sed_rewrite_new_files" \ |
|
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
5134 | sed -n -e 's,^\(.*\)/[^/]*,\1,p' \ |
|
7605
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
5135 | LC_ALL=C sort -u |
|
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
5136 } > "$tmp"/dirs |
|
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
5137 { # Rearrange file descriptors. Needed because "while ... done < ..." |
|
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
5138 # constructs are executed in a subshell e.g. by Solaris 10 /bin/sh. |
|
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
5139 exec 5<&0 < "$tmp"/dirs |
|
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
5140 while read d; do |
|
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
5141 if test ! -d "$destdir/$d"; then |
|
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
5142 if $doit; then |
|
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
5143 echo "Creating directory $destdir/$d" |
|
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
5144 mkdir -p "$destdir/$d" || func_fatal_error "failed" |
|
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
5145 else |
|
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
5146 echo "Create directory $destdir/$d" |
|
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
5147 fi |
|
6250
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
5148 fi |
|
7605
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
5149 done |
|
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
5150 exec 0<&5 5<&- |
|
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
5151 } |
|
6183
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
5152 |
|
18937
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
5153 # Copy files or make symbolic links or hard links. Remove obsolete files. |
|
8451
ba5ed28cb276
Update .cvsignore and .gitignore files.
Bruno Haible <bruno@clisp.org>
parents:
8432
diff
changeset
|
5154 added_files='' |
|
ba5ed28cb276
Update .cvsignore and .gitignore files.
Bruno Haible <bruno@clisp.org>
parents:
8432
diff
changeset
|
5155 removed_files='' |
|
6245
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
5156 delimiter=' ' |
|
7321
3bf1b669d1e1
Rewrite all file names at once.
Bruno Haible <bruno@clisp.org>
parents:
7320
diff
changeset
|
5157 # Construct a table with 2 columns: rewritten-file-name original-file-name, |
|
3bf1b669d1e1
Rewrite all file names at once.
Bruno Haible <bruno@clisp.org>
parents:
7320
diff
changeset
|
5158 # representing the files according to the last gnulib-tool invocation. |
|
3bf1b669d1e1
Rewrite all file names at once.
Bruno Haible <bruno@clisp.org>
parents:
7320
diff
changeset
|
5159 for f in $old_files; do echo $f; done \ |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
5160 | sed -e "s,^.*\$,&$delimiter&," -e "$sed_rewrite_old_files" \ |
|
7321
3bf1b669d1e1
Rewrite all file names at once.
Bruno Haible <bruno@clisp.org>
parents:
7320
diff
changeset
|
5161 | LC_ALL=C sort \ |
|
3bf1b669d1e1
Rewrite all file names at once.
Bruno Haible <bruno@clisp.org>
parents:
7320
diff
changeset
|
5162 > "$tmp"/old-files |
|
3bf1b669d1e1
Rewrite all file names at once.
Bruno Haible <bruno@clisp.org>
parents:
7320
diff
changeset
|
5163 # Construct a table with 2 columns: rewritten-file-name original-file-name, |
|
3bf1b669d1e1
Rewrite all file names at once.
Bruno Haible <bruno@clisp.org>
parents:
7320
diff
changeset
|
5164 # representing the files after this gnulib-tool invocation. |
|
3bf1b669d1e1
Rewrite all file names at once.
Bruno Haible <bruno@clisp.org>
parents:
7320
diff
changeset
|
5165 for f in $new_files; do echo $f; done \ |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
5166 | sed -e "s,^.*\$,&$delimiter&," -e "$sed_rewrite_new_files" \ |
|
7321
3bf1b669d1e1
Rewrite all file names at once.
Bruno Haible <bruno@clisp.org>
parents:
7320
diff
changeset
|
5167 | LC_ALL=C sort \ |
|
3bf1b669d1e1
Rewrite all file names at once.
Bruno Haible <bruno@clisp.org>
parents:
7320
diff
changeset
|
5168 > "$tmp"/new-files |
|
6245
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
5169 # First the files that are in old-files, but not in new-files: |
|
6595
0c67f1400c5b
Fix portability problem to Solaris 9 sh.
Bruno Haible <bruno@clisp.org>
parents:
6581
diff
changeset
|
5170 sed_take_first_column='s,'"$delimiter"'.*,,' |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
5171 for g in `LC_ALL=C join -t"$delimiter" -v1 "$tmp"/old-files "$tmp"/new-files | sed -e "$sed_take_first_column"`; do |
|
6245
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
5172 # Remove the file. Do nothing if the user already removed it. |
|
9168
9b8032e2af0c
Care about dangling symbolic links.
Bruno Haible <bruno@clisp.org>
parents:
9167
diff
changeset
|
5173 if test -f "$destdir/$g" || test -h "$destdir/$g"; then |
|
6246
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
5174 if $doit; then |
|
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
5175 echo "Removing file $g (backup in ${g}~)" |
|
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
5176 mv -f "$destdir/$g" "$destdir/${g}~" || func_fatal_error "failed" |
|
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
5177 else |
|
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
5178 echo "Remove file $g (backup in ${g}~)" |
|
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
5179 fi |
|
8451
ba5ed28cb276
Update .cvsignore and .gitignore files.
Bruno Haible <bruno@clisp.org>
parents:
8432
diff
changeset
|
5180 func_append removed_files "$g$nl" |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
5181 fi |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
5182 done |
|
6245
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
5183 # func_add_or_update handles a file that ought to be present afterwards. |
|
7321
3bf1b669d1e1
Rewrite all file names at once.
Bruno Haible <bruno@clisp.org>
parents:
7320
diff
changeset
|
5184 # Uses parameters |
|
3bf1b669d1e1
Rewrite all file names at once.
Bruno Haible <bruno@clisp.org>
parents:
7320
diff
changeset
|
5185 # - f the original file name |
|
3bf1b669d1e1
Rewrite all file names at once.
Bruno Haible <bruno@clisp.org>
parents:
7320
diff
changeset
|
5186 # - g the rewritten file name |
|
11461
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
5187 # - already_present nonempty if the file should already exist, empty |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
5188 # otherwise |
|
6245
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
5189 func_add_or_update () |
|
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
5190 { |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
5191 of="$f" |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
5192 case "$f" in |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
5193 tests=lib/*) f=`echo "$f" | sed -e 's,^tests=lib/,lib/,'` ;; |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
5194 esac |
|
6745
aca74c06bca0
Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and
Bruno Haible <bruno@clisp.org>
parents:
6633
diff
changeset
|
5195 func_dest_tmpfilename "$g" |
|
7073
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
5196 func_lookup_file "$f" |
|
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
5197 cp "$lookedup_file" "$tmpfile" || func_fatal_error "failed" |
|
19141
6d737cdd7618
gnulib-tool: Simplify commit from 2015-08-20.
Bruno Haible <bruno@clisp.org>
parents:
18959
diff
changeset
|
5198 case "$f" in |
|
6d737cdd7618
gnulib-tool: Simplify commit from 2015-08-20.
Bruno Haible <bruno@clisp.org>
parents:
18959
diff
changeset
|
5199 *.class | *.mo ) |
|
6d737cdd7618
gnulib-tool: Simplify commit from 2015-08-20.
Bruno Haible <bruno@clisp.org>
parents:
18959
diff
changeset
|
5200 # Don't process binary files with sed. |
|
6d737cdd7618
gnulib-tool: Simplify commit from 2015-08-20.
Bruno Haible <bruno@clisp.org>
parents:
18959
diff
changeset
|
5201 ;; |
|
6d737cdd7618
gnulib-tool: Simplify commit from 2015-08-20.
Bruno Haible <bruno@clisp.org>
parents:
18959
diff
changeset
|
5202 *) |
|
6d737cdd7618
gnulib-tool: Simplify commit from 2015-08-20.
Bruno Haible <bruno@clisp.org>
parents:
18959
diff
changeset
|
5203 if test -n "$sed_transform_main_lib_file"; then |
|
6d737cdd7618
gnulib-tool: Simplify commit from 2015-08-20.
Bruno Haible <bruno@clisp.org>
parents:
18959
diff
changeset
|
5204 case "$of" in |
|
6d737cdd7618
gnulib-tool: Simplify commit from 2015-08-20.
Bruno Haible <bruno@clisp.org>
parents:
18959
diff
changeset
|
5205 lib/*) |
|
6d737cdd7618
gnulib-tool: Simplify commit from 2015-08-20.
Bruno Haible <bruno@clisp.org>
parents:
18959
diff
changeset
|
5206 sed -e "$sed_transform_main_lib_file" \ |
|
6d737cdd7618
gnulib-tool: Simplify commit from 2015-08-20.
Bruno Haible <bruno@clisp.org>
parents:
18959
diff
changeset
|
5207 < "$lookedup_file" > "$tmpfile" || func_fatal_error "failed" |
|
6d737cdd7618
gnulib-tool: Simplify commit from 2015-08-20.
Bruno Haible <bruno@clisp.org>
parents:
18959
diff
changeset
|
5208 ;; |
|
6d737cdd7618
gnulib-tool: Simplify commit from 2015-08-20.
Bruno Haible <bruno@clisp.org>
parents:
18959
diff
changeset
|
5209 esac |
|
6d737cdd7618
gnulib-tool: Simplify commit from 2015-08-20.
Bruno Haible <bruno@clisp.org>
parents:
18959
diff
changeset
|
5210 fi |
|
6d737cdd7618
gnulib-tool: Simplify commit from 2015-08-20.
Bruno Haible <bruno@clisp.org>
parents:
18959
diff
changeset
|
5211 if test -n "$sed_transform_build_aux_file"; then |
|
6d737cdd7618
gnulib-tool: Simplify commit from 2015-08-20.
Bruno Haible <bruno@clisp.org>
parents:
18959
diff
changeset
|
5212 case "$of" in |
|
6d737cdd7618
gnulib-tool: Simplify commit from 2015-08-20.
Bruno Haible <bruno@clisp.org>
parents:
18959
diff
changeset
|
5213 build-aux/*) |
|
6d737cdd7618
gnulib-tool: Simplify commit from 2015-08-20.
Bruno Haible <bruno@clisp.org>
parents:
18959
diff
changeset
|
5214 sed -e "$sed_transform_build_aux_file" \ |
|
6d737cdd7618
gnulib-tool: Simplify commit from 2015-08-20.
Bruno Haible <bruno@clisp.org>
parents:
18959
diff
changeset
|
5215 < "$lookedup_file" > "$tmpfile" || func_fatal_error "failed" |
|
6d737cdd7618
gnulib-tool: Simplify commit from 2015-08-20.
Bruno Haible <bruno@clisp.org>
parents:
18959
diff
changeset
|
5216 ;; |
|
6d737cdd7618
gnulib-tool: Simplify commit from 2015-08-20.
Bruno Haible <bruno@clisp.org>
parents:
18959
diff
changeset
|
5217 esac |
|
6d737cdd7618
gnulib-tool: Simplify commit from 2015-08-20.
Bruno Haible <bruno@clisp.org>
parents:
18959
diff
changeset
|
5218 fi |
|
6d737cdd7618
gnulib-tool: Simplify commit from 2015-08-20.
Bruno Haible <bruno@clisp.org>
parents:
18959
diff
changeset
|
5219 if test -n "$sed_transform_testsrelated_lib_file"; then |
|
6d737cdd7618
gnulib-tool: Simplify commit from 2015-08-20.
Bruno Haible <bruno@clisp.org>
parents:
18959
diff
changeset
|
5220 case "$of" in |
|
6d737cdd7618
gnulib-tool: Simplify commit from 2015-08-20.
Bruno Haible <bruno@clisp.org>
parents:
18959
diff
changeset
|
5221 tests=lib/*) |
|
6d737cdd7618
gnulib-tool: Simplify commit from 2015-08-20.
Bruno Haible <bruno@clisp.org>
parents:
18959
diff
changeset
|
5222 sed -e "$sed_transform_testsrelated_lib_file" \ |
|
6d737cdd7618
gnulib-tool: Simplify commit from 2015-08-20.
Bruno Haible <bruno@clisp.org>
parents:
18959
diff
changeset
|
5223 < "$lookedup_file" > "$tmpfile" || func_fatal_error "failed" |
|
6d737cdd7618
gnulib-tool: Simplify commit from 2015-08-20.
Bruno Haible <bruno@clisp.org>
parents:
18959
diff
changeset
|
5224 ;; |
|
6d737cdd7618
gnulib-tool: Simplify commit from 2015-08-20.
Bruno Haible <bruno@clisp.org>
parents:
18959
diff
changeset
|
5225 esac |
|
6d737cdd7618
gnulib-tool: Simplify commit from 2015-08-20.
Bruno Haible <bruno@clisp.org>
parents:
18959
diff
changeset
|
5226 fi |
|
6d737cdd7618
gnulib-tool: Simplify commit from 2015-08-20.
Bruno Haible <bruno@clisp.org>
parents:
18959
diff
changeset
|
5227 ;; |
|
6d737cdd7618
gnulib-tool: Simplify commit from 2015-08-20.
Bruno Haible <bruno@clisp.org>
parents:
18959
diff
changeset
|
5228 esac |
|
6245
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
5229 if test -f "$destdir/$g"; then |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
5230 # The file already exists. |
|
11461
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
5231 func_update_file |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
5232 else |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
5233 # Install the file. |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
5234 # Don't protest if the file should be there but isn't: it happens |
|
13636
06064a28d167
gnulib-tool: Don't talk about CVS any more.
Bruno Haible <bruno@clisp.org>
parents:
13634
diff
changeset
|
5235 # frequently that developers don't put autogenerated files under version control. |
|
11461
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
5236 func_add_file |
|
8451
ba5ed28cb276
Update .cvsignore and .gitignore files.
Bruno Haible <bruno@clisp.org>
parents:
8432
diff
changeset
|
5237 func_append added_files "$g$nl" |
|
5345
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
5238 fi |
|
6745
aca74c06bca0
Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and
Bruno Haible <bruno@clisp.org>
parents:
6633
diff
changeset
|
5239 rm -f "$tmpfile" |
|
6245
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
5240 } |
|
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
5241 # Then the files that are in new-files, but not in old-files: |
|
6595
0c67f1400c5b
Fix portability problem to Solaris 9 sh.
Bruno Haible <bruno@clisp.org>
parents:
6581
diff
changeset
|
5242 sed_take_last_column='s,^.*'"$delimiter"',,' |
|
6245
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
5243 already_present= |
|
7321
3bf1b669d1e1
Rewrite all file names at once.
Bruno Haible <bruno@clisp.org>
parents:
7320
diff
changeset
|
5244 LC_ALL=C join -t"$delimiter" -v2 "$tmp"/old-files "$tmp"/new-files \ |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
5245 | sed -e "$sed_take_last_column" \ |
|
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
5246 | sed -e "s,^.*\$,&$delimiter&," -e "$sed_rewrite_new_files" > "$tmp"/added-files |
|
7326
1ca1035630dd
Avoid to execute while loops in a subshell.
Bruno Haible <bruno@clisp.org>
parents:
7323
diff
changeset
|
5247 { # Rearrange file descriptors. Needed because "while ... done < ..." |
|
1ca1035630dd
Avoid to execute while loops in a subshell.
Bruno Haible <bruno@clisp.org>
parents:
7323
diff
changeset
|
5248 # constructs are executed in a subshell e.g. by Solaris 10 /bin/sh. |
|
7368
a7abebdb07f4
* gnulib-tool (func_import, func_create_testdir): Fix typos in
Eric Blake <ebb9@byu.net>
parents:
7350
diff
changeset
|
5249 exec 5<&0 < "$tmp"/added-files |
|
7326
1ca1035630dd
Avoid to execute while loops in a subshell.
Bruno Haible <bruno@clisp.org>
parents:
7323
diff
changeset
|
5250 while read g f; do |
|
1ca1035630dd
Avoid to execute while loops in a subshell.
Bruno Haible <bruno@clisp.org>
parents:
7323
diff
changeset
|
5251 func_add_or_update |
|
1ca1035630dd
Avoid to execute while loops in a subshell.
Bruno Haible <bruno@clisp.org>
parents:
7323
diff
changeset
|
5252 done |
|
7373
330a972d58f0
Tweak last patch, for symmetry.
Bruno Haible <bruno@clisp.org>
parents:
7368
diff
changeset
|
5253 exec 0<&5 5<&- |
|
7326
1ca1035630dd
Avoid to execute while loops in a subshell.
Bruno Haible <bruno@clisp.org>
parents:
7323
diff
changeset
|
5254 } |
|
6245
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
5255 # Then the files that are in new-files and in old-files: |
|
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
5256 already_present=true |
|
7321
3bf1b669d1e1
Rewrite all file names at once.
Bruno Haible <bruno@clisp.org>
parents:
7320
diff
changeset
|
5257 LC_ALL=C join -t"$delimiter" "$tmp"/old-files "$tmp"/new-files \ |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
5258 | sed -e "$sed_take_last_column" \ |
|
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
5259 | sed -e "s,^.*\$,&$delimiter&," -e "$sed_rewrite_new_files" > "$tmp"/kept-files |
|
7326
1ca1035630dd
Avoid to execute while loops in a subshell.
Bruno Haible <bruno@clisp.org>
parents:
7323
diff
changeset
|
5260 { # Rearrange file descriptors. Needed because "while ... done < ..." |
|
1ca1035630dd
Avoid to execute while loops in a subshell.
Bruno Haible <bruno@clisp.org>
parents:
7323
diff
changeset
|
5261 # constructs are executed in a subshell e.g. by Solaris 10 /bin/sh. |
|
7368
a7abebdb07f4
* gnulib-tool (func_import, func_create_testdir): Fix typos in
Eric Blake <ebb9@byu.net>
parents:
7350
diff
changeset
|
5262 exec 5<&0 < "$tmp"/kept-files |
|
7326
1ca1035630dd
Avoid to execute while loops in a subshell.
Bruno Haible <bruno@clisp.org>
parents:
7323
diff
changeset
|
5263 while read g f; do |
|
1ca1035630dd
Avoid to execute while loops in a subshell.
Bruno Haible <bruno@clisp.org>
parents:
7323
diff
changeset
|
5264 func_add_or_update |
|
1ca1035630dd
Avoid to execute while loops in a subshell.
Bruno Haible <bruno@clisp.org>
parents:
7323
diff
changeset
|
5265 done |
|
7373
330a972d58f0
Tweak last patch, for symmetry.
Bruno Haible <bruno@clisp.org>
parents:
7368
diff
changeset
|
5266 exec 0<&5 5<&- |
|
7326
1ca1035630dd
Avoid to execute while loops in a subshell.
Bruno Haible <bruno@clisp.org>
parents:
7323
diff
changeset
|
5267 } |
|
5345
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
5268 |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
5269 # Command-line invocation printed in a comment in generated gnulib-cache.m4. |
|
39748
912cc79f4d91
gnulib-tool: limit line length for git send-email
Paul Eggert <eggert@cs.ucla.edu>
parents:
39737
diff
changeset
|
5270 actioncmd="# gnulib-tool --import" |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
5271 |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
5272 # Local helper. |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
5273 func_append_local_dir () |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
5274 { |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
5275 func_append "$1" " --local-dir=$2" |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
5276 } |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
5277 func_path_foreach "$local_gnulib_path" func_append_local_dir actioncmd %dir% |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
5278 |
|
39748
912cc79f4d91
gnulib-tool: limit line length for git send-email
Paul Eggert <eggert@cs.ucla.edu>
parents:
39737
diff
changeset
|
5279 # Break the action command log into multiple lines. |
|
912cc79f4d91
gnulib-tool: limit line length for git send-email
Paul Eggert <eggert@cs.ucla.edu>
parents:
39737
diff
changeset
|
5280 # Emacs puts some gnulib-tool log lines in its source repository, and |
|
912cc79f4d91
gnulib-tool: limit line length for git send-email
Paul Eggert <eggert@cs.ucla.edu>
parents:
39737
diff
changeset
|
5281 # git send-email rejects patch lines longer than 998 characters. |
|
912cc79f4d91
gnulib-tool: limit line length for git send-email
Paul Eggert <eggert@cs.ucla.edu>
parents:
39737
diff
changeset
|
5282 # Also, config.status uses awk, and the HP-UX 11.00 awk fails if a |
|
912cc79f4d91
gnulib-tool: limit line length for git send-email
Paul Eggert <eggert@cs.ucla.edu>
parents:
39737
diff
changeset
|
5283 # line has length >= 3071; similarly, the IRIX 6.5 awk fails if a |
|
912cc79f4d91
gnulib-tool: limit line length for git send-email
Paul Eggert <eggert@cs.ucla.edu>
parents:
39737
diff
changeset
|
5284 # line has length >= 3072. |
|
912cc79f4d91
gnulib-tool: limit line length for git send-email
Paul Eggert <eggert@cs.ucla.edu>
parents:
39737
diff
changeset
|
5285 func_append_actionarg () |
|
912cc79f4d91
gnulib-tool: limit line length for git send-email
Paul Eggert <eggert@cs.ucla.edu>
parents:
39737
diff
changeset
|
5286 { |
|
912cc79f4d91
gnulib-tool: limit line length for git send-email
Paul Eggert <eggert@cs.ucla.edu>
parents:
39737
diff
changeset
|
5287 func_append actioncmd " \\$nl# $1" |
|
912cc79f4d91
gnulib-tool: limit line length for git send-email
Paul Eggert <eggert@cs.ucla.edu>
parents:
39737
diff
changeset
|
5288 } |
|
912cc79f4d91
gnulib-tool: limit line length for git send-email
Paul Eggert <eggert@cs.ucla.edu>
parents:
39737
diff
changeset
|
5289 func_append_actionarg "--lib=$libname" |
|
912cc79f4d91
gnulib-tool: limit line length for git send-email
Paul Eggert <eggert@cs.ucla.edu>
parents:
39737
diff
changeset
|
5290 func_append_actionarg "--source-base=$sourcebase" |
|
912cc79f4d91
gnulib-tool: limit line length for git send-email
Paul Eggert <eggert@cs.ucla.edu>
parents:
39737
diff
changeset
|
5291 func_append_actionarg "--m4-base=$m4base" |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5292 if test -n "$pobase"; then |
|
39748
912cc79f4d91
gnulib-tool: limit line length for git send-email
Paul Eggert <eggert@cs.ucla.edu>
parents:
39737
diff
changeset
|
5293 func_append_actionarg "--po-base=$pobase" |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5294 fi |
|
39748
912cc79f4d91
gnulib-tool: limit line length for git send-email
Paul Eggert <eggert@cs.ucla.edu>
parents:
39737
diff
changeset
|
5295 func_append_actionarg "--doc-base=$docbase" |
|
912cc79f4d91
gnulib-tool: limit line length for git send-email
Paul Eggert <eggert@cs.ucla.edu>
parents:
39737
diff
changeset
|
5296 func_append_actionarg "--tests-base=$testsbase" |
|
912cc79f4d91
gnulib-tool: limit line length for git send-email
Paul Eggert <eggert@cs.ucla.edu>
parents:
39737
diff
changeset
|
5297 func_append_actionarg "--aux-dir=$auxdir" |
|
16932
48e8f0679448
gnulib-tool: Refactor inctests variable.
Bruno Haible <bruno@clisp.org>
parents:
16931
diff
changeset
|
5298 if $inctests; then |
|
39748
912cc79f4d91
gnulib-tool: limit line length for git send-email
Paul Eggert <eggert@cs.ucla.edu>
parents:
39737
diff
changeset
|
5299 func_append_actionarg "--with-tests" |
|
8890
576d3e4f31c2
Remember the presence of the --with-tests command-line option through
Bruno Haible <bruno@clisp.org>
parents:
8672
diff
changeset
|
5300 fi |
|
10744
7fb7b37150b3
New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents:
10743
diff
changeset
|
5301 if test -n "$incobsolete"; then |
|
39748
912cc79f4d91
gnulib-tool: limit line length for git send-email
Paul Eggert <eggert@cs.ucla.edu>
parents:
39737
diff
changeset
|
5302 func_append_actionarg "--with-obsolete" |
|
10744
7fb7b37150b3
New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents:
10743
diff
changeset
|
5303 fi |
|
13080
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
5304 if test -n "$inc_cxx_tests"; then |
|
39748
912cc79f4d91
gnulib-tool: limit line length for git send-email
Paul Eggert <eggert@cs.ucla.edu>
parents:
39737
diff
changeset
|
5305 func_append_actionarg "--with-c++-tests" |
|
13080
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
5306 fi |
|
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
5307 if test -n "$inc_longrunning_tests"; then |
|
39748
912cc79f4d91
gnulib-tool: limit line length for git send-email
Paul Eggert <eggert@cs.ucla.edu>
parents:
39737
diff
changeset
|
5308 func_append_actionarg "--with-longrunning-tests" |
|
13080
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
5309 fi |
|
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
5310 if test -n "$inc_privileged_tests"; then |
|
39748
912cc79f4d91
gnulib-tool: limit line length for git send-email
Paul Eggert <eggert@cs.ucla.edu>
parents:
39737
diff
changeset
|
5311 func_append_actionarg "--with-privileged-tests" |
|
13080
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
5312 fi |
|
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
5313 if test -n "$inc_unportable_tests"; then |
|
39748
912cc79f4d91
gnulib-tool: limit line length for git send-email
Paul Eggert <eggert@cs.ucla.edu>
parents:
39737
diff
changeset
|
5314 func_append_actionarg "--with-unportable-tests" |
|
13080
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
5315 fi |
|
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
5316 if test -n "$inc_all_tests"; then |
|
39748
912cc79f4d91
gnulib-tool: limit line length for git send-email
Paul Eggert <eggert@cs.ucla.edu>
parents:
39737
diff
changeset
|
5317 func_append_actionarg "--with-all-tests" |
|
13080
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
5318 fi |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
5319 if test -n "$lgpl"; then |
|
9417
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
5320 if test "$lgpl" = yes; then |
|
39748
912cc79f4d91
gnulib-tool: limit line length for git send-email
Paul Eggert <eggert@cs.ucla.edu>
parents:
39737
diff
changeset
|
5321 func_append_actionarg "--lgpl" |
|
9417
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
5322 else |
|
39748
912cc79f4d91
gnulib-tool: limit line length for git send-email
Paul Eggert <eggert@cs.ucla.edu>
parents:
39737
diff
changeset
|
5323 func_append_actionarg "--lgpl=$lgpl" |
|
9417
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
5324 fi |
|
5345
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
5325 fi |
|
18732
691ee9363949
gnulib-tool: fix typo in comment output
Paul Eggert <eggert@cs.ucla.edu>
parents:
18730
diff
changeset
|
5326 if $gnu_make; then |
|
39748
912cc79f4d91
gnulib-tool: limit line length for git send-email
Paul Eggert <eggert@cs.ucla.edu>
parents:
39737
diff
changeset
|
5327 func_append_actionarg "--gnu-make" |
|
18730
5ce4a5b6d112
gnulib-tool: minor --gnu-make fixups
Paul Eggert <eggert@cs.ucla.edu>
parents:
18729
diff
changeset
|
5328 fi |
|
7216
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
5329 if test -n "$makefile_name"; then |
|
39748
912cc79f4d91
gnulib-tool: limit line length for git send-email
Paul Eggert <eggert@cs.ucla.edu>
parents:
39737
diff
changeset
|
5330 func_append_actionarg "--makefile-name=$makefile_name" |
|
7216
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
5331 fi |
|
14833
76127af7039f
Finish the conditional dependencies mechanism.
Bruno Haible <bruno@clisp.org>
parents:
14806
diff
changeset
|
5332 if test "$cond_dependencies" = true; then |
|
39748
912cc79f4d91
gnulib-tool: limit line length for git send-email
Paul Eggert <eggert@cs.ucla.edu>
parents:
39737
diff
changeset
|
5333 func_append_actionarg "--conditional-dependencies" |
|
14833
76127af7039f
Finish the conditional dependencies mechanism.
Bruno Haible <bruno@clisp.org>
parents:
14806
diff
changeset
|
5334 else |
|
39748
912cc79f4d91
gnulib-tool: limit line length for git send-email
Paul Eggert <eggert@cs.ucla.edu>
parents:
39737
diff
changeset
|
5335 func_append_actionarg "--no-conditional-dependencies" |
|
14833
76127af7039f
Finish the conditional dependencies mechanism.
Bruno Haible <bruno@clisp.org>
parents:
14806
diff
changeset
|
5336 fi |
| 7077 | 5337 if test "$libtool" = true; then |
|
39748
912cc79f4d91
gnulib-tool: limit line length for git send-email
Paul Eggert <eggert@cs.ucla.edu>
parents:
39737
diff
changeset
|
5338 func_append_actionarg "--libtool" |
| 7077 | 5339 else |
|
39748
912cc79f4d91
gnulib-tool: limit line length for git send-email
Paul Eggert <eggert@cs.ucla.edu>
parents:
39737
diff
changeset
|
5340 func_append_actionarg "--no-libtool" |
|
5345
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
5341 fi |
|
39748
912cc79f4d91
gnulib-tool: limit line length for git send-email
Paul Eggert <eggert@cs.ucla.edu>
parents:
39737
diff
changeset
|
5342 func_append_actionarg "--macro-prefix=$macro_prefix" |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5343 if test -n "$po_domain"; then |
|
39748
912cc79f4d91
gnulib-tool: limit line length for git send-email
Paul Eggert <eggert@cs.ucla.edu>
parents:
39737
diff
changeset
|
5344 func_append_actionarg "--po-domain=$po_domain" |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5345 fi |
|
14894
b22360ddefc4
gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents:
14841
diff
changeset
|
5346 if test -n "$witness_c_macro"; then |
|
39748
912cc79f4d91
gnulib-tool: limit line length for git send-email
Paul Eggert <eggert@cs.ucla.edu>
parents:
39737
diff
changeset
|
5347 func_append_actionarg "--witness-c-macro=$witness_c_macro" |
|
14894
b22360ddefc4
gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents:
14841
diff
changeset
|
5348 fi |
|
9810
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5349 if test -n "$vc_files"; then |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5350 if test "$vc_files" = true; then |
|
39748
912cc79f4d91
gnulib-tool: limit line length for git send-email
Paul Eggert <eggert@cs.ucla.edu>
parents:
39737
diff
changeset
|
5351 func_append_actionarg "--vc-files" |
|
9810
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5352 else |
|
39748
912cc79f4d91
gnulib-tool: limit line length for git send-email
Paul Eggert <eggert@cs.ucla.edu>
parents:
39737
diff
changeset
|
5353 func_append_actionarg "--no-vc-files" |
|
9810
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5354 fi |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5355 fi |
|
39748
912cc79f4d91
gnulib-tool: limit line length for git send-email
Paul Eggert <eggert@cs.ucla.edu>
parents:
39737
diff
changeset
|
5356 for module in $avoidlist; do |
|
912cc79f4d91
gnulib-tool: limit line length for git send-email
Paul Eggert <eggert@cs.ucla.edu>
parents:
39737
diff
changeset
|
5357 func_append_actionarg "--avoid=$module" |
|
912cc79f4d91
gnulib-tool: limit line length for git send-email
Paul Eggert <eggert@cs.ucla.edu>
parents:
39737
diff
changeset
|
5358 done |
|
912cc79f4d91
gnulib-tool: limit line length for git send-email
Paul Eggert <eggert@cs.ucla.edu>
parents:
39737
diff
changeset
|
5359 for module in $specified_modules; do |
|
912cc79f4d91
gnulib-tool: limit line length for git send-email
Paul Eggert <eggert@cs.ucla.edu>
parents:
39737
diff
changeset
|
5360 func_append_actionarg "$module" |
|
912cc79f4d91
gnulib-tool: limit line length for git send-email
Paul Eggert <eggert@cs.ucla.edu>
parents:
39737
diff
changeset
|
5361 done |
|
5345
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
5362 |
|
14840
5f709022a256
Allow multiple gnulib generated include files to be combined.
Bruno Haible <bruno@clisp.org>
parents:
14836
diff
changeset
|
5363 # Determine include_guard_prefix. |
|
5f709022a256
Allow multiple gnulib generated include files to be combined.
Bruno Haible <bruno@clisp.org>
parents:
14836
diff
changeset
|
5364 func_compute_include_guard_prefix |
|
5f709022a256
Allow multiple gnulib generated include files to be combined.
Bruno Haible <bruno@clisp.org>
parents:
14836
diff
changeset
|
5365 |
|
7222
06eec4eaf416
* gnulib-tool (emit_lib_Makefile_am): Don't put $makefile_name
Paul Eggert <eggert@cs.ucla.edu>
parents:
7216
diff
changeset
|
5366 # Default the makefile name to Makefile.am. |
|
06eec4eaf416
* gnulib-tool (emit_lib_Makefile_am): Don't put $makefile_name
Paul Eggert <eggert@cs.ucla.edu>
parents:
7216
diff
changeset
|
5367 if test -n "$makefile_name"; then |
|
06eec4eaf416
* gnulib-tool (emit_lib_Makefile_am): Don't put $makefile_name
Paul Eggert <eggert@cs.ucla.edu>
parents:
7216
diff
changeset
|
5368 makefile_am=$makefile_name |
|
06eec4eaf416
* gnulib-tool (emit_lib_Makefile_am): Don't put $makefile_name
Paul Eggert <eggert@cs.ucla.edu>
parents:
7216
diff
changeset
|
5369 else |
|
06eec4eaf416
* gnulib-tool (emit_lib_Makefile_am): Don't put $makefile_name
Paul Eggert <eggert@cs.ucla.edu>
parents:
7216
diff
changeset
|
5370 makefile_am=Makefile.am |
|
06eec4eaf416
* gnulib-tool (emit_lib_Makefile_am): Don't put $makefile_name
Paul Eggert <eggert@cs.ucla.edu>
parents:
7216
diff
changeset
|
5371 fi |
|
06eec4eaf416
* gnulib-tool (emit_lib_Makefile_am): Don't put $makefile_name
Paul Eggert <eggert@cs.ucla.edu>
parents:
7216
diff
changeset
|
5372 |
|
7981
41421349e26b
In testing directories, link the test programs already during "make", not
Bruno Haible <bruno@clisp.org>
parents:
7911
diff
changeset
|
5373 # Create normal Makefile.ams. |
|
41421349e26b
In testing directories, link the test programs already during "make", not
Bruno Haible <bruno@clisp.org>
parents:
7911
diff
changeset
|
5374 for_test=false |
|
41421349e26b
In testing directories, link the test programs already during "make", not
Bruno Haible <bruno@clisp.org>
parents:
7911
diff
changeset
|
5375 |
|
10476
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
5376 # Setup list of Makefile.am edits that are to be performed afterwards. |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
5377 # Some of these edits apply to files that we will generate; others are |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
5378 # under the responsibility of the developer. |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
5379 makefile_am_edits=0 |
|
39815
35efeabe809f
gnulib-tool: Fix build order when $testsbase is a subdir of $sourcebase.
Bruno Haible <bruno@clisp.org>
parents:
39755
diff
changeset
|
5380 # func_note_Makefile_am_edit dir var value [dotfirst] |
|
10476
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
5381 # remembers that ${dir}Makefile.am needs to be edited to that ${var} mentions |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
5382 # ${value}. |
|
39815
35efeabe809f
gnulib-tool: Fix build order when $testsbase is a subdir of $sourcebase.
Bruno Haible <bruno@clisp.org>
parents:
39755
diff
changeset
|
5383 # If ${dotfirst} is non-empty, this mention needs to be present after '.'. |
|
35efeabe809f
gnulib-tool: Fix build order when $testsbase is a subdir of $sourcebase.
Bruno Haible <bruno@clisp.org>
parents:
39755
diff
changeset
|
5384 # This is a special hack for the SUBDIRS variable, cf. |
|
35efeabe809f
gnulib-tool: Fix build order when $testsbase is a subdir of $sourcebase.
Bruno Haible <bruno@clisp.org>
parents:
39755
diff
changeset
|
5385 # <https://www.gnu.org/software/automake/manual/html_node/Subdirectories.html>. |
|
10476
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
5386 func_note_Makefile_am_edit () |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
5387 { |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
5388 makefile_am_edits=`expr $makefile_am_edits + 1` |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
5389 eval makefile_am_edit${makefile_am_edits}_dir=\"\$1\" |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
5390 eval makefile_am_edit${makefile_am_edits}_var=\"\$2\" |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
5391 eval makefile_am_edit${makefile_am_edits}_val=\"\$3\" |
|
39815
35efeabe809f
gnulib-tool: Fix build order when $testsbase is a subdir of $sourcebase.
Bruno Haible <bruno@clisp.org>
parents:
39755
diff
changeset
|
5392 eval makefile_am_edit${makefile_am_edits}_dotfirst=\"\$4\" |
|
10476
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
5393 } |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
5394 if test "$makefile_am" = Makefile.am; then |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
5395 sourcebase_dir=`echo "$sourcebase" | sed -n -e 's,/[^/]*$,/,p'` |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
5396 sourcebase_base=`basename "$sourcebase"` |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
5397 func_note_Makefile_am_edit "$sourcebase_dir" SUBDIRS "$sourcebase_base" |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
5398 fi |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
5399 if test -n "$pobase"; then |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
5400 pobase_dir=`echo "$pobase" | sed -n -e 's,/[^/]*$,/,p'` |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
5401 pobase_base=`basename "$pobase"` |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
5402 func_note_Makefile_am_edit "$pobase_dir" SUBDIRS "$pobase_base" |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
5403 fi |
|
16932
48e8f0679448
gnulib-tool: Refactor inctests variable.
Bruno Haible <bruno@clisp.org>
parents:
16931
diff
changeset
|
5404 if $inctests; then |
|
10476
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
5405 if test "$makefile_am" = Makefile.am; then |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
5406 testsbase_dir=`echo "$testsbase" | sed -n -e 's,/[^/]*$,/,p'` |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
5407 testsbase_base=`basename "$testsbase"` |
|
39815
35efeabe809f
gnulib-tool: Fix build order when $testsbase is a subdir of $sourcebase.
Bruno Haible <bruno@clisp.org>
parents:
39755
diff
changeset
|
5408 func_note_Makefile_am_edit "$testsbase_dir" SUBDIRS "$testsbase_base" true |
|
10476
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
5409 fi |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
5410 fi |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
5411 func_note_Makefile_am_edit "" ACLOCAL_AMFLAGS "-I ${m4base}" |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
5412 { |
|
10478
569d6cd01c90
Oops, tweak last commit so that it also works in the first gnulib-tool run.
Bruno Haible <bruno@clisp.org>
parents:
10476
diff
changeset
|
5413 # Find the first parent directory of $m4base that contains or will contain |
|
569d6cd01c90
Oops, tweak last commit so that it also works in the first gnulib-tool run.
Bruno Haible <bruno@clisp.org>
parents:
10476
diff
changeset
|
5414 # a Makefile.am. |
|
10476
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
5415 sed_last='s,^.*/\([^/][^/]*\)//*$,\1/, |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
5416 s,//*$,/,' |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
5417 sed_butlast='s,[^/][^/]*//*$,,' |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
5418 dir1="${m4base}/"; dir2="" |
|
10478
569d6cd01c90
Oops, tweak last commit so that it also works in the first gnulib-tool run.
Bruno Haible <bruno@clisp.org>
parents:
10476
diff
changeset
|
5419 while test -n "$dir1" \ |
|
569d6cd01c90
Oops, tweak last commit so that it also works in the first gnulib-tool run.
Bruno Haible <bruno@clisp.org>
parents:
10476
diff
changeset
|
5420 && ! { test -f "${destdir}/${dir1}Makefile.am" \ |
|
569d6cd01c90
Oops, tweak last commit so that it also works in the first gnulib-tool run.
Bruno Haible <bruno@clisp.org>
parents:
10476
diff
changeset
|
5421 || test "${dir1}Makefile.am" = "$sourcebase/$makefile_am" \ |
|
569d6cd01c90
Oops, tweak last commit so that it also works in the first gnulib-tool run.
Bruno Haible <bruno@clisp.org>
parents:
10476
diff
changeset
|
5422 || test "./${dir1}Makefile.am" = "$sourcebase/$makefile_am" \ |
|
40185
a7fe9f54c3df
gnulib-tool: Support --import with just a few tests, not --with-tests.
Bruno Haible <bruno@clisp.org>
parents:
40184
diff
changeset
|
5423 || { $gentests \ |
|
10478
569d6cd01c90
Oops, tweak last commit so that it also works in the first gnulib-tool run.
Bruno Haible <bruno@clisp.org>
parents:
10476
diff
changeset
|
5424 && { test "${dir1}Makefile.am" = "$testsbase/$makefile_am" \ |
|
569d6cd01c90
Oops, tweak last commit so that it also works in the first gnulib-tool run.
Bruno Haible <bruno@clisp.org>
parents:
10476
diff
changeset
|
5425 || test "./${dir1}Makefile.am" = "$testsbase/$makefile_am"; }; }; }; do |
|
10476
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
5426 dir2=`echo "$dir1" | sed -e "$sed_last"`"$dir2" |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
5427 dir1=`echo "$dir1" | sed -e "$sed_butlast"` |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
5428 done |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
5429 func_note_Makefile_am_edit "$dir1" EXTRA_DIST "${dir2}gnulib-cache.m4" |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
5430 } |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
5431 |
|
7222
06eec4eaf416
* gnulib-tool (emit_lib_Makefile_am): Don't put $makefile_name
Paul Eggert <eggert@cs.ucla.edu>
parents:
7216
diff
changeset
|
5432 # Create library makefile. |
|
7216
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
5433 func_dest_tmpfilename $sourcebase/$makefile_am |
|
10476
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
5434 destfile="$sourcebase/$makefile_am" |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
5435 modules="$main_modules" |
|
6745
aca74c06bca0
Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and
Bruno Haible <bruno@clisp.org>
parents:
6633
diff
changeset
|
5436 func_emit_lib_Makefile_am > "$tmpfile" |
|
7216
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
5437 if test -f "$destdir"/$sourcebase/$makefile_am; then |
|
16714
2e2bf6c7bf38
gnulib-tool: Avoid unintended error output from 'cmp'.
Bruno Haible <bruno@clisp.org>
parents:
16713
diff
changeset
|
5438 if cmp -s "$destdir"/$sourcebase/$makefile_am "$tmpfile"; then |
|
6745
aca74c06bca0
Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and
Bruno Haible <bruno@clisp.org>
parents:
6633
diff
changeset
|
5439 rm -f "$tmpfile" |
|
6246
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
5440 else |
|
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
5441 if $doit; then |
|
7216
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
5442 echo "Updating $sourcebase/$makefile_am (backup in $sourcebase/$makefile_am~)" |
|
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
5443 mv -f "$destdir"/$sourcebase/$makefile_am "$destdir"/$sourcebase/$makefile_am~ |
|
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
5444 mv -f "$tmpfile" "$destdir"/$sourcebase/$makefile_am |
|
6246
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
5445 else |
|
7216
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
5446 echo "Update $sourcebase/$makefile_am (backup in $sourcebase/$makefile_am~)" |
|
6745
aca74c06bca0
Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and
Bruno Haible <bruno@clisp.org>
parents:
6633
diff
changeset
|
5447 rm -f "$tmpfile" |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
5448 fi |
|
6246
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
5449 fi |
|
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
5450 else |
|
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
5451 if $doit; then |
|
7216
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
5452 echo "Creating $sourcebase/$makefile_am" |
|
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
5453 mv -f "$tmpfile" "$destdir"/$sourcebase/$makefile_am |
|
6246
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
5454 else |
|
7216
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
5455 echo "Create $sourcebase/$makefile_am" |
|
6745
aca74c06bca0
Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and
Bruno Haible <bruno@clisp.org>
parents:
6633
diff
changeset
|
5456 rm -f "$tmpfile" |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
5457 fi |
|
8451
ba5ed28cb276
Update .cvsignore and .gitignore files.
Bruno Haible <bruno@clisp.org>
parents:
8432
diff
changeset
|
5458 func_append added_files "$sourcebase/$makefile_am$nl" |
|
5351
7c565c8ecabc
Move duplicated code into function func_emit_lib_Makefile_am().
Bruno Haible <bruno@clisp.org>
parents:
5350
diff
changeset
|
5459 fi |
|
5345
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
5460 |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5461 # Create po/ directory. |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5462 if test -n "$pobase"; then |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5463 # Create po makefile and auxiliary files. |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5464 for file in Makefile.in.in remove-potcdate.sin; do |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5465 func_dest_tmpfilename $pobase/$file |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5466 func_lookup_file build-aux/po/$file |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5467 cat "$lookedup_file" > "$tmpfile" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5468 if test -f "$destdir"/$pobase/$file; then |
|
16714
2e2bf6c7bf38
gnulib-tool: Avoid unintended error output from 'cmp'.
Bruno Haible <bruno@clisp.org>
parents:
16713
diff
changeset
|
5469 if cmp -s "$destdir"/$pobase/$file "$tmpfile"; then |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5470 rm -f "$tmpfile" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5471 else |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5472 if $doit; then |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5473 echo "Updating $pobase/$file (backup in $pobase/$file~)" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5474 mv -f "$destdir"/$pobase/$file "$destdir"/$pobase/$file~ |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5475 mv -f "$tmpfile" "$destdir"/$pobase/$file |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5476 else |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5477 echo "Update $pobase/$file (backup in $pobase/$file~)" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5478 rm -f "$tmpfile" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5479 fi |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5480 fi |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5481 else |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5482 if $doit; then |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5483 echo "Creating $pobase/$file" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5484 mv -f "$tmpfile" "$destdir"/$pobase/$file |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5485 else |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5486 echo "Create $pobase/$file" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5487 rm -f "$tmpfile" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5488 fi |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5489 func_append added_files "$pobase/$file$nl" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5490 fi |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5491 done |
|
10065
e1449fcc7ecb
* gnulib-tool: Fix various comment typos.
Eric Blake <ebb9@byu.net>
parents:
9887
diff
changeset
|
5492 # Create po makefile parameterization, part 1. |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5493 func_dest_tmpfilename $pobase/Makevars |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5494 func_emit_po_Makevars > "$tmpfile" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5495 if test -f "$destdir"/$pobase/Makevars; then |
|
16714
2e2bf6c7bf38
gnulib-tool: Avoid unintended error output from 'cmp'.
Bruno Haible <bruno@clisp.org>
parents:
16713
diff
changeset
|
5496 if cmp -s "$destdir"/$pobase/Makevars "$tmpfile"; then |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5497 rm -f "$tmpfile" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5498 else |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5499 if $doit; then |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5500 echo "Updating $pobase/Makevars (backup in $pobase/Makevars~)" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5501 mv -f "$destdir"/$pobase/Makevars "$destdir"/$pobase/Makevars~ |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5502 mv -f "$tmpfile" "$destdir"/$pobase/Makevars |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5503 else |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5504 echo "Update $pobase/Makevars (backup in $pobase/Makevars~)" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5505 rm -f "$tmpfile" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5506 fi |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5507 fi |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5508 else |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5509 if $doit; then |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5510 echo "Creating $pobase/Makevars" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5511 mv -f "$tmpfile" "$destdir"/$pobase/Makevars |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5512 else |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5513 echo "Create $pobase/Makevars" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5514 rm -f "$tmpfile" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5515 fi |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5516 func_append added_files "$pobase/Makevars$nl" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5517 fi |
|
10065
e1449fcc7ecb
* gnulib-tool: Fix various comment typos.
Eric Blake <ebb9@byu.net>
parents:
9887
diff
changeset
|
5518 # Create po makefile parameterization, part 2. |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5519 func_dest_tmpfilename $pobase/POTFILES.in |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5520 func_emit_po_POTFILES_in > "$tmpfile" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5521 if test -f "$destdir"/$pobase/POTFILES.in; then |
|
16714
2e2bf6c7bf38
gnulib-tool: Avoid unintended error output from 'cmp'.
Bruno Haible <bruno@clisp.org>
parents:
16713
diff
changeset
|
5522 if cmp -s "$destdir"/$pobase/POTFILES.in "$tmpfile"; then |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5523 rm -f "$tmpfile" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5524 else |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5525 if $doit; then |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5526 echo "Updating $pobase/POTFILES.in (backup in $pobase/POTFILES.in~)" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5527 mv -f "$destdir"/$pobase/POTFILES.in "$destdir"/$pobase/POTFILES.in~ |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5528 mv -f "$tmpfile" "$destdir"/$pobase/POTFILES.in |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5529 else |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5530 echo "Update $pobase/POTFILES.in (backup in $pobase/POTFILES.in~)" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5531 rm -f "$tmpfile" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5532 fi |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5533 fi |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5534 else |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5535 if $doit; then |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5536 echo "Creating $pobase/POTFILES.in" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5537 mv -f "$tmpfile" "$destdir"/$pobase/POTFILES.in |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5538 else |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5539 echo "Create $pobase/POTFILES.in" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5540 rm -f "$tmpfile" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5541 fi |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5542 func_append added_files "$pobase/POTFILES.in$nl" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5543 fi |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5544 # Fetch PO files. |
|
19192
d86e08b1f555
all: Replace many more http URLs by https URLs. Update stale URLs.
Bruno Haible <bruno@clisp.org>
parents:
19190
diff
changeset
|
5545 TP_URL="https://translationproject.org/latest/" |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5546 if $doit; then |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5547 echo "Fetching gnulib PO files from $TP_URL" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5548 (cd "$destdir"/$pobase \ |
|
39897
ac60f423d63b
bootstrap, gnulib-tool: use https instead of insecure rsync
Benno Schulenberg <bensberg@telfort.nl>
parents:
39895
diff
changeset
|
5549 && wget --no-verbose --mirror --level=1 -nd -A.po -P . "${TP_URL}gnulib/" |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5550 ) |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5551 else |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5552 echo "Fetch gnulib PO files from $TP_URL" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5553 fi |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5554 # Create po/LINGUAS. |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5555 if $doit; then |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5556 func_dest_tmpfilename $pobase/LINGUAS |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5557 (cd "$destdir"/$pobase \ |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5558 && { echo '# Set of available languages.' |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5559 LC_ALL=C ls -1 *.po | sed -e 's,\.po$,,' |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5560 } |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5561 ) > "$tmpfile" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5562 if test -f "$destdir"/$pobase/LINGUAS; then |
|
16714
2e2bf6c7bf38
gnulib-tool: Avoid unintended error output from 'cmp'.
Bruno Haible <bruno@clisp.org>
parents:
16713
diff
changeset
|
5563 if cmp -s "$destdir"/$pobase/LINGUAS "$tmpfile"; then |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5564 rm -f "$tmpfile" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5565 else |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5566 echo "Updating $pobase/LINGUAS (backup in $pobase/LINGUAS~)" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5567 mv -f "$destdir"/$pobase/LINGUAS "$destdir"/$pobase/LINGUAS~ |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5568 mv -f "$tmpfile" "$destdir"/$pobase/LINGUAS |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5569 fi |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5570 else |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5571 echo "Creating $pobase/LINGUAS" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5572 mv -f "$tmpfile" "$destdir"/$pobase/LINGUAS |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5573 func_append added_files "$pobase/LINGUAS$nl" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5574 fi |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5575 else |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5576 if test -f "$destdir"/$pobase/LINGUAS; then |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5577 echo "Update $pobase/LINGUAS (backup in $pobase/LINGUAS~)" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5578 else |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5579 echo "Create $pobase/LINGUAS" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5580 fi |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5581 fi |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5582 fi |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5583 |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
5584 # func_count_relative_local_gnulib_path |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
5585 # gl_LOCAL_DIR requires local_gnulib_path to be set relatively to destdir |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
5586 # Input: |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
5587 # - local_gnulib_path from --local-dir |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
5588 # - destdir from --dir |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
5589 # Output: |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
5590 # - relative_local_dir path to be stored into gl_LOCAL_DIR |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
5591 func_count_relative_local_gnulib_path () |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
5592 { |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
5593 relative_local_gnulib_path= |
|
40184
7f0ac0398fae
gnulib-tool: Improve handling of multiple --local-dir options.
Bruno Haible <bruno@clisp.org>
parents:
40128
diff
changeset
|
5594 save_IFS="$IFS" |
|
7f0ac0398fae
gnulib-tool: Improve handling of multiple --local-dir options.
Bruno Haible <bruno@clisp.org>
parents:
40128
diff
changeset
|
5595 IFS="$PATH_SEPARATOR" |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
5596 for local_dir in $local_gnulib_path |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
5597 do |
|
40184
7f0ac0398fae
gnulib-tool: Improve handling of multiple --local-dir options.
Bruno Haible <bruno@clisp.org>
parents:
40128
diff
changeset
|
5598 IFS="$save_IFS" |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
5599 # Store the local_dir relative to destdir. |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
5600 case "$local_dir" in |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
5601 "" | /*) |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
5602 relative_local_dir="$local_dir" ;; |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
5603 * ) |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
5604 case "$destdir" in |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
5605 /*) relative_local_dir="$local_dir" ;; |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
5606 *) |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
5607 # destdir, local_dir are both relative. |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
5608 func_relativize "$destdir" "$local_dir" |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
5609 relative_local_dir="$reldir" ;; |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
5610 esac ;; |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
5611 esac |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
5612 func_path_append relative_local_gnulib_path "$relative_local_dir" |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
5613 done |
|
40184
7f0ac0398fae
gnulib-tool: Improve handling of multiple --local-dir options.
Bruno Haible <bruno@clisp.org>
parents:
40128
diff
changeset
|
5614 IFS="$save_IFS" |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
5615 } |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
5616 |
|
6180
a0904de304e5
Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents:
6179
diff
changeset
|
5617 # Create m4/gnulib-cache.m4. |
|
6745
aca74c06bca0
Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and
Bruno Haible <bruno@clisp.org>
parents:
6633
diff
changeset
|
5618 func_dest_tmpfilename $m4base/gnulib-cache.m4 |
|
5345
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
5619 ( |
|
6777
d9b10884dc69
* gnulib-tool (func_version): Base copyright year on CVS date.
Eric Blake <ebb9@byu.net>
parents:
6765
diff
changeset
|
5620 func_emit_copyright_notice |
|
5345
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
5621 echo "#" |
|
6180
a0904de304e5
Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents:
6179
diff
changeset
|
5622 echo "# This file represents the specification of how gnulib-tool is used." |
|
a0904de304e5
Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents:
6179
diff
changeset
|
5623 echo "# It acts as a cache: It is written and read by gnulib-tool." |
|
13636
06064a28d167
gnulib-tool: Don't talk about CVS any more.
Bruno Haible <bruno@clisp.org>
parents:
13634
diff
changeset
|
5624 echo "# In projects that use version control, this file is meant to be put under" |
|
06064a28d167
gnulib-tool: Don't talk about CVS any more.
Bruno Haible <bruno@clisp.org>
parents:
13634
diff
changeset
|
5625 echo "# version control, like the configure.ac and various Makefile.am files." |
|
6180
a0904de304e5
Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents:
6179
diff
changeset
|
5626 echo |
|
a0904de304e5
Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents:
6179
diff
changeset
|
5627 echo |
|
a0904de304e5
Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents:
6179
diff
changeset
|
5628 echo "# Specification in the form of a command-line invocation:" |
|
39748
912cc79f4d91
gnulib-tool: limit line length for git send-email
Paul Eggert <eggert@cs.ucla.edu>
parents:
39737
diff
changeset
|
5629 printf '%s\n' "$actioncmd" |
|
6180
a0904de304e5
Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents:
6179
diff
changeset
|
5630 echo |
|
a0904de304e5
Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents:
6179
diff
changeset
|
5631 echo "# Specification in the form of a few gnulib-tool.m4 macro invocations:" |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
5632 func_count_relative_local_gnulib_path |
|
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
5633 echo "gl_LOCAL_DIR([$relative_local_gnulib_path])" |
|
10246
50a9076d476d
Make gnulib-cache.m4 easier to diff.
Eric Blake <ebb9@byu.net>
parents:
10157
diff
changeset
|
5634 echo "gl_MODULES([" |
| 12417 | 5635 echo "$specified_modules" | sed -e 's/^/ /g' |
|
10246
50a9076d476d
Make gnulib-cache.m4 easier to diff.
Eric Blake <ebb9@byu.net>
parents:
10157
diff
changeset
|
5636 echo "])" |
|
10744
7fb7b37150b3
New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents:
10743
diff
changeset
|
5637 test -z "$incobsolete" || echo "gl_WITH_OBSOLETE" |
|
13080
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
5638 test -z "$inc_cxx_tests" || echo "gl_WITH_CXX_TESTS" |
|
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
5639 test -z "$inc_longrunning_tests" || echo "gl_WITH_LONGRUNNING_TESTS" |
|
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
5640 test -z "$inc_privileged_tests" || echo "gl_WITH_PRIVILEGED_TESTS" |
|
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
5641 test -z "$inc_unportable_tests" || echo "gl_WITH_UNPORTABLE_TESTS" |
|
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
5642 test -z "$inc_all_tests" || echo "gl_WITH_ALL_TESTS" |
|
6180
a0904de304e5
Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents:
6179
diff
changeset
|
5643 echo "gl_AVOID([$avoidlist])" |
|
a0904de304e5
Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents:
6179
diff
changeset
|
5644 echo "gl_SOURCE_BASE([$sourcebase])" |
|
a0904de304e5
Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents:
6179
diff
changeset
|
5645 echo "gl_M4_BASE([$m4base])" |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5646 echo "gl_PO_BASE([$pobase])" |
|
6955
7715890c929a
* gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents:
6952
diff
changeset
|
5647 echo "gl_DOC_BASE([$docbase])" |
|
6250
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
5648 echo "gl_TESTS_BASE([$testsbase])" |
|
16932
48e8f0679448
gnulib-tool: Refactor inctests variable.
Bruno Haible <bruno@clisp.org>
parents:
16931
diff
changeset
|
5649 if $inctests; then |
|
48e8f0679448
gnulib-tool: Refactor inctests variable.
Bruno Haible <bruno@clisp.org>
parents:
16931
diff
changeset
|
5650 echo "gl_WITH_TESTS" |
|
48e8f0679448
gnulib-tool: Refactor inctests variable.
Bruno Haible <bruno@clisp.org>
parents:
16931
diff
changeset
|
5651 fi |
|
6180
a0904de304e5
Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents:
6179
diff
changeset
|
5652 echo "gl_LIB([$libname])" |
|
9417
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
5653 if test -n "$lgpl"; then |
|
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
5654 if test "$lgpl" = yes; then |
|
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
5655 echo "gl_LGPL" |
|
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
5656 else |
|
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
5657 echo "gl_LGPL([$lgpl])" |
|
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
5658 fi |
|
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
5659 fi |
|
7216
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
5660 echo "gl_MAKEFILE_NAME([$makefile_name])" |
|
14833
76127af7039f
Finish the conditional dependencies mechanism.
Bruno Haible <bruno@clisp.org>
parents:
14806
diff
changeset
|
5661 if test "$cond_dependencies" = true; then |
|
76127af7039f
Finish the conditional dependencies mechanism.
Bruno Haible <bruno@clisp.org>
parents:
14806
diff
changeset
|
5662 echo "gl_CONDITIONAL_DEPENDENCIES" |
|
76127af7039f
Finish the conditional dependencies mechanism.
Bruno Haible <bruno@clisp.org>
parents:
14806
diff
changeset
|
5663 fi |
| 7077 | 5664 if test "$libtool" = true; then |
| 5665 echo "gl_LIBTOOL" | |
| 5666 fi | |
|
6180
a0904de304e5
Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents:
6179
diff
changeset
|
5667 echo "gl_MACRO_PREFIX([$macro_prefix])" |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
5668 echo "gl_PO_DOMAIN([$po_domain])" |
|
17039
e5d33904a8b2
gnulib-tool: Fix persistence of --witness-c-macro option.
Bruno Haible <bruno@clisp.org>
parents:
17004
diff
changeset
|
5669 echo "gl_WITNESS_C_MACRO([$witness_c_macro])" |
|
9810
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5670 if test -n "$vc_files"; then |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5671 echo "gl_VC_FILES([$vc_files])" |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5672 fi |
|
6745
aca74c06bca0
Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and
Bruno Haible <bruno@clisp.org>
parents:
6633
diff
changeset
|
5673 ) > "$tmpfile" |
|
6246
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
5674 if test -f "$destdir"/$m4base/gnulib-cache.m4; then |
|
16714
2e2bf6c7bf38
gnulib-tool: Avoid unintended error output from 'cmp'.
Bruno Haible <bruno@clisp.org>
parents:
16713
diff
changeset
|
5675 if cmp -s "$destdir"/$m4base/gnulib-cache.m4 "$tmpfile"; then |
|
6745
aca74c06bca0
Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and
Bruno Haible <bruno@clisp.org>
parents:
6633
diff
changeset
|
5676 rm -f "$tmpfile" |
|
6246
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
5677 else |
|
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
5678 if $doit; then |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
5679 echo "Updating $m4base/gnulib-cache.m4 (backup in $m4base/gnulib-cache.m4~)" |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
5680 mv -f "$destdir"/$m4base/gnulib-cache.m4 "$destdir"/$m4base/gnulib-cache.m4~ |
|
6745
aca74c06bca0
Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and
Bruno Haible <bruno@clisp.org>
parents:
6633
diff
changeset
|
5681 mv -f "$tmpfile" "$destdir"/$m4base/gnulib-cache.m4 |
|
6246
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
5682 else |
|
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
5683 echo "Update $m4base/gnulib-cache.m4 (backup in $m4base/gnulib-cache.m4~)" |
|
6249
564133adbd69
Comment out too much verbosity in --dry-run.
Bruno Haible <bruno@clisp.org>
parents:
6248
diff
changeset
|
5684 if false; then |
|
6745
aca74c06bca0
Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and
Bruno Haible <bruno@clisp.org>
parents:
6633
diff
changeset
|
5685 cat "$tmpfile" |
|
6249
564133adbd69
Comment out too much verbosity in --dry-run.
Bruno Haible <bruno@clisp.org>
parents:
6248
diff
changeset
|
5686 echo |
|
564133adbd69
Comment out too much verbosity in --dry-run.
Bruno Haible <bruno@clisp.org>
parents:
6248
diff
changeset
|
5687 echo "# gnulib-cache.m4 ends here" |
|
564133adbd69
Comment out too much verbosity in --dry-run.
Bruno Haible <bruno@clisp.org>
parents:
6248
diff
changeset
|
5688 fi |
|
6745
aca74c06bca0
Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and
Bruno Haible <bruno@clisp.org>
parents:
6633
diff
changeset
|
5689 rm -f "$tmpfile" |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
5690 fi |
|
6246
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
5691 fi |
|
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
5692 else |
|
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
5693 if $doit; then |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
5694 echo "Creating $m4base/gnulib-cache.m4" |
|
6745
aca74c06bca0
Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and
Bruno Haible <bruno@clisp.org>
parents:
6633
diff
changeset
|
5695 mv -f "$tmpfile" "$destdir"/$m4base/gnulib-cache.m4 |
|
6246
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
5696 else |
|
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
5697 echo "Create $m4base/gnulib-cache.m4" |
|
6745
aca74c06bca0
Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and
Bruno Haible <bruno@clisp.org>
parents:
6633
diff
changeset
|
5698 cat "$tmpfile" |
|
aca74c06bca0
Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and
Bruno Haible <bruno@clisp.org>
parents:
6633
diff
changeset
|
5699 rm -f "$tmpfile" |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
5700 fi |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
5701 fi |
|
6180
a0904de304e5
Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents:
6179
diff
changeset
|
5702 |
|
a0904de304e5
Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents:
6179
diff
changeset
|
5703 # Create m4/gnulib-comp.m4. |
|
6745
aca74c06bca0
Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and
Bruno Haible <bruno@clisp.org>
parents:
6633
diff
changeset
|
5704 func_dest_tmpfilename $m4base/gnulib-comp.m4 |
|
6180
a0904de304e5
Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents:
6179
diff
changeset
|
5705 ( |
|
7421
8bace4b08db5
Mark generated files as "DO NOT EDIT".
Bruno Haible <bruno@clisp.org>
parents:
7391
diff
changeset
|
5706 echo "# DO NOT EDIT! GENERATED AUTOMATICALLY!" |
|
6777
d9b10884dc69
* gnulib-tool (func_version): Base copyright year on CVS date.
Eric Blake <ebb9@byu.net>
parents:
6765
diff
changeset
|
5707 func_emit_copyright_notice |
|
6180
a0904de304e5
Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents:
6179
diff
changeset
|
5708 echo "#" |
|
a0904de304e5
Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents:
6179
diff
changeset
|
5709 echo "# This file represents the compiled summary of the specification in" |
|
a0904de304e5
Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents:
6179
diff
changeset
|
5710 echo "# gnulib-cache.m4. It lists the computed macro invocations that need" |
|
a0904de304e5
Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents:
6179
diff
changeset
|
5711 echo "# to be invoked from configure.ac." |
|
13636
06064a28d167
gnulib-tool: Don't talk about CVS any more.
Bruno Haible <bruno@clisp.org>
parents:
13634
diff
changeset
|
5712 echo "# In projects that use version control, this file can be treated like" |
|
06064a28d167
gnulib-tool: Don't talk about CVS any more.
Bruno Haible <bruno@clisp.org>
parents:
13634
diff
changeset
|
5713 echo "# other built files." |
|
6180
a0904de304e5
Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents:
6179
diff
changeset
|
5714 echo |
|
5345
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
5715 echo |
|
6160
2fb771c0af6b
Emit more comments and advice.
Bruno Haible <bruno@clisp.org>
parents:
6159
diff
changeset
|
5716 echo "# This macro should be invoked from $configure_ac, in the section" |
|
2fb771c0af6b
Emit more comments and advice.
Bruno Haible <bruno@clisp.org>
parents:
6159
diff
changeset
|
5717 echo "# \"Checks for programs\", right after AC_PROG_CC, and certainly before" |
|
2fb771c0af6b
Emit more comments and advice.
Bruno Haible <bruno@clisp.org>
parents:
6159
diff
changeset
|
5718 echo "# any checks for libraries, header files, types and library functions." |
| 6176 | 5719 echo "AC_DEFUN([${macro_prefix}_EARLY]," |
|
5345
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
5720 echo "[" |
|
7105
641bac73140c
* gnulib-tool (func_import): Detect unexpanded macros in gnulib
Eric Blake <ebb9@byu.net>
parents:
7090
diff
changeset
|
5721 echo " m4_pattern_forbid([^gl_[A-Z]])dnl the gnulib macro namespace" |
|
7486
46b72819ef52
Add support for multiple gnulib-tool invocations in the scope of a single
Bruno Haible <bruno@clisp.org>
parents:
7485
diff
changeset
|
5722 echo " m4_pattern_allow([^gl_ES\$])dnl a valid locale name" |
|
46b72819ef52
Add support for multiple gnulib-tool invocations in the scope of a single
Bruno Haible <bruno@clisp.org>
parents:
7485
diff
changeset
|
5723 echo " m4_pattern_allow([^gl_LIBOBJS\$])dnl a variable" |
|
46b72819ef52
Add support for multiple gnulib-tool invocations in the scope of a single
Bruno Haible <bruno@clisp.org>
parents:
7485
diff
changeset
|
5724 echo " m4_pattern_allow([^gl_LTLIBOBJS\$])dnl a variable" |
|
18114
e212f9b1ce05
gnulib-common.m4: fix gl_PROG_AR_RANLIB/AM_PROG_AR clash
Pavel Raiskup <praiskup@redhat.com>
parents:
18109
diff
changeset
|
5725 |
|
18124
ef6cdfd2e603
gnulib-tool: fix tests of 'extensions' module
Pavel Raiskup <praiskup@redhat.com>
parents:
18114
diff
changeset
|
5726 func_emit_pre_early_macros : ' ' "$final_modules" |
|
ef6cdfd2e603
gnulib-tool: fix tests of 'extensions' module
Pavel Raiskup <praiskup@redhat.com>
parents:
18114
diff
changeset
|
5727 |
|
18729
9534f71959d1
gnulib-tool: new option --gnu-make
Paul Eggert <eggert@cs.ucla.edu>
parents:
18704
diff
changeset
|
5728 if ! $gnu_make && test -n "$uses_subdirs"; then |
|
7641
d6fbdb213b01
Finish support for source files in subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7640
diff
changeset
|
5729 echo " AC_REQUIRE([AM_PROG_CC_C_O])" |
|
d6fbdb213b01
Finish support for source files in subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7640
diff
changeset
|
5730 fi |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
5731 for module in $final_modules; do |
|
8079
0951beec5b89
New module description section 'configure.ac-early'.
Bruno Haible <bruno@clisp.org>
parents:
8055
diff
changeset
|
5732 func_verify_module |
|
0951beec5b89
New module description section 'configure.ac-early'.
Bruno Haible <bruno@clisp.org>
parents:
8055
diff
changeset
|
5733 if test -n "$module"; then |
|
12983
39ddc4b73387
gnulib-tool (func_import): Explain origin of code.
Simon Josefsson <simon@josefsson.org>
parents:
12982
diff
changeset
|
5734 echo "# Code from module $module:" |
|
8079
0951beec5b89
New module description section 'configure.ac-early'.
Bruno Haible <bruno@clisp.org>
parents:
8055
diff
changeset
|
5735 func_get_autoconf_early_snippet "$module" |
|
0951beec5b89
New module description section 'configure.ac-early'.
Bruno Haible <bruno@clisp.org>
parents:
8055
diff
changeset
|
5736 fi |
|
0951beec5b89
New module description section 'configure.ac-early'.
Bruno Haible <bruno@clisp.org>
parents:
8055
diff
changeset
|
5737 done \ |
|
0951beec5b89
New module description section 'configure.ac-early'.
Bruno Haible <bruno@clisp.org>
parents:
8055
diff
changeset
|
5738 | sed -e '/^$/d;' -e 's/^/ /' |
|
5345
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
5739 echo "])" |
|
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
5740 echo |
|
6160
2fb771c0af6b
Emit more comments and advice.
Bruno Haible <bruno@clisp.org>
parents:
6159
diff
changeset
|
5741 echo "# This macro should be invoked from $configure_ac, in the section" |
|
2fb771c0af6b
Emit more comments and advice.
Bruno Haible <bruno@clisp.org>
parents:
6159
diff
changeset
|
5742 echo "# \"Check for header files, types and library functions\"." |
| 6176 | 5743 echo "AC_DEFUN([${macro_prefix}_INIT]," |
|
5345
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
5744 echo "[" |
| 7077 | 5745 if test "$libtool" = true; then |
| 5746 echo " AM_CONDITIONAL([GL_COND_LIBTOOL], [true])" | |
|
7286
727bb5526bad
For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents:
7270
diff
changeset
|
5747 echo " gl_cond_libtool=true" |
| 7077 | 5748 else |
| 6512 | 5749 echo " AM_CONDITIONAL([GL_COND_LIBTOOL], [false])" |
|
7286
727bb5526bad
For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents:
7270
diff
changeset
|
5750 echo " gl_cond_libtool=false" |
|
727bb5526bad
For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents:
7270
diff
changeset
|
5751 echo " gl_libdeps=" |
|
727bb5526bad
For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents:
7270
diff
changeset
|
5752 echo " gl_ltlibdeps=" |
|
6414
46d47c8fe734
* gnulib-tool: Define automake conditional GL_COND_LIBTOOL if
Simon Josefsson <simon@josefsson.org>
parents:
6389
diff
changeset
|
5753 fi |
| 6556 | 5754 if test "$auxdir" != "build-aux"; then |
| 5755 sed_replace_build_aux=' | |
| 5756 :a | |
| 5757 /AC_CONFIG_FILES(.*:build-aux\/.*)/{ | |
| 5758 s|AC_CONFIG_FILES(\(.*\):build-aux/\(.*\))|AC_CONFIG_FILES(\1:'"$auxdir"'/\2)| | |
| 5759 ba | |
| 5760 }' | |
| 5761 else | |
|
10400
817f1418bbde
Make gnulib-tool work with native 'sed' on AIX.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
10380
diff
changeset
|
5762 sed_replace_build_aux="$sed_noop" |
| 6556 | 5763 fi |
|
13105
6d950d2ec11e
gnulib-tool: Provide the value of --m4-base to modules.
Bruno Haible <bruno@clisp.org>
parents:
13090
diff
changeset
|
5764 echo " gl_m4_base='$m4base'" |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
5765 func_emit_initmacro_start $macro_prefix |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
5766 echo " gl_source_base='$sourcebase'" |
|
14894
b22360ddefc4
gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents:
14841
diff
changeset
|
5767 if test -n "$witness_c_macro"; then |
|
b22360ddefc4
gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents:
14841
diff
changeset
|
5768 echo " m4_pushdef([gl_MODULE_INDICATOR_CONDITION], [$witness_c_macro])" |
|
b22360ddefc4
gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents:
14841
diff
changeset
|
5769 fi |
|
19478
fef1e0e56d65
gnulib-tool: Make --conditional-dependencies work better.
Bruno Haible <bruno@clisp.org>
parents:
19439
diff
changeset
|
5770 func_emit_autoconf_snippets "$main_modules" "$main_modules" func_verify_module true false true |
|
14894
b22360ddefc4
gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents:
14841
diff
changeset
|
5771 if test -n "$witness_c_macro"; then |
|
b22360ddefc4
gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents:
14841
diff
changeset
|
5772 echo " m4_popdef([gl_MODULE_INDICATOR_CONDITION])" |
|
b22360ddefc4
gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents:
14841
diff
changeset
|
5773 fi |
|
12983
39ddc4b73387
gnulib-tool (func_import): Explain origin of code.
Simon Josefsson <simon@josefsson.org>
parents:
12982
diff
changeset
|
5774 echo " # End of code from modules" |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
5775 func_emit_initmacro_end $macro_prefix |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
5776 echo " gltests_libdeps=" |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
5777 echo " gltests_ltlibdeps=" |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
5778 func_emit_initmacro_start ${macro_prefix}tests |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
5779 echo " gl_source_base='$testsbase'" |
|
13067
0e829091f9c0
Avoid side effects from tests-related modules on the compilation of lib.
Bruno Haible <bruno@clisp.org>
parents:
12986
diff
changeset
|
5780 # Define a tests witness macro that depends on the package. |
|
0e829091f9c0
Avoid side effects from tests-related modules on the compilation of lib.
Bruno Haible <bruno@clisp.org>
parents:
12986
diff
changeset
|
5781 # PACKAGE is defined by AM_INIT_AUTOMAKE, PACKAGE_TARNAME is defined by AC_INIT. |
|
19439
8bfc20b57265
maint: shorten https://lists.gnu.org/archive/html/... links
Jim Meyering <meyering@fb.com>
parents:
19271
diff
changeset
|
5782 # See <https://lists.gnu.org/r/automake/2009-05/msg00145.html>. |
|
13089
a1999d4ef573
Fix definition of tests witness macro.
Bruno Haible <bruno@clisp.org>
parents:
13081
diff
changeset
|
5783 echo "changequote(,)dnl" |
|
13090
f870702f0e45
Fix definition of tests witness macro.
Bruno Haible <bruno@clisp.org>
parents:
13089
diff
changeset
|
5784 echo " ${macro_prefix}tests_WITNESS=IN_\`echo \"\${PACKAGE-\$PACKAGE_TARNAME}\" | LC_ALL=C tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ | LC_ALL=C sed -e 's/[^A-Z0-9_]/_/g'\`_GNULIB_TESTS" |
|
13089
a1999d4ef573
Fix definition of tests witness macro.
Bruno Haible <bruno@clisp.org>
parents:
13081
diff
changeset
|
5785 echo "changequote([, ])dnl" |
|
13067
0e829091f9c0
Avoid side effects from tests-related modules on the compilation of lib.
Bruno Haible <bruno@clisp.org>
parents:
12986
diff
changeset
|
5786 echo " AC_SUBST([${macro_prefix}tests_WITNESS])" |
|
0e829091f9c0
Avoid side effects from tests-related modules on the compilation of lib.
Bruno Haible <bruno@clisp.org>
parents:
12986
diff
changeset
|
5787 echo " gl_module_indicator_condition=\$${macro_prefix}tests_WITNESS" |
|
0e829091f9c0
Avoid side effects from tests-related modules on the compilation of lib.
Bruno Haible <bruno@clisp.org>
parents:
12986
diff
changeset
|
5788 echo " m4_pushdef([gl_MODULE_INDICATOR_CONDITION], [\$gl_module_indicator_condition])" |
|
19478
fef1e0e56d65
gnulib-tool: Make --conditional-dependencies work better.
Bruno Haible <bruno@clisp.org>
parents:
19439
diff
changeset
|
5789 func_emit_autoconf_snippets "$testsrelated_modules" "$main_modules $testsrelated_modules" func_verify_module true true true |
|
13067
0e829091f9c0
Avoid side effects from tests-related modules on the compilation of lib.
Bruno Haible <bruno@clisp.org>
parents:
12986
diff
changeset
|
5790 echo " m4_popdef([gl_MODULE_INDICATOR_CONDITION])" |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
5791 func_emit_initmacro_end ${macro_prefix}tests |
|
7286
727bb5526bad
For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents:
7270
diff
changeset
|
5792 # _LIBDEPS and _LTLIBDEPS variables are not needed if this library is |
|
727bb5526bad
For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents:
7270
diff
changeset
|
5793 # created using libtool, because libtool already handles the dependencies. |
|
727bb5526bad
For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents:
7270
diff
changeset
|
5794 if test "$libtool" != true; then |
|
13768
f19c8837df90
more ports to Solaris tr, which needs [] around ranges
Paul Eggert <eggert@cs.ucla.edu>
parents:
13763
diff
changeset
|
5795 libname_upper=`echo "$libname" | LC_ALL=C tr '[a-z]-' '[A-Z]_'` |
|
7286
727bb5526bad
For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents:
7270
diff
changeset
|
5796 echo " ${libname_upper}_LIBDEPS=\"\$gl_libdeps\"" |
|
727bb5526bad
For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents:
7270
diff
changeset
|
5797 echo " AC_SUBST([${libname_upper}_LIBDEPS])" |
|
727bb5526bad
For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents:
7270
diff
changeset
|
5798 echo " ${libname_upper}_LTLIBDEPS=\"\$gl_ltlibdeps\"" |
|
727bb5526bad
For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents:
7270
diff
changeset
|
5799 echo " AC_SUBST([${libname_upper}_LTLIBDEPS])" |
|
727bb5526bad
For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents:
7270
diff
changeset
|
5800 fi |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
5801 if $use_libtests; then |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
5802 echo " LIBTESTS_LIBDEPS=\"\$gltests_libdeps\"" |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
5803 echo " AC_SUBST([LIBTESTS_LIBDEPS])" |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
5804 fi |
|
5345
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
5805 echo "])" |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
5806 func_emit_initmacro_done $macro_prefix $sourcebase |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
5807 func_emit_initmacro_done ${macro_prefix}tests $testsbase |
|
5345
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
5808 echo |
|
6180
a0904de304e5
Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents:
6179
diff
changeset
|
5809 echo "# This macro records the list of files which have been installed by" |
|
a0904de304e5
Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents:
6179
diff
changeset
|
5810 echo "# gnulib-tool and may be removed by future gnulib-tool invocations." |
|
a0904de304e5
Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents:
6179
diff
changeset
|
5811 echo "AC_DEFUN([${macro_prefix}_FILE_LIST], [" |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
5812 echo "$files" | sed -e 's,^, ,' |
|
6180
a0904de304e5
Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents:
6179
diff
changeset
|
5813 echo "])" |
|
6745
aca74c06bca0
Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and
Bruno Haible <bruno@clisp.org>
parents:
6633
diff
changeset
|
5814 ) > "$tmpfile" |
|
6246
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
5815 if test -f "$destdir"/$m4base/gnulib-comp.m4; then |
|
16714
2e2bf6c7bf38
gnulib-tool: Avoid unintended error output from 'cmp'.
Bruno Haible <bruno@clisp.org>
parents:
16713
diff
changeset
|
5816 if cmp -s "$destdir"/$m4base/gnulib-comp.m4 "$tmpfile"; then |
|
6745
aca74c06bca0
Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and
Bruno Haible <bruno@clisp.org>
parents:
6633
diff
changeset
|
5817 rm -f "$tmpfile" |
|
6246
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
5818 else |
|
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
5819 if $doit; then |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
5820 echo "Updating $m4base/gnulib-comp.m4 (backup in $m4base/gnulib-comp.m4~)" |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
5821 mv -f "$destdir"/$m4base/gnulib-comp.m4 "$destdir"/$m4base/gnulib-comp.m4~ |
|
6745
aca74c06bca0
Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and
Bruno Haible <bruno@clisp.org>
parents:
6633
diff
changeset
|
5822 mv -f "$tmpfile" "$destdir"/$m4base/gnulib-comp.m4 |
|
6246
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
5823 else |
|
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
5824 echo "Update $m4base/gnulib-comp.m4 (backup in $m4base/gnulib-comp.m4~)" |
|
6249
564133adbd69
Comment out too much verbosity in --dry-run.
Bruno Haible <bruno@clisp.org>
parents:
6248
diff
changeset
|
5825 if false; then |
|
6745
aca74c06bca0
Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and
Bruno Haible <bruno@clisp.org>
parents:
6633
diff
changeset
|
5826 cat "$tmpfile" |
|
6249
564133adbd69
Comment out too much verbosity in --dry-run.
Bruno Haible <bruno@clisp.org>
parents:
6248
diff
changeset
|
5827 echo |
|
564133adbd69
Comment out too much verbosity in --dry-run.
Bruno Haible <bruno@clisp.org>
parents:
6248
diff
changeset
|
5828 echo "# gnulib-comp.m4 ends here" |
|
564133adbd69
Comment out too much verbosity in --dry-run.
Bruno Haible <bruno@clisp.org>
parents:
6248
diff
changeset
|
5829 fi |
|
6745
aca74c06bca0
Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and
Bruno Haible <bruno@clisp.org>
parents:
6633
diff
changeset
|
5830 rm -f "$tmpfile" |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
5831 fi |
|
6246
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
5832 fi |
|
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
5833 else |
|
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
5834 if $doit; then |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
5835 echo "Creating $m4base/gnulib-comp.m4" |
|
6745
aca74c06bca0
Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and
Bruno Haible <bruno@clisp.org>
parents:
6633
diff
changeset
|
5836 mv -f "$tmpfile" "$destdir"/$m4base/gnulib-comp.m4 |
|
6246
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
5837 else |
|
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
5838 echo "Create $m4base/gnulib-comp.m4" |
|
6745
aca74c06bca0
Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and
Bruno Haible <bruno@clisp.org>
parents:
6633
diff
changeset
|
5839 cat "$tmpfile" |
|
aca74c06bca0
Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and
Bruno Haible <bruno@clisp.org>
parents:
6633
diff
changeset
|
5840 rm -f "$tmpfile" |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
5841 fi |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
5842 fi |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
5843 |
|
40185
a7fe9f54c3df
gnulib-tool: Support --import with just a few tests, not --with-tests.
Bruno Haible <bruno@clisp.org>
parents:
40184
diff
changeset
|
5844 if $gentests; then |
|
7222
06eec4eaf416
* gnulib-tool (emit_lib_Makefile_am): Don't put $makefile_name
Paul Eggert <eggert@cs.ucla.edu>
parents:
7216
diff
changeset
|
5845 # Create tests makefile. |
|
7216
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
5846 func_dest_tmpfilename $testsbase/$makefile_am |
|
10476
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
5847 destfile="$testsbase/$makefile_am" |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
5848 modules="$testsrelated_modules" |
|
13067
0e829091f9c0
Avoid side effects from tests-related modules on the compilation of lib.
Bruno Haible <bruno@clisp.org>
parents:
12986
diff
changeset
|
5849 func_emit_tests_Makefile_am "${macro_prefix}tests_WITNESS" > "$tmpfile" |
|
7216
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
5850 if test -f "$destdir"/$testsbase/$makefile_am; then |
|
16714
2e2bf6c7bf38
gnulib-tool: Avoid unintended error output from 'cmp'.
Bruno Haible <bruno@clisp.org>
parents:
16713
diff
changeset
|
5851 if cmp -s "$destdir"/$testsbase/$makefile_am "$tmpfile"; then |
|
6745
aca74c06bca0
Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and
Bruno Haible <bruno@clisp.org>
parents:
6633
diff
changeset
|
5852 rm -f "$tmpfile" |
|
6250
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
5853 else |
|
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
5854 if $doit; then |
|
7216
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
5855 echo "Updating $testsbase/$makefile_am (backup in $testsbase/$makefile_am~)" |
|
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
5856 mv -f "$destdir"/$testsbase/$makefile_am "$destdir"/$testsbase/$makefile_am~ |
|
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
5857 mv -f "$tmpfile" "$destdir"/$testsbase/$makefile_am |
|
6250
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
5858 else |
|
7216
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
5859 echo "Update $testsbase/$makefile_am (backup in $testsbase/$makefile_am~)" |
|
6745
aca74c06bca0
Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and
Bruno Haible <bruno@clisp.org>
parents:
6633
diff
changeset
|
5860 rm -f "$tmpfile" |
|
6250
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
5861 fi |
|
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
5862 fi |
|
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
5863 else |
|
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
5864 if $doit; then |
|
7216
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
5865 echo "Creating $testsbase/$makefile_am" |
|
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
5866 mv -f "$tmpfile" "$destdir"/$testsbase/$makefile_am |
|
6250
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
5867 else |
|
7216
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
5868 echo "Create $testsbase/$makefile_am" |
|
6745
aca74c06bca0
Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and
Bruno Haible <bruno@clisp.org>
parents:
6633
diff
changeset
|
5869 rm -f "$tmpfile" |
|
6250
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
5870 fi |
|
17046
e23106558036
gnulib-tool: Fix indentation.
Bruno Haible <bruno@clisp.org>
parents:
17045
diff
changeset
|
5871 func_append added_files "$testsbase/$makefile_am$nl" |
|
6250
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
5872 fi |
|
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
5873 fi |
|
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
5874 |
|
9810
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5875 if test "$vc_files" != false; then |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5876 # Update the .cvsignore and .gitignore files. |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5877 { echo "$added_files" | sed -e '/^$/d' -e 's,\([^/]*\)$,|A|\1,' |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5878 echo "$removed_files" | sed -e '/^$/d' -e 's,\([^/]*\)$,|R|\1,' |
|
10252
66f4295bd26d
Put gnulib-comp.m4 into .cvsignore or .gitignore.
Bruno Haible <bruno@clisp.org>
parents:
10250
diff
changeset
|
5879 # Treat gnulib-comp.m4 like an added file, even if it already existed. |
|
66f4295bd26d
Put gnulib-comp.m4 into .cvsignore or .gitignore.
Bruno Haible <bruno@clisp.org>
parents:
10250
diff
changeset
|
5880 echo "$m4base/|A|gnulib-comp.m4" |
|
9810
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5881 } | LC_ALL=C sort -t'|' -k1,1 > "$tmp"/fileset-changes |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5882 { # Rearrange file descriptors. Needed because "while ... done < ..." |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5883 # constructs are executed in a subshell e.g. by Solaris 10 /bin/sh. |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5884 exec 5<&0 < "$tmp"/fileset-changes |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5885 func_update_ignorelist () |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5886 { |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5887 ignore="$1" |
|
10298
9b0ceb24a573
Prepend each added line in .gitignore files with a slash.
Bruno Haible <bruno@clisp.org>
parents:
10293
diff
changeset
|
5888 if test "$ignore" = .gitignore; then |
|
9b0ceb24a573
Prepend each added line in .gitignore files with a slash.
Bruno Haible <bruno@clisp.org>
parents:
10293
diff
changeset
|
5889 # In a .gitignore file, "foo" applies to the current directory and all |
|
9b0ceb24a573
Prepend each added line in .gitignore files with a slash.
Bruno Haible <bruno@clisp.org>
parents:
10293
diff
changeset
|
5890 # subdirectories, whereas "/foo" applies to the current directory only. |
|
9b0ceb24a573
Prepend each added line in .gitignore files with a slash.
Bruno Haible <bruno@clisp.org>
parents:
10293
diff
changeset
|
5891 anchor='/' |
|
9b0ceb24a573
Prepend each added line in .gitignore files with a slash.
Bruno Haible <bruno@clisp.org>
parents:
10293
diff
changeset
|
5892 escaped_anchor='\/' |
|
9b0ceb24a573
Prepend each added line in .gitignore files with a slash.
Bruno Haible <bruno@clisp.org>
parents:
10293
diff
changeset
|
5893 doubly_escaped_anchor='\\/' |
|
9b0ceb24a573
Prepend each added line in .gitignore files with a slash.
Bruno Haible <bruno@clisp.org>
parents:
10293
diff
changeset
|
5894 else |
|
9b0ceb24a573
Prepend each added line in .gitignore files with a slash.
Bruno Haible <bruno@clisp.org>
parents:
10293
diff
changeset
|
5895 anchor='' |
|
9b0ceb24a573
Prepend each added line in .gitignore files with a slash.
Bruno Haible <bruno@clisp.org>
parents:
10293
diff
changeset
|
5896 escaped_anchor='' |
|
9b0ceb24a573
Prepend each added line in .gitignore files with a slash.
Bruno Haible <bruno@clisp.org>
parents:
10293
diff
changeset
|
5897 doubly_escaped_anchor='' |
|
9b0ceb24a573
Prepend each added line in .gitignore files with a slash.
Bruno Haible <bruno@clisp.org>
parents:
10293
diff
changeset
|
5898 fi |
|
9810
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5899 if test -f "$destdir/$dir$ignore"; then |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5900 if test -n "$dir_added" || test -n "$dir_removed"; then |
|
10298
9b0ceb24a573
Prepend each added line in .gitignore files with a slash.
Bruno Haible <bruno@clisp.org>
parents:
10293
diff
changeset
|
5901 sed -e "s|^$anchor||" < "$destdir/$dir$ignore" | LC_ALL=C sort > "$tmp"/ignore |
|
12881
c6e9c683bc41
Really work around around "broken pipe" error message from bash 3.2.
Bruno Haible <bruno@clisp.org>
parents:
12877
diff
changeset
|
5902 (echo "$dir_added" | sed -e '/^$/d' | LC_ALL=C sort -u \ |
|
10980
d54e63808f25
work around Solaris 8 'join' bug
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
10969
diff
changeset
|
5903 | LC_ALL=C join -v 1 - "$tmp"/ignore > "$tmp"/ignore-added |
|
10379
a4e295b67e54
Attempt to avoid error messages like "echo: write error: Broken pipe".
Bruno Haible <bruno@clisp.org>
parents:
10298
diff
changeset
|
5904 echo "$dir_removed" | sed -e '/^$/d' | LC_ALL=C sort -u \ |
|
17045
0e193bb29639
gnulib-tool: Remove old file names from .cvsignore, .gitignore.
Bruno Haible <bruno@clisp.org>
parents:
17042
diff
changeset
|
5905 > "$tmp"/ignore-removed |
|
10379
a4e295b67e54
Attempt to avoid error messages like "echo: write error: Broken pipe".
Bruno Haible <bruno@clisp.org>
parents:
10298
diff
changeset
|
5906 ) |
|
9810
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5907 if test -s "$tmp"/ignore-added || test -s "$tmp"/ignore-removed; then |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5908 if $doit; then |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5909 echo "Updating $destdir/$dir$ignore (backup in $destdir/$dir${ignore}~)" |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5910 mv -f "$destdir/$dir$ignore" "$destdir/$dir$ignore"~ |
|
10981
78dea9790e0f
Fix small bug in update of .cvsignore or .gitignore.
Bruno Haible <bruno@clisp.org>
parents:
10980
diff
changeset
|
5911 { sed -e 's,/,\\/,g' -e 's,^,/^,' -e 's,$,\$/d,' < "$tmp"/ignore-removed |
|
11232
6df7300b55df
Make a sed expression POSIX compliant.
Bruno Haible <bruno@clisp.org>
parents:
11231
diff
changeset
|
5912 if test -n "$anchor"; then sed -e 's,/,\\/,g' -e "s,^,/^${doubly_escaped_anchor}," -e 's,$,$/d,' < "$tmp"/ignore-removed; fi |
|
10298
9b0ceb24a573
Prepend each added line in .gitignore files with a slash.
Bruno Haible <bruno@clisp.org>
parents:
10293
diff
changeset
|
5913 } > "$tmp"/sed-ignore-removed |
|
9b0ceb24a573
Prepend each added line in .gitignore files with a slash.
Bruno Haible <bruno@clisp.org>
parents:
10293
diff
changeset
|
5914 { cat "$destdir/$dir$ignore"~ |
|
9b0ceb24a573
Prepend each added line in .gitignore files with a slash.
Bruno Haible <bruno@clisp.org>
parents:
10293
diff
changeset
|
5915 sed -e "s|^|$anchor|" < "$tmp"/ignore-added |
|
9b0ceb24a573
Prepend each added line in .gitignore files with a slash.
Bruno Haible <bruno@clisp.org>
parents:
10293
diff
changeset
|
5916 } | sed -f "$tmp"/sed-ignore-removed \ |
|
9810
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5917 > "$destdir/$dir$ignore" |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5918 else |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5919 echo "Update $destdir/$dir$ignore (backup in $destdir/$dir${ignore}~)" |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5920 fi |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5921 fi |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5922 fi |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5923 else |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5924 if test -n "$dir_added"; then |
|
8451
ba5ed28cb276
Update .cvsignore and .gitignore files.
Bruno Haible <bruno@clisp.org>
parents:
8432
diff
changeset
|
5925 if $doit; then |
|
9810
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5926 echo "Creating $destdir/$dir$ignore" |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5927 { |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5928 if test "$ignore" = .cvsignore; then |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5929 echo ".deps" |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5930 # Automake generates Makefile rules that create .dirstamp files. |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5931 echo ".dirstamp" |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5932 fi |
|
10298
9b0ceb24a573
Prepend each added line in .gitignore files with a slash.
Bruno Haible <bruno@clisp.org>
parents:
10293
diff
changeset
|
5933 echo "$dir_added" | sed -e '/^$/d' -e "s|^|$anchor|" | LC_ALL=C sort -u |
|
9810
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5934 } > "$destdir/$dir$ignore" |
|
8451
ba5ed28cb276
Update .cvsignore and .gitignore files.
Bruno Haible <bruno@clisp.org>
parents:
8432
diff
changeset
|
5935 else |
|
9810
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5936 echo "Create $destdir/$dir$ignore" |
|
8451
ba5ed28cb276
Update .cvsignore and .gitignore files.
Bruno Haible <bruno@clisp.org>
parents:
8432
diff
changeset
|
5937 fi |
|
ba5ed28cb276
Update .cvsignore and .gitignore files.
Bruno Haible <bruno@clisp.org>
parents:
8432
diff
changeset
|
5938 fi |
|
ba5ed28cb276
Update .cvsignore and .gitignore files.
Bruno Haible <bruno@clisp.org>
parents:
8432
diff
changeset
|
5939 fi |
|
9810
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5940 } |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5941 func_done_dir () |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5942 { |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5943 dir="$1" |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5944 dir_added="$2" |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5945 dir_removed="$3" |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5946 if test -d "$destdir/CVS" || test -d "$destdir/${dir}CVS" || test -f "$destdir/${dir}.cvsignore"; then |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5947 func_update_ignorelist .cvsignore |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5948 fi |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5949 if test -d "$destdir/.git" || test -f "$destdir/${dir}.gitignore"; then |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5950 func_update_ignorelist .gitignore |
|
8451
ba5ed28cb276
Update .cvsignore and .gitignore files.
Bruno Haible <bruno@clisp.org>
parents:
8432
diff
changeset
|
5951 fi |
|
9810
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5952 } |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5953 last_dir= |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5954 last_dir_added= |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5955 last_dir_removed= |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5956 while read line; do |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5957 # Why not ''read next_dir op file'' ? Because the dir column can be empty. |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5958 next_dir=`echo "$line" | sed -e 's,|.*,,'` |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5959 op=`echo "$line" | sed -e 's,^[^|]*|\([^|]*\)|.*$,\1,'` |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5960 file=`echo "$line" | sed -e 's,^[^|]*|[^|]*|,,'` |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5961 if test "$next_dir" != "$last_dir"; then |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5962 func_done_dir "$last_dir" "$last_dir_added" "$last_dir_removed" |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5963 last_dir="$next_dir" |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5964 last_dir_added= |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5965 last_dir_removed= |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5966 fi |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5967 case $op in |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5968 A) func_append last_dir_added "$file$nl";; |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5969 R) func_append last_dir_removed "$file$nl";; |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5970 esac |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5971 done |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5972 func_done_dir "$last_dir" "$last_dir_added" "$last_dir_removed" |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5973 exec 0<&5 5<&- |
|
8451
ba5ed28cb276
Update .cvsignore and .gitignore files.
Bruno Haible <bruno@clisp.org>
parents:
8432
diff
changeset
|
5974 } |
|
9810
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
5975 fi |
|
8451
ba5ed28cb276
Update .cvsignore and .gitignore files.
Bruno Haible <bruno@clisp.org>
parents:
8432
diff
changeset
|
5976 |
|
5345
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
5977 echo "Finished." |
|
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
5978 echo |
|
5572
54000928a33d
Print #include directives when --import'ing.
Simon Josefsson <simon@josefsson.org>
parents:
5527
diff
changeset
|
5979 echo "You may need to add #include directives for the following .h files." |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
5980 # Intersect $specified_modules and $main_modules |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
5981 # (since $specified_modules is not necessarily of subset of $main_modules |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
5982 # - some may have been skipped through --avoid, and since the elements of |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
5983 # $main_modules but not in $specified_modules can go away without explicit |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
5984 # notice - through changes in the module dependencies). |
|
7721
ef2654457d79
Don't show the includes for modules that were not explicitly specified.
Bruno Haible <bruno@clisp.org>
parents:
7701
diff
changeset
|
5985 echo "$specified_modules" > "$tmp"/modules1 # a sorted list, one module per line |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
5986 echo "$main_modules" > "$tmp"/modules2 # also a sorted list, one module per line |
|
7322
46d98b687a87
Speed up presentation of the include files.
Bruno Haible <bruno@clisp.org>
parents:
7321
diff
changeset
|
5987 # First the #include <...> directives without #ifs, sorted for convenience, |
|
46d98b687a87
Speed up presentation of the include files.
Bruno Haible <bruno@clisp.org>
parents:
7321
diff
changeset
|
5988 # then the #include "..." directives without #ifs, sorted for convenience, |
|
46d98b687a87
Speed up presentation of the include files.
Bruno Haible <bruno@clisp.org>
parents:
7321
diff
changeset
|
5989 # then the #include directives that are surrounded by #ifs. Not sorted. |
| 7722 | 5990 for module in `LC_ALL=C join "$tmp"/modules1 "$tmp"/modules2`; do |
|
7322
46d98b687a87
Speed up presentation of the include files.
Bruno Haible <bruno@clisp.org>
parents:
7321
diff
changeset
|
5991 include_directive=`func_get_include_directive "$module"` |
|
46d98b687a87
Speed up presentation of the include files.
Bruno Haible <bruno@clisp.org>
parents:
7321
diff
changeset
|
5992 case "$nl$include_directive" in |
|
46d98b687a87
Speed up presentation of the include files.
Bruno Haible <bruno@clisp.org>
parents:
7321
diff
changeset
|
5993 *"$nl#if"*) |
|
46d98b687a87
Speed up presentation of the include files.
Bruno Haible <bruno@clisp.org>
parents:
7321
diff
changeset
|
5994 echo "$include_directive" 1>&5 |
|
46d98b687a87
Speed up presentation of the include files.
Bruno Haible <bruno@clisp.org>
parents:
7321
diff
changeset
|
5995 ;; |
|
46d98b687a87
Speed up presentation of the include files.
Bruno Haible <bruno@clisp.org>
parents:
7321
diff
changeset
|
5996 *) |
|
46d98b687a87
Speed up presentation of the include files.
Bruno Haible <bruno@clisp.org>
parents:
7321
diff
changeset
|
5997 echo "$include_directive" | grep -v 'include "' 1>&6 |
|
46d98b687a87
Speed up presentation of the include files.
Bruno Haible <bruno@clisp.org>
parents:
7321
diff
changeset
|
5998 echo "$include_directive" | grep 'include "' 1>&7 |
|
46d98b687a87
Speed up presentation of the include files.
Bruno Haible <bruno@clisp.org>
parents:
7321
diff
changeset
|
5999 ;; |
|
46d98b687a87
Speed up presentation of the include files.
Bruno Haible <bruno@clisp.org>
parents:
7321
diff
changeset
|
6000 esac |
|
46d98b687a87
Speed up presentation of the include files.
Bruno Haible <bruno@clisp.org>
parents:
7321
diff
changeset
|
6001 done 5> "$tmp"/include-if 6> "$tmp"/include-angles 7> "$tmp"/include-quotes |
|
6756
4d481eff340f
Sort the #include directives more carefully.
Bruno Haible <bruno@clisp.org>
parents:
6750
diff
changeset
|
6002 ( |
|
7322
46d98b687a87
Speed up presentation of the include files.
Bruno Haible <bruno@clisp.org>
parents:
7321
diff
changeset
|
6003 LC_ALL=C sort -u "$tmp"/include-angles |
|
46d98b687a87
Speed up presentation of the include files.
Bruno Haible <bruno@clisp.org>
parents:
7321
diff
changeset
|
6004 LC_ALL=C sort -u "$tmp"/include-quotes |
|
46d98b687a87
Speed up presentation of the include files.
Bruno Haible <bruno@clisp.org>
parents:
7321
diff
changeset
|
6005 cat "$tmp"/include-if |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
6006 ) | sed -e '/^$/d' -e 's/^/ /' |
|
7322
46d98b687a87
Speed up presentation of the include files.
Bruno Haible <bruno@clisp.org>
parents:
7321
diff
changeset
|
6007 rm -f "$tmp"/include-angles "$tmp"/include-quotes "$tmp"/include-if |
|
46d98b687a87
Speed up presentation of the include files.
Bruno Haible <bruno@clisp.org>
parents:
7321
diff
changeset
|
6008 |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
6009 for module in $main_modules; do |
|
8055
5c79d44f739d
New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents:
8040
diff
changeset
|
6010 func_get_link_directive "$module" |
|
5c79d44f739d
New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents:
8040
diff
changeset
|
6011 done \ |
|
5c79d44f739d
New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents:
8040
diff
changeset
|
6012 | LC_ALL=C sort -u | sed -e '/^$/d' -e 's/^/ /' > "$tmp"/link |
|
5c79d44f739d
New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents:
8040
diff
changeset
|
6013 if test `wc -l < "$tmp"/link` != 0; then |
|
5c79d44f739d
New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents:
8040
diff
changeset
|
6014 echo |
|
5c79d44f739d
New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents:
8040
diff
changeset
|
6015 echo "You may need to use the following Makefile variables when linking." |
|
5c79d44f739d
New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents:
8040
diff
changeset
|
6016 echo "Use them in <program>_LDADD when linking a program, or" |
|
5c79d44f739d
New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents:
8040
diff
changeset
|
6017 echo "in <library>_a_LDFLAGS or <library>_la_LDFLAGS when linking a library." |
|
5c79d44f739d
New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents:
8040
diff
changeset
|
6018 cat "$tmp"/link |
|
5c79d44f739d
New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents:
8040
diff
changeset
|
6019 fi |
|
5c79d44f739d
New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents:
8040
diff
changeset
|
6020 rm -f "$tmp"/link |
|
5c79d44f739d
New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents:
8040
diff
changeset
|
6021 |
|
5572
54000928a33d
Print #include directives when --import'ing.
Simon Josefsson <simon@josefsson.org>
parents:
5527
diff
changeset
|
6022 echo |
|
6160
2fb771c0af6b
Emit more comments and advice.
Bruno Haible <bruno@clisp.org>
parents:
6159
diff
changeset
|
6023 echo "Don't forget to" |
|
7222
06eec4eaf416
* gnulib-tool (emit_lib_Makefile_am): Don't put $makefile_name
Paul Eggert <eggert@cs.ucla.edu>
parents:
7216
diff
changeset
|
6024 if test "$makefile_am" = Makefile.am; then |
|
7216
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
6025 echo " - add \"$sourcebase/Makefile\" to AC_CONFIG_FILES in $configure_ac," |
|
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
6026 else |
|
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
6027 echo " - \"include $makefile_name\" from within \"$sourcebase/Makefile.am\"," |
|
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
6028 fi |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
6029 if test -n "$pobase"; then |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
6030 echo " - add \"$pobase/Makefile.in\" to AC_CONFIG_FILES in $configure_ac," |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
6031 fi |
|
40185
a7fe9f54c3df
gnulib-tool: Support --import with just a few tests, not --with-tests.
Bruno Haible <bruno@clisp.org>
parents:
40184
diff
changeset
|
6032 if $gentests; then |
|
7222
06eec4eaf416
* gnulib-tool (emit_lib_Makefile_am): Don't put $makefile_name
Paul Eggert <eggert@cs.ucla.edu>
parents:
7216
diff
changeset
|
6033 if test "$makefile_am" = Makefile.am; then |
|
7216
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
6034 echo " - add \"$testsbase/Makefile\" to AC_CONFIG_FILES in $configure_ac," |
|
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
6035 else |
|
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
6036 echo " - \"include $makefile_name\" from within \"$testsbase/Makefile.am\"," |
|
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
6037 fi |
|
6250
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
6038 fi |
|
10476
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
6039 edit=0 |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
6040 while test $edit != $makefile_am_edits; do |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
6041 edit=`expr $edit + 1` |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
6042 eval dir=\"\$makefile_am_edit${edit}_dir\" |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
6043 eval var=\"\$makefile_am_edit${edit}_var\" |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
6044 eval val=\"\$makefile_am_edit${edit}_val\" |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
6045 if test -n "$var"; then |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
6046 echo " - mention \"${val}\" in ${var} in ${dir}Makefile.am," |
|
7216
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
6047 fi |
|
10476
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
6048 done |
|
15801
3002f394d1fe
gnulib-tool: Improve suggestion where to put gl_EARLY invocation.
Bruno Haible <bruno@clisp.org>
parents:
15790
diff
changeset
|
6049 if grep '^ *AC_PROG_CC_STDC' "$configure_ac" > /dev/null; then |
|
3002f394d1fe
gnulib-tool: Improve suggestion where to put gl_EARLY invocation.
Bruno Haible <bruno@clisp.org>
parents:
15790
diff
changeset
|
6050 position_early_after=AC_PROG_CC_STDC |
|
3002f394d1fe
gnulib-tool: Improve suggestion where to put gl_EARLY invocation.
Bruno Haible <bruno@clisp.org>
parents:
15790
diff
changeset
|
6051 else |
|
3002f394d1fe
gnulib-tool: Improve suggestion where to put gl_EARLY invocation.
Bruno Haible <bruno@clisp.org>
parents:
15790
diff
changeset
|
6052 if grep '^ *AC_PROG_CC_C99' "$configure_ac" > /dev/null; then |
|
3002f394d1fe
gnulib-tool: Improve suggestion where to put gl_EARLY invocation.
Bruno Haible <bruno@clisp.org>
parents:
15790
diff
changeset
|
6053 position_early_after=AC_PROG_CC_C99 |
|
3002f394d1fe
gnulib-tool: Improve suggestion where to put gl_EARLY invocation.
Bruno Haible <bruno@clisp.org>
parents:
15790
diff
changeset
|
6054 else |
|
3002f394d1fe
gnulib-tool: Improve suggestion where to put gl_EARLY invocation.
Bruno Haible <bruno@clisp.org>
parents:
15790
diff
changeset
|
6055 position_early_after=AC_PROG_CC |
|
3002f394d1fe
gnulib-tool: Improve suggestion where to put gl_EARLY invocation.
Bruno Haible <bruno@clisp.org>
parents:
15790
diff
changeset
|
6056 fi |
|
3002f394d1fe
gnulib-tool: Improve suggestion where to put gl_EARLY invocation.
Bruno Haible <bruno@clisp.org>
parents:
15790
diff
changeset
|
6057 fi |
|
3002f394d1fe
gnulib-tool: Improve suggestion where to put gl_EARLY invocation.
Bruno Haible <bruno@clisp.org>
parents:
15790
diff
changeset
|
6058 echo " - invoke ${macro_prefix}_EARLY in $configure_ac, right after $position_early_after," |
| 6176 | 6059 echo " - invoke ${macro_prefix}_INIT in $configure_ac." |
|
5345
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
6060 } |
|
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
6061 |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6062 # func_create_testdir testdir modules |
|
6109
a52f596fdf00
Generalize support for --aux-dir.
Bruno Haible <bruno@clisp.org>
parents:
6108
diff
changeset
|
6063 # Input: |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
6064 # - local_gnulib_path from --local-dir |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
6065 # - modcache true or false, from --cache-modules/--no-cache-modules |
|
6109
a52f596fdf00
Generalize support for --aux-dir.
Bruno Haible <bruno@clisp.org>
parents:
6108
diff
changeset
|
6066 # - auxdir directory relative to destdir where to place build aux files |
|
16932
48e8f0679448
gnulib-tool: Refactor inctests variable.
Bruno Haible <bruno@clisp.org>
parents:
16931
diff
changeset
|
6067 # - inctests true if tests should be included, false otherwise |
|
12986
bfc76977457d
Clarify which options are available for --create-testdir.
Bruno Haible <bruno@clisp.org>
parents:
12983
diff
changeset
|
6068 # - incobsolete true if obsolete modules among dependencies should be |
|
bfc76977457d
Clarify which options are available for --create-testdir.
Bruno Haible <bruno@clisp.org>
parents:
12983
diff
changeset
|
6069 # included, blank otherwise |
|
13263
e7d114c00ff9
gnulib-tool: Add --without-*-tests options.
Bruno Haible <bruno@clisp.org>
parents:
13223
diff
changeset
|
6070 # - excl_cxx_tests true if C++ interoperability tests should be excluded, |
|
e7d114c00ff9
gnulib-tool: Add --without-*-tests options.
Bruno Haible <bruno@clisp.org>
parents:
13223
diff
changeset
|
6071 # blank otherwise |
|
e7d114c00ff9
gnulib-tool: Add --without-*-tests options.
Bruno Haible <bruno@clisp.org>
parents:
13223
diff
changeset
|
6072 # - excl_longrunning_tests true if long-runnings tests should be excluded, |
|
e7d114c00ff9
gnulib-tool: Add --without-*-tests options.
Bruno Haible <bruno@clisp.org>
parents:
13223
diff
changeset
|
6073 # blank otherwise |
|
e7d114c00ff9
gnulib-tool: Add --without-*-tests options.
Bruno Haible <bruno@clisp.org>
parents:
13223
diff
changeset
|
6074 # - excl_privileged_tests true if tests that require root privileges should be |
|
e7d114c00ff9
gnulib-tool: Add --without-*-tests options.
Bruno Haible <bruno@clisp.org>
parents:
13223
diff
changeset
|
6075 # excluded, blank otherwise |
|
e7d114c00ff9
gnulib-tool: Add --without-*-tests options.
Bruno Haible <bruno@clisp.org>
parents:
13223
diff
changeset
|
6076 # - excl_unportable_tests true if tests that fail on some platforms should be |
|
e7d114c00ff9
gnulib-tool: Add --without-*-tests options.
Bruno Haible <bruno@clisp.org>
parents:
13223
diff
changeset
|
6077 # excluded, blank otherwise |
|
14836
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6078 # - single_configure true if a single configure file should be generated, |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6079 # false for a separate configure file for the tests |
|
12986
bfc76977457d
Clarify which options are available for --create-testdir.
Bruno Haible <bruno@clisp.org>
parents:
12983
diff
changeset
|
6080 # - avoidlist list of modules to avoid |
|
14833
76127af7039f
Finish the conditional dependencies mechanism.
Bruno Haible <bruno@clisp.org>
parents:
14806
diff
changeset
|
6081 # - cond_dependencies true if --conditional-dependencies was given, false if |
|
76127af7039f
Finish the conditional dependencies mechanism.
Bruno Haible <bruno@clisp.org>
parents:
14806
diff
changeset
|
6082 # --no-conditional-dependencies was given, blank otherwise |
|
12986
bfc76977457d
Clarify which options are available for --create-testdir.
Bruno Haible <bruno@clisp.org>
parents:
12983
diff
changeset
|
6083 # - libtool true if --libtool was given, false if --no-libtool was |
|
bfc76977457d
Clarify which options are available for --create-testdir.
Bruno Haible <bruno@clisp.org>
parents:
12983
diff
changeset
|
6084 # given, blank otherwise |
|
18937
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
6085 # - copymode copy mode for files in general |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
6086 # - lcopymode copy mode for files from local_gnulib_path |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6087 func_create_testdir () |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6088 { |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6089 testdir="$1" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6090 modules="$2" |
|
7484
57fe575409ae
--create-testdir without module names now means to use nearly all modules.
Bruno Haible <bruno@clisp.org>
parents:
7421
diff
changeset
|
6091 if test -z "$modules"; then |
|
57fe575409ae
--create-testdir without module names now means to use nearly all modules.
Bruno Haible <bruno@clisp.org>
parents:
7421
diff
changeset
|
6092 # All modules together. |
|
57fe575409ae
--create-testdir without module names now means to use nearly all modules.
Bruno Haible <bruno@clisp.org>
parents:
7421
diff
changeset
|
6093 # Except config-h, which breaks all modules which use HAVE_CONFIG_H. |
|
18471
5031955d34d3
gnulib-tool: Make --create-testdir on all modules work again.
Bruno Haible <bruno@clisp.org>
parents:
18231
diff
changeset
|
6094 # Except non-recursive-gnulib-prefix-hack, which represents a nonstandard |
|
5031955d34d3
gnulib-tool: Make --create-testdir on all modules work again.
Bruno Haible <bruno@clisp.org>
parents:
18231
diff
changeset
|
6095 # way of using Automake. |
|
39941
647230feebc0
Fix failure of 'gnulib-tool --create-testdir' with all modules.
Bruno Haible <bruno@clisp.org>
parents:
39897
diff
changeset
|
6096 # Except timevar, which lacks the required file timevar.def. |
|
7533
029a26ecb19a
Don't include ftruncate and mountlist by default.
Bruno Haible <bruno@clisp.org>
parents:
7530
diff
changeset
|
6097 # Except ftruncate, mountlist, which abort the configuration on mingw. FIXME. |
|
12923
cb00143b4bf6
Exclude lib-ignore module.
Bruno Haible <bruno@clisp.org>
parents:
12917
diff
changeset
|
6098 # Except lib-ignore, which leads to link errors when Sun C++ is used. FIXME. |
|
7484
57fe575409ae
--create-testdir without module names now means to use nearly all modules.
Bruno Haible <bruno@clisp.org>
parents:
7421
diff
changeset
|
6099 modules=`func_all_modules` |
|
39941
647230feebc0
Fix failure of 'gnulib-tool --create-testdir' with all modules.
Bruno Haible <bruno@clisp.org>
parents:
39897
diff
changeset
|
6100 modules=`for m in $modules; do case $m in config-h | non-recursive-gnulib-prefix-hack | timevar | ftruncate | mountlist | lib-ignore) ;; *) echo $m;; esac; done` |
|
7484
57fe575409ae
--create-testdir without module names now means to use nearly all modules.
Bruno Haible <bruno@clisp.org>
parents:
7421
diff
changeset
|
6101 fi |
|
13419
a18c56544c84
gnulib-tool: Align code of func_import and func_create_testdir.
Bruno Haible <bruno@clisp.org>
parents:
13299
diff
changeset
|
6102 specified_modules="$modules" |
|
a18c56544c84
gnulib-tool: Align code of func_import and func_create_testdir.
Bruno Haible <bruno@clisp.org>
parents:
13299
diff
changeset
|
6103 |
|
a18c56544c84
gnulib-tool: Align code of func_import and func_create_testdir.
Bruno Haible <bruno@clisp.org>
parents:
13299
diff
changeset
|
6104 # Canonicalize the list of specified modules. |
|
a18c56544c84
gnulib-tool: Align code of func_import and func_create_testdir.
Bruno Haible <bruno@clisp.org>
parents:
13299
diff
changeset
|
6105 specified_modules=`for m in $specified_modules; do echo $m; done | LC_ALL=C sort -u` |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6106 |
|
18704
316d6897d46c
gnulib-tool: Avoid conflict of havelib-tests with --single-configure.
Bruno Haible <bruno@clisp.org>
parents:
18626
diff
changeset
|
6107 # Test modules which invoke AC_CONFIG_FILES cannot be used with |
|
316d6897d46c
gnulib-tool: Avoid conflict of havelib-tests with --single-configure.
Bruno Haible <bruno@clisp.org>
parents:
18626
diff
changeset
|
6108 # --with-tests --single-configure. Avoid them. |
|
316d6897d46c
gnulib-tool: Avoid conflict of havelib-tests with --single-configure.
Bruno Haible <bruno@clisp.org>
parents:
18626
diff
changeset
|
6109 if $inctests && $single_configure; then |
|
316d6897d46c
gnulib-tool: Avoid conflict of havelib-tests with --single-configure.
Bruno Haible <bruno@clisp.org>
parents:
18626
diff
changeset
|
6110 avoidlist="$avoidlist havelib-tests" |
|
316d6897d46c
gnulib-tool: Avoid conflict of havelib-tests with --single-configure.
Bruno Haible <bruno@clisp.org>
parents:
18626
diff
changeset
|
6111 fi |
|
316d6897d46c
gnulib-tool: Avoid conflict of havelib-tests with --single-configure.
Bruno Haible <bruno@clisp.org>
parents:
18626
diff
changeset
|
6112 |
|
13264
d66e74e6fe48
gnulib-tool: Don't include hairy tests of dependencies in testdirs.
Bruno Haible <bruno@clisp.org>
parents:
13263
diff
changeset
|
6113 # Unlike in func_import, here we want to include all kinds of tests for the |
|
d66e74e6fe48
gnulib-tool: Don't include hairy tests of dependencies in testdirs.
Bruno Haible <bruno@clisp.org>
parents:
13263
diff
changeset
|
6114 # directly specified modules, but not for dependencies. |
|
d66e74e6fe48
gnulib-tool: Don't include hairy tests of dependencies in testdirs.
Bruno Haible <bruno@clisp.org>
parents:
13263
diff
changeset
|
6115 inc_all_direct_tests=true |
|
d66e74e6fe48
gnulib-tool: Don't include hairy tests of dependencies in testdirs.
Bruno Haible <bruno@clisp.org>
parents:
13263
diff
changeset
|
6116 inc_all_indirect_tests="$inc_all_tests" |
|
13080
fad0b62b5bf5
gnulib-tool: Add support for special categories of tests.
Bruno Haible <bruno@clisp.org>
parents:
13070
diff
changeset
|
6117 |
|
7660
7aa6fbd6b3b7
Add license compatibility check in --create-testdir.
Bruno Haible <bruno@clisp.org>
parents:
7647
diff
changeset
|
6118 # Check that the license of every module is consistent with the license of |
|
7aa6fbd6b3b7
Add license compatibility check in --create-testdir.
Bruno Haible <bruno@clisp.org>
parents:
7647
diff
changeset
|
6119 # its dependencies. |
|
7896
cd3ed2fae0bf
Tests modules are under GPL now.
Bruno Haible <bruno@clisp.org>
parents:
7872
diff
changeset
|
6120 saved_inctests="$inctests" |
|
cd3ed2fae0bf
Tests modules are under GPL now.
Bruno Haible <bruno@clisp.org>
parents:
7872
diff
changeset
|
6121 # When computing transitive closures, don't consider $module to depend on |
| 16358 | 6122 # $module-tests. Need this because tests are implicitly GPL and may depend |
|
7896
cd3ed2fae0bf
Tests modules are under GPL now.
Bruno Haible <bruno@clisp.org>
parents:
7872
diff
changeset
|
6123 # on GPL modules - therefore we don't want a warning in this case. |
|
16932
48e8f0679448
gnulib-tool: Refactor inctests variable.
Bruno Haible <bruno@clisp.org>
parents:
16931
diff
changeset
|
6124 inctests=false |
|
13419
a18c56544c84
gnulib-tool: Align code of func_import and func_create_testdir.
Bruno Haible <bruno@clisp.org>
parents:
13299
diff
changeset
|
6125 for requested_module in $specified_modules; do |
|
7660
7aa6fbd6b3b7
Add license compatibility check in --create-testdir.
Bruno Haible <bruno@clisp.org>
parents:
7647
diff
changeset
|
6126 requested_license=`func_get_license "$requested_module"` |
|
7aa6fbd6b3b7
Add license compatibility check in --create-testdir.
Bruno Haible <bruno@clisp.org>
parents:
7647
diff
changeset
|
6127 if test "$requested_license" != GPL; then |
|
7aa6fbd6b3b7
Add license compatibility check in --create-testdir.
Bruno Haible <bruno@clisp.org>
parents:
7647
diff
changeset
|
6128 # Here we use func_modules_transitive_closure, not just |
|
7aa6fbd6b3b7
Add license compatibility check in --create-testdir.
Bruno Haible <bruno@clisp.org>
parents:
7647
diff
changeset
|
6129 # func_get_dependencies, so that we also detect weird situations like |
|
7aa6fbd6b3b7
Add license compatibility check in --create-testdir.
Bruno Haible <bruno@clisp.org>
parents:
7647
diff
changeset
|
6130 # an LGPL module which depends on a GPLed build tool module which depends |
|
7aa6fbd6b3b7
Add license compatibility check in --create-testdir.
Bruno Haible <bruno@clisp.org>
parents:
7647
diff
changeset
|
6131 # on a GPL module. |
|
7aa6fbd6b3b7
Add license compatibility check in --create-testdir.
Bruno Haible <bruno@clisp.org>
parents:
7647
diff
changeset
|
6132 modules="$requested_module" |
|
7aa6fbd6b3b7
Add license compatibility check in --create-testdir.
Bruno Haible <bruno@clisp.org>
parents:
7647
diff
changeset
|
6133 func_modules_transitive_closure |
|
7aa6fbd6b3b7
Add license compatibility check in --create-testdir.
Bruno Haible <bruno@clisp.org>
parents:
7647
diff
changeset
|
6134 for module in $modules; do |
|
7aa6fbd6b3b7
Add license compatibility check in --create-testdir.
Bruno Haible <bruno@clisp.org>
parents:
7647
diff
changeset
|
6135 license=`func_get_license "$module"` |
|
9090
b1835d4a5e2a
Handle copying terms "GPLv2+" and "LGPLv2+".
Bruno Haible <bruno@clisp.org>
parents:
9086
diff
changeset
|
6136 case "$license" in |
|
b1835d4a5e2a
Handle copying terms "GPLv2+" and "LGPLv2+".
Bruno Haible <bruno@clisp.org>
parents:
9086
diff
changeset
|
6137 'GPLed build tool') ;; |
|
7660
7aa6fbd6b3b7
Add license compatibility check in --create-testdir.
Bruno Haible <bruno@clisp.org>
parents:
7647
diff
changeset
|
6138 'public domain' | 'unlimited' | 'unmodifiable license text') ;; |
|
9090
b1835d4a5e2a
Handle copying terms "GPLv2+" and "LGPLv2+".
Bruno Haible <bruno@clisp.org>
parents:
9086
diff
changeset
|
6139 *) |
|
b1835d4a5e2a
Handle copying terms "GPLv2+" and "LGPLv2+".
Bruno Haible <bruno@clisp.org>
parents:
9086
diff
changeset
|
6140 case "$requested_license" in |
|
18501
9012a151a519
gnulib-tool: Support for the dual "LGPLv3+ or GPLv2" license.
Bruno Haible <bruno@clisp.org>
parents:
18474
diff
changeset
|
6141 GPLv3+ | GPL) |
|
9090
b1835d4a5e2a
Handle copying terms "GPLv2+" and "LGPLv2+".
Bruno Haible <bruno@clisp.org>
parents:
9086
diff
changeset
|
6142 case "$license" in |
|
18501
9012a151a519
gnulib-tool: Support for the dual "LGPLv3+ or GPLv2" license.
Bruno Haible <bruno@clisp.org>
parents:
18474
diff
changeset
|
6143 LGPLv2+ | 'LGPLv3+ or GPLv2' | LGPLv3+ | LGPL | GPLv2+ | GPLv3+ | GPL) ;; |
|
12819
4b5bf4c79e0c
gnulib-tool: Make warning diagnostics consistent.
Bruno Haible <bruno@clisp.org>
parents:
12775
diff
changeset
|
6144 *) func_warning "module $requested_module depends on a module with an incompatible license: $module" ;; |
|
9090
b1835d4a5e2a
Handle copying terms "GPLv2+" and "LGPLv2+".
Bruno Haible <bruno@clisp.org>
parents:
9086
diff
changeset
|
6145 esac |
|
b1835d4a5e2a
Handle copying terms "GPLv2+" and "LGPLv2+".
Bruno Haible <bruno@clisp.org>
parents:
9086
diff
changeset
|
6146 ;; |
|
18501
9012a151a519
gnulib-tool: Support for the dual "LGPLv3+ or GPLv2" license.
Bruno Haible <bruno@clisp.org>
parents:
18474
diff
changeset
|
6147 GPLv2+) |
|
9012a151a519
gnulib-tool: Support for the dual "LGPLv3+ or GPLv2" license.
Bruno Haible <bruno@clisp.org>
parents:
18474
diff
changeset
|
6148 case "$license" in |
|
9012a151a519
gnulib-tool: Support for the dual "LGPLv3+ or GPLv2" license.
Bruno Haible <bruno@clisp.org>
parents:
18474
diff
changeset
|
6149 LGPLv2+ | 'LGPLv3+ or GPLv2' | GPLv2+) ;; |
|
9012a151a519
gnulib-tool: Support for the dual "LGPLv3+ or GPLv2" license.
Bruno Haible <bruno@clisp.org>
parents:
18474
diff
changeset
|
6150 *) func_warning "module $requested_module depends on a module with an incompatible license: $module" ;; |
|
9012a151a519
gnulib-tool: Support for the dual "LGPLv3+ or GPLv2" license.
Bruno Haible <bruno@clisp.org>
parents:
18474
diff
changeset
|
6151 esac |
|
9012a151a519
gnulib-tool: Support for the dual "LGPLv3+ or GPLv2" license.
Bruno Haible <bruno@clisp.org>
parents:
18474
diff
changeset
|
6152 ;; |
|
9012a151a519
gnulib-tool: Support for the dual "LGPLv3+ or GPLv2" license.
Bruno Haible <bruno@clisp.org>
parents:
18474
diff
changeset
|
6153 LGPLv3+ | LGPL) |
|
9090
b1835d4a5e2a
Handle copying terms "GPLv2+" and "LGPLv2+".
Bruno Haible <bruno@clisp.org>
parents:
9086
diff
changeset
|
6154 case "$license" in |
|
18501
9012a151a519
gnulib-tool: Support for the dual "LGPLv3+ or GPLv2" license.
Bruno Haible <bruno@clisp.org>
parents:
18474
diff
changeset
|
6155 LGPLv2+ | 'LGPLv3+ or GPLv2' | LGPLv3+ | LGPL) ;; |
|
9012a151a519
gnulib-tool: Support for the dual "LGPLv3+ or GPLv2" license.
Bruno Haible <bruno@clisp.org>
parents:
18474
diff
changeset
|
6156 *) func_warning "module $requested_module depends on a module with an incompatible license: $module" ;; |
|
9012a151a519
gnulib-tool: Support for the dual "LGPLv3+ or GPLv2" license.
Bruno Haible <bruno@clisp.org>
parents:
18474
diff
changeset
|
6157 esac |
|
9012a151a519
gnulib-tool: Support for the dual "LGPLv3+ or GPLv2" license.
Bruno Haible <bruno@clisp.org>
parents:
18474
diff
changeset
|
6158 ;; |
|
9012a151a519
gnulib-tool: Support for the dual "LGPLv3+ or GPLv2" license.
Bruno Haible <bruno@clisp.org>
parents:
18474
diff
changeset
|
6159 'LGPLv3+ or GPLv2') |
|
9012a151a519
gnulib-tool: Support for the dual "LGPLv3+ or GPLv2" license.
Bruno Haible <bruno@clisp.org>
parents:
18474
diff
changeset
|
6160 case "$license" in |
|
9012a151a519
gnulib-tool: Support for the dual "LGPLv3+ or GPLv2" license.
Bruno Haible <bruno@clisp.org>
parents:
18474
diff
changeset
|
6161 LGPLv2+ | 'LGPLv3+ or GPLv2') ;; |
|
12819
4b5bf4c79e0c
gnulib-tool: Make warning diagnostics consistent.
Bruno Haible <bruno@clisp.org>
parents:
12775
diff
changeset
|
6162 *) func_warning "module $requested_module depends on a module with an incompatible license: $module" ;; |
|
9090
b1835d4a5e2a
Handle copying terms "GPLv2+" and "LGPLv2+".
Bruno Haible <bruno@clisp.org>
parents:
9086
diff
changeset
|
6163 esac |
|
b1835d4a5e2a
Handle copying terms "GPLv2+" and "LGPLv2+".
Bruno Haible <bruno@clisp.org>
parents:
9086
diff
changeset
|
6164 ;; |
|
b1835d4a5e2a
Handle copying terms "GPLv2+" and "LGPLv2+".
Bruno Haible <bruno@clisp.org>
parents:
9086
diff
changeset
|
6165 LGPLv2+) |
|
b1835d4a5e2a
Handle copying terms "GPLv2+" and "LGPLv2+".
Bruno Haible <bruno@clisp.org>
parents:
9086
diff
changeset
|
6166 case "$license" in |
|
b1835d4a5e2a
Handle copying terms "GPLv2+" and "LGPLv2+".
Bruno Haible <bruno@clisp.org>
parents:
9086
diff
changeset
|
6167 LGPLv2+) ;; |
|
12819
4b5bf4c79e0c
gnulib-tool: Make warning diagnostics consistent.
Bruno Haible <bruno@clisp.org>
parents:
12775
diff
changeset
|
6168 *) func_warning "module $requested_module depends on a module with an incompatible license: $module" ;; |
|
9090
b1835d4a5e2a
Handle copying terms "GPLv2+" and "LGPLv2+".
Bruno Haible <bruno@clisp.org>
parents:
9086
diff
changeset
|
6169 esac |
|
b1835d4a5e2a
Handle copying terms "GPLv2+" and "LGPLv2+".
Bruno Haible <bruno@clisp.org>
parents:
9086
diff
changeset
|
6170 ;; |
|
b1835d4a5e2a
Handle copying terms "GPLv2+" and "LGPLv2+".
Bruno Haible <bruno@clisp.org>
parents:
9086
diff
changeset
|
6171 esac |
|
b1835d4a5e2a
Handle copying terms "GPLv2+" and "LGPLv2+".
Bruno Haible <bruno@clisp.org>
parents:
9086
diff
changeset
|
6172 ;; |
|
7660
7aa6fbd6b3b7
Add license compatibility check in --create-testdir.
Bruno Haible <bruno@clisp.org>
parents:
7647
diff
changeset
|
6173 esac |
|
7aa6fbd6b3b7
Add license compatibility check in --create-testdir.
Bruno Haible <bruno@clisp.org>
parents:
7647
diff
changeset
|
6174 done |
|
7aa6fbd6b3b7
Add license compatibility check in --create-testdir.
Bruno Haible <bruno@clisp.org>
parents:
7647
diff
changeset
|
6175 fi |
|
7aa6fbd6b3b7
Add license compatibility check in --create-testdir.
Bruno Haible <bruno@clisp.org>
parents:
7647
diff
changeset
|
6176 done |
|
7896
cd3ed2fae0bf
Tests modules are under GPL now.
Bruno Haible <bruno@clisp.org>
parents:
7872
diff
changeset
|
6177 inctests="$saved_inctests" |
|
7660
7aa6fbd6b3b7
Add license compatibility check in --create-testdir.
Bruno Haible <bruno@clisp.org>
parents:
7647
diff
changeset
|
6178 |
|
7195
e4a459055e78
Test other subdirectory names than 'lib' and 'm4'.
Bruno Haible <bruno@clisp.org>
parents:
7187
diff
changeset
|
6179 # Subdirectory names. |
|
e4a459055e78
Test other subdirectory names than 'lib' and 'm4'.
Bruno Haible <bruno@clisp.org>
parents:
7187
diff
changeset
|
6180 sourcebase=gllib |
|
e4a459055e78
Test other subdirectory names than 'lib' and 'm4'.
Bruno Haible <bruno@clisp.org>
parents:
7187
diff
changeset
|
6181 m4base=glm4 |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
6182 pobase= |
|
7321
3bf1b669d1e1
Rewrite all file names at once.
Bruno Haible <bruno@clisp.org>
parents:
7320
diff
changeset
|
6183 docbase=gldoc |
|
7195
e4a459055e78
Test other subdirectory names than 'lib' and 'm4'.
Bruno Haible <bruno@clisp.org>
parents:
7187
diff
changeset
|
6184 testsbase=gltests |
|
7486
46b72819ef52
Add support for multiple gnulib-tool invocations in the scope of a single
Bruno Haible <bruno@clisp.org>
parents:
7485
diff
changeset
|
6185 macro_prefix=gl |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
6186 po_domain= |
|
14894
b22360ddefc4
gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents:
14841
diff
changeset
|
6187 witness_c_macro= |
|
9810
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
6188 vc_files= |
|
7195
e4a459055e78
Test other subdirectory names than 'lib' and 'm4'.
Bruno Haible <bruno@clisp.org>
parents:
7187
diff
changeset
|
6189 |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6190 # Determine final module list. |
|
13419
a18c56544c84
gnulib-tool: Align code of func_import and func_create_testdir.
Bruno Haible <bruno@clisp.org>
parents:
13299
diff
changeset
|
6191 modules="$specified_modules" |
|
5347
0318c37925dc
Move duplicated code into function func_modules_transitive_closure().
Bruno Haible <bruno@clisp.org>
parents:
5346
diff
changeset
|
6192 func_modules_transitive_closure |
|
9188
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
6193 if test $verbose -ge 0; then |
|
13420
2291a2f3d56c
gnulib-tool: Display specified modules and dependencies differently.
Bruno Haible <bruno@clisp.org>
parents:
13419
diff
changeset
|
6194 func_show_module_list |
|
9188
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
6195 fi |
|
14836
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6196 final_modules="$modules" |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6197 |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6198 if $single_configure; then |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6199 # Determine main module list and tests-related module list separately. |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6200 func_modules_transitive_closure_separately |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6201 fi |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6202 |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6203 if $single_configure; then |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6204 # Determine whether a $testsbase/libtests.a is needed. |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6205 func_determine_use_libtests |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6206 fi |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6207 |
|
6550
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
6208 # Add the dummy module if needed. |
|
14836
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6209 if $single_configure; then |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6210 func_modules_add_dummy_separately |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6211 else |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6212 func_modules_add_dummy |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6213 fi |
|
6550
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
6214 |
|
19478
fef1e0e56d65
gnulib-tool: Make --conditional-dependencies work better.
Bruno Haible <bruno@clisp.org>
parents:
19439
diff
changeset
|
6215 # Note: |
|
fef1e0e56d65
gnulib-tool: Make --conditional-dependencies work better.
Bruno Haible <bruno@clisp.org>
parents:
19439
diff
changeset
|
6216 # If $single_configure, we use the module lists $main_modules and |
|
fef1e0e56d65
gnulib-tool: Make --conditional-dependencies work better.
Bruno Haible <bruno@clisp.org>
parents:
19439
diff
changeset
|
6217 # $testsrelated_modules; $modules is merely a temporary variable. |
|
fef1e0e56d65
gnulib-tool: Make --conditional-dependencies work better.
Bruno Haible <bruno@clisp.org>
parents:
19439
diff
changeset
|
6218 # Whereas if ! $configure, the module list is $modules. |
|
fef1e0e56d65
gnulib-tool: Make --conditional-dependencies work better.
Bruno Haible <bruno@clisp.org>
parents:
19439
diff
changeset
|
6219 |
|
9189
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
6220 # Show banner notice of every module. |
|
14836
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6221 if $single_configure; then |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6222 modules="$main_modules" |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6223 func_modules_notice |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6224 else |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6225 func_modules_notice |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6226 fi |
|
9189
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
6227 |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6228 # Determine final file list. |
|
14836
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6229 if $single_configure; then |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6230 func_modules_to_filelist_separately |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6231 else |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6232 func_modules_to_filelist |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6233 if test $verbose -ge 0; then |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6234 echo "File list:" |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6235 echo "$files" | sed -e 's/^/ /' |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6236 fi |
|
9188
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
6237 fi |
|
13752
68e7104b03e2
gnulib-tool: In testdirs, use the newest available config.{guess.sub}.
Bruno Haible <bruno@clisp.org>
parents:
13750
diff
changeset
|
6238 # Add files for which the copy in gnulib is newer than the one that |
|
68e7104b03e2
gnulib-tool: In testdirs, use the newest available config.{guess.sub}.
Bruno Haible <bruno@clisp.org>
parents:
13750
diff
changeset
|
6239 # "automake --add-missing --copy" would provide. |
|
68e7104b03e2
gnulib-tool: In testdirs, use the newest available config.{guess.sub}.
Bruno Haible <bruno@clisp.org>
parents:
13750
diff
changeset
|
6240 files="$files build-aux/config.guess" |
|
68e7104b03e2
gnulib-tool: In testdirs, use the newest available config.{guess.sub}.
Bruno Haible <bruno@clisp.org>
parents:
13750
diff
changeset
|
6241 files="$files build-aux/config.sub" |
|
68e7104b03e2
gnulib-tool: In testdirs, use the newest available config.{guess.sub}.
Bruno Haible <bruno@clisp.org>
parents:
13750
diff
changeset
|
6242 files=`for f in $files; do echo $f; done | LC_ALL=C sort -u` |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6243 |
|
11560
987b2dec97b7
Fix the rewriting rules for file names.
Bruno Haible <bruno@clisp.org>
parents:
11533
diff
changeset
|
6244 rewritten='%REWRITTEN%' |
|
7321
3bf1b669d1e1
Rewrite all file names at once.
Bruno Haible <bruno@clisp.org>
parents:
7320
diff
changeset
|
6245 sed_rewrite_files="\ |
|
11560
987b2dec97b7
Fix the rewriting rules for file names.
Bruno Haible <bruno@clisp.org>
parents:
11533
diff
changeset
|
6246 s,^build-aux/,$rewritten$auxdir/, |
|
987b2dec97b7
Fix the rewriting rules for file names.
Bruno Haible <bruno@clisp.org>
parents:
11533
diff
changeset
|
6247 s,^doc/,$rewritten$docbase/, |
|
987b2dec97b7
Fix the rewriting rules for file names.
Bruno Haible <bruno@clisp.org>
parents:
11533
diff
changeset
|
6248 s,^lib/,$rewritten$sourcebase/, |
|
987b2dec97b7
Fix the rewriting rules for file names.
Bruno Haible <bruno@clisp.org>
parents:
11533
diff
changeset
|
6249 s,^m4/,$rewritten$m4base/, |
|
987b2dec97b7
Fix the rewriting rules for file names.
Bruno Haible <bruno@clisp.org>
parents:
11533
diff
changeset
|
6250 s,^tests/,$rewritten$testsbase/, |
|
14836
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6251 s,^tests=lib/,$rewritten$testsbase/, |
|
11560
987b2dec97b7
Fix the rewriting rules for file names.
Bruno Haible <bruno@clisp.org>
parents:
11533
diff
changeset
|
6252 s,^top/,$rewritten, |
|
987b2dec97b7
Fix the rewriting rules for file names.
Bruno Haible <bruno@clisp.org>
parents:
11533
diff
changeset
|
6253 s,^$rewritten,," |
|
7605
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
6254 |
|
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
6255 # Create directories. |
|
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
6256 for f in $files; do echo $f; done \ |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
6257 | sed -e "$sed_rewrite_files" \ |
|
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
6258 | sed -n -e 's,^\(.*\)/[^/]*,\1,p' \ |
|
7605
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
6259 | LC_ALL=C sort -u \ |
|
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
6260 > "$tmp"/dirs |
|
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
6261 { # Rearrange file descriptors. Needed because "while ... done < ..." |
|
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
6262 # constructs are executed in a subshell e.g. by Solaris 10 /bin/sh. |
|
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
6263 exec 5<&0 < "$tmp"/dirs |
|
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
6264 while read d; do |
|
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
6265 mkdir -p "$testdir/$d" |
|
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
6266 done |
|
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
6267 exec 0<&5 5<&- |
|
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
6268 } |
|
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
6269 |
|
18937
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
6270 # Copy files or make symbolic links or hard links. |
|
7605
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
6271 delimiter=' ' |
|
7321
3bf1b669d1e1
Rewrite all file names at once.
Bruno Haible <bruno@clisp.org>
parents:
7320
diff
changeset
|
6272 for f in $files; do echo $f; done \ |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
6273 | sed -e "s,^.*\$,&$delimiter&," -e "$sed_rewrite_files" \ |
|
7321
3bf1b669d1e1
Rewrite all file names at once.
Bruno Haible <bruno@clisp.org>
parents:
7320
diff
changeset
|
6274 | LC_ALL=C sort \ |
|
3bf1b669d1e1
Rewrite all file names at once.
Bruno Haible <bruno@clisp.org>
parents:
7320
diff
changeset
|
6275 > "$tmp"/files |
|
7326
1ca1035630dd
Avoid to execute while loops in a subshell.
Bruno Haible <bruno@clisp.org>
parents:
7323
diff
changeset
|
6276 { # Rearrange file descriptors. Needed because "while ... done < ..." |
|
1ca1035630dd
Avoid to execute while loops in a subshell.
Bruno Haible <bruno@clisp.org>
parents:
7323
diff
changeset
|
6277 # constructs are executed in a subshell e.g. by Solaris 10 /bin/sh. |
|
7368
a7abebdb07f4
* gnulib-tool (func_import, func_create_testdir): Fix typos in
Eric Blake <ebb9@byu.net>
parents:
7350
diff
changeset
|
6278 exec 5<&0 < "$tmp"/files |
|
7326
1ca1035630dd
Avoid to execute while loops in a subshell.
Bruno Haible <bruno@clisp.org>
parents:
7323
diff
changeset
|
6279 while read g f; do |
|
14836
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6280 case "$f" in |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6281 tests=lib/*) f=`echo "$f" | sed -e 's,^tests=lib/,lib/,'` ;; |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6282 esac |
|
7326
1ca1035630dd
Avoid to execute while loops in a subshell.
Bruno Haible <bruno@clisp.org>
parents:
7323
diff
changeset
|
6283 func_lookup_file "$f" |
|
1ca1035630dd
Avoid to execute while loops in a subshell.
Bruno Haible <bruno@clisp.org>
parents:
7323
diff
changeset
|
6284 if test -n "$lookedup_tmp"; then |
|
7073
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
6285 cp -p "$lookedup_file" "$testdir/$g" |
|
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
6286 else |
|
18937
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
6287 func_should_link |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
6288 if test "$copyaction" = symlink; then |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
6289 func_symlink "$lookedup_file" "$testdir/$g" |
|
7643
d67f9dc6019d
New option --local-symlink.
Bruno Haible <bruno@clisp.org>
parents:
7642
diff
changeset
|
6290 else |
|
18937
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
6291 if test "$copyaction" = hardlink; then |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
6292 func_hardlink "$lookedup_file" "$testdir/$g" |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
6293 else |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
6294 cp -p "$lookedup_file" "$testdir/$g" |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
6295 fi |
|
7326
1ca1035630dd
Avoid to execute while loops in a subshell.
Bruno Haible <bruno@clisp.org>
parents:
7323
diff
changeset
|
6296 fi |
|
7073
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
6297 fi |
|
7326
1ca1035630dd
Avoid to execute while loops in a subshell.
Bruno Haible <bruno@clisp.org>
parents:
7323
diff
changeset
|
6298 done |
|
7373
330a972d58f0
Tweak last patch, for symmetry.
Bruno Haible <bruno@clisp.org>
parents:
7368
diff
changeset
|
6299 exec 0<&5 5<&- |
|
7326
1ca1035630dd
Avoid to execute while loops in a subshell.
Bruno Haible <bruno@clisp.org>
parents:
7323
diff
changeset
|
6300 } |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6301 |
|
14840
5f709022a256
Allow multiple gnulib generated include files to be combined.
Bruno Haible <bruno@clisp.org>
parents:
14836
diff
changeset
|
6302 # Determine include_guard_prefix. |
|
5f709022a256
Allow multiple gnulib generated include files to be combined.
Bruno Haible <bruno@clisp.org>
parents:
14836
diff
changeset
|
6303 func_compute_include_guard_prefix |
|
5f709022a256
Allow multiple gnulib generated include files to be combined.
Bruno Haible <bruno@clisp.org>
parents:
14836
diff
changeset
|
6304 |
|
7981
41421349e26b
In testing directories, link the test programs already during "make", not
Bruno Haible <bruno@clisp.org>
parents:
7911
diff
changeset
|
6305 # Create Makefile.ams that are for testing. |
|
41421349e26b
In testing directories, link the test programs already during "make", not
Bruno Haible <bruno@clisp.org>
parents:
7911
diff
changeset
|
6306 for_test=true |
|
41421349e26b
In testing directories, link the test programs already during "make", not
Bruno Haible <bruno@clisp.org>
parents:
7911
diff
changeset
|
6307 |
|
10476
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
6308 # No special edits are needed. |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
6309 makefile_am_edits=0 |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
6310 |
|
7195
e4a459055e78
Test other subdirectory names than 'lib' and 'm4'.
Bruno Haible <bruno@clisp.org>
parents:
7187
diff
changeset
|
6311 # Create $sourcebase/Makefile.am. |
|
e4a459055e78
Test other subdirectory names than 'lib' and 'm4'.
Bruno Haible <bruno@clisp.org>
parents:
7187
diff
changeset
|
6312 mkdir -p "$testdir/$sourcebase" |
|
10476
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
6313 destfile="$sourcebase/Makefile.am" |
|
14836
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6314 if $single_configure; then |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6315 modules="$main_modules" |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6316 fi |
|
7195
e4a459055e78
Test other subdirectory names than 'lib' and 'm4'.
Bruno Haible <bruno@clisp.org>
parents:
7187
diff
changeset
|
6317 func_emit_lib_Makefile_am > "$testdir/$sourcebase/Makefile.am" |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
6318 any_uses_subdirs="$uses_subdirs" |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6319 |
|
7195
e4a459055e78
Test other subdirectory names than 'lib' and 'm4'.
Bruno Haible <bruno@clisp.org>
parents:
7187
diff
changeset
|
6320 # Create $m4base/Makefile.am. |
|
e4a459055e78
Test other subdirectory names than 'lib' and 'm4'.
Bruno Haible <bruno@clisp.org>
parents:
7187
diff
changeset
|
6321 mkdir -p "$testdir/$m4base" |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6322 (echo "## Process this file with automake to produce Makefile.in." |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6323 echo |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6324 echo "EXTRA_DIST =" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6325 for f in $files; do |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6326 case "$f" in |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6327 m4/* ) |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
6328 echo "EXTRA_DIST += "`echo "$f" | sed -e 's,^m4/,,'` ;; |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6329 esac |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6330 done |
|
7195
e4a459055e78
Test other subdirectory names than 'lib' and 'm4'.
Bruno Haible <bruno@clisp.org>
parents:
7187
diff
changeset
|
6331 ) > "$testdir/$m4base/Makefile.am" |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6332 |
|
7195
e4a459055e78
Test other subdirectory names than 'lib' and 'm4'.
Bruno Haible <bruno@clisp.org>
parents:
7187
diff
changeset
|
6333 subdirs="$sourcebase $m4base" |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
6334 subdirs_with_configure_ac="" |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6335 |
|
7485
0194db3ad154
Handle mismatch between latest gettext release and current gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7484
diff
changeset
|
6336 if false && test -f "$testdir"/$m4base/gettext.m4; then |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6337 # Avoid stupid error message from automake: |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6338 # "AM_GNU_GETTEXT used but `po' not in SUBDIRS" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6339 mkdir -p "$testdir/po" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6340 (echo "## Process this file with automake to produce Makefile.in." |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6341 ) > "$testdir/po/Makefile.am" |
|
7323
7ca0e325d5db
Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents:
7322
diff
changeset
|
6342 func_append subdirs " po" |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6343 fi |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6344 |
|
16932
48e8f0679448
gnulib-tool: Refactor inctests variable.
Bruno Haible <bruno@clisp.org>
parents:
16931
diff
changeset
|
6345 if $inctests; then |
|
7195
e4a459055e78
Test other subdirectory names than 'lib' and 'm4'.
Bruno Haible <bruno@clisp.org>
parents:
7187
diff
changeset
|
6346 test -d "$testdir/$testsbase" || mkdir "$testdir/$testsbase" |
|
14836
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6347 if $single_configure; then |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6348 # Create $testsbase/Makefile.am. |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6349 destfile="$testsbase/Makefile.am" |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6350 modules="$testsrelated_modules" |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6351 func_emit_tests_Makefile_am "${macro_prefix}tests_WITNESS" > "$testdir/$testsbase/Makefile.am" |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6352 else |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6353 # Viewed from the $testsbase subdirectory, $auxdir is different. |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6354 saved_auxdir="$auxdir" |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6355 auxdir=`echo "$testsbase/" | sed -e 's%[^/][^/]*//*%../%g'`"$auxdir" |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6356 # Create $testsbase/Makefile.am. |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6357 use_libtests=false |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6358 destfile="$testsbase/Makefile.am" |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6359 func_emit_tests_Makefile_am "" > "$testdir/$testsbase/Makefile.am" |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6360 any_uses_subdirs="$any_uses_subdirs$uses_subdirs" |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6361 # Create $testsbase/configure.ac. |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6362 (echo "# Process this file with autoconf to produce a configure script." |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6363 echo "AC_INIT([dummy], [0])" |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6364 echo "AC_CONFIG_AUX_DIR([$auxdir])" |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6365 echo "AM_INIT_AUTOMAKE" |
|
12109
b56c1bd3de46
Conditionally emit AM_PROG_CC_C_O invocation to tests/configure.ac.
Bruno Haible <bruno@clisp.org>
parents:
12055
diff
changeset
|
6366 echo |
|
14836
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6367 echo "AC_CONFIG_HEADERS([config.h])" |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6368 echo |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6369 echo "AC_PROG_CC" |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6370 echo "AC_PROG_INSTALL" |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6371 echo "AC_PROG_MAKE_SET" |
|
18124
ef6cdfd2e603
gnulib-tool: fix tests of 'extensions' module
Pavel Raiskup <praiskup@redhat.com>
parents:
18114
diff
changeset
|
6372 |
|
ef6cdfd2e603
gnulib-tool: fix tests of 'extensions' module
Pavel Raiskup <praiskup@redhat.com>
parents:
18114
diff
changeset
|
6373 func_emit_pre_early_macros false '' "$modules" |
|
ef6cdfd2e603
gnulib-tool: fix tests of 'extensions' module
Pavel Raiskup <praiskup@redhat.com>
parents:
18114
diff
changeset
|
6374 |
|
14836
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6375 if test -n "$uses_subdirs"; then |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6376 echo "AM_PROG_CC_C_O" |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6377 echo |
|
8079
0951beec5b89
New module description section 'configure.ac-early'.
Bruno Haible <bruno@clisp.org>
parents:
8055
diff
changeset
|
6378 fi |
|
14836
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6379 for module in $modules; do |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6380 func_verify_module |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6381 if test -n "$module"; then |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6382 case $module in |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6383 gnumakefile | maintainer-makefile) |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6384 # These modules are meant to be used only in the top-level directory. |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6385 ;; |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6386 *) |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6387 func_get_autoconf_early_snippet "$module" |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6388 ;; |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6389 esac |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6390 fi |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6391 done \ |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6392 | sed -e '/^$/d;' -e 's/AC_REQUIRE(\[\([^()]*\)\])/\1/' |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6393 if test "$libtool" = true; then |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6394 echo "LT_INIT([win32-dll])" |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6395 echo "LT_LANG([C++])" |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6396 echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [true])" |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6397 echo "gl_cond_libtool=true" |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6398 else |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6399 echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [false])" |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6400 echo "gl_cond_libtool=false" |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6401 echo "gl_libdeps=" |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6402 echo "gl_ltlibdeps=" |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6403 fi |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6404 # Wrap the set of autoconf snippets into an autoconf macro that is then |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6405 # invoked. This is needed because autoconf does not support AC_REQUIRE |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6406 # at the top level: |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6407 # error: AC_REQUIRE(gt_CSHARPCOMP): cannot be used outside of an AC_DEFUN'd macro |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6408 # but we want the AC_REQUIRE to have its normal meaning (provide one |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6409 # expansion of the required macro before the current point, and only one |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6410 # expansion total). |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6411 echo "AC_DEFUN([gl_INIT], [" |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6412 sed_replace_build_aux=' |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6413 :a |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6414 /AC_CONFIG_FILES(.*:build-aux\/.*)/{ |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6415 s|AC_CONFIG_FILES(\(.*\):build-aux/\(.*\))|AC_CONFIG_FILES(\1:'"$auxdir"'/\2)| |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6416 ba |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6417 }' |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6418 echo "gl_m4_base='../$m4base'" |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6419 func_emit_initmacro_start $macro_prefix |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6420 # We don't have explicit ordering constraints between the various |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6421 # autoconf snippets. It's cleanest to put those of the library before |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6422 # those of the tests. |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6423 echo "gl_source_base='../$sourcebase'" |
|
19478
fef1e0e56d65
gnulib-tool: Make --conditional-dependencies work better.
Bruno Haible <bruno@clisp.org>
parents:
19439
diff
changeset
|
6424 func_emit_autoconf_snippets "$modules" "$modules" func_verify_nontests_module false false false |
|
14836
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6425 echo "gl_source_base='.'" |
|
19478
fef1e0e56d65
gnulib-tool: Make --conditional-dependencies work better.
Bruno Haible <bruno@clisp.org>
parents:
19439
diff
changeset
|
6426 func_emit_autoconf_snippets "$modules" "$modules" func_verify_tests_module false false false |
|
14836
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6427 func_emit_initmacro_end $macro_prefix |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6428 # _LIBDEPS and _LTLIBDEPS variables are not needed if this library is |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6429 # created using libtool, because libtool already handles the dependencies. |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6430 if test "$libtool" != true; then |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6431 libname_upper=`echo "$libname" | LC_ALL=C tr '[a-z]-' '[A-Z]_'` |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6432 echo " ${libname_upper}_LIBDEPS=\"\$gl_libdeps\"" |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6433 echo " AC_SUBST([${libname_upper}_LIBDEPS])" |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6434 echo " ${libname_upper}_LTLIBDEPS=\"\$gl_ltlibdeps\"" |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6435 echo " AC_SUBST([${libname_upper}_LTLIBDEPS])" |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6436 fi |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6437 echo "])" |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6438 func_emit_initmacro_done $macro_prefix $sourcebase # FIXME use $sourcebase or $testsbase? |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6439 echo |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6440 echo "gl_INIT" |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6441 echo |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6442 # Usually $testsbase/config.h will be a superset of config.h. Verify this |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6443 # by "merging" config.h into $testsbase/config.h; look out for gcc warnings. |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6444 echo "AH_TOP([#include \"../config.h\"])" |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6445 echo |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6446 echo "AC_CONFIG_FILES([Makefile])" |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6447 echo "AC_OUTPUT" |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6448 ) > "$testdir/$testsbase/configure.ac" |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6449 auxdir="$saved_auxdir" |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6450 subdirs_with_configure_ac="$subdirs_with_configure_ac $testsbase" |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6451 fi |
|
14841
9341bfde6165
gnulib-tool: Fix bug in yesterday's commit.
Bruno Haible <bruno@clisp.org>
parents:
14840
diff
changeset
|
6452 func_append subdirs " $testsbase" |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
6453 fi |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
6454 |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6455 # Create Makefile.am. |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6456 (echo "## Process this file with automake to produce Makefile.in." |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6457 echo |
| 39943 | 6458 echo "AUTOMAKE_OPTIONS = 1.11 foreign" |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6459 echo |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6460 echo "SUBDIRS = $subdirs" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6461 echo |
|
7195
e4a459055e78
Test other subdirectory names than 'lib' and 'm4'.
Bruno Haible <bruno@clisp.org>
parents:
7187
diff
changeset
|
6462 echo "ACLOCAL_AMFLAGS = -I $m4base" |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6463 ) > "$testdir/Makefile.am" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6464 |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6465 # Create configure.ac. |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6466 (echo "# Process this file with autoconf to produce a configure script." |
|
6106
66bd85c8a9cd
Proper autoconf macro argument quoting.
Bruno Haible <bruno@clisp.org>
parents:
6039
diff
changeset
|
6467 echo "AC_INIT([dummy], [0])" |
|
6109
a52f596fdf00
Generalize support for --aux-dir.
Bruno Haible <bruno@clisp.org>
parents:
6108
diff
changeset
|
6468 if test "$auxdir" != "."; then |
|
a52f596fdf00
Generalize support for --aux-dir.
Bruno Haible <bruno@clisp.org>
parents:
6108
diff
changeset
|
6469 echo "AC_CONFIG_AUX_DIR([$auxdir])" |
|
a52f596fdf00
Generalize support for --aux-dir.
Bruno Haible <bruno@clisp.org>
parents:
6108
diff
changeset
|
6470 fi |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6471 echo "AM_INIT_AUTOMAKE" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6472 echo |
|
11931
d42b3b6f11d3
Replace uses of obsolete Autoconf macros with modern counterparts.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
11919
diff
changeset
|
6473 echo "AC_CONFIG_HEADERS([config.h])" |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6474 echo |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6475 echo "AC_PROG_CC" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6476 echo "AC_PROG_INSTALL" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6477 echo "AC_PROG_MAKE_SET" |
|
7106
b9fff044578d
Apply last patch also to --create-testdir.
Bruno Haible <bruno@clisp.org>
parents:
7105
diff
changeset
|
6478 echo |
|
7777
b33956fbd953
2007-01-03 Simon Josefsson <simon@josefsson.org>
Simon Josefsson <simon@josefsson.org>
parents:
7771
diff
changeset
|
6479 echo "# For autobuild." |
|
b33956fbd953
2007-01-03 Simon Josefsson <simon@josefsson.org>
Simon Josefsson <simon@josefsson.org>
parents:
7771
diff
changeset
|
6480 echo "AC_CANONICAL_BUILD" |
|
b33956fbd953
2007-01-03 Simon Josefsson <simon@josefsson.org>
Simon Josefsson <simon@josefsson.org>
parents:
7771
diff
changeset
|
6481 echo "AC_CANONICAL_HOST" |
|
b33956fbd953
2007-01-03 Simon Josefsson <simon@josefsson.org>
Simon Josefsson <simon@josefsson.org>
parents:
7771
diff
changeset
|
6482 echo |
|
7106
b9fff044578d
Apply last patch also to --create-testdir.
Bruno Haible <bruno@clisp.org>
parents:
7105
diff
changeset
|
6483 echo "m4_pattern_forbid([^gl_[A-Z]])dnl the gnulib macro namespace" |
|
7486
46b72819ef52
Add support for multiple gnulib-tool invocations in the scope of a single
Bruno Haible <bruno@clisp.org>
parents:
7485
diff
changeset
|
6484 echo "m4_pattern_allow([^gl_ES\$])dnl a valid locale name" |
|
46b72819ef52
Add support for multiple gnulib-tool invocations in the scope of a single
Bruno Haible <bruno@clisp.org>
parents:
7485
diff
changeset
|
6485 echo "m4_pattern_allow([^gl_LIBOBJS\$])dnl a variable" |
|
46b72819ef52
Add support for multiple gnulib-tool invocations in the scope of a single
Bruno Haible <bruno@clisp.org>
parents:
7485
diff
changeset
|
6486 echo "m4_pattern_allow([^gl_LTLIBOBJS\$])dnl a variable" |
|
18124
ef6cdfd2e603
gnulib-tool: fix tests of 'extensions' module
Pavel Raiskup <praiskup@redhat.com>
parents:
18114
diff
changeset
|
6487 |
|
ef6cdfd2e603
gnulib-tool: fix tests of 'extensions' module
Pavel Raiskup <praiskup@redhat.com>
parents:
18114
diff
changeset
|
6488 func_emit_pre_early_macros false '' "$final_modules" |
|
ef6cdfd2e603
gnulib-tool: fix tests of 'extensions' module
Pavel Raiskup <praiskup@redhat.com>
parents:
18114
diff
changeset
|
6489 |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
6490 if test -n "$any_uses_subdirs"; then |
|
7641
d6fbdb213b01
Finish support for source files in subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7640
diff
changeset
|
6491 echo "AM_PROG_CC_C_O" |
|
d6fbdb213b01
Finish support for source files in subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7640
diff
changeset
|
6492 echo |
|
d6fbdb213b01
Finish support for source files in subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7640
diff
changeset
|
6493 fi |
|
14836
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6494 for module in $final_modules; do |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6495 if $single_configure; then |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6496 func_verify_module |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6497 else |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6498 func_verify_nontests_module |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6499 fi |
|
8079
0951beec5b89
New module description section 'configure.ac-early'.
Bruno Haible <bruno@clisp.org>
parents:
8055
diff
changeset
|
6500 if test -n "$module"; then |
|
0951beec5b89
New module description section 'configure.ac-early'.
Bruno Haible <bruno@clisp.org>
parents:
8055
diff
changeset
|
6501 func_get_autoconf_early_snippet "$module" |
|
0951beec5b89
New module description section 'configure.ac-early'.
Bruno Haible <bruno@clisp.org>
parents:
8055
diff
changeset
|
6502 fi |
|
0951beec5b89
New module description section 'configure.ac-early'.
Bruno Haible <bruno@clisp.org>
parents:
8055
diff
changeset
|
6503 done \ |
|
0951beec5b89
New module description section 'configure.ac-early'.
Bruno Haible <bruno@clisp.org>
parents:
8055
diff
changeset
|
6504 | sed -e '/^$/d;' -e 's/AC_REQUIRE(\[\([^()]*\)\])/\1/' |
| 7077 | 6505 if test "$libtool" = true; then |
|
12978
b7726f620298
gnulib-tool: Add support for --libtool in --create-testdir.
Bruno Haible <bruno@clisp.org>
parents:
12923
diff
changeset
|
6506 echo "LT_INIT([win32-dll])" |
|
12982
4bf217bee1d8
Fix problem with automake's definition of CXXLINK.
Bruno Haible <bruno@clisp.org>
parents:
12979
diff
changeset
|
6507 echo "LT_LANG([C++])" |
| 7077 | 6508 echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [true])" |
|
7286
727bb5526bad
For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents:
7270
diff
changeset
|
6509 echo "gl_cond_libtool=true" |
| 7077 | 6510 else |
|
6418
e0a8b9b05999
Proper autoconf macro argument quoting.
Bruno Haible <bruno@clisp.org>
parents:
6414
diff
changeset
|
6511 echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [false])" |
|
7286
727bb5526bad
For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents:
7270
diff
changeset
|
6512 echo "gl_cond_libtool=false" |
|
727bb5526bad
For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents:
7270
diff
changeset
|
6513 echo "gl_libdeps=" |
|
727bb5526bad
For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents:
7270
diff
changeset
|
6514 echo "gl_ltlibdeps=" |
|
6414
46d47c8fe734
* gnulib-tool: Define automake conditional GL_COND_LIBTOOL if
Simon Josefsson <simon@josefsson.org>
parents:
6389
diff
changeset
|
6515 fi |
|
7090
dfc92f94c781
Allow AC_REQUIREs in the configure.ac snippet.
Bruno Haible <bruno@clisp.org>
parents:
7089
diff
changeset
|
6516 # Wrap the set of autoconf snippets into an autoconf macro that is then |
|
dfc92f94c781
Allow AC_REQUIREs in the configure.ac snippet.
Bruno Haible <bruno@clisp.org>
parents:
7089
diff
changeset
|
6517 # invoked. This is needed because autoconf does not support AC_REQUIRE |
|
dfc92f94c781
Allow AC_REQUIREs in the configure.ac snippet.
Bruno Haible <bruno@clisp.org>
parents:
7089
diff
changeset
|
6518 # at the top level: |
|
dfc92f94c781
Allow AC_REQUIREs in the configure.ac snippet.
Bruno Haible <bruno@clisp.org>
parents:
7089
diff
changeset
|
6519 # error: AC_REQUIRE(gt_CSHARPCOMP): cannot be used outside of an AC_DEFUN'd macro |
|
dfc92f94c781
Allow AC_REQUIREs in the configure.ac snippet.
Bruno Haible <bruno@clisp.org>
parents:
7089
diff
changeset
|
6520 # but we want the AC_REQUIRE to have its normal meaning (provide one |
|
dfc92f94c781
Allow AC_REQUIREs in the configure.ac snippet.
Bruno Haible <bruno@clisp.org>
parents:
7089
diff
changeset
|
6521 # expansion of the required macro before the current point, and only one |
|
dfc92f94c781
Allow AC_REQUIREs in the configure.ac snippet.
Bruno Haible <bruno@clisp.org>
parents:
7089
diff
changeset
|
6522 # expansion total). |
|
dfc92f94c781
Allow AC_REQUIREs in the configure.ac snippet.
Bruno Haible <bruno@clisp.org>
parents:
7089
diff
changeset
|
6523 echo "AC_DEFUN([gl_INIT], [" |
| 6556 | 6524 if test "$auxdir" != "build-aux"; then |
| 6525 sed_replace_build_aux=' | |
| 6526 :a | |
| 6527 /AC_CONFIG_FILES(.*:build-aux\/.*)/{ | |
| 6528 s|AC_CONFIG_FILES(\(.*\):build-aux/\(.*\))|AC_CONFIG_FILES(\1:'"$auxdir"'/\2)| | |
| 6529 ba | |
| 6530 }' | |
| 6531 else | |
|
10400
817f1418bbde
Make gnulib-tool work with native 'sed' on AIX.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
10380
diff
changeset
|
6532 sed_replace_build_aux="$sed_noop" |
| 6556 | 6533 fi |
|
13105
6d950d2ec11e
gnulib-tool: Provide the value of --m4-base to modules.
Bruno Haible <bruno@clisp.org>
parents:
13090
diff
changeset
|
6534 echo "gl_m4_base='$m4base'" |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
6535 func_emit_initmacro_start $macro_prefix |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
6536 echo "gl_source_base='$sourcebase'" |
|
14836
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6537 if $single_configure; then |
|
19478
fef1e0e56d65
gnulib-tool: Make --conditional-dependencies work better.
Bruno Haible <bruno@clisp.org>
parents:
19439
diff
changeset
|
6538 func_emit_autoconf_snippets "$main_modules" "$main_modules" func_verify_module true false false |
|
14836
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6539 else |
|
19478
fef1e0e56d65
gnulib-tool: Make --conditional-dependencies work better.
Bruno Haible <bruno@clisp.org>
parents:
19439
diff
changeset
|
6540 func_emit_autoconf_snippets "$modules" "$modules" func_verify_nontests_module true false false |
|
14836
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6541 fi |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
6542 func_emit_initmacro_end $macro_prefix |
|
14836
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6543 if $single_configure; then |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6544 echo " gltests_libdeps=" |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6545 echo " gltests_ltlibdeps=" |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6546 func_emit_initmacro_start ${macro_prefix}tests |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6547 echo " gl_source_base='$testsbase'" |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6548 # Define a tests witness macro. |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6549 echo " ${macro_prefix}tests_WITNESS=IN_GNULIB_TESTS" |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6550 echo " AC_SUBST([${macro_prefix}tests_WITNESS])" |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6551 echo " gl_module_indicator_condition=\$${macro_prefix}tests_WITNESS" |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6552 echo " m4_pushdef([gl_MODULE_INDICATOR_CONDITION], [\$gl_module_indicator_condition])" |
|
19478
fef1e0e56d65
gnulib-tool: Make --conditional-dependencies work better.
Bruno Haible <bruno@clisp.org>
parents:
19439
diff
changeset
|
6553 func_emit_autoconf_snippets "$testsrelated_modules" "$main_modules $testsrelated_modules" func_verify_module true false false |
|
14836
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6554 echo " m4_popdef([gl_MODULE_INDICATOR_CONDITION])" |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6555 func_emit_initmacro_end ${macro_prefix}tests |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6556 fi |
|
7286
727bb5526bad
For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents:
7270
diff
changeset
|
6557 # _LIBDEPS and _LTLIBDEPS variables are not needed if this library is |
|
727bb5526bad
For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents:
7270
diff
changeset
|
6558 # created using libtool, because libtool already handles the dependencies. |
|
727bb5526bad
For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents:
7270
diff
changeset
|
6559 if test "$libtool" != true; then |
|
13768
f19c8837df90
more ports to Solaris tr, which needs [] around ranges
Paul Eggert <eggert@cs.ucla.edu>
parents:
13763
diff
changeset
|
6560 libname_upper=`echo "$libname" | LC_ALL=C tr '[a-z]-' '[A-Z]_'` |
|
7286
727bb5526bad
For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents:
7270
diff
changeset
|
6561 echo " ${libname_upper}_LIBDEPS=\"\$gl_libdeps\"" |
|
727bb5526bad
For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents:
7270
diff
changeset
|
6562 echo " AC_SUBST([${libname_upper}_LIBDEPS])" |
|
727bb5526bad
For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents:
7270
diff
changeset
|
6563 echo " ${libname_upper}_LTLIBDEPS=\"\$gl_ltlibdeps\"" |
|
727bb5526bad
For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents:
7270
diff
changeset
|
6564 echo " AC_SUBST([${libname_upper}_LTLIBDEPS])" |
|
727bb5526bad
For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents:
7270
diff
changeset
|
6565 fi |
|
14836
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6566 if $single_configure; then |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6567 if $use_libtests; then |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6568 echo " LIBTESTS_LIBDEPS=\"\$gltests_libdeps\"" |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6569 echo " AC_SUBST([LIBTESTS_LIBDEPS])" |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6570 fi |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6571 fi |
|
7090
dfc92f94c781
Allow AC_REQUIREs in the configure.ac snippet.
Bruno Haible <bruno@clisp.org>
parents:
7089
diff
changeset
|
6572 echo "])" |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
6573 func_emit_initmacro_done $macro_prefix $sourcebase |
|
14836
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6574 if $single_configure; then |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6575 func_emit_initmacro_done ${macro_prefix}tests $testsbase |
|
ea0ee6fc3c8e
gnulib-tool: Alternative structure of testdirs, similar to --import.
Bruno Haible <bruno@clisp.org>
parents:
14833
diff
changeset
|
6576 fi |
|
7486
46b72819ef52
Add support for multiple gnulib-tool invocations in the scope of a single
Bruno Haible <bruno@clisp.org>
parents:
7485
diff
changeset
|
6577 echo |
|
7090
dfc92f94c781
Allow AC_REQUIREs in the configure.ac snippet.
Bruno Haible <bruno@clisp.org>
parents:
7089
diff
changeset
|
6578 echo "gl_INIT" |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6579 echo |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
6580 if test -n "$subdirs_with_configure_ac"; then |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
6581 echo "AC_CONFIG_SUBDIRS(["`echo $subdirs_with_configure_ac`"])" |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
6582 fi |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6583 makefiles="Makefile" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6584 for d in $subdirs; do |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
6585 # For subdirs that have a configure.ac by their own, it's the subdir's |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
6586 # configure.ac which creates the subdir's Makefile.am, not this one. |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
6587 case " $subdirs_with_configure_ac " in |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
6588 *" $d "*) ;; |
|
7323
7ca0e325d5db
Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents:
7322
diff
changeset
|
6589 *) func_append makefiles " $d/Makefile" ;; |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
6590 esac |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6591 done |
|
11931
d42b3b6f11d3
Replace uses of obsolete Autoconf macros with modern counterparts.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
11919
diff
changeset
|
6592 echo "AC_CONFIG_FILES([$makefiles])" |
|
d42b3b6f11d3
Replace uses of obsolete Autoconf macros with modern counterparts.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
11919
diff
changeset
|
6593 echo "AC_OUTPUT" |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6594 ) > "$testdir/configure.ac" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6595 |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6596 # Create autogenerated files. |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6597 (cd "$testdir" |
|
7485
0194db3ad154
Handle mismatch between latest gettext release and current gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7484
diff
changeset
|
6598 # Do not use "${AUTORECONF} --force --install", because it may invoke |
|
0194db3ad154
Handle mismatch between latest gettext release and current gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7484
diff
changeset
|
6599 # autopoint, which brings in older versions of some of our .m4 files. |
|
0194db3ad154
Handle mismatch between latest gettext release and current gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7484
diff
changeset
|
6600 if test -f $m4base/gettext.m4; then |
|
9188
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
6601 func_execute_command ${AUTOPOINT} --force || func_exit 1 |
|
7485
0194db3ad154
Handle mismatch between latest gettext release and current gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7484
diff
changeset
|
6602 for f in $m4base/*.m4~; do |
|
10969
4c304a656b87
Fix a gnulib-tool failure.
Bruno Haible <bruno@clisp.org>
parents:
10854
diff
changeset
|
6603 if test -f $f; then |
|
4c304a656b87
Fix a gnulib-tool failure.
Bruno Haible <bruno@clisp.org>
parents:
10854
diff
changeset
|
6604 mv -f $f `echo $f | sed -e 's,~$,,'` || func_exit 1 |
|
4c304a656b87
Fix a gnulib-tool failure.
Bruno Haible <bruno@clisp.org>
parents:
10854
diff
changeset
|
6605 fi |
|
7485
0194db3ad154
Handle mismatch between latest gettext release and current gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7484
diff
changeset
|
6606 done |
|
0194db3ad154
Handle mismatch between latest gettext release and current gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7484
diff
changeset
|
6607 fi |
|
12978
b7726f620298
gnulib-tool: Add support for --libtool in --create-testdir.
Bruno Haible <bruno@clisp.org>
parents:
12923
diff
changeset
|
6608 if test "$libtool" = true; then |
|
b7726f620298
gnulib-tool: Add support for --libtool in --create-testdir.
Bruno Haible <bruno@clisp.org>
parents:
12923
diff
changeset
|
6609 func_execute_command ${LIBTOOLIZE} --copy || func_exit 1 |
|
b7726f620298
gnulib-tool: Add support for --libtool in --create-testdir.
Bruno Haible <bruno@clisp.org>
parents:
12923
diff
changeset
|
6610 fi |
|
9188
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
6611 func_execute_command ${ACLOCAL} -I $m4base || func_exit 1 |
|
7485
0194db3ad154
Handle mismatch between latest gettext release and current gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7484
diff
changeset
|
6612 if ! test -d build-aux; then |
|
9188
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
6613 func_execute_command mkdir build-aux || func_exit 1 |
|
7485
0194db3ad154
Handle mismatch between latest gettext release and current gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7484
diff
changeset
|
6614 fi |
|
9188
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
6615 func_execute_command ${AUTOCONF} || func_exit 1 |
|
19261
91adfa2ad3ed
gnulib-tool: Avoid unnecessary config.h.in remaking in testdirs.
Bruno Haible <bruno@clisp.org>
parents:
19192
diff
changeset
|
6616 # Explicit 'touch config.h.in': see <https://savannah.gnu.org/support/index.php?109406>. |
|
19271
6d9b9b82d0af
Port recent gnulib-tool change to Dash
Paul Eggert <eggert@cs.ucla.edu>
parents:
19261
diff
changeset
|
6617 func_execute_command ${AUTOHEADER} && |
|
6d9b9b82d0af
Port recent gnulib-tool change to Dash
Paul Eggert <eggert@cs.ucla.edu>
parents:
19261
diff
changeset
|
6618 func_execute_command touch config.h.in || |
|
6d9b9b82d0af
Port recent gnulib-tool change to Dash
Paul Eggert <eggert@cs.ucla.edu>
parents:
19261
diff
changeset
|
6619 func_exit 1 |
|
9188
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
6620 func_execute_command ${AUTOMAKE} --add-missing --copy || func_exit 1 |
|
18959
a2064df3feed
gnulib-tool: Clean up after autotools.
Bruno Haible <bruno@clisp.org>
parents:
18952
diff
changeset
|
6621 rm -rf autom4te.cache |
|
7638
581c011e05d6
* gnulib-tool (func_create_testdir): Fix replacement of
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7605
diff
changeset
|
6622 ) || func_exit 1 |
|
16932
48e8f0679448
gnulib-tool: Refactor inctests variable.
Bruno Haible <bruno@clisp.org>
parents:
16931
diff
changeset
|
6623 if $inctests && ! $single_configure; then |
|
7638
581c011e05d6
* gnulib-tool (func_create_testdir): Fix replacement of
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7605
diff
changeset
|
6624 # Create autogenerated files. |
|
581c011e05d6
* gnulib-tool (func_create_testdir): Fix replacement of
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7605
diff
changeset
|
6625 (cd "$testdir/$testsbase" || func_exit 1 |
|
581c011e05d6
* gnulib-tool (func_create_testdir): Fix replacement of
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7605
diff
changeset
|
6626 # Do not use "${AUTORECONF} --force --install", because it may invoke |
|
581c011e05d6
* gnulib-tool (func_create_testdir): Fix replacement of
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7605
diff
changeset
|
6627 # autopoint, which brings in older versions of some of our .m4 files. |
|
581c011e05d6
* gnulib-tool (func_create_testdir): Fix replacement of
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7605
diff
changeset
|
6628 if test -f ../$m4base/gettext.m4; then |
|
9188
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
6629 func_execute_command ${AUTOPOINT} --force || func_exit 1 |
|
7638
581c011e05d6
* gnulib-tool (func_create_testdir): Fix replacement of
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7605
diff
changeset
|
6630 for f in ../$m4base/*.m4~; do |
|
10969
4c304a656b87
Fix a gnulib-tool failure.
Bruno Haible <bruno@clisp.org>
parents:
10854
diff
changeset
|
6631 if test -f $f; then |
|
4c304a656b87
Fix a gnulib-tool failure.
Bruno Haible <bruno@clisp.org>
parents:
10854
diff
changeset
|
6632 mv -f $f `echo $f | sed -e 's,~$,,'` || func_exit 1 |
|
4c304a656b87
Fix a gnulib-tool failure.
Bruno Haible <bruno@clisp.org>
parents:
10854
diff
changeset
|
6633 fi |
|
7638
581c011e05d6
* gnulib-tool (func_create_testdir): Fix replacement of
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7605
diff
changeset
|
6634 done |
|
581c011e05d6
* gnulib-tool (func_create_testdir): Fix replacement of
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7605
diff
changeset
|
6635 fi |
|
9188
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
6636 func_execute_command ${ACLOCAL} -I ../$m4base || func_exit 1 |
|
7638
581c011e05d6
* gnulib-tool (func_create_testdir): Fix replacement of
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7605
diff
changeset
|
6637 if ! test -d ../build-aux; then |
|
9188
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
6638 func_execute_command mkdir ../build-aux |
|
7638
581c011e05d6
* gnulib-tool (func_create_testdir): Fix replacement of
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7605
diff
changeset
|
6639 fi |
|
9188
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
6640 func_execute_command ${AUTOCONF} || func_exit 1 |
|
19261
91adfa2ad3ed
gnulib-tool: Avoid unnecessary config.h.in remaking in testdirs.
Bruno Haible <bruno@clisp.org>
parents:
19192
diff
changeset
|
6641 # Explicit 'touch config.h.in': see <https://savannah.gnu.org/support/index.php?109406>. |
|
19271
6d9b9b82d0af
Port recent gnulib-tool change to Dash
Paul Eggert <eggert@cs.ucla.edu>
parents:
19261
diff
changeset
|
6642 func_execute_command ${AUTOHEADER} && |
|
6d9b9b82d0af
Port recent gnulib-tool change to Dash
Paul Eggert <eggert@cs.ucla.edu>
parents:
19261
diff
changeset
|
6643 func_execute_command touch config.h.in || |
|
6d9b9b82d0af
Port recent gnulib-tool change to Dash
Paul Eggert <eggert@cs.ucla.edu>
parents:
19261
diff
changeset
|
6644 func_exit 1 |
|
9188
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
6645 func_execute_command ${AUTOMAKE} --add-missing --copy || func_exit 1 |
|
18959
a2064df3feed
gnulib-tool: Clean up after autotools.
Bruno Haible <bruno@clisp.org>
parents:
18952
diff
changeset
|
6646 rm -rf autom4te.cache |
|
7638
581c011e05d6
* gnulib-tool (func_create_testdir): Fix replacement of
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7605
diff
changeset
|
6647 ) || func_exit 1 |
|
581c011e05d6
* gnulib-tool (func_create_testdir): Fix replacement of
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7605
diff
changeset
|
6648 fi |
|
7866
58d9bcb3d6c4
Don't unnecessarily run configure and make.
Bruno Haible <bruno@clisp.org>
parents:
7858
diff
changeset
|
6649 # Need to run configure and make once, to create built files that are to be |
|
13769
896628c568fa
parse-datetime: better name than get_date
Eric Blake <eblake@redhat.com>
parents:
13768
diff
changeset
|
6650 # distributed (such as parse-datetime.c). |
|
13107
ed335ebb55f0
gnulib-tool: Create distributed built sources also for the tests.
Bruno Haible <bruno@clisp.org>
parents:
13106
diff
changeset
|
6651 sed_remove_make_variables='s,[$]([A-Za-z0-9_]*),,g' |
|
8410
bf7fdc3211a4
Avoiding the "./configure && make && make distclean" did not work most of the
Bruno Haible <bruno@clisp.org>
parents:
8356
diff
changeset
|
6652 # Extract the value of "CLEANFILES += ..." and "MOSTLYCLEANFILES += ...". |
|
18000
d0c8068a7c6f
gnulib-tool: concatenate lib_SOURCES to a single line
Pádraig Brady <P@draigBrady.com>
parents:
17964
diff
changeset
|
6653 cleaned_files=`combine_lines < "$testdir/$sourcebase/Makefile.am" \ |
|
8503
7c0e7f4f1ac1
* gnulib-tool: Rearrange space-tab sequences, since some editors
Eric Blake <ebb9@byu.net>
parents:
8451
diff
changeset
|
6654 | sed -n -e 's,^CLEANFILES[ ]*+=\([^#]*\).*$,\1,p' -e 's,^MOSTLYCLEANFILES[ ]*+=\([^#]*\).*$,\1,p'` |
|
8410
bf7fdc3211a4
Avoiding the "./configure && make && make distclean" did not work most of the
Bruno Haible <bruno@clisp.org>
parents:
8356
diff
changeset
|
6655 cleaned_files=`for file in $cleaned_files; do echo " $file "; done` |
|
7866
58d9bcb3d6c4
Don't unnecessarily run configure and make.
Bruno Haible <bruno@clisp.org>
parents:
7858
diff
changeset
|
6656 # Extract the value of "BUILT_SOURCES += ...". Remove variable references |
|
58d9bcb3d6c4
Don't unnecessarily run configure and make.
Bruno Haible <bruno@clisp.org>
parents:
7858
diff
changeset
|
6657 # such $(FOO_H) because they don't refer to distributed files. |
|
18000
d0c8068a7c6f
gnulib-tool: concatenate lib_SOURCES to a single line
Pádraig Brady <P@draigBrady.com>
parents:
17964
diff
changeset
|
6658 built_sources=`combine_lines < "$testdir/$sourcebase/Makefile.am" \ |
|
8503
7c0e7f4f1ac1
* gnulib-tool: Rearrange space-tab sequences, since some editors
Eric Blake <ebb9@byu.net>
parents:
8451
diff
changeset
|
6659 | sed -n -e 's,^BUILT_SOURCES[ ]*+=\([^#]*\).*$,\1,p' \ |
|
7866
58d9bcb3d6c4
Don't unnecessarily run configure and make.
Bruno Haible <bruno@clisp.org>
parents:
7858
diff
changeset
|
6660 | sed -e "$sed_remove_make_variables"` |
|
58d9bcb3d6c4
Don't unnecessarily run configure and make.
Bruno Haible <bruno@clisp.org>
parents:
7858
diff
changeset
|
6661 distributed_built_sources=`for file in $built_sources; do |
|
58d9bcb3d6c4
Don't unnecessarily run configure and make.
Bruno Haible <bruno@clisp.org>
parents:
7858
diff
changeset
|
6662 case "$cleaned_files" in |
|
58d9bcb3d6c4
Don't unnecessarily run configure and make.
Bruno Haible <bruno@clisp.org>
parents:
7858
diff
changeset
|
6663 *" "$file" "*) ;; |
|
58d9bcb3d6c4
Don't unnecessarily run configure and make.
Bruno Haible <bruno@clisp.org>
parents:
7858
diff
changeset
|
6664 *) echo $file ;; |
|
58d9bcb3d6c4
Don't unnecessarily run configure and make.
Bruno Haible <bruno@clisp.org>
parents:
7858
diff
changeset
|
6665 esac; |
|
58d9bcb3d6c4
Don't unnecessarily run configure and make.
Bruno Haible <bruno@clisp.org>
parents:
7858
diff
changeset
|
6666 done` |
|
13107
ed335ebb55f0
gnulib-tool: Create distributed built sources also for the tests.
Bruno Haible <bruno@clisp.org>
parents:
13106
diff
changeset
|
6667 tests_distributed_built_sources= |
|
16932
48e8f0679448
gnulib-tool: Refactor inctests variable.
Bruno Haible <bruno@clisp.org>
parents:
16931
diff
changeset
|
6668 if $inctests; then |
|
13107
ed335ebb55f0
gnulib-tool: Create distributed built sources also for the tests.
Bruno Haible <bruno@clisp.org>
parents:
13106
diff
changeset
|
6669 # Likewise for built files in the $testsbase directory. |
|
18000
d0c8068a7c6f
gnulib-tool: concatenate lib_SOURCES to a single line
Pádraig Brady <P@draigBrady.com>
parents:
17964
diff
changeset
|
6670 tests_cleaned_files=`combine_lines < "$testdir/$testsbase/Makefile.am" \ |
|
13107
ed335ebb55f0
gnulib-tool: Create distributed built sources also for the tests.
Bruno Haible <bruno@clisp.org>
parents:
13106
diff
changeset
|
6671 | sed -n -e 's,^CLEANFILES[ ]*+=\([^#]*\).*$,\1,p' -e 's,^MOSTLYCLEANFILES[ ]*+=\([^#]*\).*$,\1,p'` |
|
ed335ebb55f0
gnulib-tool: Create distributed built sources also for the tests.
Bruno Haible <bruno@clisp.org>
parents:
13106
diff
changeset
|
6672 tests_cleaned_files=`for file in $tests_cleaned_files; do echo " $file "; done` |
|
18000
d0c8068a7c6f
gnulib-tool: concatenate lib_SOURCES to a single line
Pádraig Brady <P@draigBrady.com>
parents:
17964
diff
changeset
|
6673 tests_built_sources=`combine_lines < "$testdir/$testsbase/Makefile.am" \ |
|
13107
ed335ebb55f0
gnulib-tool: Create distributed built sources also for the tests.
Bruno Haible <bruno@clisp.org>
parents:
13106
diff
changeset
|
6674 | sed -n -e 's,^BUILT_SOURCES[ ]*+=\([^#]*\).*$,\1,p' \ |
|
ed335ebb55f0
gnulib-tool: Create distributed built sources also for the tests.
Bruno Haible <bruno@clisp.org>
parents:
13106
diff
changeset
|
6675 | sed -e "$sed_remove_make_variables"` |
|
ed335ebb55f0
gnulib-tool: Create distributed built sources also for the tests.
Bruno Haible <bruno@clisp.org>
parents:
13106
diff
changeset
|
6676 tests_distributed_built_sources=`for file in $tests_built_sources; do |
|
ed335ebb55f0
gnulib-tool: Create distributed built sources also for the tests.
Bruno Haible <bruno@clisp.org>
parents:
13106
diff
changeset
|
6677 case "$tests_cleaned_files" in |
|
ed335ebb55f0
gnulib-tool: Create distributed built sources also for the tests.
Bruno Haible <bruno@clisp.org>
parents:
13106
diff
changeset
|
6678 *" "$file" "*) ;; |
|
ed335ebb55f0
gnulib-tool: Create distributed built sources also for the tests.
Bruno Haible <bruno@clisp.org>
parents:
13106
diff
changeset
|
6679 *) echo $file ;; |
|
ed335ebb55f0
gnulib-tool: Create distributed built sources also for the tests.
Bruno Haible <bruno@clisp.org>
parents:
13106
diff
changeset
|
6680 esac; |
|
ed335ebb55f0
gnulib-tool: Create distributed built sources also for the tests.
Bruno Haible <bruno@clisp.org>
parents:
13106
diff
changeset
|
6681 done` |
|
ed335ebb55f0
gnulib-tool: Create distributed built sources also for the tests.
Bruno Haible <bruno@clisp.org>
parents:
13106
diff
changeset
|
6682 fi |
|
ed335ebb55f0
gnulib-tool: Create distributed built sources also for the tests.
Bruno Haible <bruno@clisp.org>
parents:
13106
diff
changeset
|
6683 if test -n "$distributed_built_sources" || test -n "$tests_distributed_built_sources"; then |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6684 (cd "$testdir" |
|
7638
581c011e05d6
* gnulib-tool (func_create_testdir): Fix replacement of
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7605
diff
changeset
|
6685 ./configure || func_exit 1 |
|
40128
a2e861fa78d1
gnulib-tool: Support running testdirs on Android.
Bruno Haible <bruno@clisp.org>
parents:
40074
diff
changeset
|
6686 if test -n "$distributed_built_sources"; then |
|
a2e861fa78d1
gnulib-tool: Support running testdirs on Android.
Bruno Haible <bruno@clisp.org>
parents:
40074
diff
changeset
|
6687 cd "$sourcebase" |
|
a2e861fa78d1
gnulib-tool: Support running testdirs on Android.
Bruno Haible <bruno@clisp.org>
parents:
40074
diff
changeset
|
6688 echo 'built_sources: $(BUILT_SOURCES)' >> Makefile |
|
a2e861fa78d1
gnulib-tool: Support running testdirs on Android.
Bruno Haible <bruno@clisp.org>
parents:
40074
diff
changeset
|
6689 $MAKE AUTOCONF="${AUTOCONF}" AUTOHEADER="${AUTOHEADER}" ACLOCAL="${ACLOCAL}" AUTOMAKE="${AUTOMAKE}" AUTORECONF="${AUTORECONF}" AUTOPOINT="${AUTOPOINT}" LIBTOOLIZE="${LIBTOOLIZE}" \ |
|
a2e861fa78d1
gnulib-tool: Support running testdirs on Android.
Bruno Haible <bruno@clisp.org>
parents:
40074
diff
changeset
|
6690 built_sources \ |
|
a2e861fa78d1
gnulib-tool: Support running testdirs on Android.
Bruno Haible <bruno@clisp.org>
parents:
40074
diff
changeset
|
6691 || func_exit 1 |
|
a2e861fa78d1
gnulib-tool: Support running testdirs on Android.
Bruno Haible <bruno@clisp.org>
parents:
40074
diff
changeset
|
6692 cd .. |
|
a2e861fa78d1
gnulib-tool: Support running testdirs on Android.
Bruno Haible <bruno@clisp.org>
parents:
40074
diff
changeset
|
6693 fi |
|
a2e861fa78d1
gnulib-tool: Support running testdirs on Android.
Bruno Haible <bruno@clisp.org>
parents:
40074
diff
changeset
|
6694 if test -n "$tests_distributed_built_sources"; then |
|
a2e861fa78d1
gnulib-tool: Support running testdirs on Android.
Bruno Haible <bruno@clisp.org>
parents:
40074
diff
changeset
|
6695 cd "$testsbase" |
|
a2e861fa78d1
gnulib-tool: Support running testdirs on Android.
Bruno Haible <bruno@clisp.org>
parents:
40074
diff
changeset
|
6696 echo 'built_sources: $(BUILT_SOURCES)' >> Makefile |
|
a2e861fa78d1
gnulib-tool: Support running testdirs on Android.
Bruno Haible <bruno@clisp.org>
parents:
40074
diff
changeset
|
6697 $MAKE AUTOCONF="${AUTOCONF}" AUTOHEADER="${AUTOHEADER}" ACLOCAL="${ACLOCAL}" AUTOMAKE="${AUTOMAKE}" AUTORECONF="${AUTORECONF}" AUTOPOINT="${AUTOPOINT}" LIBTOOLIZE="${LIBTOOLIZE}" \ |
|
a2e861fa78d1
gnulib-tool: Support running testdirs on Android.
Bruno Haible <bruno@clisp.org>
parents:
40074
diff
changeset
|
6698 built_sources \ |
|
a2e861fa78d1
gnulib-tool: Support running testdirs on Android.
Bruno Haible <bruno@clisp.org>
parents:
40074
diff
changeset
|
6699 || func_exit 1 |
|
a2e861fa78d1
gnulib-tool: Support running testdirs on Android.
Bruno Haible <bruno@clisp.org>
parents:
40074
diff
changeset
|
6700 cd .. |
|
a2e861fa78d1
gnulib-tool: Support running testdirs on Android.
Bruno Haible <bruno@clisp.org>
parents:
40074
diff
changeset
|
6701 fi |
|
13107
ed335ebb55f0
gnulib-tool: Create distributed built sources also for the tests.
Bruno Haible <bruno@clisp.org>
parents:
13106
diff
changeset
|
6702 $MAKE AUTOCONF="${AUTOCONF}" AUTOHEADER="${AUTOHEADER}" ACLOCAL="${ACLOCAL}" AUTOMAKE="${AUTOMAKE}" AUTORECONF="${AUTORECONF}" AUTOPOINT="${AUTOPOINT}" LIBTOOLIZE="${LIBTOOLIZE}" \ |
|
ed335ebb55f0
gnulib-tool: Create distributed built sources also for the tests.
Bruno Haible <bruno@clisp.org>
parents:
13106
diff
changeset
|
6703 distclean \ |
|
ed335ebb55f0
gnulib-tool: Create distributed built sources also for the tests.
Bruno Haible <bruno@clisp.org>
parents:
13106
diff
changeset
|
6704 || func_exit 1 |
|
7638
581c011e05d6
* gnulib-tool (func_create_testdir): Fix replacement of
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7605
diff
changeset
|
6705 ) || func_exit 1 |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6706 fi |
|
40128
a2e861fa78d1
gnulib-tool: Support running testdirs on Android.
Bruno Haible <bruno@clisp.org>
parents:
40074
diff
changeset
|
6707 (cd "$testdir" |
|
a2e861fa78d1
gnulib-tool: Support running testdirs on Android.
Bruno Haible <bruno@clisp.org>
parents:
40074
diff
changeset
|
6708 if test -f build-aux/test-driver; then |
|
a2e861fa78d1
gnulib-tool: Support running testdirs on Android.
Bruno Haible <bruno@clisp.org>
parents:
40074
diff
changeset
|
6709 patch build-aux/test-driver < "$gnulib_dir"/build-aux/test-driver.diff || func_exit 1 |
|
a2e861fa78d1
gnulib-tool: Support running testdirs on Android.
Bruno Haible <bruno@clisp.org>
parents:
40074
diff
changeset
|
6710 fi |
|
a2e861fa78d1
gnulib-tool: Support running testdirs on Android.
Bruno Haible <bruno@clisp.org>
parents:
40074
diff
changeset
|
6711 ) || func_exit 1 |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6712 } |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6713 |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6714 # func_create_megatestdir megatestdir allmodules |
|
6109
a52f596fdf00
Generalize support for --aux-dir.
Bruno Haible <bruno@clisp.org>
parents:
6108
diff
changeset
|
6715 # Input: |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
6716 # - local_gnulib_path from --local-dir |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
6717 # - modcache true or false, from --cache-modules/--no-cache-modules |
|
6109
a52f596fdf00
Generalize support for --aux-dir.
Bruno Haible <bruno@clisp.org>
parents:
6108
diff
changeset
|
6718 # - auxdir directory relative to destdir where to place build aux files |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6719 func_create_megatestdir () |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6720 { |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6721 megatestdir="$1" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6722 allmodules="$2" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6723 if test -z "$allmodules"; then |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6724 allmodules=`func_all_modules` |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6725 fi |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6726 |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6727 megasubdirs= |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6728 # First, all modules one by one. |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6729 for onemodule in $allmodules; do |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6730 func_create_testdir "$megatestdir/$onemodule" $onemodule |
|
7323
7ca0e325d5db
Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents:
7322
diff
changeset
|
6731 func_append megasubdirs "$onemodule " |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6732 done |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6733 # Then, all modules all together. |
|
7350
6c5c8c8b93a3
Don't include the config-h module in megatestdir.
Bruno Haible <bruno@clisp.org>
parents:
7348
diff
changeset
|
6734 # Except config-h, which breaks all modules which use HAVE_CONFIG_H. |
|
11737
351c1d4b1ca6
Undo last gnulib-tool commit: maintainer-makefile is fixed.
Bruno Haible <bruno@clisp.org>
parents:
11734
diff
changeset
|
6735 allmodules=`for m in $allmodules; do if test $m != config-h; then echo $m; fi; done` |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6736 func_create_testdir "$megatestdir/ALL" "$allmodules" |
|
7323
7ca0e325d5db
Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents:
7322
diff
changeset
|
6737 func_append megasubdirs "ALL" |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6738 |
|
8416
0bf5cb89a6b9
Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents:
8410
diff
changeset
|
6739 # Create autobuild. |
|
17378
1d9362a18c34
Assume gnulib is checked out from Git, not CVS
Stefano Lattarini <stefano.lattarini@gmail.com>
parents:
17269
diff
changeset
|
6740 cvsdate=`vc_witness="$gnulib_dir/.git/refs/heads/master"; \ |
|
9377
ca27c3808c95
Update after move from cvs to git.
Bruno Haible <bruno@clisp.org>
parents:
9355
diff
changeset
|
6741 sh "$gnulib_dir/build-aux/mdate-sh" "$vc_witness" \ |
|
8416
0bf5cb89a6b9
Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents:
8410
diff
changeset
|
6742 | sed -e 's,January,01,' -e 's,Jan,01,' \ |
|
0bf5cb89a6b9
Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents:
8410
diff
changeset
|
6743 -e 's,February,02,' -e 's,Feb,02,' \ |
|
0bf5cb89a6b9
Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents:
8410
diff
changeset
|
6744 -e 's,March,03,' -e 's,Mar,03,' \ |
|
0bf5cb89a6b9
Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents:
8410
diff
changeset
|
6745 -e 's,April,04,' -e 's,Apr,04,' \ |
|
0bf5cb89a6b9
Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents:
8410
diff
changeset
|
6746 -e 's,May,05,' \ |
|
0bf5cb89a6b9
Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents:
8410
diff
changeset
|
6747 -e 's,June,06,' -e 's,Jun,06,' \ |
|
0bf5cb89a6b9
Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents:
8410
diff
changeset
|
6748 -e 's,July,07,' -e 's,Jul,07,' \ |
|
0bf5cb89a6b9
Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents:
8410
diff
changeset
|
6749 -e 's,August,08,' -e 's,Aug,08,' \ |
|
0bf5cb89a6b9
Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents:
8410
diff
changeset
|
6750 -e 's,September,09,' -e 's,Sep,09,' \ |
|
0bf5cb89a6b9
Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents:
8410
diff
changeset
|
6751 -e 's,October,10,' -e 's,Oct,10,' \ |
|
0bf5cb89a6b9
Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents:
8410
diff
changeset
|
6752 -e 's,November,11,' -e 's,Nov,11,' \ |
|
0bf5cb89a6b9
Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents:
8410
diff
changeset
|
6753 -e 's,December,12,' -e 's,Dec,12,' \ |
|
9022
44509698ba9d
* gnulib-tool: Fix indentation.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
9010
diff
changeset
|
6754 -e 's,^,00,' -e 's,^[0-9]*\([0-9][0-9] \),\1,' \ |
|
9005
e04f36b292ad
* gnulib-tool (IFS): Initialize early, so we don't set it to
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
9003
diff
changeset
|
6755 -e 's,^\([0-9]*\) \([0-9]*\) \([0-9]*\),\3\2\1,'` |
|
8418
6840759b4ce2
Start the autobuild script with /bin/sh.
Bruno Haible <bruno@clisp.org>
parents:
8416
diff
changeset
|
6756 (echo '#!/bin/sh' |
|
6840759b4ce2
Start the autobuild script with /bin/sh.
Bruno Haible <bruno@clisp.org>
parents:
8416
diff
changeset
|
6757 echo "CVSDATE=$cvsdate" |
|
11403
ec75c090b646
gnulib-tool: use $MAKE not make in generated files
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
11261
diff
changeset
|
6758 echo ": \${MAKE=make}" |
|
8416
0bf5cb89a6b9
Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents:
8410
diff
changeset
|
6759 echo "test -d logs || mkdir logs" |
|
0bf5cb89a6b9
Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents:
8410
diff
changeset
|
6760 echo "for module in $megasubdirs; do" |
|
0bf5cb89a6b9
Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents:
8410
diff
changeset
|
6761 echo " echo \"Working on module \$module...\"" |
|
0bf5cb89a6b9
Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents:
8410
diff
changeset
|
6762 echo " safemodule=\`echo \$module | sed -e 's|/|-|g'\`" |
|
0bf5cb89a6b9
Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents:
8410
diff
changeset
|
6763 echo " (echo \"To: gnulib@autobuild.josefsson.org\"" |
|
0bf5cb89a6b9
Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents:
8410
diff
changeset
|
6764 echo " echo" |
|
0bf5cb89a6b9
Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents:
8410
diff
changeset
|
6765 echo " set -x" |
|
0bf5cb89a6b9
Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents:
8410
diff
changeset
|
6766 echo " : autobuild project... \$module" |
|
0bf5cb89a6b9
Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents:
8410
diff
changeset
|
6767 echo " : autobuild revision... cvs-\$CVSDATE-000000" |
|
0bf5cb89a6b9
Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents:
8410
diff
changeset
|
6768 echo " : autobuild timestamp... \`date \"+%Y%m%d-%H%M%S\"\`" |
|
0bf5cb89a6b9
Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents:
8410
diff
changeset
|
6769 echo " : autobuild hostname... \`hostname\`" |
|
11403
ec75c090b646
gnulib-tool: use $MAKE not make in generated files
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
11261
diff
changeset
|
6770 echo " cd \$module && ./configure \$CONFIGURE_OPTIONS && \$MAKE && \$MAKE check && \$MAKE distclean" |
|
8416
0bf5cb89a6b9
Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents:
8410
diff
changeset
|
6771 echo " echo rc=\$?" |
|
8419
d5e85ac6458c
Avoid using sed -e "", not supported by AIX sed.
Bruno Haible <bruno@clisp.org>
parents:
8418
diff
changeset
|
6772 echo " ) 2>&1 | { if test -n \"\$AUTOBUILD_SUBST\"; then sed -e \"\$AUTOBUILD_SUBST\"; else cat; fi; } > logs/\$safemodule" |
|
8416
0bf5cb89a6b9
Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents:
8410
diff
changeset
|
6773 echo "done" |
|
8672
c00e30e9aba4
2007-04-12 Simon Josefsson <simon@josefsson.org>
Simon Josefsson <simon@josefsson.org>
parents:
8668
diff
changeset
|
6774 ) > "$megatestdir/do-autobuild" |
|
c00e30e9aba4
2007-04-12 Simon Josefsson <simon@josefsson.org>
Simon Josefsson <simon@josefsson.org>
parents:
8668
diff
changeset
|
6775 chmod a+x "$megatestdir/do-autobuild" |
|
8416
0bf5cb89a6b9
Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents:
8410
diff
changeset
|
6776 |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6777 # Create Makefile.am. |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6778 (echo "## Process this file with automake to produce Makefile.in." |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6779 echo |
| 39943 | 6780 echo "AUTOMAKE_OPTIONS = 1.11 foreign" |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6781 echo |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6782 echo "SUBDIRS = $megasubdirs" |
|
8416
0bf5cb89a6b9
Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents:
8410
diff
changeset
|
6783 echo |
|
8672
c00e30e9aba4
2007-04-12 Simon Josefsson <simon@josefsson.org>
Simon Josefsson <simon@josefsson.org>
parents:
8668
diff
changeset
|
6784 echo "EXTRA_DIST = do-autobuild" |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6785 ) > "$megatestdir/Makefile.am" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6786 |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6787 # Create configure.ac. |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6788 (echo "# Process this file with autoconf to produce a configure script." |
|
6106
66bd85c8a9cd
Proper autoconf macro argument quoting.
Bruno Haible <bruno@clisp.org>
parents:
6039
diff
changeset
|
6789 echo "AC_INIT([dummy], [0])" |
|
6109
a52f596fdf00
Generalize support for --aux-dir.
Bruno Haible <bruno@clisp.org>
parents:
6108
diff
changeset
|
6790 if test "$auxdir" != "."; then |
|
a52f596fdf00
Generalize support for --aux-dir.
Bruno Haible <bruno@clisp.org>
parents:
6108
diff
changeset
|
6791 echo "AC_CONFIG_AUX_DIR([$auxdir])" |
|
a52f596fdf00
Generalize support for --aux-dir.
Bruno Haible <bruno@clisp.org>
parents:
6108
diff
changeset
|
6792 fi |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6793 echo "AM_INIT_AUTOMAKE" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6794 echo |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6795 echo "AC_PROG_MAKE_SET" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6796 echo |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6797 echo "AC_CONFIG_SUBDIRS([$megasubdirs])" |
|
11931
d42b3b6f11d3
Replace uses of obsolete Autoconf macros with modern counterparts.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
11919
diff
changeset
|
6798 echo "AC_CONFIG_FILES([Makefile])" |
|
d42b3b6f11d3
Replace uses of obsolete Autoconf macros with modern counterparts.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
11919
diff
changeset
|
6799 echo "AC_OUTPUT" |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6800 ) > "$megatestdir/configure.ac" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6801 |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6802 # Create autogenerated files. |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6803 (cd "$megatestdir" |
|
6547
1a65fb7ddbbb
Don't waste time in a recursive autoreconf.
Bruno Haible <bruno@clisp.org>
parents:
6546
diff
changeset
|
6804 # Do not use "${AUTORECONF} --install", because autoreconf operates |
|
1a65fb7ddbbb
Don't waste time in a recursive autoreconf.
Bruno Haible <bruno@clisp.org>
parents:
6546
diff
changeset
|
6805 # recursively, but the subdirectories are already finished, therefore |
|
1a65fb7ddbbb
Don't waste time in a recursive autoreconf.
Bruno Haible <bruno@clisp.org>
parents:
6546
diff
changeset
|
6806 # calling autoreconf here would only waste lots of CPU time. |
|
9188
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
6807 func_execute_command ${ACLOCAL} || func_exit 1 |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
6808 func_execute_command mkdir build-aux |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
6809 func_execute_command ${AUTOCONF} || func_exit 1 |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
6810 func_execute_command ${AUTOMAKE} --add-missing --copy || func_exit 1 |
|
18959
a2064df3feed
gnulib-tool: Clean up after autotools.
Bruno Haible <bruno@clisp.org>
parents:
18952
diff
changeset
|
6811 rm -rf autom4te.cache |
|
40128
a2e861fa78d1
gnulib-tool: Support running testdirs on Android.
Bruno Haible <bruno@clisp.org>
parents:
40074
diff
changeset
|
6812 if test -f build-aux/test-driver; then |
|
a2e861fa78d1
gnulib-tool: Support running testdirs on Android.
Bruno Haible <bruno@clisp.org>
parents:
40074
diff
changeset
|
6813 patch build-aux/test-driver < "$gnulib_dir"/build-aux/test-driver.diff || func_exit 1 |
|
a2e861fa78d1
gnulib-tool: Support running testdirs on Android.
Bruno Haible <bruno@clisp.org>
parents:
40074
diff
changeset
|
6814 fi |
|
7638
581c011e05d6
* gnulib-tool (func_create_testdir): Fix replacement of
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7605
diff
changeset
|
6815 ) || func_exit 1 |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6816 } |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6817 |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6818 case $mode in |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6819 "" ) |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6820 func_fatal_error "no mode specified" ;; |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6821 |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6822 list ) |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6823 func_all_modules |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6824 ;; |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
6825 |
|
12876
030a6f5cbffd
Make it easier to find modules. New gnulib-tool option '--find'.
Bruno Haible <bruno@clisp.org>
parents:
12859
diff
changeset
|
6826 find ) |
|
030a6f5cbffd
Make it easier to find modules. New gnulib-tool option '--find'.
Bruno Haible <bruno@clisp.org>
parents:
12859
diff
changeset
|
6827 # sed expression that converts a literal to a basic regular expression. |
|
030a6f5cbffd
Make it easier to find modules. New gnulib-tool option '--find'.
Bruno Haible <bruno@clisp.org>
parents:
12859
diff
changeset
|
6828 # Needs to handle . [ \ * ^ $. |
|
030a6f5cbffd
Make it easier to find modules. New gnulib-tool option '--find'.
Bruno Haible <bruno@clisp.org>
parents:
12859
diff
changeset
|
6829 sed_literal_to_basic_regex='s/\\/\\\\/g |
|
030a6f5cbffd
Make it easier to find modules. New gnulib-tool option '--find'.
Bruno Haible <bruno@clisp.org>
parents:
12859
diff
changeset
|
6830 s/\[/\\[/g |
|
030a6f5cbffd
Make it easier to find modules. New gnulib-tool option '--find'.
Bruno Haible <bruno@clisp.org>
parents:
12859
diff
changeset
|
6831 s/\^/\\^/g |
|
030a6f5cbffd
Make it easier to find modules. New gnulib-tool option '--find'.
Bruno Haible <bruno@clisp.org>
parents:
12859
diff
changeset
|
6832 s/\([.*$]\)/[\1]/g' |
|
030a6f5cbffd
Make it easier to find modules. New gnulib-tool option '--find'.
Bruno Haible <bruno@clisp.org>
parents:
12859
diff
changeset
|
6833 for filename |
|
030a6f5cbffd
Make it easier to find modules. New gnulib-tool option '--find'.
Bruno Haible <bruno@clisp.org>
parents:
12859
diff
changeset
|
6834 do |
|
030a6f5cbffd
Make it easier to find modules. New gnulib-tool option '--find'.
Bruno Haible <bruno@clisp.org>
parents:
12859
diff
changeset
|
6835 if test -f "$gnulib_dir/$filename" \ |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
6836 || func_lookup_local_file "$filename"; then |
|
12877
2e190fad4cfe
Tweak last commit: Reduce the candidate list.
Bruno Haible <bruno@clisp.org>
parents:
12876
diff
changeset
|
6837 filename_anywhere_regex=`echo "$filename" | sed -e "$sed_literal_to_basic_regex"` |
|
2e190fad4cfe
Tweak last commit: Reduce the candidate list.
Bruno Haible <bruno@clisp.org>
parents:
12876
diff
changeset
|
6838 filename_line_regex='^'"$filename_anywhere_regex"'$' |
|
12876
030a6f5cbffd
Make it easier to find modules. New gnulib-tool option '--find'.
Bruno Haible <bruno@clisp.org>
parents:
12859
diff
changeset
|
6839 module_candidates=` |
|
030a6f5cbffd
Make it easier to find modules. New gnulib-tool option '--find'.
Bruno Haible <bruno@clisp.org>
parents:
12859
diff
changeset
|
6840 { |
|
12877
2e190fad4cfe
Tweak last commit: Reduce the candidate list.
Bruno Haible <bruno@clisp.org>
parents:
12876
diff
changeset
|
6841 (cd "$gnulib_dir" && find modules -type f -print | xargs -n 100 grep -l "$filename_line_regex" /dev/null | sed -e 's,^modules/,,') |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
6842 func_path_foreach "$local_gnulib_path" func_modules_in_dir %dir% | xargs -n 100 grep -l "$filename_anywhere_regex" /dev/null | sed -e 's,^modules/,,' -e 's,\.diff$,,' |
|
12876
030a6f5cbffd
Make it easier to find modules. New gnulib-tool option '--find'.
Bruno Haible <bruno@clisp.org>
parents:
12859
diff
changeset
|
6843 } \ |
|
030a6f5cbffd
Make it easier to find modules. New gnulib-tool option '--find'.
Bruno Haible <bruno@clisp.org>
parents:
12859
diff
changeset
|
6844 | func_sanitize_modulelist \ |
|
030a6f5cbffd
Make it easier to find modules. New gnulib-tool option '--find'.
Bruno Haible <bruno@clisp.org>
parents:
12859
diff
changeset
|
6845 | LC_ALL=C sort -u |
|
030a6f5cbffd
Make it easier to find modules. New gnulib-tool option '--find'.
Bruno Haible <bruno@clisp.org>
parents:
12859
diff
changeset
|
6846 ` |
|
030a6f5cbffd
Make it easier to find modules. New gnulib-tool option '--find'.
Bruno Haible <bruno@clisp.org>
parents:
12859
diff
changeset
|
6847 for module in $module_candidates; do |
|
12877
2e190fad4cfe
Tweak last commit: Reduce the candidate list.
Bruno Haible <bruno@clisp.org>
parents:
12876
diff
changeset
|
6848 if func_get_filelist $module | grep "$filename_line_regex" > /dev/null; then |
|
12876
030a6f5cbffd
Make it easier to find modules. New gnulib-tool option '--find'.
Bruno Haible <bruno@clisp.org>
parents:
12859
diff
changeset
|
6849 echo $module |
|
030a6f5cbffd
Make it easier to find modules. New gnulib-tool option '--find'.
Bruno Haible <bruno@clisp.org>
parents:
12859
diff
changeset
|
6850 fi |
|
030a6f5cbffd
Make it easier to find modules. New gnulib-tool option '--find'.
Bruno Haible <bruno@clisp.org>
parents:
12859
diff
changeset
|
6851 done |
|
030a6f5cbffd
Make it easier to find modules. New gnulib-tool option '--find'.
Bruno Haible <bruno@clisp.org>
parents:
12859
diff
changeset
|
6852 else |
|
030a6f5cbffd
Make it easier to find modules. New gnulib-tool option '--find'.
Bruno Haible <bruno@clisp.org>
parents:
12859
diff
changeset
|
6853 func_warning "file $filename does not exist" |
|
030a6f5cbffd
Make it easier to find modules. New gnulib-tool option '--find'.
Bruno Haible <bruno@clisp.org>
parents:
12859
diff
changeset
|
6854 fi |
|
030a6f5cbffd
Make it easier to find modules. New gnulib-tool option '--find'.
Bruno Haible <bruno@clisp.org>
parents:
12859
diff
changeset
|
6855 done |
|
030a6f5cbffd
Make it easier to find modules. New gnulib-tool option '--find'.
Bruno Haible <bruno@clisp.org>
parents:
12859
diff
changeset
|
6856 ;; |
|
030a6f5cbffd
Make it easier to find modules. New gnulib-tool option '--find'.
Bruno Haible <bruno@clisp.org>
parents:
12859
diff
changeset
|
6857 |
|
13638
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6858 import | add-import | remove-import | update ) |
|
6940
ca8592ba8eba
* gnulib-tool (func_get_filelist): Don't echo m4/onceonly_2_57.m4,
Paul Eggert <eggert@cs.ucla.edu>
parents:
6862
diff
changeset
|
6859 |
| 5343 | 6860 # Where to import. |
| 6861 if test -z "$destdir"; then | |
| 6862 destdir=. | |
| 6863 fi | |
| 6864 test -d "$destdir" \ | |
| 6865 || func_fatal_error "destination directory does not exist: $destdir" | |
|
5202
64446bf39961
Use sed instead of autoconf --trace, inspired by
Paul Eggert <eggert@cs.ucla.edu>
parents:
5198
diff
changeset
|
6866 |
|
6183
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
6867 # Prefer configure.ac to configure.in. |
|
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
6868 if test -f "$destdir"/configure.ac; then |
|
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
6869 configure_ac="$destdir/configure.ac" |
|
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
6870 else |
|
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
6871 if test -f "$destdir"/configure.in; then |
|
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
6872 configure_ac="$destdir/configure.in" |
|
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
6873 else |
|
12021
d625e819e6ea
Add advice to an error message.
Bruno Haible <bruno@clisp.org>
parents:
11931
diff
changeset
|
6874 func_fatal_error "cannot find $destdir/configure.ac - make sure you run gnulib-tool from within your package's directory" |
|
6183
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
6875 fi |
|
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
6876 fi |
|
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
6877 |
|
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
6878 # Analyze configure.ac. |
|
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
6879 guessed_auxdir="." |
| 7077 | 6880 guessed_libtool=false |
|
6183
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
6881 my_sed_traces=' |
|
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
6882 s,#.*$,, |
|
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
6883 s,^dnl .*$,, |
|
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
6884 s, dnl .*$,, |
|
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
6885 /AC_CONFIG_AUX_DIR/ { |
| 10987 | 6886 s,^.*AC_CONFIG_AUX_DIR([[ ]*\([^]"$`\\)]*\).*$,guessed_auxdir="\1",p |
|
5798
49900d80eaaf
2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu>
Simon Josefsson <simon@josefsson.org>
parents:
5685
diff
changeset
|
6887 } |
|
6183
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
6888 /A[CM]_PROG_LIBTOOL/ { |
|
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
6889 s,^.*$,guessed_libtool=true,p |
|
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
6890 }' |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
6891 eval `sed -n -e "$my_sed_traces" < "$configure_ac"` |
|
5202
64446bf39961
Use sed instead of autoconf --trace, inspired by
Paul Eggert <eggert@cs.ucla.edu>
parents:
5198
diff
changeset
|
6892 |
|
6183
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
6893 if test -z "$auxdir"; then |
|
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
6894 auxdir="$guessed_auxdir" |
| 5343 | 6895 fi |
|
5202
64446bf39961
Use sed instead of autoconf --trace, inspired by
Paul Eggert <eggert@cs.ucla.edu>
parents:
5198
diff
changeset
|
6896 |
|
6183
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
6897 # Determine where to apply func_import. |
|
13638
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6898 if test "$mode" = import; then |
|
6183
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
6899 # Apply func_import to a particular gnulib directory. |
|
13638
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6900 # The command line contains the complete specification; don't look at |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6901 # the contents of gnulib-cache.m4. |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6902 test -n "$supplied_libname" || supplied_libname=true |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6903 test -n "$sourcebase" || sourcebase="lib" |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6904 test -n "$m4base" || m4base="m4" |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6905 test -n "$docbase" || docbase="doc" |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6906 test -n "$testsbase" || testsbase="tests" |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6907 test -n "$macro_prefix" || macro_prefix="gl" |
|
6183
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
6908 func_import "$*" |
|
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
6909 else |
|
13638
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6910 if test -n "$m4base"; then |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6911 # Apply func_import to a particular gnulib directory. |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6912 # Any number of additional modules can be given. |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6913 if test ! -f "$destdir/$m4base"/gnulib-cache.m4; then |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6914 # First use of gnulib in the given m4base. |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6915 test -n "$supplied_libname" || supplied_libname=true |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6916 test -n "$sourcebase" || sourcebase="lib" |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6917 test -n "$docbase" || docbase="doc" |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6918 test -n "$testsbase" || testsbase="tests" |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6919 test -n "$macro_prefix" || macro_prefix="gl" |
|
6183
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
6920 fi |
|
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
6921 func_import "$*" |
|
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
6922 else |
|
13638
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6923 # Apply func_import to all gnulib directories. |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6924 # To get this list of directories, look at Makefile.am. (Not at |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6925 # configure, because it may be omitted from version control. Also, |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6926 # don't run "find $destdir -name gnulib-cache.m4", as it might be |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6927 # too expensive.) |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6928 m4dirs= |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6929 m4dirs_count=0 |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6930 if test -f "$destdir"/Makefile.am; then |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6931 aclocal_amflags=`sed -n -e 's/^ACLOCAL_AMFLAGS[ ]*=\(.*\)$/\1/p' "$destdir"/Makefile.am` |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6932 m4dir_is_next= |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6933 for arg in $aclocal_amflags; do |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6934 if test -n "$m4dir_is_next"; then |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6935 # Ignore absolute directory pathnames, like /usr/local/share/aclocal. |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6936 case "$arg" in |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6937 /*) ;; |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6938 *) |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6939 if test -f "$destdir/$arg"/gnulib-cache.m4; then |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6940 func_append m4dirs " $arg" |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6941 m4dirs_count=`expr $m4dirs_count + 1` |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6942 fi |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6943 ;; |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6944 esac |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6945 m4dir_is_next= |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6946 else |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6947 if test "X$arg" = "X-I"; then |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6948 m4dir_is_next=yes |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6949 else |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6950 m4dir_is_next= |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6951 fi |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6952 fi |
|
6183
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
6953 done |
|
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
6954 else |
|
13638
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6955 # No Makefile.am! Oh well. Look at the last generated aclocal.m4. |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6956 if test -f "$destdir"/aclocal.m4; then |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6957 sedexpr1='s,^m4_include(\[\(.*\)])$,\1,p' |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6958 sedexpr2='s,^[^/]*$,.,' |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6959 sedexpr3='s,/[^/]*$,,' |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6960 m4dirs=`sed -n -e "$sedexpr1" aclocal.m4 | sed -e "$sedexpr2" -e "$sedexpr3" | LC_ALL=C sort -u` |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6961 m4dirs=`for arg in $m4dirs; do if test -f "$destdir/$arg"/gnulib-cache.m4; then echo $arg; fi; done` |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6962 m4dirs_count=`for arg in $m4dirs; do echo "$arg"; done | wc -l` |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6963 fi |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6964 fi |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6965 if test $m4dirs_count = 0; then |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6966 # First use of gnulib in a package. |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6967 # Any number of additional modules can be given. |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6968 test -n "$supplied_libname" || supplied_libname=true |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6969 test -n "$sourcebase" || sourcebase="lib" |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6970 m4base="m4" |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6971 test -n "$docbase" || docbase="doc" |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6972 test -n "$testsbase" || testsbase="tests" |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6973 test -n "$macro_prefix" || macro_prefix="gl" |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6974 func_import "$*" |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6975 else |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6976 if test $m4dirs_count = 1; then |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6977 # There's only one use of gnulib here. Assume the user means it. |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6978 # Any number of additional modules can be given. |
|
6183
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
6979 for m4base in $m4dirs; do |
|
13638
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6980 func_import "$*" |
|
6183
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
6981 done |
|
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
6982 else |
|
13638
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6983 # Ambiguous - guess what the user meant. |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6984 if test $# = 0; then |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6985 # No further arguments. Guess the user wants to update all of them. |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6986 for m4base in $m4dirs; do |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6987 # Perform func_import in a subshell, so that variable values |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6988 # such as |
|
18173
c5a6d6300f8f
gnulib-tool: allow multiple --local-dir usage
Pavel Raiskup <praiskup@redhat.com>
parents:
18124
diff
changeset
|
6989 # local_gnulib_path, incobsolete, inc_cxx_tests, |
|
13638
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6990 # inc_longrunning_tests, inc_privileged_tests, |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6991 # inc_unportable_tests, inc_all_tests, avoidlist, sourcebase, |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6992 # m4base, pobase, docbase, testsbase, inctests, libname, lgpl, |
|
14894
b22360ddefc4
gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents:
14841
diff
changeset
|
6993 # makefile_name, libtool, macro_prefix, po_domain, |
|
b22360ddefc4
gnulib-tool: Better isolation between different gnulib-tool invocations.
Bruno Haible <bruno@clisp.org>
parents:
14841
diff
changeset
|
6994 # witness_c_macro, vc_files |
|
13638
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6995 # don't propagate from one directory to another. |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6996 (func_import) || func_exit 1 |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6997 done |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6998 else |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
6999 # Really ambiguous. |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
7000 func_fatal_error "Ambiguity: to which directory should the modules be added? Please specify at least --m4-base=..." |
|
8ae47cf4002f
gnulib-tool: Change --import. New options --add/remove-import.
Bruno Haible <bruno@clisp.org>
parents:
13636
diff
changeset
|
7001 fi |
|
6183
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
7002 fi |
|
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
7003 fi |
|
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
7004 fi |
| 6178 | 7005 fi |
| 5343 | 7006 ;; |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7007 |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7008 create-testdir ) |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7009 if test -z "$destdir"; then |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7010 func_fatal_error "please specify --dir option" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7011 fi |
|
4126
e8caa337b4e1
(create-testdir): don't complain if destdir
Karl Berry <karl@freefriends.org>
parents:
4124
diff
changeset
|
7012 mkdir "$destdir" |
|
e8caa337b4e1
(create-testdir): don't complain if destdir
Karl Berry <karl@freefriends.org>
parents:
4124
diff
changeset
|
7013 test -d "$destdir" \ |
|
e8caa337b4e1
(create-testdir): don't complain if destdir
Karl Berry <karl@freefriends.org>
parents:
4124
diff
changeset
|
7014 || func_fatal_error "could not create destination directory" |
|
6109
a52f596fdf00
Generalize support for --aux-dir.
Bruno Haible <bruno@clisp.org>
parents:
6108
diff
changeset
|
7015 test -n "$auxdir" || auxdir="build-aux" |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7016 func_create_testdir "$destdir" "$*" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7017 ;; |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7018 |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7019 create-megatestdir ) |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7020 if test -z "$destdir"; then |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7021 func_fatal_error "please specify --dir option" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7022 fi |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7023 mkdir "$destdir" || func_fatal_error "could not create destination directory" |
|
6109
a52f596fdf00
Generalize support for --aux-dir.
Bruno Haible <bruno@clisp.org>
parents:
6108
diff
changeset
|
7024 test -n "$auxdir" || auxdir="build-aux" |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7025 func_create_megatestdir "$destdir" "$*" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7026 ;; |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7027 |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7028 test ) |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7029 test -n "$destdir" || destdir=testdir$$ |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7030 mkdir "$destdir" || func_fatal_error "could not create destination directory" |
|
6109
a52f596fdf00
Generalize support for --aux-dir.
Bruno Haible <bruno@clisp.org>
parents:
6108
diff
changeset
|
7031 test -n "$auxdir" || auxdir="build-aux" |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7032 func_create_testdir "$destdir" "$*" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7033 cd "$destdir" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7034 mkdir build |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7035 cd build |
|
7638
581c011e05d6
* gnulib-tool (func_create_testdir): Fix replacement of
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7605
diff
changeset
|
7036 ../configure || func_exit 1 |
|
11404
eb725d01cd4c
gnulib-tool: execute $MAKE not make
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
11403
diff
changeset
|
7037 $MAKE || func_exit 1 |
|
eb725d01cd4c
gnulib-tool: execute $MAKE not make
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
11403
diff
changeset
|
7038 $MAKE check || func_exit 1 |
|
eb725d01cd4c
gnulib-tool: execute $MAKE not make
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
11403
diff
changeset
|
7039 $MAKE distclean || func_exit 1 |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7040 remaining=`find . -type f -print` |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7041 if test -n "$remaining"; then |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7042 echo "Remaining files:" $remaining 1>&2 |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7043 echo "gnulib-tool: *** Stop." 1>&2 |
|
7332
dd6e80d0c89e
* gnulib-tool (func_exit): New function, to allow to pass the
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7327
diff
changeset
|
7044 func_exit 1 |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7045 fi |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7046 cd .. |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7047 cd .. |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7048 rm -rf "$destdir" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7049 ;; |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7050 |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7051 megatest ) |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7052 test -n "$destdir" || destdir=testdir$$ |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7053 mkdir "$destdir" || func_fatal_error "could not create destination directory" |
|
6109
a52f596fdf00
Generalize support for --aux-dir.
Bruno Haible <bruno@clisp.org>
parents:
6108
diff
changeset
|
7054 test -n "$auxdir" || auxdir="build-aux" |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7055 func_create_megatestdir "$destdir" "$*" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7056 cd "$destdir" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7057 mkdir build |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7058 cd build |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7059 ../configure |
|
11404
eb725d01cd4c
gnulib-tool: execute $MAKE not make
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
11403
diff
changeset
|
7060 $MAKE |
|
eb725d01cd4c
gnulib-tool: execute $MAKE not make
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
11403
diff
changeset
|
7061 $MAKE check |
|
eb725d01cd4c
gnulib-tool: execute $MAKE not make
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
11403
diff
changeset
|
7062 $MAKE distclean |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7063 remaining=`find . -type f -print` |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7064 if test -n "$remaining"; then |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7065 echo "Remaining files:" $remaining 1>&2 |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7066 echo "gnulib-tool: *** Stop." 1>&2 |
|
7332
dd6e80d0c89e
* gnulib-tool (func_exit): New function, to allow to pass the
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7327
diff
changeset
|
7067 func_exit 1 |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7068 fi |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7069 cd .. |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7070 cd .. |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7071 rm -rf "$destdir" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7072 ;; |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7073 |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7074 extract-description ) |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7075 for module |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7076 do |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7077 func_verify_module |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7078 if test -n "$module"; then |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7079 func_get_description "$module" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7080 fi |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7081 done |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7082 ;; |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7083 |
|
13070
71d59ec8c75f
New module description field 'Comment'.
Bruno Haible <bruno@clisp.org>
parents:
13069
diff
changeset
|
7084 extract-comment ) |
|
71d59ec8c75f
New module description field 'Comment'.
Bruno Haible <bruno@clisp.org>
parents:
13069
diff
changeset
|
7085 for module |
|
71d59ec8c75f
New module description field 'Comment'.
Bruno Haible <bruno@clisp.org>
parents:
13069
diff
changeset
|
7086 do |
|
71d59ec8c75f
New module description field 'Comment'.
Bruno Haible <bruno@clisp.org>
parents:
13069
diff
changeset
|
7087 func_verify_module |
|
71d59ec8c75f
New module description field 'Comment'.
Bruno Haible <bruno@clisp.org>
parents:
13069
diff
changeset
|
7088 if test -n "$module"; then |
|
71d59ec8c75f
New module description field 'Comment'.
Bruno Haible <bruno@clisp.org>
parents:
13069
diff
changeset
|
7089 func_get_comment "$module" |
|
71d59ec8c75f
New module description field 'Comment'.
Bruno Haible <bruno@clisp.org>
parents:
13069
diff
changeset
|
7090 fi |
|
71d59ec8c75f
New module description field 'Comment'.
Bruno Haible <bruno@clisp.org>
parents:
13069
diff
changeset
|
7091 done |
|
71d59ec8c75f
New module description field 'Comment'.
Bruno Haible <bruno@clisp.org>
parents:
13069
diff
changeset
|
7092 ;; |
|
71d59ec8c75f
New module description field 'Comment'.
Bruno Haible <bruno@clisp.org>
parents:
13069
diff
changeset
|
7093 |
|
10743
ec39330cb04e
Modules now have a 'status' attribute.
Bruno Haible <bruno@clisp.org>
parents:
10732
diff
changeset
|
7094 extract-status ) |
|
ec39330cb04e
Modules now have a 'status' attribute.
Bruno Haible <bruno@clisp.org>
parents:
10732
diff
changeset
|
7095 for module |
|
ec39330cb04e
Modules now have a 'status' attribute.
Bruno Haible <bruno@clisp.org>
parents:
10732
diff
changeset
|
7096 do |
|
ec39330cb04e
Modules now have a 'status' attribute.
Bruno Haible <bruno@clisp.org>
parents:
10732
diff
changeset
|
7097 func_verify_module |
|
ec39330cb04e
Modules now have a 'status' attribute.
Bruno Haible <bruno@clisp.org>
parents:
10732
diff
changeset
|
7098 if test -n "$module"; then |
|
ec39330cb04e
Modules now have a 'status' attribute.
Bruno Haible <bruno@clisp.org>
parents:
10732
diff
changeset
|
7099 func_get_status "$module" |
|
ec39330cb04e
Modules now have a 'status' attribute.
Bruno Haible <bruno@clisp.org>
parents:
10732
diff
changeset
|
7100 fi |
|
ec39330cb04e
Modules now have a 'status' attribute.
Bruno Haible <bruno@clisp.org>
parents:
10732
diff
changeset
|
7101 done |
|
ec39330cb04e
Modules now have a 'status' attribute.
Bruno Haible <bruno@clisp.org>
parents:
10732
diff
changeset
|
7102 ;; |
|
ec39330cb04e
Modules now have a 'status' attribute.
Bruno Haible <bruno@clisp.org>
parents:
10732
diff
changeset
|
7103 |
|
9189
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
7104 extract-notice ) |
|
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
7105 for module |
|
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
7106 do |
|
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
7107 func_verify_module |
|
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
7108 if test -n "$module"; then |
|
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
7109 func_get_notice "$module" |
|
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
7110 fi |
|
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
7111 done |
|
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
7112 ;; |
|
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
7113 |
|
12460
282eecca2301
New module attribute 'Applicability'.
Bruno Haible <bruno@clisp.org>
parents:
12417
diff
changeset
|
7114 extract-applicability ) |
|
282eecca2301
New module attribute 'Applicability'.
Bruno Haible <bruno@clisp.org>
parents:
12417
diff
changeset
|
7115 for module |
|
282eecca2301
New module attribute 'Applicability'.
Bruno Haible <bruno@clisp.org>
parents:
12417
diff
changeset
|
7116 do |
|
282eecca2301
New module attribute 'Applicability'.
Bruno Haible <bruno@clisp.org>
parents:
12417
diff
changeset
|
7117 func_verify_module |
|
282eecca2301
New module attribute 'Applicability'.
Bruno Haible <bruno@clisp.org>
parents:
12417
diff
changeset
|
7118 if test -n "$module"; then |
|
282eecca2301
New module attribute 'Applicability'.
Bruno Haible <bruno@clisp.org>
parents:
12417
diff
changeset
|
7119 func_get_applicability "$module" |
|
282eecca2301
New module attribute 'Applicability'.
Bruno Haible <bruno@clisp.org>
parents:
12417
diff
changeset
|
7120 fi |
|
282eecca2301
New module attribute 'Applicability'.
Bruno Haible <bruno@clisp.org>
parents:
12417
diff
changeset
|
7121 done |
|
282eecca2301
New module attribute 'Applicability'.
Bruno Haible <bruno@clisp.org>
parents:
12417
diff
changeset
|
7122 ;; |
|
282eecca2301
New module attribute 'Applicability'.
Bruno Haible <bruno@clisp.org>
parents:
12417
diff
changeset
|
7123 |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7124 extract-filelist ) |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7125 for module |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7126 do |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7127 func_verify_module |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7128 if test -n "$module"; then |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7129 func_get_filelist "$module" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7130 fi |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7131 done |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7132 ;; |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7133 |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7134 extract-dependencies ) |
|
15853
3034b1243e09
gnulib-tool: don't follow dependencies to avoided modules
Paul Eggert <eggert@cs.ucla.edu>
parents:
15852
diff
changeset
|
7135 if test -n "$avoidlist"; then |
|
3034b1243e09
gnulib-tool: don't follow dependencies to avoided modules
Paul Eggert <eggert@cs.ucla.edu>
parents:
15852
diff
changeset
|
7136 func_fatal_error "cannot combine --avoid and --extract-dependencies" |
|
3034b1243e09
gnulib-tool: don't follow dependencies to avoided modules
Paul Eggert <eggert@cs.ucla.edu>
parents:
15852
diff
changeset
|
7137 fi |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7138 for module |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7139 do |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7140 func_verify_module |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7141 if test -n "$module"; then |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7142 func_get_dependencies "$module" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7143 fi |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7144 done |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7145 ;; |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7146 |
|
40074
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
7147 extract-recursive-dependencies ) |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
7148 if test -n "$avoidlist"; then |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
7149 func_fatal_error "cannot combine --avoid and --extract-recursive-dependencies" |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
7150 fi |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
7151 for module |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
7152 do |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
7153 func_verify_module |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
7154 if test -n "$module"; then |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
7155 func_get_dependencies_recursively "$module" |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
7156 fi |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
7157 done |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
7158 ;; |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
7159 |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7160 extract-autoconf-snippet ) |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7161 for module |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7162 do |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7163 func_verify_module |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7164 if test -n "$module"; then |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7165 func_get_autoconf_snippet "$module" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7166 fi |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7167 done |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7168 ;; |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7169 |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7170 extract-automake-snippet ) |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7171 for module |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7172 do |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7173 func_verify_module |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7174 if test -n "$module"; then |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7175 func_get_automake_snippet "$module" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7176 fi |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7177 done |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7178 ;; |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7179 |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7180 extract-include-directive ) |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7181 for module |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7182 do |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7183 func_verify_module |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7184 if test -n "$module"; then |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7185 func_get_include_directive "$module" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7186 fi |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7187 done |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7188 ;; |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7189 |
|
8055
5c79d44f739d
New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents:
8040
diff
changeset
|
7190 extract-link-directive ) |
|
5c79d44f739d
New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents:
8040
diff
changeset
|
7191 for module |
|
5c79d44f739d
New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents:
8040
diff
changeset
|
7192 do |
|
5c79d44f739d
New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents:
8040
diff
changeset
|
7193 func_verify_module |
|
5c79d44f739d
New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents:
8040
diff
changeset
|
7194 if test -n "$module"; then |
|
5c79d44f739d
New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents:
8040
diff
changeset
|
7195 func_get_link_directive "$module" |
|
5c79d44f739d
New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents:
8040
diff
changeset
|
7196 fi |
|
5c79d44f739d
New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents:
8040
diff
changeset
|
7197 done |
|
5c79d44f739d
New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents:
8040
diff
changeset
|
7198 ;; |
|
5c79d44f739d
New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents:
8040
diff
changeset
|
7199 |
|
40074
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
7200 extract-recursive-link-directive ) |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
7201 if test -n "$avoidlist"; then |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
7202 func_fatal_error "cannot combine --avoid and --extract-recursive-link-directive" |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
7203 fi |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
7204 for module |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
7205 do |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
7206 func_verify_module |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
7207 if test -n "$module"; then |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
7208 func_get_link_directive_recursively "$module" |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
7209 fi |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
7210 done |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
7211 ;; |
|
203657b01911
gnulib-tool: New option --extract-recursive-link-directive.
Bruno Haible <bruno@clisp.org>
parents:
40057
diff
changeset
|
7212 |
|
5251
42b53a22aee5
Add a license tag to every module.
Bruno Haible <bruno@clisp.org>
parents:
5250
diff
changeset
|
7213 extract-license ) |
|
42b53a22aee5
Add a license tag to every module.
Bruno Haible <bruno@clisp.org>
parents:
5250
diff
changeset
|
7214 for module |
|
42b53a22aee5
Add a license tag to every module.
Bruno Haible <bruno@clisp.org>
parents:
5250
diff
changeset
|
7215 do |
|
42b53a22aee5
Add a license tag to every module.
Bruno Haible <bruno@clisp.org>
parents:
5250
diff
changeset
|
7216 func_verify_module |
|
42b53a22aee5
Add a license tag to every module.
Bruno Haible <bruno@clisp.org>
parents:
5250
diff
changeset
|
7217 if test -n "$module"; then |
|
42b53a22aee5
Add a license tag to every module.
Bruno Haible <bruno@clisp.org>
parents:
5250
diff
changeset
|
7218 func_get_license "$module" |
|
42b53a22aee5
Add a license tag to every module.
Bruno Haible <bruno@clisp.org>
parents:
5250
diff
changeset
|
7219 fi |
|
42b53a22aee5
Add a license tag to every module.
Bruno Haible <bruno@clisp.org>
parents:
5250
diff
changeset
|
7220 done |
|
42b53a22aee5
Add a license tag to every module.
Bruno Haible <bruno@clisp.org>
parents:
5250
diff
changeset
|
7221 ;; |
|
42b53a22aee5
Add a license tag to every module.
Bruno Haible <bruno@clisp.org>
parents:
5250
diff
changeset
|
7222 |
| 4197 | 7223 extract-maintainer ) |
| 7224 for module | |
| 7225 do | |
| 7226 func_verify_module | |
| 7227 if test -n "$module"; then | |
| 7228 func_get_maintainer "$module" | |
| 7229 fi | |
| 7230 done | |
| 7231 ;; | |
| 7232 | |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
7233 extract-tests-module ) |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
7234 for module |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
7235 do |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
7236 func_verify_module |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
7237 if test -n "$module"; then |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
7238 func_get_tests_module "$module" |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
7239 fi |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
7240 done |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
7241 ;; |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
7242 |
|
11461
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
7243 copy-file ) |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
7244 # Verify the number of arguments. |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
7245 if test $# -lt 1 || test $# -gt 2; then |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
7246 func_fatal_error "invalid number of arguments for --$mode" |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
7247 fi |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
7248 |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
7249 # The first argument is the file to be copied. |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
7250 f="$1" |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
7251 # Verify the file exists. |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
7252 func_lookup_file "$f" |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
7253 |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
7254 # The second argument is the destination; either a directory ot a file. |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
7255 # It defaults to the current directory. |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
7256 dest="$2" |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
7257 test -n "$dest" || dest='.' |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
7258 test -n "$sourcebase" || sourcebase="lib" |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
7259 test -n "$m4base" || m4base="m4" |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
7260 test -n "$docbase" || docbase="doc" |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
7261 test -n "$testsbase" || testsbase="tests" |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
7262 test -n "$auxdir" || auxdir="build-aux" |
|
11560
987b2dec97b7
Fix the rewriting rules for file names.
Bruno Haible <bruno@clisp.org>
parents:
11533
diff
changeset
|
7263 rewritten='%REWRITTEN%' |
|
11461
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
7264 sed_rewrite_files="\ |
|
11560
987b2dec97b7
Fix the rewriting rules for file names.
Bruno Haible <bruno@clisp.org>
parents:
11533
diff
changeset
|
7265 s,^build-aux/,$rewritten$auxdir/, |
|
987b2dec97b7
Fix the rewriting rules for file names.
Bruno Haible <bruno@clisp.org>
parents:
11533
diff
changeset
|
7266 s,^doc/,$rewritten$docbase/, |
|
987b2dec97b7
Fix the rewriting rules for file names.
Bruno Haible <bruno@clisp.org>
parents:
11533
diff
changeset
|
7267 s,^lib/,$rewritten$sourcebase/, |
|
987b2dec97b7
Fix the rewriting rules for file names.
Bruno Haible <bruno@clisp.org>
parents:
11533
diff
changeset
|
7268 s,^m4/,$rewritten$m4base/, |
|
987b2dec97b7
Fix the rewriting rules for file names.
Bruno Haible <bruno@clisp.org>
parents:
11533
diff
changeset
|
7269 s,^tests/,$rewritten$testsbase/, |
|
987b2dec97b7
Fix the rewriting rules for file names.
Bruno Haible <bruno@clisp.org>
parents:
11533
diff
changeset
|
7270 s,^top/,$rewritten, |
|
987b2dec97b7
Fix the rewriting rules for file names.
Bruno Haible <bruno@clisp.org>
parents:
11533
diff
changeset
|
7271 s,^$rewritten,," |
|
11461
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
7272 if test -d "$dest"; then |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
7273 destdir="$dest" |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
7274 g=`echo "$f" | sed -e "$sed_rewrite_files"` |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
7275 else |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
7276 destdir=`dirname "$dest"` |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
7277 g=`basename "$dest"` |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
7278 fi |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
7279 |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
7280 # Create the directory for destfile. |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
7281 d=`dirname "$destdir/$g"` |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
7282 if $doit; then |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
7283 if test -n "$d" && test ! -d "$d"; then |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
7284 mkdir -p "$d" || func_fatal_error "failed" |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
7285 fi |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
7286 fi |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
7287 # Copy the file. |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
7288 func_dest_tmpfilename "$g" |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
7289 cp "$lookedup_file" "$tmpfile" || func_fatal_error "failed" |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
7290 already_present=true |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
7291 if test -f "$destdir/$g"; then |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
7292 # The file already exists. |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
7293 func_update_file |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
7294 else |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
7295 # Install the file. |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
7296 # Don't protest if the file should be there but isn't: it happens |
|
13636
06064a28d167
gnulib-tool: Don't talk about CVS any more.
Bruno Haible <bruno@clisp.org>
parents:
13634
diff
changeset
|
7297 # frequently that developers don't put autogenerated files under version |
|
06064a28d167
gnulib-tool: Don't talk about CVS any more.
Bruno Haible <bruno@clisp.org>
parents:
13634
diff
changeset
|
7298 # control. |
|
11461
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
7299 func_add_file |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
7300 fi |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
7301 rm -f "$tmpfile" |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
7302 ;; |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
7303 |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7304 * ) |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7305 func_fatal_error "unknown operation mode --$mode" ;; |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7306 esac |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7307 |
|
18937
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
7308 if test "$copymode" = hardlink -o "$lcopymode" = hardlink; then |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
7309 # Setting hard links modifies the ctime of files in the gnulib checkout. |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
7310 # This disturbs the result of the next "gitk" invocation. |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
7311 # Workaround: Let git scan the files. This can be done through |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
7312 # "git update-index --refresh" or "git status" or "git diff". |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
7313 if test -d "$gnulib_dir"/.git \ |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
7314 && (git --version) >/dev/null 2>/dev/null; then |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
7315 (cd "$gnulib_dir" && git update-index --refresh >/dev/null) |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
7316 fi |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
7317 fi |
|
f0e497cb3d67
gnulib-tool: Add options to create hard links.
Bruno Haible <bruno@clisp.org>
parents:
18934
diff
changeset
|
7318 |
|
7073
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
7319 rm -rf "$tmp" |
|
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
7320 # Undo the effect of the previous 'trap' command. Some shellology: |
|
7332
dd6e80d0c89e
* gnulib-tool (func_exit): New function, to allow to pass the
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7327
diff
changeset
|
7321 # We cannot use "trap - 0 1 2 3 13 15", because Solaris sh would attempt to |
|
7073
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
7322 # execute the command "-". "trap '' ..." is fine only for signal 0 (= normal |
|
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
7323 # exit); for the others we need to call 'exit' explicitly. The value of $? is |
|
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
7324 # 128 + signal number and is set before the trap-registered command is run. |
|
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
7325 trap '' 0 |
|
7332
dd6e80d0c89e
* gnulib-tool (func_exit): New function, to allow to pass the
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7327
diff
changeset
|
7326 trap 'func_exit $?' 1 2 3 13 15 |
|
7073
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
7327 |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
7328 exit 0 |
|
7241
aed440dca701
* gnulib-tool: Don't let emacs change spaces to TAB.
Eric Blake <ebb9@byu.net>
parents:
7240
diff
changeset
|
7329 |
|
aed440dca701
* gnulib-tool: Don't let emacs change spaces to TAB.
Eric Blake <ebb9@byu.net>
parents:
7240
diff
changeset
|
7330 # Local Variables: |
|
aed440dca701
* gnulib-tool: Don't let emacs change spaces to TAB.
Eric Blake <ebb9@byu.net>
parents:
7240
diff
changeset
|
7331 # indent-tabs-mode: nil |
|
aed440dca701
* gnulib-tool: Don't let emacs change spaces to TAB.
Eric Blake <ebb9@byu.net>
parents:
7240
diff
changeset
|
7332 # whitespace-check-buffer-indent: nil |
|
aed440dca701
* gnulib-tool: Don't let emacs change spaces to TAB.
Eric Blake <ebb9@byu.net>
parents:
7240
diff
changeset
|
7333 # End: |