Mercurial > gnulib
annotate gnulib-tool @ 12859:736f81f59a39
gnulib-tool: Fix typo in 2010-02-07 commit.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Mon, 08 Feb 2010 21:29:32 +0100 |
| parents | dfbc7f3aa6d0 |
| children | 030a6f5cbffd |
| 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 # |
|
12559
c2cbabec01dd
update nearly all FSF copyright year lists to include 2010
Jim Meyering <meyering@redhat.com>
parents:
12460
diff
changeset
|
3 # Copyright (C) 2002-2010 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 |
|
9309
bbbbbf4cd1c5
Change copyright notice from GPLv2+ to GPLv3+.
Bruno Haible <bruno@clisp.org>
parents:
9284
diff
changeset
|
16 # along with this program. If not, see <http://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 |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
28 # You can set AUTOCONFPATH to empty if autoconf 2.57 is already in your PATH. |
|
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 ) |
|
46a747db97f2
Comment out private settings.
Bruno Haible <bruno@clisp.org>
parents:
5237
diff
changeset
|
32 # AUTOCONFBINDIR=/packages/gnu-inst-autoconf/2.57/bin |
|
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 |
|
6547
1a65fb7ddbbb
Don't waste time in a recursive autoreconf.
Bruno Haible <bruno@clisp.org>
parents:
6546
diff
changeset
|
37 # You can set AUTOMAKEPATH to empty if automake 1.9.x is already in your PATH. |
|
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 |
|
6551
d37637700b4e
Make the AUTOCONF etc. commands overridable by the user.
Bruno Haible <bruno@clisp.org>
parents:
6550
diff
changeset
|
43 # 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
|
44 # 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
|
45 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
|
46 AUTOCONF="${AUTOCONFPATH}autoconf" |
|
d37637700b4e
Make the AUTOCONF etc. commands overridable by the user.
Bruno Haible <bruno@clisp.org>
parents:
6550
diff
changeset
|
47 fi |
|
7485
0194db3ad154
Handle mismatch between latest gettext release and current gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7484
diff
changeset
|
48 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
|
49 AUTOHEADER="${AUTOCONFPATH}autoheader" |
|
0194db3ad154
Handle mismatch between latest gettext release and current gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7484
diff
changeset
|
50 fi |
|
6551
d37637700b4e
Make the AUTOCONF etc. commands overridable by the user.
Bruno Haible <bruno@clisp.org>
parents:
6550
diff
changeset
|
51 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
|
52 ACLOCAL="${AUTOMAKEPATH}aclocal" |
|
d37637700b4e
Make the AUTOCONF etc. commands overridable by the user.
Bruno Haible <bruno@clisp.org>
parents:
6550
diff
changeset
|
53 fi |
|
d37637700b4e
Make the AUTOCONF etc. commands overridable by the user.
Bruno Haible <bruno@clisp.org>
parents:
6550
diff
changeset
|
54 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
|
55 AUTOMAKE="${AUTOMAKEPATH}automake" |
|
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 "${AUTORECONF}" || test -n "${AUTOCONFPATH}"; then |
|
d37637700b4e
Make the AUTOCONF etc. commands overridable by the user.
Bruno Haible <bruno@clisp.org>
parents:
6550
diff
changeset
|
58 AUTORECONF="${AUTOCONFPATH}autoreconf" |
|
d37637700b4e
Make the AUTOCONF etc. commands overridable by the user.
Bruno Haible <bruno@clisp.org>
parents:
6550
diff
changeset
|
59 fi |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
60 |
|
7485
0194db3ad154
Handle mismatch between latest gettext release and current gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7484
diff
changeset
|
61 # 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
|
62 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
|
63 AUTOPOINT="${GETTEXTPATH}autopoint" |
|
0194db3ad154
Handle mismatch between latest gettext release and current gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7484
diff
changeset
|
64 fi |
|
0194db3ad154
Handle mismatch between latest gettext release and current gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7484
diff
changeset
|
65 |
|
11404
eb725d01cd4c
gnulib-tool: execute $MAKE not make
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
11403
diff
changeset
|
66 # You can set MAKE. |
|
eb725d01cd4c
gnulib-tool: execute $MAKE not make
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
11403
diff
changeset
|
67 if test -z "${MAKE}"; then |
|
eb725d01cd4c
gnulib-tool: execute $MAKE not make
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
11403
diff
changeset
|
68 MAKE=make |
|
eb725d01cd4c
gnulib-tool: execute $MAKE not make
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
11403
diff
changeset
|
69 fi |
|
eb725d01cd4c
gnulib-tool: execute $MAKE not make
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
11403
diff
changeset
|
70 |
|
11249
0a95b8deac2e
Re-enable the use of "sed --posix" with sed >= 4.2.
Bruno Haible <bruno@clisp.org>
parents:
11232
diff
changeset
|
71 # 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
|
72 # 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
|
73 # 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
|
74 # 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
|
75 # 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
|
76 # because "sed --posix" is buggy in GNU sed 4.1.5, see |
|
11231
30f41a946fb0
Don't use "sed --posix", since it is buggy.
Bruno Haible <bruno@clisp.org>
parents:
11094
diff
changeset
|
77 # <http://lists.gnu.org/archive/html/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
|
78 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
|
79 && 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
|
80 && 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
|
81 [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
|
82 *) true;; \ |
|
0a95b8deac2e
Re-enable the use of "sed --posix" with sed >= 4.2.
Bruno Haible <bruno@clisp.org>
parents:
11232
diff
changeset
|
83 esac \ |
|
0a95b8deac2e
Re-enable the use of "sed --posix" with sed >= 4.2.
Bruno Haible <bruno@clisp.org>
parents:
11232
diff
changeset
|
84 ; then |
|
0a95b8deac2e
Re-enable the use of "sed --posix" with sed >= 4.2.
Bruno Haible <bruno@clisp.org>
parents:
11232
diff
changeset
|
85 # 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
|
86 # 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
|
87 # 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
|
88 # 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
|
89 # 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
|
90 # 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
|
91 # 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
|
92 # '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
|
93 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
|
94 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
|
95 fi |
|
11249
0a95b8deac2e
Re-enable the use of "sed --posix" with sed >= 4.2.
Bruno Haible <bruno@clisp.org>
parents:
11232
diff
changeset
|
96 alias sed='sed --posix' |
|
7737
19ff03763d73
Use "sed --posix" instead of "sed" when possible.
Bruno Haible <bruno@clisp.org>
parents:
7722
diff
changeset
|
97 fi |
|
19ff03763d73
Use "sed --posix" instead of "sed" when possible.
Bruno Haible <bruno@clisp.org>
parents:
7722
diff
changeset
|
98 |
|
10400
817f1418bbde
Make gnulib-tool work with native 'sed' on AIX.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
10380
diff
changeset
|
99 # sed_noop is a sed expression that does nothing. |
| 10401 | 100 # 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
|
101 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
|
102 |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
103 # sed_comments is true or false, depending whether 'sed' supports comments. |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
104 # (The GNU autoconf doc says that sed comments are not portable, but does |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
105 # not say which 'sed' versions are affected.) |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
106 if echo fo | sed -e 's/f/g/ |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
107 # s/o/u/ |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
108 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
|
109 sed_comments=true |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
110 else |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
111 sed_comments=false |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
112 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
113 |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
114 # func_usage |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
115 # outputs to stdout the --help usage message. |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
116 func_usage () |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
117 { |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
118 echo "\ |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
119 Usage: gnulib-tool --list |
|
5344
c2f5677fc6ed
Initialize supplied_libname. Tweak usage message.
Bruno Haible <bruno@clisp.org>
parents:
5343
diff
changeset
|
120 gnulib-tool --import [module1 ... moduleN] |
|
6443
1a35941d29ab
Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents:
6425
diff
changeset
|
121 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
|
122 gnulib-tool --create-testdir --dir=directory [module1 ... moduleN] |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
123 gnulib-tool --create-megatestdir --dir=directory [module1 ... moduleN] |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
124 gnulib-tool --test --dir=directory module1 ... moduleN |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
125 gnulib-tool --megatest --dir=directory [module1 ... moduleN] |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
126 gnulib-tool --extract-description module |
|
10743
ec39330cb04e
Modules now have a 'status' attribute.
Bruno Haible <bruno@clisp.org>
parents:
10732
diff
changeset
|
127 gnulib-tool --extract-status module |
|
9189
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
128 gnulib-tool --extract-notice module |
|
12460
282eecca2301
New module attribute 'Applicability'.
Bruno Haible <bruno@clisp.org>
parents:
12417
diff
changeset
|
129 gnulib-tool --extract-applicability module |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
130 gnulib-tool --extract-filelist module |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
131 gnulib-tool --extract-dependencies module |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
132 gnulib-tool --extract-autoconf-snippet module |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
133 gnulib-tool --extract-automake-snippet module |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
134 gnulib-tool --extract-include-directive module |
|
8055
5c79d44f739d
New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents:
8040
diff
changeset
|
135 gnulib-tool --extract-link-directive module |
|
5251
42b53a22aee5
Add a license tag to every module.
Bruno Haible <bruno@clisp.org>
parents:
5250
diff
changeset
|
136 gnulib-tool --extract-license module |
| 4197 | 137 gnulib-tool --extract-maintainer module |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
138 gnulib-tool --extract-tests-module module |
|
11461
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
139 gnulib-tool --copy-file file [destination] |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
140 |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
141 Operation modes: |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
142 --list print the available module names |
|
6633
5118aa463328
* gnulib-tool (Usage): Fix --import, from
Simon Josefsson <simon@josefsson.org>
parents:
6614
diff
changeset
|
143 --import import the given modules into the current package; |
|
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
|
144 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
|
145 package from the current gnulib |
|
aca74c06bca0
Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and
Bruno Haible <bruno@clisp.org>
parents:
6633
diff
changeset
|
146 --update update the current package, restore files omitted |
|
aca74c06bca0
Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and
Bruno Haible <bruno@clisp.org>
parents:
6633
diff
changeset
|
147 from CVS |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
148 --create-testdir create a scratch package with the given modules |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
149 --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
|
150 one by one and all together |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
151 --test test the combination of the given modules |
| 4197 | 152 (recommended to use CC=\"gcc -Wall\" here) |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
153 --megatest test the given modules one by one and all together |
| 4197 | 154 (recommended to use CC=\"gcc -Wall\" here) |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
155 --extract-description extract the description |
|
10743
ec39330cb04e
Modules now have a 'status' attribute.
Bruno Haible <bruno@clisp.org>
parents:
10732
diff
changeset
|
156 --extract-status extract the status (obsolete or not) |
|
9189
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
157 --extract-notice extract the notice or banner |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
158 --extract-filelist extract the list of files |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
159 --extract-dependencies extract the dependencies |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
160 --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
|
161 --extract-automake-snippet extract the snippet for library makefile |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
162 --extract-include-directive extract the #include directive |
|
8055
5c79d44f739d
New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents:
8040
diff
changeset
|
163 --extract-link-directive extract the linker directive |
|
5251
42b53a22aee5
Add a license tag to every module.
Bruno Haible <bruno@clisp.org>
parents:
5250
diff
changeset
|
164 --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
|
165 under lib/ |
| 4197 | 166 --extract-maintainer report the maintainer(s) inside gnulib |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
167 --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
|
168 --copy-file copy a file that is not part of any module |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
169 |
|
7069
0fb5ef99e00f
Split the --help output into several paragraphs.
Bruno Haible <bruno@clisp.org>
parents:
7068
diff
changeset
|
170 General options: |
|
7068
ec1cfcfd352a
Revert the --help output reordering.
Bruno Haible <bruno@clisp.org>
parents:
7067
diff
changeset
|
171 --dir=DIRECTORY Specify the target directory. |
|
ec1cfcfd352a
Revert the --help output reordering.
Bruno Haible <bruno@clisp.org>
parents:
7067
diff
changeset
|
172 For --import, this specifies where your |
|
ec1cfcfd352a
Revert the --help output reordering.
Bruno Haible <bruno@clisp.org>
parents:
7067
diff
changeset
|
173 configure.ac can be found. Defaults to current |
|
ec1cfcfd352a
Revert the --help output reordering.
Bruno Haible <bruno@clisp.org>
parents:
7067
diff
changeset
|
174 directory. |
|
7073
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
175 --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
|
176 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
|
177 --cache-modules Enable module caching optimization. |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
178 --no-cache-modules Disable module caching optimization. |
|
9188
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
179 --verbose Increase verbosity. May be repeated. |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
180 --quiet Decrease verbosity. May be repeated. |
|
7069
0fb5ef99e00f
Split the --help output into several paragraphs.
Bruno Haible <bruno@clisp.org>
parents:
7068
diff
changeset
|
181 |
|
0fb5ef99e00f
Split the --help output into several paragraphs.
Bruno Haible <bruno@clisp.org>
parents:
7068
diff
changeset
|
182 Options for --import: |
|
7068
ec1cfcfd352a
Revert the --help output reordering.
Bruno Haible <bruno@clisp.org>
parents:
7067
diff
changeset
|
183 --lib=LIBRARY Specify the library name. Defaults to 'libgnu'. |
|
ec1cfcfd352a
Revert the --help output reordering.
Bruno Haible <bruno@clisp.org>
parents:
7067
diff
changeset
|
184 --source-base=DIRECTORY |
|
ec1cfcfd352a
Revert the --help output reordering.
Bruno Haible <bruno@clisp.org>
parents:
7067
diff
changeset
|
185 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
|
186 placed (default \"lib\"). |
|
7068
ec1cfcfd352a
Revert the --help output reordering.
Bruno Haible <bruno@clisp.org>
parents:
7067
diff
changeset
|
187 --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
|
188 placed (default \"m4\"). |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
189 --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
|
190 placed (default \"po\"). |
|
7069
0fb5ef99e00f
Split the --help output into several paragraphs.
Bruno Haible <bruno@clisp.org>
parents:
7068
diff
changeset
|
191 --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
|
192 placed (default \"doc\"). |
|
7068
ec1cfcfd352a
Revert the --help output reordering.
Bruno Haible <bruno@clisp.org>
parents:
7067
diff
changeset
|
193 --tests-base=DIRECTORY |
|
ec1cfcfd352a
Revert the --help output reordering.
Bruno Haible <bruno@clisp.org>
parents:
7067
diff
changeset
|
194 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
|
195 placed (default \"tests\"). |
|
7068
ec1cfcfd352a
Revert the --help output reordering.
Bruno Haible <bruno@clisp.org>
parents:
7067
diff
changeset
|
196 --aux-dir=DIRECTORY Directory relative to --dir where auxiliary build |
|
ec1cfcfd352a
Revert the --help output reordering.
Bruno Haible <bruno@clisp.org>
parents:
7067
diff
changeset
|
197 tools are placed (default \"build-aux\"). |
|
ec1cfcfd352a
Revert the --help output reordering.
Bruno Haible <bruno@clisp.org>
parents:
7067
diff
changeset
|
198 --with-tests Include unit tests for the included modules. |
|
10744
7fb7b37150b3
New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents:
10743
diff
changeset
|
199 --with-obsolete Include obsolete modules when they occur among the |
|
7fb7b37150b3
New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents:
10743
diff
changeset
|
200 dependencies. By default, dependencies to obsolete |
|
7fb7b37150b3
New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents:
10743
diff
changeset
|
201 modules are ignored. |
|
7068
ec1cfcfd352a
Revert the --help output reordering.
Bruno Haible <bruno@clisp.org>
parents:
7067
diff
changeset
|
202 --avoid=MODULE Avoid including the given MODULE. Useful if you |
|
ec1cfcfd352a
Revert the --help output reordering.
Bruno Haible <bruno@clisp.org>
parents:
7067
diff
changeset
|
203 have code that provides equivalent functionality. |
|
ec1cfcfd352a
Revert the --help output reordering.
Bruno Haible <bruno@clisp.org>
parents:
7067
diff
changeset
|
204 This option can be repeated. |
|
9417
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
205 --lgpl[=2|=3] 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
|
206 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
|
207 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
|
208 the default is currently LGPLv3. |
|
7216
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
209 --makefile-name=NAME Name of makefile in automake syntax in the |
|
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
210 source-base and tests-base directories |
|
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
211 (default \"Makefile.am\"). |
|
7069
0fb5ef99e00f
Split the --help output into several paragraphs.
Bruno Haible <bruno@clisp.org>
parents:
7068
diff
changeset
|
212 --libtool Use libtool rules. |
| 7077 | 213 --no-libtool Don't use libtool rules. |
|
7068
ec1cfcfd352a
Revert the --help output reordering.
Bruno Haible <bruno@clisp.org>
parents:
7067
diff
changeset
|
214 --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
|
215 'gl_INIT'. Default is 'gl'. |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
216 --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
|
217 the package name. A suffix '-gnulib' is appended. |
|
9810
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
218 --vc-files Update version control related files. |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
219 --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
|
220 (.gitignore and/or .cvsignore). |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
221 --no-changelog Don't update or create ChangeLog files. |
|
7069
0fb5ef99e00f
Split the --help output into several paragraphs.
Bruno Haible <bruno@clisp.org>
parents:
7068
diff
changeset
|
222 |
|
0fb5ef99e00f
Split the --help output into several paragraphs.
Bruno Haible <bruno@clisp.org>
parents:
7068
diff
changeset
|
223 Options for --import and --update: |
| 6966 | 224 --dry-run For --import, only print what would have been done. |
| 225 -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
|
226 --local-symlink Make symbolic links instead of copying files, only |
|
d67f9dc6019d
New option --local-symlink.
Bruno Haible <bruno@clisp.org>
parents:
7642
diff
changeset
|
227 for files from the local override directory. |
|
9096
7f1880b27b89
New gnulib-tool option --more-symlinks.
Bruno Haible <bruno@clisp.org>
parents:
9090
diff
changeset
|
228 -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
|
229 don't replace copyright notices. |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
230 |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
231 Report bugs to <bug-gnulib@gnu.org>." |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
232 } |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
233 |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
234 # func_version |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
235 # outputs to stdout the --version message. |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
236 func_version () |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
237 { |
|
9793
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
238 func_gnulib_dir |
|
9805
d3af04de9f0b
Tweak "gnulib --version" output.
Bruno Haible <bruno@clisp.org>
parents:
9804
diff
changeset
|
239 if test -d "$gnulib_dir"/.git \ |
|
d3af04de9f0b
Tweak "gnulib --version" output.
Bruno Haible <bruno@clisp.org>
parents:
9804
diff
changeset
|
240 && (git --version) >/dev/null 2>/dev/null \ |
|
d3af04de9f0b
Tweak "gnulib --version" output.
Bruno Haible <bruno@clisp.org>
parents:
9804
diff
changeset
|
241 && (date --version) >/dev/null 2>/dev/null; then |
|
d3af04de9f0b
Tweak "gnulib --version" output.
Bruno Haible <bruno@clisp.org>
parents:
9804
diff
changeset
|
242 # gnulib checked out from git. |
|
d3af04de9f0b
Tweak "gnulib --version" output.
Bruno Haible <bruno@clisp.org>
parents:
9804
diff
changeset
|
243 sed_extract_first_date='/^Date/{ |
|
d3af04de9f0b
Tweak "gnulib --version" output.
Bruno Haible <bruno@clisp.org>
parents:
9804
diff
changeset
|
244 s/^Date:[ ]*//p |
|
d3af04de9f0b
Tweak "gnulib --version" output.
Bruno Haible <bruno@clisp.org>
parents:
9804
diff
changeset
|
245 q |
|
d3af04de9f0b
Tweak "gnulib --version" output.
Bruno Haible <bruno@clisp.org>
parents:
9804
diff
changeset
|
246 }' |
|
d3af04de9f0b
Tweak "gnulib --version" output.
Bruno Haible <bruno@clisp.org>
parents:
9804
diff
changeset
|
247 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
|
248 # 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
|
249 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
|
250 date=`echo "$date" | sed -e "$sed_year_before_time"` |
|
d3af04de9f0b
Tweak "gnulib --version" output.
Bruno Haible <bruno@clisp.org>
parents:
9804
diff
changeset
|
251 # Use GNU date to compute the time in GMT. |
|
d3af04de9f0b
Tweak "gnulib --version" output.
Bruno Haible <bruno@clisp.org>
parents:
9804
diff
changeset
|
252 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
|
253 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
|
254 else |
|
d3af04de9f0b
Tweak "gnulib --version" output.
Bruno Haible <bruno@clisp.org>
parents:
9804
diff
changeset
|
255 if test -d "$gnulib_dir"/CVS \ |
|
d3af04de9f0b
Tweak "gnulib --version" output.
Bruno Haible <bruno@clisp.org>
parents:
9804
diff
changeset
|
256 && (cvs --version) >/dev/null 2>/dev/null; then |
|
d3af04de9f0b
Tweak "gnulib --version" output.
Bruno Haible <bruno@clisp.org>
parents:
9804
diff
changeset
|
257 # gnulib checked out from CVS. |
|
d3af04de9f0b
Tweak "gnulib --version" output.
Bruno Haible <bruno@clisp.org>
parents:
9804
diff
changeset
|
258 sed_extract_first_date='/^date: /{ |
|
d3af04de9f0b
Tweak "gnulib --version" output.
Bruno Haible <bruno@clisp.org>
parents:
9804
diff
changeset
|
259 s/^date: \([0-9][0-9][0-9][0-9]\).\([0-9][0-9]\).\([0-9][0-9]\) \([0-9][0-9]:[0-9][0-9]:[0-9][0-9]\).*/\1-\2-\3 \4/p |
|
d3af04de9f0b
Tweak "gnulib --version" output.
Bruno Haible <bruno@clisp.org>
parents:
9804
diff
changeset
|
260 q |
|
d3af04de9f0b
Tweak "gnulib --version" output.
Bruno Haible <bruno@clisp.org>
parents:
9804
diff
changeset
|
261 }' |
|
d3af04de9f0b
Tweak "gnulib --version" output.
Bruno Haible <bruno@clisp.org>
parents:
9804
diff
changeset
|
262 date=`cd "$gnulib_dir" && cvs log -N ChangeLog 2>/dev/null | sed -n -e "$sed_extract_first_date"` |
|
d3af04de9f0b
Tweak "gnulib --version" output.
Bruno Haible <bruno@clisp.org>
parents:
9804
diff
changeset
|
263 else |
|
d3af04de9f0b
Tweak "gnulib --version" output.
Bruno Haible <bruno@clisp.org>
parents:
9804
diff
changeset
|
264 # gnulib copy without versioning information. |
|
d3af04de9f0b
Tweak "gnulib --version" output.
Bruno Haible <bruno@clisp.org>
parents:
9804
diff
changeset
|
265 date=`sed -e 's/ .*//;q' "$gnulib_dir"/ChangeLog` |
|
d3af04de9f0b
Tweak "gnulib --version" output.
Bruno Haible <bruno@clisp.org>
parents:
9804
diff
changeset
|
266 fi |
|
d3af04de9f0b
Tweak "gnulib --version" output.
Bruno Haible <bruno@clisp.org>
parents:
9804
diff
changeset
|
267 version= |
|
d3af04de9f0b
Tweak "gnulib --version" output.
Bruno Haible <bruno@clisp.org>
parents:
9804
diff
changeset
|
268 fi |
| 12417 | 269 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
|
270 echo "\ |
|
9805
d3af04de9f0b
Tweak "gnulib --version" output.
Bruno Haible <bruno@clisp.org>
parents:
9804
diff
changeset
|
271 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
|
272 Copyright (C) $year Free Software Foundation, Inc. |
|
9793
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
273 License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html> |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
274 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
|
275 There is NO WARRANTY, to the extent permitted by law. |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
276 |
|
7347
d86464f614f7
* gnulib-tool (func_version): Create output all at once. This
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7335
diff
changeset
|
277 Written by" "Bruno Haible" "and" "Simon Josefsson" |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
278 } |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
279 |
|
6777
d9b10884dc69
* gnulib-tool (func_version): Base copyright year on CVS date.
Eric Blake <ebb9@byu.net>
parents:
6765
diff
changeset
|
280 # func_emit_copyright_notice |
|
d9b10884dc69
* gnulib-tool (func_version): Base copyright year on CVS date.
Eric Blake <ebb9@byu.net>
parents:
6765
diff
changeset
|
281 # 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
|
282 func_emit_copyright_notice () |
|
d9b10884dc69
* gnulib-tool (func_version): Base copyright year on CVS date.
Eric Blake <ebb9@byu.net>
parents:
6765
diff
changeset
|
283 { |
| 12417 | 284 sed -n -e '/Copyright/ { |
| 285 p | |
| 286 q | |
| 287 }' < "$self_abspathname" | |
|
6777
d9b10884dc69
* gnulib-tool (func_version): Base copyright year on CVS date.
Eric Blake <ebb9@byu.net>
parents:
6765
diff
changeset
|
288 echo "#" |
|
d9b10884dc69
* gnulib-tool (func_version): Base copyright year on CVS date.
Eric Blake <ebb9@byu.net>
parents:
6765
diff
changeset
|
289 echo "# This file is free software, distributed under the terms of the GNU" |
|
d9b10884dc69
* gnulib-tool (func_version): Base copyright year on CVS date.
Eric Blake <ebb9@byu.net>
parents:
6765
diff
changeset
|
290 echo "# General Public License. As a special exception to the GNU General" |
|
d9b10884dc69
* gnulib-tool (func_version): Base copyright year on CVS date.
Eric Blake <ebb9@byu.net>
parents:
6765
diff
changeset
|
291 echo "# Public License, this file may be distributed as part of a program" |
|
d9b10884dc69
* gnulib-tool (func_version): Base copyright year on CVS date.
Eric Blake <ebb9@byu.net>
parents:
6765
diff
changeset
|
292 echo "# that contains a configuration script generated by Autoconf, under" |
|
d9b10884dc69
* gnulib-tool (func_version): Base copyright year on CVS date.
Eric Blake <ebb9@byu.net>
parents:
6765
diff
changeset
|
293 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
|
294 echo "#" |
|
d9b10884dc69
* gnulib-tool (func_version): Base copyright year on CVS date.
Eric Blake <ebb9@byu.net>
parents:
6765
diff
changeset
|
295 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
|
296 } |
|
d9b10884dc69
* gnulib-tool (func_version): Base copyright year on CVS date.
Eric Blake <ebb9@byu.net>
parents:
6765
diff
changeset
|
297 |
|
7332
dd6e80d0c89e
* gnulib-tool (func_exit): New function, to allow to pass the
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7327
diff
changeset
|
298 # func_exit STATUS |
| 10453 | 299 # exits with a given status. |
| 300 # This function needs to be used, rather than 'exit', when a 'trap' handler is | |
| 301 # 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
|
302 func_exit () |
|
dd6e80d0c89e
* gnulib-tool (func_exit): New function, to allow to pass the
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7327
diff
changeset
|
303 { |
|
dd6e80d0c89e
* gnulib-tool (func_exit): New function, to allow to pass the
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7327
diff
changeset
|
304 (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
|
305 } |
|
dd6e80d0c89e
* gnulib-tool (func_exit): New function, to allow to pass the
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7327
diff
changeset
|
306 |
|
9793
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
307 # func_gnulib_dir |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
308 # 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
|
309 # Input: |
|
4e04aaeb17f9
Fix previous patch, and tweak references to $0.
Eric Blake <ebb9@byu.net>
parents:
10495
diff
changeset
|
310 # - 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
|
311 # Sets variables |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
312 # - 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
|
313 # - 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
|
314 func_gnulib_dir () |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
315 { |
|
10501
4e04aaeb17f9
Fix previous patch, and tweak references to $0.
Eric Blake <ebb9@byu.net>
parents:
10495
diff
changeset
|
316 case "$progname" in |
|
4e04aaeb17f9
Fix previous patch, and tweak references to $0.
Eric Blake <ebb9@byu.net>
parents:
10495
diff
changeset
|
317 /*) self_abspathname="$progname" ;; |
|
4e04aaeb17f9
Fix previous patch, and tweak references to $0.
Eric Blake <ebb9@byu.net>
parents:
10495
diff
changeset
|
318 */*) self_abspathname=`pwd`/"$progname" ;; |
|
9793
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
319 *) |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
320 # Look in $PATH. |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
321 # 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
|
322 # We use IFS=: instead of |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
323 # 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
|
324 # 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
|
325 # 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
|
326 # 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
|
327 # 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
|
328 # - /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
|
329 # 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
|
330 # - /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
|
331 # 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
|
332 # - 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
|
333 # 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
|
334 # 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
|
335 # 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
|
336 self_abspathname= |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
337 if test "${PATH_SEPARATOR+set}" != set; then |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
338 func_tmpdir |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
339 { echo "#! /bin/sh"; echo "exit 0"; } > "$tmp"/conf.sh |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
340 chmod +x "$tmp"/conf.sh |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
341 if (PATH="/nonexistent;$tmp"; conf.sh) >/dev/null 2>&1; then |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
342 PATH_SEPARATOR=';' |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
343 else |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
344 PATH_SEPARATOR=: |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
345 fi |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
346 rm -rf "$tmp" |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
347 fi |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
348 if test "$PATH_SEPARATOR" = ";"; then |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
349 # 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
|
350 pathx=".;$PATH" |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
351 else |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
352 # 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
|
353 pathx="$PATH" |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
354 case :$PATH: in |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
355 *::*) |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
356 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
|
357 ;; |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
358 esac |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
359 fi |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
360 save_IFS="$IFS" |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
361 IFS="$PATH_SEPARATOR" |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
362 for d in $pathx; do |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
363 IFS="$save_IFS" |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
364 test -z "$d" && d=. |
|
10501
4e04aaeb17f9
Fix previous patch, and tweak references to $0.
Eric Blake <ebb9@byu.net>
parents:
10495
diff
changeset
|
365 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
|
366 self_abspathname="$d/$progname" |
|
9793
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
367 break |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
368 fi |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
369 done |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
370 IFS="$save_IFS" |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
371 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
|
372 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
|
373 fi |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
374 ;; |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
375 esac |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
376 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
|
377 # Resolve symbolic link. |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
378 linkval=`func_readlink "$self_abspathname"` |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
379 test -n "$linkval" || break |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
380 case "$linkval" in |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
381 /* ) self_abspathname="$linkval" ;; |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
382 * ) 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
|
383 esac |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
384 done |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
385 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
|
386 } |
|
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
387 |
|
6245
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
388 # func_tmpdir |
|
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
389 # creates a temporary directory. |
|
10501
4e04aaeb17f9
Fix previous patch, and tweak references to $0.
Eric Blake <ebb9@byu.net>
parents:
10495
diff
changeset
|
390 # Input: |
|
4e04aaeb17f9
Fix previous patch, and tweak references to $0.
Eric Blake <ebb9@byu.net>
parents:
10495
diff
changeset
|
391 # - 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
|
392 # Sets variable |
|
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
393 # - 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
|
394 func_tmpdir () |
|
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
395 { |
|
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
396 # 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
|
397 # 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
|
398 # /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
|
399 : ${TMPDIR=/tmp} |
|
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
400 { |
|
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
401 # 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
|
402 # 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
|
403 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
|
404 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
|
405 } || |
|
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
406 { |
|
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
407 # 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
|
408 # 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
|
409 # 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
|
410 # 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
|
411 # directory. |
|
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
412 tmp=$TMPDIR/gl$$-$RANDOM |
|
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
413 (umask 077 && mkdir "$tmp") |
|
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
414 } || |
|
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
415 { |
|
10501
4e04aaeb17f9
Fix previous patch, and tweak references to $0.
Eric Blake <ebb9@byu.net>
parents:
10495
diff
changeset
|
416 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
|
417 func_exit 1 |
|
6245
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
418 } |
|
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
419 } |
|
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
420 |
|
7323
7ca0e325d5db
Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents:
7322
diff
changeset
|
421 # func_append var value |
|
7ca0e325d5db
Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents:
7322
diff
changeset
|
422 # 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
|
423 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
|
424 # 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
|
425 # 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
|
426 func_append () |
|
7ca0e325d5db
Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents:
7322
diff
changeset
|
427 { |
|
7ca0e325d5db
Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents:
7322
diff
changeset
|
428 eval "$1+=\"\$2\"" |
|
7ca0e325d5db
Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents:
7322
diff
changeset
|
429 } |
|
10989
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
430 fast_func_append=true |
|
7323
7ca0e325d5db
Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents:
7322
diff
changeset
|
431 else |
|
7ca0e325d5db
Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents:
7322
diff
changeset
|
432 func_append () |
|
7ca0e325d5db
Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents:
7322
diff
changeset
|
433 { |
|
7ca0e325d5db
Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents:
7322
diff
changeset
|
434 eval "$1=\"\$$1\$2\"" |
|
7ca0e325d5db
Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents:
7322
diff
changeset
|
435 } |
|
10989
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
436 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
|
437 fi |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
438 |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
439 # 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
|
440 # 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
|
441 # 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
|
442 # 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
|
443 # 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
|
444 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
|
445 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
|
446 { |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
447 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
|
448 } |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
449 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
|
450 else |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
451 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
|
452 { |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
453 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
|
454 prefix="$2" |
|
11037
d94dc78c3947
Improve func_remove_prefix, func_remove_suffix.
Bruno Haible <bruno@clisp.org>
parents:
10993
diff
changeset
|
455 case "$prefix" in |
|
d94dc78c3947
Improve func_remove_prefix, func_remove_suffix.
Bruno Haible <bruno@clisp.org>
parents:
10993
diff
changeset
|
456 *.*) |
|
d94dc78c3947
Improve func_remove_prefix, func_remove_suffix.
Bruno Haible <bruno@clisp.org>
parents:
10993
diff
changeset
|
457 sed_escape_dots='s/\([.]\)/\\\1/g' |
|
d94dc78c3947
Improve func_remove_prefix, func_remove_suffix.
Bruno Haible <bruno@clisp.org>
parents:
10993
diff
changeset
|
458 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
|
459 ;; |
|
d94dc78c3947
Improve func_remove_prefix, func_remove_suffix.
Bruno Haible <bruno@clisp.org>
parents:
10993
diff
changeset
|
460 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
|
461 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
|
462 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
|
463 } |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
464 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
|
465 fi |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
466 |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
467 # 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
|
468 # 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
|
469 # 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
|
470 # 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
|
471 # 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
|
472 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
|
473 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
|
474 { |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
475 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
|
476 } |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
477 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
|
478 else |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
479 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
|
480 { |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
481 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
|
482 suffix="$2" |
|
11037
d94dc78c3947
Improve func_remove_prefix, func_remove_suffix.
Bruno Haible <bruno@clisp.org>
parents:
10993
diff
changeset
|
483 case "$suffix" in |
|
d94dc78c3947
Improve func_remove_prefix, func_remove_suffix.
Bruno Haible <bruno@clisp.org>
parents:
10993
diff
changeset
|
484 *.*) |
|
d94dc78c3947
Improve func_remove_prefix, func_remove_suffix.
Bruno Haible <bruno@clisp.org>
parents:
10993
diff
changeset
|
485 sed_escape_dots='s/\([.]\)/\\\1/g' |
|
d94dc78c3947
Improve func_remove_prefix, func_remove_suffix.
Bruno Haible <bruno@clisp.org>
parents:
10993
diff
changeset
|
486 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
|
487 ;; |
|
d94dc78c3947
Improve func_remove_prefix, func_remove_suffix.
Bruno Haible <bruno@clisp.org>
parents:
10993
diff
changeset
|
488 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
|
489 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
|
490 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
|
491 } |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
492 fast_func_remove_suffix=false |
|
7323
7ca0e325d5db
Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents:
7322
diff
changeset
|
493 fi |
|
7ca0e325d5db
Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents:
7322
diff
changeset
|
494 |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
495 # func_fatal_error message |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
496 # 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
|
497 # Input: |
|
4e04aaeb17f9
Fix previous patch, and tweak references to $0.
Eric Blake <ebb9@byu.net>
parents:
10495
diff
changeset
|
498 # - progname name of this program |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
499 func_fatal_error () |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
500 { |
|
10501
4e04aaeb17f9
Fix previous patch, and tweak references to $0.
Eric Blake <ebb9@byu.net>
parents:
10495
diff
changeset
|
501 echo "$progname: *** $1" 1>&2 |
|
4e04aaeb17f9
Fix previous patch, and tweak references to $0.
Eric Blake <ebb9@byu.net>
parents:
10495
diff
changeset
|
502 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
|
503 func_exit 1 |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
504 } |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
505 |
|
12819
4b5bf4c79e0c
gnulib-tool: Make warning diagnostics consistent.
Bruno Haible <bruno@clisp.org>
parents:
12775
diff
changeset
|
506 # func_warning message |
|
4b5bf4c79e0c
gnulib-tool: Make warning diagnostics consistent.
Bruno Haible <bruno@clisp.org>
parents:
12775
diff
changeset
|
507 # Outputs to stderr a warning message, |
|
4b5bf4c79e0c
gnulib-tool: Make warning diagnostics consistent.
Bruno Haible <bruno@clisp.org>
parents:
12775
diff
changeset
|
508 func_warning () |
|
4b5bf4c79e0c
gnulib-tool: Make warning diagnostics consistent.
Bruno Haible <bruno@clisp.org>
parents:
12775
diff
changeset
|
509 { |
|
4b5bf4c79e0c
gnulib-tool: Make warning diagnostics consistent.
Bruno Haible <bruno@clisp.org>
parents:
12775
diff
changeset
|
510 echo "gnulib-tool: warning: $1" 1>&2 |
|
4b5bf4c79e0c
gnulib-tool: Make warning diagnostics consistent.
Bruno Haible <bruno@clisp.org>
parents:
12775
diff
changeset
|
511 } |
|
4b5bf4c79e0c
gnulib-tool: Make warning diagnostics consistent.
Bruno Haible <bruno@clisp.org>
parents:
12775
diff
changeset
|
512 |
|
6248
ba937772eda4
Portability fix: readlink is not portable.
Bruno Haible <bruno@clisp.org>
parents:
6247
diff
changeset
|
513 # func_readlink SYMLINK |
|
ba937772eda4
Portability fix: readlink is not portable.
Bruno Haible <bruno@clisp.org>
parents:
6247
diff
changeset
|
514 # outputs the target of the given symlink. |
|
ba937772eda4
Portability fix: readlink is not portable.
Bruno Haible <bruno@clisp.org>
parents:
6247
diff
changeset
|
515 if (type -p readlink) > /dev/null 2>&1; then |
|
ba937772eda4
Portability fix: readlink is not portable.
Bruno Haible <bruno@clisp.org>
parents:
6247
diff
changeset
|
516 func_readlink () |
|
ba937772eda4
Portability fix: readlink is not portable.
Bruno Haible <bruno@clisp.org>
parents:
6247
diff
changeset
|
517 { |
|
ba937772eda4
Portability fix: readlink is not portable.
Bruno Haible <bruno@clisp.org>
parents:
6247
diff
changeset
|
518 # Use the readlink program from GNU coreutils. |
|
ba937772eda4
Portability fix: readlink is not portable.
Bruno Haible <bruno@clisp.org>
parents:
6247
diff
changeset
|
519 readlink "$1" |
|
ba937772eda4
Portability fix: readlink is not portable.
Bruno Haible <bruno@clisp.org>
parents:
6247
diff
changeset
|
520 } |
|
ba937772eda4
Portability fix: readlink is not portable.
Bruno Haible <bruno@clisp.org>
parents:
6247
diff
changeset
|
521 else |
|
ba937772eda4
Portability fix: readlink is not portable.
Bruno Haible <bruno@clisp.org>
parents:
6247
diff
changeset
|
522 func_readlink () |
|
ba937772eda4
Portability fix: readlink is not portable.
Bruno Haible <bruno@clisp.org>
parents:
6247
diff
changeset
|
523 { |
|
ba937772eda4
Portability fix: readlink is not portable.
Bruno Haible <bruno@clisp.org>
parents:
6247
diff
changeset
|
524 # 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
|
525 # 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
|
526 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
|
527 } |
|
ba937772eda4
Portability fix: readlink is not portable.
Bruno Haible <bruno@clisp.org>
parents:
6247
diff
changeset
|
528 fi |
|
ba937772eda4
Portability fix: readlink is not portable.
Bruno Haible <bruno@clisp.org>
parents:
6247
diff
changeset
|
529 |
|
7213
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
530 # func_relativize DIR1 DIR2 |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
531 # 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
|
532 # Input: |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
533 # - 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
|
534 # - 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
|
535 # Output: |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
536 # - 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
|
537 func_relativize () |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
538 { |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
539 dir0=`pwd` |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
540 dir1="$1" |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
541 dir2="$2" |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
542 sed_first='s,^\([^/]*\)/.*$,\1,' |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
543 sed_rest='s,^[^/]*/*,,' |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
544 sed_last='s,^.*/\([^/]*\)$,\1,' |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
545 sed_butlast='s,/*[^/]*$,,' |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
546 while test -n "$dir1"; do |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
547 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
|
548 if test "$first" != "."; then |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
549 if test "$first" = ".."; then |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
550 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
|
551 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
|
552 else |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
553 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
|
554 if test "$first2" = "$first"; then |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
555 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
|
556 else |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
557 dir2="../$dir2" |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
558 fi |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
559 dir0="$dir0"/"$first" |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
560 fi |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
561 fi |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
562 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
|
563 done |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
564 reldir="$dir2" |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
565 } |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
566 |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
567 # func_relconcat DIR1 DIR2 |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
568 # 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
|
569 # Input: |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
570 # - 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
|
571 # - 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
|
572 # Output: |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
573 # - 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
|
574 func_relconcat () |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
575 { |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
576 dir1="$1" |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
577 dir2="$2" |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
578 sed_first='s,^\([^/]*\)/.*$,\1,' |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
579 sed_rest='s,^[^/]*/*,,' |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
580 sed_last='s,^.*/\([^/]*\)$,\1,' |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
581 sed_butlast='s,/*[^/]*$,,' |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
582 while true; do |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
583 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
|
584 if test "$first" = "."; then |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
585 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
|
586 if test -z "$dir2"; then |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
587 relconcat="$dir1" |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
588 break |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
589 fi |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
590 else |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
591 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
|
592 while test "$last" = "."; do |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
593 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
|
594 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
|
595 done |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
596 if test -z "$dir1"; then |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
597 relconcat="$dir2" |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
598 break |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
599 fi |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
600 if test "$first" = ".."; then |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
601 if test "$last" = ".."; then |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
602 relconcat="$dir1/$dir2" |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
603 break |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
604 fi |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
605 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
|
606 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
|
607 if test -z "$dir1"; then |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
608 relconcat="$dir2" |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
609 break |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
610 fi |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
611 if test -z "$dir2"; then |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
612 relconcat="$dir1" |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
613 break |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
614 fi |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
615 else |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
616 relconcat="$dir1/$dir2" |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
617 break |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
618 fi |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
619 fi |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
620 done |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
621 } |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
622 |
|
7642
0878abcc59c9
Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents:
7641
diff
changeset
|
623 # func_ln SRC DEST |
|
0878abcc59c9
Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents:
7641
diff
changeset
|
624 # Like ln -s, except that SRC is given relative to the current directory (or |
|
0878abcc59c9
Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents:
7641
diff
changeset
|
625 # absolute), not given relative to the directory of DEST. |
|
0878abcc59c9
Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents:
7641
diff
changeset
|
626 func_ln () |
|
0878abcc59c9
Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents:
7641
diff
changeset
|
627 { |
|
0878abcc59c9
Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents:
7641
diff
changeset
|
628 case "$1" in |
|
0878abcc59c9
Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents:
7641
diff
changeset
|
629 /*) |
|
0878abcc59c9
Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents:
7641
diff
changeset
|
630 ln -s "$1" "$2" ;; |
|
0878abcc59c9
Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents:
7641
diff
changeset
|
631 *) # SRC is relative. |
|
0878abcc59c9
Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents:
7641
diff
changeset
|
632 case "$2" in |
|
0878abcc59c9
Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents:
7641
diff
changeset
|
633 /*) |
|
0878abcc59c9
Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents:
7641
diff
changeset
|
634 ln -s "`pwd`/$1" "$2" ;; |
|
0878abcc59c9
Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents:
7641
diff
changeset
|
635 *) # DEST is relative too. |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
636 ln_destdir=`echo "$2" | sed -e 's,[^/]*$,,'` |
|
7642
0878abcc59c9
Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents:
7641
diff
changeset
|
637 test -n "$ln_destdir" || ln_destdir="." |
|
0878abcc59c9
Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents:
7641
diff
changeset
|
638 func_relativize "$ln_destdir" "$1" |
|
0878abcc59c9
Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents:
7641
diff
changeset
|
639 ln -s "$reldir" "$2" |
|
0878abcc59c9
Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents:
7641
diff
changeset
|
640 ;; |
|
0878abcc59c9
Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents:
7641
diff
changeset
|
641 esac |
|
0878abcc59c9
Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents:
7641
diff
changeset
|
642 ;; |
|
0878abcc59c9
Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents:
7641
diff
changeset
|
643 esac |
|
0878abcc59c9
Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents:
7641
diff
changeset
|
644 } |
|
0878abcc59c9
Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents:
7641
diff
changeset
|
645 |
|
0878abcc59c9
Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents:
7641
diff
changeset
|
646 # func_ln_if_changed SRC DEST |
|
0878abcc59c9
Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents:
7641
diff
changeset
|
647 # Like func_ln, but avoids munging timestamps if the link is correct. |
|
0878abcc59c9
Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents:
7641
diff
changeset
|
648 func_ln_if_changed () |
|
0878abcc59c9
Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents:
7641
diff
changeset
|
649 { |
|
0878abcc59c9
Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents:
7641
diff
changeset
|
650 if test $# -ne 2; then |
|
0878abcc59c9
Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents:
7641
diff
changeset
|
651 echo "usage: func_ln_if_changed SRC DEST" >&2 |
|
0878abcc59c9
Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents:
7641
diff
changeset
|
652 fi |
|
0878abcc59c9
Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents:
7641
diff
changeset
|
653 ln_target=`func_readlink "$2"` |
| 9167 | 654 if test -h "$2" && test "$1" = "$ln_target"; then |
|
7642
0878abcc59c9
Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents:
7641
diff
changeset
|
655 : |
|
0878abcc59c9
Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents:
7641
diff
changeset
|
656 else |
|
0878abcc59c9
Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents:
7641
diff
changeset
|
657 rm -f "$2" |
|
0878abcc59c9
Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents:
7641
diff
changeset
|
658 func_ln "$1" "$2" |
|
0878abcc59c9
Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents:
7641
diff
changeset
|
659 fi |
|
0878abcc59c9
Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents:
7641
diff
changeset
|
660 } |
|
0878abcc59c9
Fix the symlinks installed by the --symlink option.
Bruno Haible <bruno@clisp.org>
parents:
7641
diff
changeset
|
661 |
|
10379
a4e295b67e54
Attempt to avoid error messages like "echo: write error: Broken pipe".
Bruno Haible <bruno@clisp.org>
parents:
10298
diff
changeset
|
662 # func_reset_sigpipe |
|
a4e295b67e54
Attempt to avoid error messages like "echo: write error: Broken pipe".
Bruno Haible <bruno@clisp.org>
parents:
10298
diff
changeset
|
663 # Resets SIGPIPE to its default behaviour. SIGPIPE is signalled when a process |
|
a4e295b67e54
Attempt to avoid error messages like "echo: write error: Broken pipe".
Bruno Haible <bruno@clisp.org>
parents:
10298
diff
changeset
|
664 # writes into a pipe with no readers, i.e. a pipe where all readers have |
|
a4e295b67e54
Attempt to avoid error messages like "echo: write error: Broken pipe".
Bruno Haible <bruno@clisp.org>
parents:
10298
diff
changeset
|
665 # already closed their file descriptor that read from it or exited entirely. |
|
a4e295b67e54
Attempt to avoid error messages like "echo: write error: Broken pipe".
Bruno Haible <bruno@clisp.org>
parents:
10298
diff
changeset
|
666 # The default behaviour is to terminate the current process without an error |
|
a4e295b67e54
Attempt to avoid error messages like "echo: write error: Broken pipe".
Bruno Haible <bruno@clisp.org>
parents:
10298
diff
changeset
|
667 # message. |
|
a4e295b67e54
Attempt to avoid error messages like "echo: write error: Broken pipe".
Bruno Haible <bruno@clisp.org>
parents:
10298
diff
changeset
|
668 # When "trap '' SIGPIPE" is in effect, the behaviour (at least with bash) is to |
|
a4e295b67e54
Attempt to avoid error messages like "echo: write error: Broken pipe".
Bruno Haible <bruno@clisp.org>
parents:
10298
diff
changeset
|
669 # terminate the current process with an error message. |
|
a4e295b67e54
Attempt to avoid error messages like "echo: write error: Broken pipe".
Bruno Haible <bruno@clisp.org>
parents:
10298
diff
changeset
|
670 # This function should be called at the beginning of a command that only |
|
a4e295b67e54
Attempt to avoid error messages like "echo: write error: Broken pipe".
Bruno Haible <bruno@clisp.org>
parents:
10298
diff
changeset
|
671 # produces output to stdout (i.e. no side effects!), when the command that |
|
a4e295b67e54
Attempt to avoid error messages like "echo: write error: Broken pipe".
Bruno Haible <bruno@clisp.org>
parents:
10298
diff
changeset
|
672 # will read from this pipe might prematurely exit or close its standard input |
|
a4e295b67e54
Attempt to avoid error messages like "echo: write error: Broken pipe".
Bruno Haible <bruno@clisp.org>
parents:
10298
diff
changeset
|
673 # descriptor. |
|
a4e295b67e54
Attempt to avoid error messages like "echo: write error: Broken pipe".
Bruno Haible <bruno@clisp.org>
parents:
10298
diff
changeset
|
674 if test -n "$BASH_VERSION"; then |
| 10986 | 675 # The problem has only been reported with bash. Probably it occurs only with |
| 676 # bash-3.2. For the reasons, see | |
| 677 # <http://lists.gnu.org/archive/html/bug-bash/2008-12/msg00050.html>. | |
|
10379
a4e295b67e54
Attempt to avoid error messages like "echo: write error: Broken pipe".
Bruno Haible <bruno@clisp.org>
parents:
10298
diff
changeset
|
678 # Note that Solaris sh does not understand "trap - SIGPIPE". |
|
a4e295b67e54
Attempt to avoid error messages like "echo: write error: Broken pipe".
Bruno Haible <bruno@clisp.org>
parents:
10298
diff
changeset
|
679 func_reset_sigpipe () |
|
a4e295b67e54
Attempt to avoid error messages like "echo: write error: Broken pipe".
Bruno Haible <bruno@clisp.org>
parents:
10298
diff
changeset
|
680 { |
|
a4e295b67e54
Attempt to avoid error messages like "echo: write error: Broken pipe".
Bruno Haible <bruno@clisp.org>
parents:
10298
diff
changeset
|
681 trap - SIGPIPE |
|
a4e295b67e54
Attempt to avoid error messages like "echo: write error: Broken pipe".
Bruno Haible <bruno@clisp.org>
parents:
10298
diff
changeset
|
682 } |
|
a4e295b67e54
Attempt to avoid error messages like "echo: write error: Broken pipe".
Bruno Haible <bruno@clisp.org>
parents:
10298
diff
changeset
|
683 else |
|
a4e295b67e54
Attempt to avoid error messages like "echo: write error: Broken pipe".
Bruno Haible <bruno@clisp.org>
parents:
10298
diff
changeset
|
684 func_reset_sigpipe () |
|
a4e295b67e54
Attempt to avoid error messages like "echo: write error: Broken pipe".
Bruno Haible <bruno@clisp.org>
parents:
10298
diff
changeset
|
685 { |
|
10380
85d962720a4e
Oops, fix syntax error in last commit.
Bruno Haible <bruno@clisp.org>
parents:
10379
diff
changeset
|
686 : |
|
10379
a4e295b67e54
Attempt to avoid error messages like "echo: write error: Broken pipe".
Bruno Haible <bruno@clisp.org>
parents:
10298
diff
changeset
|
687 } |
|
a4e295b67e54
Attempt to avoid error messages like "echo: write error: Broken pipe".
Bruno Haible <bruno@clisp.org>
parents:
10298
diff
changeset
|
688 fi |
|
a4e295b67e54
Attempt to avoid error messages like "echo: write error: Broken pipe".
Bruno Haible <bruno@clisp.org>
parents:
10298
diff
changeset
|
689 |
|
9003
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
690 # Ensure an 'echo' command that does not interpret backslashes. |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
691 # Test cases: |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
692 # 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
|
693 # echo '\t' | grep t > /dev/null has return code 0 when OK, 1 when KO |
|
9006
0df4abf0cce4
Add better support for bash versions < 2.04.
Bruno Haible <bruno@clisp.org>
parents:
9005
diff
changeset
|
694 # This problem is a weird heritage from SVR4. BSD got it right (except that |
|
0df4abf0cce4
Add better support for bash versions < 2.04.
Bruno Haible <bruno@clisp.org>
parents:
9005
diff
changeset
|
695 # 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
|
696 # 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
|
697 # - 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
|
698 # 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
|
699 # 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
|
700 # - 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
|
701 # - 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
|
702 # 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
|
703 # - 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
|
704 # We try the following workarounds: |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
705 # - 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
|
706 # - 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
|
707 # - 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
|
708 # - 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
|
709 # - 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
|
710 # - 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
|
711 # - 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
|
712 # - 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
|
713 # the ksh workaround. |
|
9003
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
714 # - 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
|
715 # 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
|
716 # turning this script into a fork bomb in unlucky situations. |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
717 have_echo= |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
718 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
|
719 have_echo=yes # Lucky! |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
720 fi |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
721 # Try the workarounds. |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
722 # 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
|
723 if test -z "$have_echo" \ |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
724 && test "X$1" != "X--no-reexec" \ |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
725 && test -n "$CONFIG_SHELL" \ |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
726 && 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
|
727 && $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
|
728 exec $CONFIG_SHELL "$0" --no-reexec "$@" |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
729 exit 127 |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
730 fi |
|
9006
0df4abf0cce4
Add better support for bash versions < 2.04.
Bruno Haible <bruno@clisp.org>
parents:
9005
diff
changeset
|
731 # 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
|
732 if test -z "$have_echo" \ |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
733 && test -n "$BASH_VERSION" \ |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
734 && (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
|
735 shopt -o xpg_echo |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
736 have_echo=yes |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
737 fi |
|
9006
0df4abf0cce4
Add better support for bash versions < 2.04.
Bruno Haible <bruno@clisp.org>
parents:
9005
diff
changeset
|
738 # 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
|
739 # 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
|
740 # (There is no win in using 'printf' over 'cat' if it is not a shell built-in.) |
|
0df4abf0cce4
Add better support for bash versions < 2.04.
Bruno Haible <bruno@clisp.org>
parents:
9005
diff
changeset
|
741 if test -z "$have_echo" \ |
|
0df4abf0cce4
Add better support for bash versions < 2.04.
Bruno Haible <bruno@clisp.org>
parents:
9005
diff
changeset
|
742 && test -n "$BASH_VERSION"; then \ |
|
0df4abf0cce4
Add better support for bash versions < 2.04.
Bruno Haible <bruno@clisp.org>
parents:
9005
diff
changeset
|
743 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
|
744 # '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
|
745 echo () |
|
0df4abf0cce4
Add better support for bash versions < 2.04.
Bruno Haible <bruno@clisp.org>
parents:
9005
diff
changeset
|
746 { |
|
0df4abf0cce4
Add better support for bash versions < 2.04.
Bruno Haible <bruno@clisp.org>
parents:
9005
diff
changeset
|
747 cat <<EOF |
|
0df4abf0cce4
Add better support for bash versions < 2.04.
Bruno Haible <bruno@clisp.org>
parents:
9005
diff
changeset
|
748 $* |
|
0df4abf0cce4
Add better support for bash versions < 2.04.
Bruno Haible <bruno@clisp.org>
parents:
9005
diff
changeset
|
749 EOF |
|
0df4abf0cce4
Add better support for bash versions < 2.04.
Bruno Haible <bruno@clisp.org>
parents:
9005
diff
changeset
|
750 } |
|
0df4abf0cce4
Add better support for bash versions < 2.04.
Bruno Haible <bruno@clisp.org>
parents:
9005
diff
changeset
|
751 else |
| 9007 | 752 # '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
|
753 echo () |
|
0df4abf0cce4
Add better support for bash versions < 2.04.
Bruno Haible <bruno@clisp.org>
parents:
9005
diff
changeset
|
754 { |
|
0df4abf0cce4
Add better support for bash versions < 2.04.
Bruno Haible <bruno@clisp.org>
parents:
9005
diff
changeset
|
755 printf '%s\n' "$*" |
|
0df4abf0cce4
Add better support for bash versions < 2.04.
Bruno Haible <bruno@clisp.org>
parents:
9005
diff
changeset
|
756 } |
|
0df4abf0cce4
Add better support for bash versions < 2.04.
Bruno Haible <bruno@clisp.org>
parents:
9005
diff
changeset
|
757 fi |
|
0df4abf0cce4
Add better support for bash versions < 2.04.
Bruno Haible <bruno@clisp.org>
parents:
9005
diff
changeset
|
758 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
|
759 have_echo=yes |
|
0df4abf0cce4
Add better support for bash versions < 2.04.
Bruno Haible <bruno@clisp.org>
parents:
9005
diff
changeset
|
760 fi |
|
0df4abf0cce4
Add better support for bash versions < 2.04.
Bruno Haible <bruno@clisp.org>
parents:
9005
diff
changeset
|
761 fi |
|
9003
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
762 # For zsh: turn sh-emulation on. |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
763 if test -z "$have_echo" \ |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
764 && test -n "$ZSH_VERSION" \ |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
765 && (emulate sh) >/dev/null 2>&1; then |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
766 emulate sh |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
767 fi |
|
9008
78f53a569f31
Make use of ksh's 'print' built-in.
Bruno Haible <bruno@clisp.org>
parents:
9007
diff
changeset
|
768 # 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
|
769 if test -z "$have_echo" \ |
|
78f53a569f31
Make use of ksh's 'print' built-in.
Bruno Haible <bruno@clisp.org>
parents:
9007
diff
changeset
|
770 && (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
|
771 # A 'print' command exists. |
|
78f53a569f31
Make use of ksh's 'print' built-in.
Bruno Haible <bruno@clisp.org>
parents:
9007
diff
changeset
|
772 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
|
773 : |
|
78f53a569f31
Make use of ksh's 'print' built-in.
Bruno Haible <bruno@clisp.org>
parents:
9007
diff
changeset
|
774 else |
|
78f53a569f31
Make use of ksh's 'print' built-in.
Bruno Haible <bruno@clisp.org>
parents:
9007
diff
changeset
|
775 # 'print' is a shell built-in. |
|
78f53a569f31
Make use of ksh's 'print' built-in.
Bruno Haible <bruno@clisp.org>
parents:
9007
diff
changeset
|
776 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
|
777 # '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
|
778 alias echo='print -r' |
|
78f53a569f31
Make use of ksh's 'print' built-in.
Bruno Haible <bruno@clisp.org>
parents:
9007
diff
changeset
|
779 fi |
|
78f53a569f31
Make use of ksh's 'print' built-in.
Bruno Haible <bruno@clisp.org>
parents:
9007
diff
changeset
|
780 fi |
|
78f53a569f31
Make use of ksh's 'print' built-in.
Bruno Haible <bruno@clisp.org>
parents:
9007
diff
changeset
|
781 fi |
|
78f53a569f31
Make use of ksh's 'print' built-in.
Bruno Haible <bruno@clisp.org>
parents:
9007
diff
changeset
|
782 if test -z "$have_echo" \ |
|
78f53a569f31
Make use of ksh's 'print' built-in.
Bruno Haible <bruno@clisp.org>
parents:
9007
diff
changeset
|
783 && 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
|
784 have_echo=yes |
|
78f53a569f31
Make use of ksh's 'print' built-in.
Bruno Haible <bruno@clisp.org>
parents:
9007
diff
changeset
|
785 fi |
|
9003
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
786 # 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
|
787 # The ksh manual page says: |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
788 # "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
|
789 # 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
|
790 # 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
|
791 # 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
|
792 # 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
|
793 # command. |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
794 if test -z "$have_echo"; then |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
795 bsd_echo () |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
796 { |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
797 cat <<EOF |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
798 $* |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
799 EOF |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
800 } |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
801 alias echo=bsd_echo 2>/dev/null |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
802 fi |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
803 if test -z "$have_echo" \ |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
804 && echo '\t' | grep t > /dev/null; then |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
805 have_echo=yes |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
806 fi |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
807 if test -z "$have_echo"; then |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
808 unalias echo 2>/dev/null |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
809 fi |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
810 # 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
|
811 if test -z "$have_echo" \ |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
812 && test "X$1" != "X--no-reexec" \ |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
813 && test -f /bin/ksh; then |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
814 exec /bin/ksh "$0" --no-reexec "$@" |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
815 exit 127 |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
816 fi |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
817 # Otherwise: respawn using /bin/sh. |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
818 if test -z "$have_echo" \ |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
819 && test "X$1" != "X--no-reexec" \ |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
820 && test -f /bin/sh; then |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
821 exec /bin/sh "$0" --no-reexec "$@" |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
822 exit 127 |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
823 fi |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
824 if test -z "$have_echo"; then |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
825 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
|
826 fi |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
827 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
|
828 : # Works fine now. |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
829 else |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
830 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
|
831 fi |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
832 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
|
833 shift |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
834 fi |
|
952d16aa4c29
Ensure a POSIX:2001 compliant 'echo' command.
Bruno Haible <bruno@clisp.org>
parents:
9001
diff
changeset
|
835 |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
836 # Command-line option processing. |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
837 # Removes the OPTIONS from the arguments. Sets the variables: |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
838 # - mode list or import or create-testdir or create-megatestdir |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
839 # - destdir from --dir |
| 7215 | 840 # - local_gnulib_dir from --local-dir |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
841 # - 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
|
842 # - 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
|
843 # - libname, supplied_libname from --lib |
|
5198
9317c9ebe82c
Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4717
diff
changeset
|
844 # - sourcebase from --source-base |
|
9317c9ebe82c
Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4717
diff
changeset
|
845 # - m4base from --m4-base |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
846 # - pobase from --po-base |
|
6955
7715890c929a
* gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents:
6952
diff
changeset
|
847 # - docbase from --doc-base |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
848 # - testsbase from --tests-base |
|
5798
49900d80eaaf
2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu>
Simon Josefsson <simon@josefsson.org>
parents:
5685
diff
changeset
|
849 # - auxdir from --aux-dir |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
850 # - inctests true if --with-tests was given, blank otherwise |
|
10744
7fb7b37150b3
New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents:
10743
diff
changeset
|
851 # - incobsolete true if --with-obsolete was given, blank otherwise |
| 5981 | 852 # - avoidlist list of modules to avoid, from --avoid |
|
9417
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
853 # - lgpl yes or a number if --lgpl was given, blank otherwise |
|
7216
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
854 # - makefile_name from --makefile-name |
| 7077 | 855 # - libtool true if --libtool was given, false if --no-libtool was |
| 856 # given, blank otherwise | |
|
6994
3484a8772427
Add option --assume-autoconf. Default is back to 2.59.
Bruno Haible <bruno@clisp.org>
parents:
6993
diff
changeset
|
857 # - macro_prefix from --macro-prefix |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
858 # - po_domain from --po-domain |
|
9810
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
859 # - 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
|
860 # given, blank otherwise |
|
6994
3484a8772427
Add option --assume-autoconf. Default is back to 2.59.
Bruno Haible <bruno@clisp.org>
parents:
6993
diff
changeset
|
861 # - autoconf_minversion minimum supported autoconf version |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
862 # - do_changelog false if --no-changelog was given, : otherwise |
|
6246
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
863 # - doit : if actions shall be executed, false if only to be printed |
|
9096
7f1880b27b89
New gnulib-tool option --more-symlinks.
Bruno Haible <bruno@clisp.org>
parents:
9090
diff
changeset
|
864 # - symbolic true if --symlink or --more-symlinks was given, blank |
|
7f1880b27b89
New gnulib-tool option --more-symlinks.
Bruno Haible <bruno@clisp.org>
parents:
9090
diff
changeset
|
865 # otherwise |
|
7643
d67f9dc6019d
New option --local-symlink.
Bruno Haible <bruno@clisp.org>
parents:
7642
diff
changeset
|
866 # - lsymbolic true if --local-symlink was given, blank otherwise |
|
9096
7f1880b27b89
New gnulib-tool option --more-symlinks.
Bruno Haible <bruno@clisp.org>
parents:
9090
diff
changeset
|
867 # - do_copyrights blank if --more-symlinks was given, true otherwise |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
868 { |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
869 mode= |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
870 destdir= |
| 7215 | 871 local_gnulib_dir= |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
872 modcache=true |
|
9188
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
873 verbose=0 |
|
5198
9317c9ebe82c
Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4717
diff
changeset
|
874 libname=libgnu |
|
5344
c2f5677fc6ed
Initialize supplied_libname. Tweak usage message.
Bruno Haible <bruno@clisp.org>
parents:
5343
diff
changeset
|
875 supplied_libname= |
|
5202
64446bf39961
Use sed instead of autoconf --trace, inspired by
Paul Eggert <eggert@cs.ucla.edu>
parents:
5198
diff
changeset
|
876 sourcebase= |
|
64446bf39961
Use sed instead of autoconf --trace, inspired by
Paul Eggert <eggert@cs.ucla.edu>
parents:
5198
diff
changeset
|
877 m4base= |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
878 pobase= |
|
6955
7715890c929a
* gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents:
6952
diff
changeset
|
879 docbase= |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
880 testsbase= |
|
5798
49900d80eaaf
2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu>
Simon Josefsson <simon@josefsson.org>
parents:
5685
diff
changeset
|
881 auxdir= |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
882 inctests= |
|
10744
7fb7b37150b3
New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents:
10743
diff
changeset
|
883 incobsolete= |
| 5981 | 884 avoidlist= |
| 885 lgpl= | |
|
7216
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
886 makefile_name= |
|
5198
9317c9ebe82c
Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4717
diff
changeset
|
887 libtool= |
| 6176 | 888 macro_prefix= |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
889 po_domain= |
|
9810
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
890 vc_files= |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
891 do_changelog=: |
|
6246
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
892 doit=: |
|
5799
ad9eff556694
2005-04-15 Simon Josefsson <jas@extundo.com>
Simon Josefsson <simon@josefsson.org>
parents:
5798
diff
changeset
|
893 symbolic= |
|
7643
d67f9dc6019d
New option --local-symlink.
Bruno Haible <bruno@clisp.org>
parents:
7642
diff
changeset
|
894 lsymbolic= |
|
9096
7f1880b27b89
New gnulib-tool option --more-symlinks.
Bruno Haible <bruno@clisp.org>
parents:
9090
diff
changeset
|
895 do_copyrights=true |
|
5202
64446bf39961
Use sed instead of autoconf --trace, inspired by
Paul Eggert <eggert@cs.ucla.edu>
parents:
5198
diff
changeset
|
896 |
|
64446bf39961
Use sed instead of autoconf --trace, inspired by
Paul Eggert <eggert@cs.ucla.edu>
parents:
5198
diff
changeset
|
897 supplied_opts="$@" |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
898 |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
899 while test $# -gt 0; do |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
900 case "$1" in |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
901 --list | --lis ) |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
902 mode=list |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
903 shift ;; |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
904 --import | --impor | --impo | --imp | --im | --i ) |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
905 mode=import |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
906 shift ;; |
|
6443
1a35941d29ab
Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents:
6425
diff
changeset
|
907 --update | --updat | --upda | --upd | --up | --u ) |
|
1a35941d29ab
Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents:
6425
diff
changeset
|
908 mode=update |
|
1a35941d29ab
Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents:
6425
diff
changeset
|
909 shift ;; |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
910 --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
|
911 mode=create-testdir |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
912 shift ;; |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
913 --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
|
914 mode=create-megatestdir |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
915 shift ;; |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
916 --test | --tes | --te | --t ) |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
917 mode=test |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
918 shift ;; |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
919 --megatest | --megates | --megate | --megat | --mega | --meg | --me | --m ) |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
920 mode=megatest |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
921 shift ;; |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
922 --extract-* ) |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
923 mode=`echo "X$1" | sed -e 's/^X--//'` |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
924 shift ;; |
|
11461
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
925 --copy-file | --copy-fil | --copy-fi | --copy-f | --copy- | --copy | --cop | --co ) |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
926 mode=copy-file |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
927 shift ;; |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
928 --dir ) |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
929 shift |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
930 if test $# = 0; then |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
931 func_fatal_error "missing argument for --dir" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
932 fi |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
933 destdir=$1 |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
934 shift ;; |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
935 --dir=* ) |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
936 destdir=`echo "X$1" | sed -e 's/^X--dir=//'` |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
937 shift ;; |
| 7215 | 938 --local-dir ) |
| 939 shift | |
| 940 if test $# = 0; then | |
| 941 func_fatal_error "missing argument for --local-dir" | |
| 942 fi | |
| 943 local_gnulib_dir=$1 | |
| 944 shift ;; | |
| 945 --local-dir=* ) | |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
946 local_gnulib_dir=`echo "X$1" | sed -e 's/^X--local-dir=//'` |
| 7215 | 947 shift ;; |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
948 --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
|
949 modcache=true |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
950 shift ;; |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
951 --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
|
952 modcache=false |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
953 shift ;; |
|
9188
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
954 --verbose | --verbos | --verbo | --verb ) |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
955 verbose=`expr $verbose + 1` |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
956 shift ;; |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
957 --quiet | --quie | --qui | --qu | --q ) |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
958 verbose=`expr $verbose - 1` |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
959 shift ;; |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
960 --lib ) |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
961 shift |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
962 if test $# = 0; then |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
963 func_fatal_error "missing argument for --lib" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
964 fi |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
965 libname=$1 |
| 5343 | 966 supplied_libname=true |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
967 shift ;; |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
968 --lib=* ) |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
969 libname=`echo "X$1" | sed -e 's/^X--lib=//'` |
| 5343 | 970 supplied_libname=true |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
971 shift ;; |
|
5198
9317c9ebe82c
Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4717
diff
changeset
|
972 --source-base ) |
|
9317c9ebe82c
Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4717
diff
changeset
|
973 shift |
|
9317c9ebe82c
Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4717
diff
changeset
|
974 if test $# = 0; then |
|
9317c9ebe82c
Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4717
diff
changeset
|
975 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
|
976 fi |
|
9317c9ebe82c
Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4717
diff
changeset
|
977 sourcebase=$1 |
|
9317c9ebe82c
Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4717
diff
changeset
|
978 shift ;; |
|
9317c9ebe82c
Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4717
diff
changeset
|
979 --source-base=* ) |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
980 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
|
981 shift ;; |
|
9317c9ebe82c
Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4717
diff
changeset
|
982 --m4-base ) |
|
9317c9ebe82c
Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4717
diff
changeset
|
983 shift |
|
9317c9ebe82c
Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4717
diff
changeset
|
984 if test $# = 0; then |
|
9317c9ebe82c
Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4717
diff
changeset
|
985 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
|
986 fi |
|
9317c9ebe82c
Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4717
diff
changeset
|
987 m4base=$1 |
|
9317c9ebe82c
Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4717
diff
changeset
|
988 shift ;; |
|
9317c9ebe82c
Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4717
diff
changeset
|
989 --m4-base=* ) |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
990 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
|
991 shift ;; |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
992 --po-base ) |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
993 shift |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
994 if test $# = 0; then |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
995 func_fatal_error "missing argument for --po-base" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
996 fi |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
997 pobase=$1 |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
998 shift ;; |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
999 --po-base=* ) |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
1000 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
|
1001 shift ;; |
|
6955
7715890c929a
* gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents:
6952
diff
changeset
|
1002 --doc-base ) |
|
7715890c929a
* gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents:
6952
diff
changeset
|
1003 shift |
|
7715890c929a
* gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents:
6952
diff
changeset
|
1004 if test $# = 0; then |
|
7715890c929a
* gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents:
6952
diff
changeset
|
1005 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
|
1006 fi |
|
7715890c929a
* gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents:
6952
diff
changeset
|
1007 docbase=$1 |
|
7715890c929a
* gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents:
6952
diff
changeset
|
1008 shift ;; |
|
7715890c929a
* gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents:
6952
diff
changeset
|
1009 --doc-base=* ) |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
1010 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
|
1011 shift ;; |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1012 --tests-base ) |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1013 shift |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1014 if test $# = 0; then |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1015 func_fatal_error "missing argument for --tests-base" |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1016 fi |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1017 testsbase=$1 |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1018 shift ;; |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1019 --tests-base=* ) |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
1020 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
|
1021 shift ;; |
|
5798
49900d80eaaf
2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu>
Simon Josefsson <simon@josefsson.org>
parents:
5685
diff
changeset
|
1022 --aux-dir ) |
|
49900d80eaaf
2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu>
Simon Josefsson <simon@josefsson.org>
parents:
5685
diff
changeset
|
1023 shift |
|
49900d80eaaf
2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu>
Simon Josefsson <simon@josefsson.org>
parents:
5685
diff
changeset
|
1024 if test $# = 0; then |
|
49900d80eaaf
2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu>
Simon Josefsson <simon@josefsson.org>
parents:
5685
diff
changeset
|
1025 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
|
1026 fi |
|
49900d80eaaf
2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu>
Simon Josefsson <simon@josefsson.org>
parents:
5685
diff
changeset
|
1027 auxdir=$1 |
|
49900d80eaaf
2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu>
Simon Josefsson <simon@josefsson.org>
parents:
5685
diff
changeset
|
1028 shift ;; |
|
49900d80eaaf
2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu>
Simon Josefsson <simon@josefsson.org>
parents:
5685
diff
changeset
|
1029 --aux-dir=* ) |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
1030 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
|
1031 shift ;; |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1032 --with-tests ) |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1033 inctests=true |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1034 shift ;; |
|
10744
7fb7b37150b3
New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents:
10743
diff
changeset
|
1035 --with-obsolete ) |
|
7fb7b37150b3
New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents:
10743
diff
changeset
|
1036 incobsolete=true |
|
7fb7b37150b3
New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents:
10743
diff
changeset
|
1037 shift ;; |
| 5981 | 1038 --avoid ) |
| 1039 shift | |
| 1040 if test $# = 0; then | |
| 1041 func_fatal_error "missing argument for --avoid" | |
| 1042 fi | |
|
7323
7ca0e325d5db
Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents:
7322
diff
changeset
|
1043 func_append avoidlist " $1" |
| 5981 | 1044 shift ;; |
| 1045 --avoid=* ) | |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
1046 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
|
1047 func_append avoidlist " $arg" |
|
5198
9317c9ebe82c
Add --source-base, --m4-base, --libtool options.
Paul Eggert <eggert@cs.ucla.edu>
parents:
4717
diff
changeset
|
1048 shift ;; |
|
5262
97ed4b64d853
New parameter --lgpl, to asseert that modules are
Paul Eggert <eggert@cs.ucla.edu>
parents:
5255
diff
changeset
|
1049 --lgpl ) |
|
9417
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
1050 lgpl=yes |
|
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
1051 shift ;; |
|
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
1052 --lgpl=* ) |
|
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
1053 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
|
1054 case "$arg" in |
|
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
1055 2 | 3) ;; |
|
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
1056 *) 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
|
1057 esac |
|
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
1058 lgpl=$arg |
|
5262
97ed4b64d853
New parameter --lgpl, to asseert that modules are
Paul Eggert <eggert@cs.ucla.edu>
parents:
5255
diff
changeset
|
1059 shift ;; |
|
7216
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
1060 --makefile-name ) |
|
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
1061 shift |
|
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
1062 if test $# = 0; then |
|
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
1063 func_fatal_error "missing argument for --makefile-name" |
|
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
1064 fi |
|
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
1065 makefile_name="$1" |
|
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
1066 shift ;; |
|
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
1067 --makefile-name=* ) |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
1068 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
|
1069 shift ;; |
| 5981 | 1070 --libtool ) |
| 1071 libtool=true | |
| 1072 shift ;; | |
| 7077 | 1073 --no-libtool ) |
| 1074 libtool=false | |
| 1075 shift ;; | |
| 6176 | 1076 --macro-prefix ) |
| 1077 shift | |
| 1078 if test $# = 0; then | |
| 1079 func_fatal_error "missing argument for --macro-prefix" | |
| 1080 fi | |
| 1081 macro_prefix="$1" | |
| 1082 shift ;; | |
| 1083 --macro-prefix=* ) | |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
1084 macro_prefix=`echo "X$1" | sed -e 's/^X--macro-prefix=//'` |
| 6176 | 1085 shift ;; |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
1086 --po-domain ) |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
1087 shift |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
1088 if test $# = 0; then |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
1089 func_fatal_error "missing argument for --po-domain" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
1090 fi |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
1091 po_domain="$1" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
1092 shift ;; |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
1093 --po-domain=* ) |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
1094 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
|
1095 shift ;; |
|
9810
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
1096 --vc-files ) |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
1097 vc_files=true |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
1098 shift ;; |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
1099 --no-vc-files ) |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
1100 vc_files=false |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
1101 shift ;; |
|
12855
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1102 --no-changelog | --no-changelo | --no-changel | --no-change | --no-chang | --no-chan | --no-cha | --no-ch ) |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1103 do_changelog=false |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1104 shift ;; |
|
5202
64446bf39961
Use sed instead of autoconf --trace, inspired by
Paul Eggert <eggert@cs.ucla.edu>
parents:
5198
diff
changeset
|
1105 --dry-run ) |
|
6246
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
1106 doit=false |
|
5202
64446bf39961
Use sed instead of autoconf --trace, inspired by
Paul Eggert <eggert@cs.ucla.edu>
parents:
5198
diff
changeset
|
1107 shift ;; |
|
6443
1a35941d29ab
Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents:
6425
diff
changeset
|
1108 -s | --symbolic | --symboli | --symbol | --symbo | --symb | --symlink | --symlin | --symli | --syml | --sym | --sy ) |
|
5799
ad9eff556694
2005-04-15 Simon Josefsson <jas@extundo.com>
Simon Josefsson <simon@josefsson.org>
parents:
5798
diff
changeset
|
1109 symbolic=true |
|
5798
49900d80eaaf
2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu>
Simon Josefsson <simon@josefsson.org>
parents:
5685
diff
changeset
|
1110 shift ;; |
|
7643
d67f9dc6019d
New option --local-symlink.
Bruno Haible <bruno@clisp.org>
parents:
7642
diff
changeset
|
1111 --local-symlink | --local-symlin | --local-symli | --local-syml | --local-sym | --local-sy | --local-s ) |
|
d67f9dc6019d
New option --local-symlink.
Bruno Haible <bruno@clisp.org>
parents:
7642
diff
changeset
|
1112 lsymbolic=true |
|
d67f9dc6019d
New option --local-symlink.
Bruno Haible <bruno@clisp.org>
parents:
7642
diff
changeset
|
1113 shift ;; |
|
9096
7f1880b27b89
New gnulib-tool option --more-symlinks.
Bruno Haible <bruno@clisp.org>
parents:
9090
diff
changeset
|
1114 -S | --more-symlinks | --more-symlink | --more-symlin | --more-symli | --more-syml | --more-sym | --more-sy | --more-s | --more- | --more | --mor | --mo ) |
|
7f1880b27b89
New gnulib-tool option --more-symlinks.
Bruno Haible <bruno@clisp.org>
parents:
9090
diff
changeset
|
1115 symbolic=true |
|
7f1880b27b89
New gnulib-tool option --more-symlinks.
Bruno Haible <bruno@clisp.org>
parents:
9090
diff
changeset
|
1116 do_copyrights= |
|
7f1880b27b89
New gnulib-tool option --more-symlinks.
Bruno Haible <bruno@clisp.org>
parents:
9090
diff
changeset
|
1117 shift ;; |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1118 --help | --hel | --he | --h ) |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1119 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
|
1120 func_exit $? ;; |
|
9188
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
1121 --version | --versio | --versi | --vers ) |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1122 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
|
1123 func_exit $? ;; |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1124 -- ) |
|
6264
eaa3b6787ec9
Ignore trailing slashes in --m4-base value etc.
Bruno Haible <bruno@clisp.org>
parents:
6263
diff
changeset
|
1125 # Stop option processing |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1126 shift |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1127 break ;; |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1128 -* ) |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1129 echo "gnulib-tool: unknown option $1" 1>&2 |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1130 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
|
1131 func_exit 1 ;; |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1132 * ) |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1133 break ;; |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1134 esac |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1135 done |
|
6264
eaa3b6787ec9
Ignore trailing slashes in --m4-base value etc.
Bruno Haible <bruno@clisp.org>
parents:
6263
diff
changeset
|
1136 |
|
6443
1a35941d29ab
Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents:
6425
diff
changeset
|
1137 if test "$mode" = update; then |
|
1a35941d29ab
Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents:
6425
diff
changeset
|
1138 if test $# != 0; then |
|
1a35941d29ab
Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents:
6425
diff
changeset
|
1139 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
|
1140 echo "Try 'gnulib-tool --help' for more information." 1>&2 |
|
1a35941d29ab
Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents:
6425
diff
changeset
|
1141 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
|
1142 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
|
1143 func_exit 1 |
|
6443
1a35941d29ab
Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents:
6425
diff
changeset
|
1144 fi |
|
7213
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
1145 if test -n "$local_gnulib_dir" || test -n "$supplied_libname" \ |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
1146 || 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
|
1147 || test -n "$docbase" || test -n "$testsbase" || test -n "$auxdir" \ |
|
10744
7fb7b37150b3
New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents:
10743
diff
changeset
|
1148 || test -n "$inctests" || test -n "$incobsolete" \ |
|
7fb7b37150b3
New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents:
10743
diff
changeset
|
1149 || test -n "$avoidlist" || test -n "$lgpl" || test -n "$makefile_name" \ |
|
7fb7b37150b3
New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents:
10743
diff
changeset
|
1150 || test -n "$macro_prefix" || test -n "$po_domain" \ |
|
7fb7b37150b3
New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents:
10743
diff
changeset
|
1151 || test -n "$vc_files"; then |
|
6443
1a35941d29ab
Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents:
6425
diff
changeset
|
1152 echo "gnulib-tool: invalid options for 'update' mode" 1>&2 |
|
1a35941d29ab
Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents:
6425
diff
changeset
|
1153 echo "Try 'gnulib-tool --help' for more information." 1>&2 |
|
1a35941d29ab
Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents:
6425
diff
changeset
|
1154 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
|
1155 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
|
1156 func_exit 1 |
|
6443
1a35941d29ab
Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents:
6425
diff
changeset
|
1157 fi |
|
1a35941d29ab
Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents:
6425
diff
changeset
|
1158 do_changelog=false |
|
1a35941d29ab
Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents:
6425
diff
changeset
|
1159 fi |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
1160 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
|
1161 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
|
1162 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
|
1163 func_exit 1 |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
1164 fi |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
1165 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
|
1166 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
|
1167 fi |
|
6443
1a35941d29ab
Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents:
6425
diff
changeset
|
1168 |
|
7071
71c5caf223fc
Remove the --assume-autoconf option.
Bruno Haible <bruno@clisp.org>
parents:
7070
diff
changeset
|
1169 # 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
|
1170 # configure.ac. |
|
6994
3484a8772427
Add option --assume-autoconf. Default is back to 2.59.
Bruno Haible <bruno@clisp.org>
parents:
6993
diff
changeset
|
1171 DEFAULT_AUTOCONF_MINVERSION="2.59" |
|
7078
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
1172 autoconf_minversion= |
|
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
1173 configure_ac= |
|
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
1174 if { test "$mode" = import || test "$mode" = update; } && test -n "$destdir"; then |
|
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
1175 if test -f "$destdir"/configure.ac; then |
|
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
1176 configure_ac="$destdir/configure.ac" |
|
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
1177 else |
|
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
1178 if test -f "$destdir"/configure.in; then |
|
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
1179 configure_ac="$destdir/configure.in" |
|
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
1180 fi |
|
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
1181 fi |
|
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
1182 else |
|
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
1183 if test -f configure.ac; then |
|
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
1184 configure_ac="configure.ac" |
|
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
1185 else |
|
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
1186 if test -f configure.in; then |
|
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
1187 configure_ac="configure.in" |
|
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
1188 fi |
|
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
1189 fi |
|
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
1190 fi |
|
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
1191 if test -n "$configure_ac"; then |
|
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
1192 # Use sed, not autoconf --trace, to look for the AC_PREREQ invocation, |
|
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
1193 # because when some m4 files are omitted from a CVS repository, |
|
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
1194 # "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
|
1195 # 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
|
1196 # autom4te: m4 failed with exit status: 1 |
|
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
1197 prereqs= |
|
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
1198 my_sed_traces=' |
|
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
1199 s,#.*$,, |
|
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
1200 s,^dnl .*$,, |
|
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
1201 s, dnl .*$,, |
|
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
1202 /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
|
1203 s,^.*AC_PREREQ([[ ]*\([^])]*\).*$,\1,p |
|
7078
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
1204 }' |
|
7767
0339d0fb77b2
* gnulib-tool (SORT): Remove, since we no longer assume GNU sort.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7754
diff
changeset
|
1205 prereqs=`sed -n -e "$my_sed_traces" < "$configure_ac"` |
|
7078
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
1206 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
|
1207 autoconf_minversion=` |
|
0339d0fb77b2
* gnulib-tool (SORT): Remove, since we no longer assume GNU sort.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7754
diff
changeset
|
1208 for version in $prereqs; do echo $version; done | |
| 12417 | 1209 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
|
1210 ` |
|
7078
a060dfddc867
Improve autoconf_minversion detection.
Bruno Haible <bruno@clisp.org>
parents:
7077
diff
changeset
|
1211 fi |
|
7071
71c5caf223fc
Remove the --assume-autoconf option.
Bruno Haible <bruno@clisp.org>
parents:
7070
diff
changeset
|
1212 fi |
|
71c5caf223fc
Remove the --assume-autoconf option.
Bruno Haible <bruno@clisp.org>
parents:
7070
diff
changeset
|
1213 if test -z "$autoconf_minversion"; then |
|
71c5caf223fc
Remove the --assume-autoconf option.
Bruno Haible <bruno@clisp.org>
parents:
7070
diff
changeset
|
1214 autoconf_minversion=$DEFAULT_AUTOCONF_MINVERSION |
|
71c5caf223fc
Remove the --assume-autoconf option.
Bruno Haible <bruno@clisp.org>
parents:
7070
diff
changeset
|
1215 fi |
|
6994
3484a8772427
Add option --assume-autoconf. Default is back to 2.59.
Bruno Haible <bruno@clisp.org>
parents:
6993
diff
changeset
|
1216 case "$autoconf_minversion" in |
|
3484a8772427
Add option --assume-autoconf. Default is back to 2.59.
Bruno Haible <bruno@clisp.org>
parents:
6993
diff
changeset
|
1217 1.* | 2.[0-4]* | 2.5[0-8]*) |
|
7071
71c5caf223fc
Remove the --assume-autoconf option.
Bruno Haible <bruno@clisp.org>
parents:
7070
diff
changeset
|
1218 func_fatal_error "minimum supported autoconf version is 2.59. 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
|
1219 esac |
|
3484a8772427
Add option --assume-autoconf. Default is back to 2.59.
Bruno Haible <bruno@clisp.org>
parents:
6993
diff
changeset
|
1220 |
|
6264
eaa3b6787ec9
Ignore trailing slashes in --m4-base value etc.
Bruno Haible <bruno@clisp.org>
parents:
6263
diff
changeset
|
1221 # 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
|
1222 # 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
|
1223 sed_trimtrailingslashes='s,\([^/]\)//*$,\1,' |
|
7213
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
1224 case "$local_gnulib_dir" in |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
1225 */ ) local_gnulib_dir=`echo "$local_gnulib_dir" | sed -e "$sed_trimtrailingslashes"` ;; |
|
7213
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
1226 esac |
|
6264
eaa3b6787ec9
Ignore trailing slashes in --m4-base value etc.
Bruno Haible <bruno@clisp.org>
parents:
6263
diff
changeset
|
1227 case "$sourcebase" in |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
1228 */ ) 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
|
1229 esac |
|
eaa3b6787ec9
Ignore trailing slashes in --m4-base value etc.
Bruno Haible <bruno@clisp.org>
parents:
6263
diff
changeset
|
1230 case "$m4base" in |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
1231 */ ) 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
|
1232 esac |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
1233 case "$pobase" in |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
1234 */ ) pobase=`echo "$pobase" | sed -e "$sed_trimtrailingslashes"` ;; |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
1235 esac |
|
6955
7715890c929a
* gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents:
6952
diff
changeset
|
1236 case "$docbase" in |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
1237 */ ) 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
|
1238 esac |
|
6264
eaa3b6787ec9
Ignore trailing slashes in --m4-base value etc.
Bruno Haible <bruno@clisp.org>
parents:
6263
diff
changeset
|
1239 case "$testsbase" in |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
1240 */ ) 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
|
1241 esac |
|
eaa3b6787ec9
Ignore trailing slashes in --m4-base value etc.
Bruno Haible <bruno@clisp.org>
parents:
6263
diff
changeset
|
1242 case "$auxdir" in |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
1243 */ ) 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
|
1244 esac |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1245 } |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1246 |
|
9793
f899dba61804
Fix 'gnulib-tool --version' output to work with git.
Eric Blake <ebb9@byu.net>
parents:
9541
diff
changeset
|
1247 func_gnulib_dir |
|
7073
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
1248 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
|
1249 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
|
1250 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
|
1251 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
|
1252 fi |
|
dd6e80d0c89e
* gnulib-tool (func_exit): New function, to allow to pass the
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7327
diff
changeset
|
1253 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
|
1254 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
|
1255 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
|
1256 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
|
1257 done |
|
dd6e80d0c89e
* gnulib-tool (func_exit): New function, to allow to pass the
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7327
diff
changeset
|
1258 signal=0 |
|
7073
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
1259 |
|
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
1260 # func_lookup_file file |
|
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
1261 # looks up a file in $local_gnulib_dir or $gnulib_dir, or combines it through |
|
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
1262 # 'patch'. |
|
7214
eb43edab28c3
Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents:
7213
diff
changeset
|
1263 # Input: |
|
eb43edab28c3
Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents:
7213
diff
changeset
|
1264 # - local_gnulib_dir from --local-dir |
|
7073
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
1265 # Output: |
|
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
1266 # - 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
|
1267 # - 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
|
1268 func_lookup_file () |
|
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
1269 { |
|
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
1270 lkfile="$1" |
|
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
1271 if test -n "$local_gnulib_dir" && test -f "$local_gnulib_dir/$lkfile"; then |
|
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
1272 lookedup_file="$local_gnulib_dir/$lkfile" |
|
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
1273 lookedup_tmp= |
|
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
1274 else |
|
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
1275 if test -f "$gnulib_dir/$lkfile"; then |
|
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
1276 if test -n "$local_gnulib_dir" && test -f "$local_gnulib_dir/$lkfile.diff"; then |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
1277 lkbase=`echo "$lkfile" | sed -e 's,^.*/,,'` |
|
7073
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
1278 rm -f "$tmp/$lkbase" |
|
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
1279 cp "$gnulib_dir/$lkfile" "$tmp/$lkbase" |
|
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
1280 patch -s "$tmp/$lkbase" < "$local_gnulib_dir/$lkfile.diff" \ |
|
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
1281 || func_fatal_error "patch file $local_gnulib_dir/$lkfile.diff didn't apply cleanly" |
|
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
1282 lookedup_file="$tmp/$lkbase" |
|
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
1283 lookedup_tmp=true |
|
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
1284 else |
|
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
1285 lookedup_file="$gnulib_dir/$lkfile" |
|
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
1286 lookedup_tmp= |
|
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
1287 fi |
|
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
1288 else |
|
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
1289 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
|
1290 fi |
|
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
1291 fi |
|
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
1292 } |
|
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
1293 |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1294 # func_all_modules |
|
7214
eb43edab28c3
Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents:
7213
diff
changeset
|
1295 # Input: |
|
eb43edab28c3
Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents:
7213
diff
changeset
|
1296 # - local_gnulib_dir from --local-dir |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1297 func_all_modules () |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1298 { |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1299 # 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
|
1300 # 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
|
1301 # --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
|
1302 { |
|
7805
2ee7433618fe
Add support for subdirectories of the 'modules/' directory.
Bruno Haible <bruno@clisp.org>
parents:
7788
diff
changeset
|
1303 (cd "$gnulib_dir" && find modules -type f -print | sed -e 's,^modules/,,') |
|
7073
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
1304 if test -n "$local_gnulib_dir" && test -d "$local_gnulib_dir/modules"; then |
|
7805
2ee7433618fe
Add support for subdirectories of the 'modules/' directory.
Bruno Haible <bruno@clisp.org>
parents:
7788
diff
changeset
|
1305 (cd "$local_gnulib_dir" && find modules -type f -print | 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
|
1306 fi |
|
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
1307 } \ |
|
7857
978cf3123a32
Exclude all files inside the CVS directory.
Bruno Haible <bruno@clisp.org>
parents:
7850
diff
changeset
|
1308 | sed -e '/^CVS\//d' -e '/\/CVS\//d' \ |
|
7850
4c8e2f42f969
* gnulib-tool (func_all_modules): Use POSIX conforming escaping
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7805
diff
changeset
|
1309 -e '/^ChangeLog$/d' -e '/\/ChangeLog$/d' \ |
|
4c8e2f42f969
* gnulib-tool (func_all_modules): Use POSIX conforming escaping
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7805
diff
changeset
|
1310 -e '/^COPYING$/d' -e '/\/COPYING$/d' \ |
|
4c8e2f42f969
* gnulib-tool (func_all_modules): Use POSIX conforming escaping
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7805
diff
changeset
|
1311 -e '/^README$/d' -e '/\/README$/d' \ |
|
7805
2ee7433618fe
Add support for subdirectories of the 'modules/' directory.
Bruno Haible <bruno@clisp.org>
parents:
7788
diff
changeset
|
1312 -e '/^TEMPLATE$/d' \ |
|
8626
eb080a5d05de
TEMPLATE-EXTENDED is not a module.
Bruno Haible <bruno@clisp.org>
parents:
8503
diff
changeset
|
1313 -e '/^TEMPLATE-EXTENDED$/d' \ |
|
7805
2ee7433618fe
Add support for subdirectories of the 'modules/' directory.
Bruno Haible <bruno@clisp.org>
parents:
7788
diff
changeset
|
1314 -e '/^TEMPLATE-TESTS$/d' \ |
|
7858
08609b22ffd5
(func_all_modules): Exclude all .* files (e.g., Emacs .#* auto-save files).
Simon Josefsson <simon@josefsson.org>
parents:
7857
diff
changeset
|
1315 -e '/^\..*/d' \ |
|
7805
2ee7433618fe
Add support for subdirectories of the 'modules/' directory.
Bruno Haible <bruno@clisp.org>
parents:
7788
diff
changeset
|
1316 -e '/~$/d' \ |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
1317 | sed -e '/-tests$/d' \ |
|
7319
1726cc39709b
Use "sort -u" where it makes sense.
Bruno Haible <bruno@clisp.org>
parents:
7299
diff
changeset
|
1318 | LC_ALL=C sort -u |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1319 } |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1320 |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1321 # func_verify_module |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1322 # verifies a module name |
|
7214
eb43edab28c3
Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents:
7213
diff
changeset
|
1323 # Input: |
|
eb43edab28c3
Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents:
7213
diff
changeset
|
1324 # - local_gnulib_dir from --local-dir |
|
eb43edab28c3
Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents:
7213
diff
changeset
|
1325 # - module module name argument |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1326 func_verify_module () |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1327 { |
|
7168
56632b3512af
Make it work also with Solaris /bin/sh.
Bruno Haible <bruno@clisp.org>
parents:
7142
diff
changeset
|
1328 if { test -f "$gnulib_dir/modules/$module" \ |
|
56632b3512af
Make it work also with Solaris /bin/sh.
Bruno Haible <bruno@clisp.org>
parents:
7142
diff
changeset
|
1329 || { test -n "$local_gnulib_dir" && test -d "$local_gnulib_dir/modules" \ |
|
56632b3512af
Make it work also with Solaris /bin/sh.
Bruno Haible <bruno@clisp.org>
parents:
7142
diff
changeset
|
1330 && test -f "$local_gnulib_dir/modules/$module"; }; } \ |
|
56632b3512af
Make it work also with Solaris /bin/sh.
Bruno Haible <bruno@clisp.org>
parents:
7142
diff
changeset
|
1331 && test "CVS" != "$module" \ |
|
56632b3512af
Make it work also with Solaris /bin/sh.
Bruno Haible <bruno@clisp.org>
parents:
7142
diff
changeset
|
1332 && test "ChangeLog" != "$module" \ |
|
56632b3512af
Make it work also with Solaris /bin/sh.
Bruno Haible <bruno@clisp.org>
parents:
7142
diff
changeset
|
1333 && test "COPYING" != "$module" \ |
|
56632b3512af
Make it work also with Solaris /bin/sh.
Bruno Haible <bruno@clisp.org>
parents:
7142
diff
changeset
|
1334 && test "README" != "$module" \ |
|
56632b3512af
Make it work also with Solaris /bin/sh.
Bruno Haible <bruno@clisp.org>
parents:
7142
diff
changeset
|
1335 && test "TEMPLATE" != "$module" \ |
|
8626
eb080a5d05de
TEMPLATE-EXTENDED is not a module.
Bruno Haible <bruno@clisp.org>
parents:
8503
diff
changeset
|
1336 && test "TEMPLATE-EXTENDED" != "$module" \ |
|
7168
56632b3512af
Make it work also with Solaris /bin/sh.
Bruno Haible <bruno@clisp.org>
parents:
7142
diff
changeset
|
1337 && test "TEMPLATE-TESTS" != "$module"; then |
|
56632b3512af
Make it work also with Solaris /bin/sh.
Bruno Haible <bruno@clisp.org>
parents:
7142
diff
changeset
|
1338 # OK, $module is a correct module name. |
| 7212 | 1339 # Verify that building the module description with 'patch' succeeds. |
| 1340 func_lookup_file "modules/$module" | |
|
7168
56632b3512af
Make it work also with Solaris /bin/sh.
Bruno Haible <bruno@clisp.org>
parents:
7142
diff
changeset
|
1341 else |
|
12819
4b5bf4c79e0c
gnulib-tool: Make warning diagnostics consistent.
Bruno Haible <bruno@clisp.org>
parents:
12775
diff
changeset
|
1342 func_warning "module $module doesn't exist" |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1343 module= |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1344 fi |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1345 } |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1346 |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1347 # func_verify_nontests_module |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1348 # verifies a module name, excluding tests modules |
|
7214
eb43edab28c3
Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents:
7213
diff
changeset
|
1349 # Input: |
|
eb43edab28c3
Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents:
7213
diff
changeset
|
1350 # - local_gnulib_dir from --local-dir |
|
eb43edab28c3
Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents:
7213
diff
changeset
|
1351 # - module module name argument |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1352 func_verify_nontests_module () |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1353 { |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1354 case "$module" in |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1355 *-tests ) module= ;; |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1356 * ) func_verify_module ;; |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1357 esac |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1358 } |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1359 |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1360 # func_verify_tests_module |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1361 # 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
|
1362 # Input: |
|
eb43edab28c3
Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents:
7213
diff
changeset
|
1363 # - local_gnulib_dir from --local-dir |
|
eb43edab28c3
Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents:
7213
diff
changeset
|
1364 # - module module name argument |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1365 func_verify_tests_module () |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1366 { |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1367 case "$module" in |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1368 *-tests ) func_verify_module ;; |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1369 * ) module= ;; |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1370 esac |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1371 } |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1372 |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1373 # 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
|
1374 # module description. |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1375 # 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
|
1376 # 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
|
1377 # 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
|
1378 # field. |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1379 # 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
|
1380 # 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
|
1381 sed_extract_prog=':[ ]*$/ { |
|
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1382 :a |
|
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1383 n |
|
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1384 s/^Description:[ ]*$// |
|
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1385 s/^Status:[ ]*$// |
|
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1386 s/^Notice:[ ]*$// |
|
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1387 s/^Applicability:[ ]*$// |
|
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1388 s/^Files:[ ]*$// |
|
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1389 s/^Depends-on:[ ]*$// |
|
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1390 s/^configure\.ac-early:[ ]*$// |
|
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1391 s/^configure\.ac:[ ]*$// |
|
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1392 s/^Makefile\.am:[ ]*$// |
|
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1393 s/^Include:[ ]*$// |
|
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1394 s/^Link:[ ]*$// |
|
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1395 s/^License:[ ]*$// |
|
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1396 s/^Maintainer:[ ]*$// |
|
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1397 tb |
|
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1398 p |
|
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1399 ba |
|
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1400 :b |
|
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1401 }' |
|
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1402 |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1403 # 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
|
1404 # variable name, |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1405 # 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
|
1406 sed_extract_field_header=' |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1407 s/^Description:[ ]*$/description/ |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1408 s/^Status:[ ]*$/status/ |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1409 s/^Notice:[ ]*$/notice/ |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1410 s/^Applicability:[ ]*$/applicability/ |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1411 s/^Files:[ ]*$/files/ |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1412 s/^Depends-on:[ ]*$/dependson/ |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1413 s/^configure\.ac-early:[ ]*$/configureac_early/ |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1414 s/^configure\.ac:[ ]*$/configureac/ |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1415 s/^Makefile\.am:[ ]*$/makefile/ |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1416 s/^Include:[ ]*$/include/ |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1417 s/^Link:[ ]*$/link/ |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1418 s/^License:[ ]*$/license/ |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1419 s/^Maintainer:[ ]*$/maintainer/' |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1420 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1421 if $modcache; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1422 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1423 # Note: The 'eval' silences stderr output in dash. |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1424 if declare -A x 2>/dev/null && { x[f/2]='foo'; x[f/3]='bar'; eval test '${x[f/2]}' = foo; }; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1425 # Zsh 4 and Bash 4 have associative arrays. |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1426 have_associative=true |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1427 else |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1428 # For other shells, use 'eval' with computed shell variable names. |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1429 have_associative=false |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1430 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1431 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1432 if $have_associative; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1433 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1434 # Declare the associative arrays. |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1435 declare -A modcache_cached |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1436 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
|
1437 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
|
1438 eval "$declare_script" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1439 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1440 else |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1441 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1442 # func_cache_var module |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1443 # computes the cache variable name corresponding to $module. |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1444 # 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
|
1445 # 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
|
1446 # to protect against this case. |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1447 # Output: |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1448 # - cachevar a shell variable name |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1449 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
|
1450 # 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
|
1451 # ${param//pattern/replacement} |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1452 # as a shorthand for |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1453 # `echo "$param" | sed -e "s/pattern/replacement/g"`. |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1454 # Note: The 'eval' above silences stderr output in dash. |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1455 func_cache_var () |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1456 { |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1457 cachevar=c_${1//[!a-zA-Z0-9_]/_} |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1458 } |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1459 else |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1460 func_cache_var () |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1461 { |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1462 case $1 in |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1463 *[!a-zA-Z0-9_]*) |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1464 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
|
1465 *) |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1466 cachevar=c_$1 ;; |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1467 esac |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1468 } |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1469 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1470 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1471 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1472 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1473 # func_init_sed_convert_to_cache_statements |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1474 # Input: |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1475 # - modcachevar_assignment |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1476 # Output: |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1477 # - sed_convert_to_cache_statements |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1478 func_init_sed_convert_to_cache_statements () |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1479 { |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1480 # '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
|
1481 # 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
|
1482 # This script turns |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1483 # Description: |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1484 # Some module's description |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1485 # |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1486 # Files: |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1487 # lib/file.h |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1488 # into: |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1489 # modcache_description[$1]=\ |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1490 # 'Some module'"'"'s description |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1491 # ' |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1492 # modcache_files[$1]=\ |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1493 # 'lib/file.h' |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1494 # or: |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1495 # c_MODULE_description_set=set; c_MODULE_description=\ |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1496 # 'Some module'"'"'s description |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1497 # ' |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1498 # c_MODULE_files_set=set; c_MODULE_files=\ |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1499 # 'lib/file.h' |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1500 # The script consists of two parts: |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1501 # 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
|
1502 # 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
|
1503 # 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
|
1504 sed_convert_to_cache_statements=" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1505 :llla |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1506 # 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
|
1507 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1508 # 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
|
1509 t llla1 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1510 :llla1 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1511 ${sed_extract_field_header} |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1512 t lllb |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1513 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1514 # No field header. Ignore the line. |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1515 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1516 # Read the next line. Upon EOF, just exit. |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1517 n |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1518 b llla |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1519 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1520 :lllb |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1521 # The current line contains a field header. |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1522 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1523 # Turn it into the beginning of an assignment. |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1524 s/^\\(.*\\)\$/${modcachevar_assignment}\\\\/ |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1525 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1526 # 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
|
1527 # 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
|
1528 h |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1529 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1530 # Read the next line. |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1531 # 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
|
1532 n |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1533 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1534 # 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
|
1535 t lllb1 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1536 :lllb1 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1537 ${sed_extract_field_header} |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1538 # 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
|
1539 t lllb |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1540 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1541 # Not a field header. |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1542 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1543 # 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
|
1544 x |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1545 p |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1546 x |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1547 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1548 # Transform single quotes. |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1549 s/'/'\"'\"'/g |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1550 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1551 # Prepend a single quote. |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1552 s/^/'/ |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1553 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1554 :lllc |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1555 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1556 # Move it to the hold space. |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1557 h |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1558 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1559 # Read the next line. |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1560 # Upon EOF, branch. |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1561 \${ |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1562 b llle |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1563 } |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1564 n |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1565 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1566 # 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
|
1567 t lllc1 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1568 :lllc1 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1569 ${sed_extract_field_header} |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1570 t llld |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1571 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1572 # 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
|
1573 x |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1574 p |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1575 x |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1576 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1577 # Transform single quotes. |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1578 s/'/'\"'\"'/g |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1579 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1580 b lllc |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1581 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1582 :llld |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1583 # A field header. |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1584 # 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
|
1585 # to end the assignment. |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1586 x |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1587 s/\$/'/ |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1588 p |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1589 x |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1590 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1591 b lllb |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1592 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1593 :llle |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1594 # EOF seen. |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1595 # 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
|
1596 # to end the assignment. |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1597 x |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1598 s/\$/'/ |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1599 p |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1600 # Exit. |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1601 n |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1602 " |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1603 if ! $sed_comments; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1604 # Remove comments. |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1605 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
|
1606 | sed -e 's/^ *//' -e 's/^#.*//'` |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1607 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1608 } |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1609 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1610 if $have_associative; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1611 # 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
|
1612 modcachevar_assignment='modcache_\1[$1]=' |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1613 func_init_sed_convert_to_cache_statements |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1614 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1615 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1616 # func_cache_lookup_module module |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1617 # |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1618 # 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
|
1619 # 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
|
1620 # 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
|
1621 # Parameters: |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1622 # - module non-empty string |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1623 # Output if $have_associative: |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1624 # - modcache_cached[$module] set to yes |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1625 # - modcache_description[$module] == |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1626 # - 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
|
1627 # - ... / final newline, |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1628 # - 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
|
1629 # Output if ! $have_associative: |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1630 # - cachevar a shell variable name |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1631 # - ${cachevar}_cached set to $module |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1632 # - ${cachevar}_description == |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1633 # - ${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
|
1634 # - ... / final newline, |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1635 # - ${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
|
1636 # - ${cachevar}_description_set == |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1637 # - ${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
|
1638 # - ... / is non-empty, |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1639 # - ${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
|
1640 func_cache_lookup_module () |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1641 { |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1642 if $have_associative; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1643 cached=${modcache_cached[$1]} |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1644 else |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1645 func_cache_var "$1" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1646 eval "cached=\"\$${cachevar}_cached\"" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1647 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1648 if test -z "$cached"; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1649 # 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
|
1650 func_lookup_file "modules/$1" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1651 if $have_associative; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1652 modcache_cached[$1]=yes |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1653 else |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1654 eval "${cachevar}_cached=\"\$1\"" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1655 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1656 if ! $have_associative; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1657 # 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
|
1658 modcachevar_assignment="${cachevar}"'_\1_set=set; '"${cachevar}"'_\1=' |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1659 func_init_sed_convert_to_cache_statements |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1660 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1661 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
|
1662 eval "$cache_statements" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1663 else |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1664 if ! $have_associative; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1665 if test "$1" != "$cached"; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1666 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
|
1667 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1668 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1669 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1670 } |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1671 |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1672 fi |
|
12855
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1673 |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1674 # func_get_description module |
|
7214
eb43edab28c3
Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents:
7213
diff
changeset
|
1675 # Input: |
|
eb43edab28c3
Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents:
7213
diff
changeset
|
1676 # - local_gnulib_dir from --local-dir |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1677 # - 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
|
1678 func_get_description () |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1679 { |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1680 if ! $modcache; then |
|
12855
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1681 func_lookup_file "modules/$1" |
|
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1682 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
|
1683 else |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1684 func_cache_lookup_module "$1" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1685 # 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
|
1686 if $have_associative; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1687 if test -n "${modcache_description[$1]+set}"; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1688 echo "${modcache_description[$1]}" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1689 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1690 else |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1691 eval "field_set=\"\$${cachevar}_description_set\"" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1692 if test -n "$field_set"; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1693 eval "field_value=\"\$${cachevar}_description\"" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1694 echo "${field_value}" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1695 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1696 fi |
|
12855
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1697 fi |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1698 } |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1699 |
|
10743
ec39330cb04e
Modules now have a 'status' attribute.
Bruno Haible <bruno@clisp.org>
parents:
10732
diff
changeset
|
1700 # func_get_status module |
|
ec39330cb04e
Modules now have a 'status' attribute.
Bruno Haible <bruno@clisp.org>
parents:
10732
diff
changeset
|
1701 # Input: |
|
ec39330cb04e
Modules now have a 'status' attribute.
Bruno Haible <bruno@clisp.org>
parents:
10732
diff
changeset
|
1702 # - local_gnulib_dir from --local-dir |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1703 # - 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
|
1704 func_get_status () |
|
ec39330cb04e
Modules now have a 'status' attribute.
Bruno Haible <bruno@clisp.org>
parents:
10732
diff
changeset
|
1705 { |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1706 if ! $modcache; then |
|
12855
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1707 func_lookup_file "modules/$1" |
|
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1708 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
|
1709 else |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1710 func_cache_lookup_module "$1" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1711 # 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
|
1712 if $have_associative; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1713 if test -n "${modcache_status[$1]+set}"; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1714 echo "${modcache_status[$1]}" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1715 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1716 else |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1717 eval "field_set=\"\$${cachevar}_status_set\"" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1718 if test -n "$field_set"; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1719 eval "field_value=\"\$${cachevar}_status\"" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1720 echo "${field_value}" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1721 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1722 fi |
|
12855
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1723 fi |
|
10743
ec39330cb04e
Modules now have a 'status' attribute.
Bruno Haible <bruno@clisp.org>
parents:
10732
diff
changeset
|
1724 } |
|
ec39330cb04e
Modules now have a 'status' attribute.
Bruno Haible <bruno@clisp.org>
parents:
10732
diff
changeset
|
1725 |
|
9189
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
1726 # func_get_notice module |
|
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
1727 # Input: |
|
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
1728 # - local_gnulib_dir from --local-dir |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1729 # - 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
|
1730 func_get_notice () |
|
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
1731 { |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1732 if ! $modcache; then |
|
12855
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1733 func_lookup_file "modules/$1" |
|
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1734 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
|
1735 else |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1736 func_cache_lookup_module "$1" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1737 # 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
|
1738 if $have_associative; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1739 if test -n "${modcache_notice[$1]+set}"; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1740 echo "${modcache_notice[$1]}" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1741 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1742 else |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1743 eval "field_set=\"\$${cachevar}_notice_set\"" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1744 if test -n "$field_set"; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1745 eval "field_value=\"\$${cachevar}_notice\"" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1746 echo "${field_value}" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1747 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1748 fi |
|
12855
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1749 fi |
|
9189
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
1750 } |
|
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
1751 |
|
12460
282eecca2301
New module attribute 'Applicability'.
Bruno Haible <bruno@clisp.org>
parents:
12417
diff
changeset
|
1752 # func_get_applicability module |
|
282eecca2301
New module attribute 'Applicability'.
Bruno Haible <bruno@clisp.org>
parents:
12417
diff
changeset
|
1753 # Input: |
|
282eecca2301
New module attribute 'Applicability'.
Bruno Haible <bruno@clisp.org>
parents:
12417
diff
changeset
|
1754 # - local_gnulib_dir from --local-dir |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1755 # - 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
|
1756 # 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
|
1757 func_get_applicability () |
|
282eecca2301
New module attribute 'Applicability'.
Bruno Haible <bruno@clisp.org>
parents:
12417
diff
changeset
|
1758 { |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1759 if ! $modcache; then |
|
12855
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1760 func_lookup_file "modules/$1" |
|
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1761 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
|
1762 else |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1763 func_cache_lookup_module "$1" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1764 # 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
|
1765 if $have_associative; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1766 my_applicability="${modcache_applicability[$1]}" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1767 else |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1768 eval "my_applicability=\"\$${cachevar}_applicability\"" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1769 fi |
|
12855
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1770 fi |
|
12854
a57c17c10b63
gnulib-tool: cache module metainformation.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12819
diff
changeset
|
1771 if test -n "$my_applicability"; then |
|
a57c17c10b63
gnulib-tool: cache module metainformation.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12819
diff
changeset
|
1772 echo $my_applicability |
|
a57c17c10b63
gnulib-tool: cache module metainformation.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12819
diff
changeset
|
1773 else |
|
12460
282eecca2301
New module attribute 'Applicability'.
Bruno Haible <bruno@clisp.org>
parents:
12417
diff
changeset
|
1774 # 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
|
1775 case $1 in |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1776 *-tests) echo "tests";; |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1777 *) echo "main";; |
|
12460
282eecca2301
New module attribute 'Applicability'.
Bruno Haible <bruno@clisp.org>
parents:
12417
diff
changeset
|
1778 esac |
|
12854
a57c17c10b63
gnulib-tool: cache module metainformation.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12819
diff
changeset
|
1779 fi |
|
12460
282eecca2301
New module attribute 'Applicability'.
Bruno Haible <bruno@clisp.org>
parents:
12417
diff
changeset
|
1780 } |
|
282eecca2301
New module attribute 'Applicability'.
Bruno Haible <bruno@clisp.org>
parents:
12417
diff
changeset
|
1781 |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1782 # func_get_filelist module |
|
7214
eb43edab28c3
Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents:
7213
diff
changeset
|
1783 # Input: |
|
eb43edab28c3
Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents:
7213
diff
changeset
|
1784 # - local_gnulib_dir from --local-dir |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1785 # - 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
|
1786 func_get_filelist () |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1787 { |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1788 if ! $modcache; then |
|
12855
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1789 func_lookup_file "modules/$1" |
|
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1790 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
|
1791 else |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1792 func_cache_lookup_module "$1" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1793 # 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
|
1794 if $have_associative; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1795 if test -n "${modcache_files[$1]+set}"; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1796 echo "${modcache_files[$1]}" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1797 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1798 else |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1799 eval "field_set=\"\$${cachevar}_files_set\"" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1800 if test -n "$field_set"; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1801 eval "field_value=\"\$${cachevar}_files\"" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1802 echo "${field_value}" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1803 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1804 fi |
|
12855
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1805 fi |
|
11094
5e937a2f5647
Backport improved autoconf semantics of AC_DEFUN_ONCE.
Eric Blake <ebb9@byu.net>
parents:
11065
diff
changeset
|
1806 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
|
1807 echo m4/gnulib-common.m4 |
|
6994
3484a8772427
Add option --assume-autoconf. Default is back to 2.59.
Bruno Haible <bruno@clisp.org>
parents:
6993
diff
changeset
|
1808 case "$autoconf_minversion" in |
|
3484a8772427
Add option --assume-autoconf. Default is back to 2.59.
Bruno Haible <bruno@clisp.org>
parents:
6993
diff
changeset
|
1809 2.59) |
|
9879
e0ce0891df69
Avoid some more autoconf warnings.
Eric Blake <ebb9@byu.net>
parents:
9875
diff
changeset
|
1810 echo m4/onceonly.m4 |
|
6994
3484a8772427
Add option --assume-autoconf. Default is back to 2.59.
Bruno Haible <bruno@clisp.org>
parents:
6993
diff
changeset
|
1811 ;; |
|
3484a8772427
Add option --assume-autoconf. Default is back to 2.59.
Bruno Haible <bruno@clisp.org>
parents:
6993
diff
changeset
|
1812 esac |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1813 } |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1814 |
|
10989
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
1815 # 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
|
1816 # 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
|
1817 # 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
|
1818 # 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
|
1819 # 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
|
1820 # 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
|
1821 # 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
|
1822 # 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
|
1823 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
|
1824 { |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
1825 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
|
1826 || { $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
|
1827 && { 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
|
1828 && { 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
|
1829 }; then |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
1830 ffflist= |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
1831 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
|
1832 # 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
|
1833 # 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
|
1834 case "$fff" in |
|
12743
3d337755e12c
gnulib-tool: fix filelist for AIX, HP-UX ksh.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12741
diff
changeset
|
1835 $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
|
1836 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
|
1837 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
|
1838 fi |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
1839 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
|
1840 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
|
1841 fi |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
1842 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
|
1843 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
|
1844 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
|
1845 else |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
1846 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
|
1847 fi |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
1848 ;; |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
1849 esac |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
1850 done |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
1851 else |
|
10993
996a5b3859fe
gnulib-tool: fix sed-based filtering
Jim Meyering <meyering@redhat.com>
parents:
10989
diff
changeset
|
1852 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
|
1853 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
|
1854 case "$fff" in |
|
12743
3d337755e12c
gnulib-tool: fix filelist for AIX, HP-UX ksh.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12741
diff
changeset
|
1855 $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
|
1856 esac |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
1857 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
|
1858 fi |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
1859 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
|
1860 } |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
1861 |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1862 # func_get_dependencies module |
|
7214
eb43edab28c3
Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents:
7213
diff
changeset
|
1863 # Input: |
|
eb43edab28c3
Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents:
7213
diff
changeset
|
1864 # - local_gnulib_dir from --local-dir |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1865 # - 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
|
1866 func_get_dependencies () |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1867 { |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1868 # ${module}-tests always implicitly depends on ${module}. |
|
10989
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
1869 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
|
1870 *-tests) |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
1871 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
|
1872 func_remove_suffix fgd1 '-tests' |
|
12859
736f81f59a39
gnulib-tool: Fix typo in 2010-02-07 commit.
Bruno Haible <bruno@clisp.org>
parents:
12857
diff
changeset
|
1873 echo "$fgd1" |
|
10989
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
1874 ;; |
|
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
1875 esac |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
1876 # Then the explicit dependencies listed in the module description. |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1877 if ! $modcache; then |
|
12855
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1878 func_lookup_file "modules/$1" |
|
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1879 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
|
1880 else |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1881 func_cache_lookup_module "$1" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1882 # 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
|
1883 if $have_associative; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1884 if test -n "${modcache_dependson[$1]+set}"; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1885 echo "${modcache_dependson[$1]}" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1886 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1887 else |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1888 eval "field_set=\"\$${cachevar}_dependson_set\"" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1889 if test -n "$field_set"; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1890 eval "field_value=\"\$${cachevar}_dependson\"" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1891 echo "${field_value}" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1892 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1893 fi |
|
12855
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1894 fi |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1895 } |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1896 |
|
8079
0951beec5b89
New module description section 'configure.ac-early'.
Bruno Haible <bruno@clisp.org>
parents:
8055
diff
changeset
|
1897 # func_get_autoconf_early_snippet module |
|
0951beec5b89
New module description section 'configure.ac-early'.
Bruno Haible <bruno@clisp.org>
parents:
8055
diff
changeset
|
1898 # Input: |
|
0951beec5b89
New module description section 'configure.ac-early'.
Bruno Haible <bruno@clisp.org>
parents:
8055
diff
changeset
|
1899 # - local_gnulib_dir from --local-dir |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1900 # - 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
|
1901 func_get_autoconf_early_snippet () |
|
0951beec5b89
New module description section 'configure.ac-early'.
Bruno Haible <bruno@clisp.org>
parents:
8055
diff
changeset
|
1902 { |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1903 if ! $modcache; then |
|
12855
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1904 func_lookup_file "modules/$1" |
|
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1905 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
|
1906 else |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1907 func_cache_lookup_module "$1" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1908 # 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
|
1909 if $have_associative; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1910 if test -n "${modcache_configureac_early[$1]+set}"; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1911 echo "${modcache_configureac_early[$1]}" |
|
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 else |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1914 eval "field_set=\"\$${cachevar}_configureac_early_set\"" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1915 if test -n "$field_set"; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1916 eval "field_value=\"\$${cachevar}_configureac_early\"" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1917 echo "${field_value}" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1918 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1919 fi |
|
12855
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1920 fi |
|
8079
0951beec5b89
New module description section 'configure.ac-early'.
Bruno Haible <bruno@clisp.org>
parents:
8055
diff
changeset
|
1921 } |
|
0951beec5b89
New module description section 'configure.ac-early'.
Bruno Haible <bruno@clisp.org>
parents:
8055
diff
changeset
|
1922 |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1923 # func_get_autoconf_snippet module |
|
7214
eb43edab28c3
Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents:
7213
diff
changeset
|
1924 # Input: |
|
eb43edab28c3
Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents:
7213
diff
changeset
|
1925 # - local_gnulib_dir from --local-dir |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1926 # - 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
|
1927 func_get_autoconf_snippet () |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1928 { |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1929 if ! $modcache; then |
|
12855
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1930 func_lookup_file "modules/$1" |
|
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1931 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
|
1932 else |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1933 func_cache_lookup_module "$1" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1934 # 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
|
1935 if $have_associative; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1936 if test -n "${modcache_configureac[$1]+set}"; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1937 echo "${modcache_configureac[$1]}" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1938 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1939 else |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1940 eval "field_set=\"\$${cachevar}_configureac_set\"" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1941 if test -n "$field_set"; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1942 eval "field_value=\"\$${cachevar}_configureac\"" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1943 echo "${field_value}" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1944 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1945 fi |
|
12855
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1946 fi |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1947 } |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1948 |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1949 # func_get_automake_snippet module |
|
7214
eb43edab28c3
Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents:
7213
diff
changeset
|
1950 # Input: |
|
eb43edab28c3
Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents:
7213
diff
changeset
|
1951 # - local_gnulib_dir from --local-dir |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1952 # - 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
|
1953 func_get_automake_snippet () |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
1954 { |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1955 if ! $modcache; then |
|
12855
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1956 func_lookup_file "modules/$1" |
|
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1957 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
|
1958 else |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1959 func_cache_lookup_module "$1" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1960 # 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
|
1961 if $have_associative; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1962 if test -n "${modcache_makefile[$1]+set}"; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1963 echo "${modcache_makefile[$1]}" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1964 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1965 else |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1966 eval "field_set=\"\$${cachevar}_makefile_set\"" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1967 if test -n "$field_set"; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1968 eval "field_value=\"\$${cachevar}_makefile\"" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1969 echo "${field_value}" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1970 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1971 fi |
|
12855
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
1972 fi |
|
7497
6a764f23e302
gnulib-tool now synthesizes the EXTRA_DIST line.
Bruno Haible <bruno@clisp.org>
parents:
7486
diff
changeset
|
1973 case "$1" in |
|
6a764f23e302
gnulib-tool now synthesizes the EXTRA_DIST line.
Bruno Haible <bruno@clisp.org>
parents:
7486
diff
changeset
|
1974 *-tests) |
|
6a764f23e302
gnulib-tool now synthesizes the EXTRA_DIST line.
Bruno Haible <bruno@clisp.org>
parents:
7486
diff
changeset
|
1975 # *-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
|
1976 # Synthesize an EXTRA_DIST augmentation. |
|
afba4e078ebc
Synthesize an EXTRA_DIST augmentation also for tests modules.
Bruno Haible <bruno@clisp.org>
parents:
9275
diff
changeset
|
1977 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
|
1978 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
|
1979 extra_files="$tests_files" |
|
afba4e078ebc
Synthesize an EXTRA_DIST augmentation also for tests modules.
Bruno Haible <bruno@clisp.org>
parents:
9275
diff
changeset
|
1980 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
|
1981 echo "EXTRA_DIST +=" $extra_files |
|
afba4e078ebc
Synthesize an EXTRA_DIST augmentation also for tests modules.
Bruno Haible <bruno@clisp.org>
parents:
9275
diff
changeset
|
1982 echo |
|
afba4e078ebc
Synthesize an EXTRA_DIST augmentation also for tests modules.
Bruno Haible <bruno@clisp.org>
parents:
9275
diff
changeset
|
1983 fi |
|
7497
6a764f23e302
gnulib-tool now synthesizes the EXTRA_DIST line.
Bruno Haible <bruno@clisp.org>
parents:
7486
diff
changeset
|
1984 ;; |
|
6a764f23e302
gnulib-tool now synthesizes the EXTRA_DIST line.
Bruno Haible <bruno@clisp.org>
parents:
7486
diff
changeset
|
1985 *) |
|
6a764f23e302
gnulib-tool now synthesizes the EXTRA_DIST line.
Bruno Haible <bruno@clisp.org>
parents:
7486
diff
changeset
|
1986 # Synthesize an EXTRA_DIST augmentation. |
|
6a764f23e302
gnulib-tool now synthesizes the EXTRA_DIST line.
Bruno Haible <bruno@clisp.org>
parents:
7486
diff
changeset
|
1987 sed_combine_lines='/\\$/{ |
|
6a764f23e302
gnulib-tool now synthesizes the EXTRA_DIST line.
Bruno Haible <bruno@clisp.org>
parents:
7486
diff
changeset
|
1988 :a |
|
6a764f23e302
gnulib-tool now synthesizes the EXTRA_DIST line.
Bruno Haible <bruno@clisp.org>
parents:
7486
diff
changeset
|
1989 N |
|
7599
352da45c182e
Interpret a backslash-newline sequence in the Makefile.am snippet as a space.
Bruno Haible <bruno@clisp.org>
parents:
7591
diff
changeset
|
1990 s/\\\n/ / |
|
7497
6a764f23e302
gnulib-tool now synthesizes the EXTRA_DIST line.
Bruno Haible <bruno@clisp.org>
parents:
7486
diff
changeset
|
1991 s/\\$/\\/ |
|
6a764f23e302
gnulib-tool now synthesizes the EXTRA_DIST line.
Bruno Haible <bruno@clisp.org>
parents:
7486
diff
changeset
|
1992 ta |
|
6a764f23e302
gnulib-tool now synthesizes the EXTRA_DIST line.
Bruno Haible <bruno@clisp.org>
parents:
7486
diff
changeset
|
1993 }' |
|
7754
ed8105720327
* modules/absolute-header: New module.
Eric Blake <ebb9@byu.net>
parents:
7752
diff
changeset
|
1994 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
|
1995 already_mentioned_files=` \ |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1996 { if ! $modcache; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1997 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
|
1998 else |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
1999 if $have_associative; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2000 if test -n "${modcache_makefile[$1]+set}"; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2001 echo "${modcache_makefile[$1]}" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2002 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2003 else |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2004 eval 'field_set="$'"${cachevar}"'_makefile_set"' |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2005 if test -n "$field_set"; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2006 eval 'field_value="$'"${cachevar}"'_makefile"' |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2007 echo "${field_value}" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2008 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2009 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2010 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2011 } \ |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2012 | sed -e "$sed_combine_lines" \ |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2013 | 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
|
2014 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
|
2015 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
|
2016 # 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
|
2017 echo "$lib_files" | LC_ALL=C sort -u > "$tmp"/lib-files |
|
10379
a4e295b67e54
Attempt to avoid error messages like "echo: write error: Broken pipe".
Bruno Haible <bruno@clisp.org>
parents:
10298
diff
changeset
|
2018 extra_files=`func_reset_sigpipe; \ |
|
a4e295b67e54
Attempt to avoid error messages like "echo: write error: Broken pipe".
Bruno Haible <bruno@clisp.org>
parents:
10298
diff
changeset
|
2019 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
|
2020 | 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
|
2021 if test -n "$extra_files"; then |
|
6a764f23e302
gnulib-tool now synthesizes the EXTRA_DIST line.
Bruno Haible <bruno@clisp.org>
parents:
7486
diff
changeset
|
2022 echo "EXTRA_DIST +=" $extra_files |
|
6a764f23e302
gnulib-tool now synthesizes the EXTRA_DIST line.
Bruno Haible <bruno@clisp.org>
parents:
7486
diff
changeset
|
2023 echo |
|
6a764f23e302
gnulib-tool now synthesizes the EXTRA_DIST line.
Bruno Haible <bruno@clisp.org>
parents:
7486
diff
changeset
|
2024 fi |
|
7640
a4d97c9b97de
Synthesize also an EXTRA_lib_SOURCES augmentation.
Bruno Haible <bruno@clisp.org>
parents:
7638
diff
changeset
|
2025 # Synthesize also an EXTRA_lib_SOURCES augmentation. |
|
a4d97c9b97de
Synthesize also an EXTRA_lib_SOURCES augmentation.
Bruno Haible <bruno@clisp.org>
parents:
7638
diff
changeset
|
2026 # 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
|
2027 # dependency rules. |
|
a4d97c9b97de
Synthesize also an EXTRA_lib_SOURCES augmentation.
Bruno Haible <bruno@clisp.org>
parents:
7638
diff
changeset
|
2028 # 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
|
2029 # 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
|
2030 # (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
|
2031 # 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
|
2032 # 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
|
2033 # 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
|
2034 # 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
|
2035 # 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
|
2036 case "$1" in |
|
72f47158c694
Special handling for the 'relocatable-prog-wrapper' module.
Bruno Haible <bruno@clisp.org>
parents:
8079
diff
changeset
|
2037 relocatable-prog-wrapper) ;; |
|
72f47158c694
Special handling for the 'relocatable-prog-wrapper' module.
Bruno Haible <bruno@clisp.org>
parents:
8079
diff
changeset
|
2038 *) |
|
10989
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
2039 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
|
2040 if test -n "$extra_files"; then |
|
72f47158c694
Special handling for the 'relocatable-prog-wrapper' module.
Bruno Haible <bruno@clisp.org>
parents:
8079
diff
changeset
|
2041 echo "EXTRA_lib_SOURCES +=" $extra_files |
|
72f47158c694
Special handling for the 'relocatable-prog-wrapper' module.
Bruno Haible <bruno@clisp.org>
parents:
8079
diff
changeset
|
2042 echo |
|
72f47158c694
Special handling for the 'relocatable-prog-wrapper' module.
Bruno Haible <bruno@clisp.org>
parents:
8079
diff
changeset
|
2043 fi |
|
72f47158c694
Special handling for the 'relocatable-prog-wrapper' module.
Bruno Haible <bruno@clisp.org>
parents:
8079
diff
changeset
|
2044 ;; |
|
72f47158c694
Special handling for the 'relocatable-prog-wrapper' module.
Bruno Haible <bruno@clisp.org>
parents:
8079
diff
changeset
|
2045 esac |
|
9107
2878e8c70604
Ensure that also files under build-aux/ are distributed.
Bruno Haible <bruno@clisp.org>
parents:
9096
diff
changeset
|
2046 # 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
|
2047 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
|
2048 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
|
2049 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
|
2050 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
|
2051 echo |
|
2878e8c70604
Ensure that also files under build-aux/ are distributed.
Bruno Haible <bruno@clisp.org>
parents:
9096
diff
changeset
|
2052 fi |
|
9807
24b7b77b3295
Install files from top/ in the destination directory.
Bruno Haible <bruno@clisp.org>
parents:
9806
diff
changeset
|
2053 # Synthesize an EXTRA_DIST augmentation also for the files from top/. |
|
10989
8b11d1d206e0
Speed up gnulib-tool by doing more string processing through shell built-ins.
Bruno Haible <bruno@clisp.org>
parents:
10987
diff
changeset
|
2054 func_filter_filelist top_files "$nl" "$all_files" 'top/' '' 'top/' '' |
|
9807
24b7b77b3295
Install files from top/ in the destination directory.
Bruno Haible <bruno@clisp.org>
parents:
9806
diff
changeset
|
2055 if test -n "$top_files"; then |
|
24b7b77b3295
Install files from top/ in the destination directory.
Bruno Haible <bruno@clisp.org>
parents:
9806
diff
changeset
|
2056 sed_prepend_topdir='s,^,$(top_srcdir)/,' |
|
24b7b77b3295
Install files from top/ in the destination directory.
Bruno Haible <bruno@clisp.org>
parents:
9806
diff
changeset
|
2057 echo "EXTRA_DIST += "`echo "$top_files" | sed -e "$sed_prepend_topdir"` |
|
24b7b77b3295
Install files from top/ in the destination directory.
Bruno Haible <bruno@clisp.org>
parents:
9806
diff
changeset
|
2058 echo |
|
24b7b77b3295
Install files from top/ in the destination directory.
Bruno Haible <bruno@clisp.org>
parents:
9806
diff
changeset
|
2059 fi |
|
7497
6a764f23e302
gnulib-tool now synthesizes the EXTRA_DIST line.
Bruno Haible <bruno@clisp.org>
parents:
7486
diff
changeset
|
2060 ;; |
|
6a764f23e302
gnulib-tool now synthesizes the EXTRA_DIST line.
Bruno Haible <bruno@clisp.org>
parents:
7486
diff
changeset
|
2061 esac |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2062 } |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2063 |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2064 # func_get_include_directive module |
|
7214
eb43edab28c3
Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents:
7213
diff
changeset
|
2065 # Input: |
|
eb43edab28c3
Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents:
7213
diff
changeset
|
2066 # - local_gnulib_dir from --local-dir |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2067 # - 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
|
2068 func_get_include_directive () |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2069 { |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2070 { |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2071 if ! $modcache; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2072 func_lookup_file "modules/$1" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2073 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
|
2074 else |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2075 func_cache_lookup_module "$1" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2076 # 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
|
2077 if $have_associative; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2078 if test -n "${modcache_include[$1]+set}"; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2079 echo "${modcache_include[$1]}" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2080 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2081 else |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2082 eval "field_set=\"\$${cachevar}_include_set\"" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2083 if test -n "$field_set"; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2084 eval "field_value=\"\$${cachevar}_include\"" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2085 echo "${field_value}" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2086 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2087 fi |
|
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 } | sed -e 's/^\(["<]\)/#include \1/' |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2090 } |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
2091 |
|
8055
5c79d44f739d
New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents:
8040
diff
changeset
|
2092 # func_get_link_directive module |
|
5c79d44f739d
New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents:
8040
diff
changeset
|
2093 # Input: |
|
5c79d44f739d
New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents:
8040
diff
changeset
|
2094 # - local_gnulib_dir from --local-dir |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2095 # - 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
|
2096 func_get_link_directive () |
|
5c79d44f739d
New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents:
8040
diff
changeset
|
2097 { |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2098 if ! $modcache; then |
|
12855
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
2099 func_lookup_file "modules/$1" |
|
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
2100 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
|
2101 else |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2102 func_cache_lookup_module "$1" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2103 # 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
|
2104 if $have_associative; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2105 if test -n "${modcache_link[$1]+set}"; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2106 echo "${modcache_link[$1]}" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2107 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2108 else |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2109 eval "field_set=\"\$${cachevar}_link_set\"" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2110 if test -n "$field_set"; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2111 eval "field_value=\"\$${cachevar}_link\"" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2112 echo "${field_value}" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2113 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2114 fi |
|
12855
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
2115 fi |
|
8055
5c79d44f739d
New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents:
8040
diff
changeset
|
2116 } |
|
5c79d44f739d
New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents:
8040
diff
changeset
|
2117 |
|
5251
42b53a22aee5
Add a license tag to every module.
Bruno Haible <bruno@clisp.org>
parents:
5250
diff
changeset
|
2118 # func_get_license module |
|
7214
eb43edab28c3
Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents:
7213
diff
changeset
|
2119 # Input: |
|
eb43edab28c3
Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents:
7213
diff
changeset
|
2120 # - local_gnulib_dir from --local-dir |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2121 # - 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
|
2122 func_get_license () |
|
42b53a22aee5
Add a license tag to every module.
Bruno Haible <bruno@clisp.org>
parents:
5250
diff
changeset
|
2123 { |
|
12854
a57c17c10b63
gnulib-tool: cache module metainformation.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12819
diff
changeset
|
2124 { |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2125 if ! $modcache; then |
|
12855
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
2126 func_lookup_file "modules/$1" |
|
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
2127 sed -n -e "/^License$sed_extract_prog" < "$lookedup_file" |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2128 else |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2129 func_cache_lookup_module "$1" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2130 # 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
|
2131 if $have_associative; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2132 if test -n "${modcache_license[$1]+set}"; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2133 echo "${modcache_license[$1]}" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2134 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2135 else |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2136 eval "field_set=\"\$${cachevar}_license_set\"" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2137 if test -n "$field_set"; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2138 eval "field_value=\"\$${cachevar}_license\"" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2139 echo "${field_value}" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2140 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2141 fi |
|
12855
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
2142 fi |
|
7896
cd3ed2fae0bf
Tests modules are under GPL now.
Bruno Haible <bruno@clisp.org>
parents:
7872
diff
changeset
|
2143 # The default is GPL. |
|
cd3ed2fae0bf
Tests modules are under GPL now.
Bruno Haible <bruno@clisp.org>
parents:
7872
diff
changeset
|
2144 echo "GPL" |
|
cd3ed2fae0bf
Tests modules are under GPL now.
Bruno Haible <bruno@clisp.org>
parents:
7872
diff
changeset
|
2145 } | sed -e 's,^ *$,,' | sed -e 1q |
|
5251
42b53a22aee5
Add a license tag to every module.
Bruno Haible <bruno@clisp.org>
parents:
5250
diff
changeset
|
2146 } |
|
42b53a22aee5
Add a license tag to every module.
Bruno Haible <bruno@clisp.org>
parents:
5250
diff
changeset
|
2147 |
| 4197 | 2148 # func_get_maintainer module |
|
7214
eb43edab28c3
Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents:
7213
diff
changeset
|
2149 # Input: |
|
eb43edab28c3
Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents:
7213
diff
changeset
|
2150 # - local_gnulib_dir from --local-dir |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2151 # - modcache true or false, from --cache-modules/--no-cache-modules |
| 4197 | 2152 func_get_maintainer () |
| 2153 { | |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2154 if ! $modcache; then |
|
12855
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
2155 func_lookup_file "modules/$1" |
|
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
2156 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
|
2157 else |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2158 func_cache_lookup_module "$1" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2159 # 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
|
2160 if $have_associative; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2161 if test -n "${modcache_maintainer[$1]+set}"; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2162 echo "${modcache_maintainer[$1]}" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2163 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2164 else |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2165 eval "field_set=\"\$${cachevar}_maintainer_set\"" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2166 if test -n "$field_set"; then |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2167 eval "field_value=\"\$${cachevar}_maintainer\"" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2168 echo "${field_value}" |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2169 fi |
|
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2170 fi |
|
12855
e4098d9b46fa
gnulib-tool: Make caching optional.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12854
diff
changeset
|
2171 fi |
| 4197 | 2172 } |
| 2173 | |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
2174 # func_get_tests_module module |
|
7214
eb43edab28c3
Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents:
7213
diff
changeset
|
2175 # Input: |
|
eb43edab28c3
Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents:
7213
diff
changeset
|
2176 # - local_gnulib_dir from --local-dir |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
2177 func_get_tests_module () |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
2178 { |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
2179 # 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
|
2180 if test -f "$gnulib_dir/modules/$1"-tests \ |
|
eb43edab28c3
Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents:
7213
diff
changeset
|
2181 || { test -n "$local_gnulib_dir" && test -d "$local_gnulib_dir/modules" \ |
|
eb43edab28c3
Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents:
7213
diff
changeset
|
2182 && test -f "$local_gnulib_dir/modules/$1"-tests; }; then |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
2183 echo "$1"-tests |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
2184 fi |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
2185 } |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
2186 |
| 5981 | 2187 # func_acceptable module |
| 2188 # tests whether a module is acceptable. | |
| 2189 # Input: | |
| 2190 # - avoidlist list of modules to avoid | |
| 2191 func_acceptable () | |
| 2192 { | |
| 2193 for avoid in $avoidlist; do | |
| 2194 if test "$avoid" = "$1"; then | |
| 2195 return 1 | |
| 2196 fi | |
| 2197 done | |
| 2198 return 0 | |
| 2199 } | |
| 2200 | |
|
5347
0318c37925dc
Move duplicated code into function func_modules_transitive_closure().
Bruno Haible <bruno@clisp.org>
parents:
5346
diff
changeset
|
2201 # func_modules_transitive_closure |
|
0318c37925dc
Move duplicated code into function func_modules_transitive_closure().
Bruno Haible <bruno@clisp.org>
parents:
5346
diff
changeset
|
2202 # Input: |
|
7214
eb43edab28c3
Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents:
7213
diff
changeset
|
2203 # - local_gnulib_dir from --local-dir |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2204 # - 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
|
2205 # - modules list of specified modules |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
2206 # - inctests true if tests should be included, blank otherwise |
|
10744
7fb7b37150b3
New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents:
10743
diff
changeset
|
2207 # - incobsolete true if obsolete modules among dependencies should be |
|
7fb7b37150b3
New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents:
10743
diff
changeset
|
2208 # included, blank otherwise |
| 5981 | 2209 # - avoidlist list of modules to avoid |
|
7320
9349ee4e633c
Speed up func_modules_transitive_closure.
Bruno Haible <bruno@clisp.org>
parents:
7319
diff
changeset
|
2210 # - 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
|
2211 # Output: |
|
0318c37925dc
Move duplicated code into function func_modules_transitive_closure().
Bruno Haible <bruno@clisp.org>
parents:
5346
diff
changeset
|
2212 # - modules list of modules, including dependencies |
|
0318c37925dc
Move duplicated code into function func_modules_transitive_closure().
Bruno Haible <bruno@clisp.org>
parents:
5346
diff
changeset
|
2213 func_modules_transitive_closure () |
|
5345
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
2214 { |
|
7320
9349ee4e633c
Speed up func_modules_transitive_closure.
Bruno Haible <bruno@clisp.org>
parents:
7319
diff
changeset
|
2215 # 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
|
2216 # 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
|
2217 # 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
|
2218 # 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
|
2219 # to process it again. |
|
9349ee4e633c
Speed up func_modules_transitive_closure.
Bruno Haible <bruno@clisp.org>
parents:
7319
diff
changeset
|
2220 handledmodules= |
|
9349ee4e633c
Speed up func_modules_transitive_closure.
Bruno Haible <bruno@clisp.org>
parents:
7319
diff
changeset
|
2221 inmodules="$modules" |
|
9349ee4e633c
Speed up func_modules_transitive_closure.
Bruno Haible <bruno@clisp.org>
parents:
7319
diff
changeset
|
2222 outmodules= |
|
9349ee4e633c
Speed up func_modules_transitive_closure.
Bruno Haible <bruno@clisp.org>
parents:
7319
diff
changeset
|
2223 while test -n "$inmodules"; do |
|
9349ee4e633c
Speed up func_modules_transitive_closure.
Bruno Haible <bruno@clisp.org>
parents:
7319
diff
changeset
|
2224 inmodules_this_round="$inmodules" |
|
9349ee4e633c
Speed up func_modules_transitive_closure.
Bruno Haible <bruno@clisp.org>
parents:
7319
diff
changeset
|
2225 inmodules= # Accumulator, queue for next round |
|
9349ee4e633c
Speed up func_modules_transitive_closure.
Bruno Haible <bruno@clisp.org>
parents:
7319
diff
changeset
|
2226 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
|
2227 func_verify_module |
|
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
2228 if test -n "$module"; then |
| 5981 | 2229 if func_acceptable $module; then |
|
7323
7ca0e325d5db
Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents:
7322
diff
changeset
|
2230 func_append outmodules " $module" |
|
7320
9349ee4e633c
Speed up func_modules_transitive_closure.
Bruno Haible <bruno@clisp.org>
parents:
7319
diff
changeset
|
2231 deps=`func_get_dependencies $module` |
|
9349ee4e633c
Speed up func_modules_transitive_closure.
Bruno Haible <bruno@clisp.org>
parents:
7319
diff
changeset
|
2232 # 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
|
2233 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
|
2234 if test -n "$duplicated_deps"; then |
|
12819
4b5bf4c79e0c
gnulib-tool: Make warning diagnostics consistent.
Bruno Haible <bruno@clisp.org>
parents:
12775
diff
changeset
|
2235 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
|
2236 fi |
|
10744
7fb7b37150b3
New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents:
10743
diff
changeset
|
2237 for dep in $deps; do |
|
7fb7b37150b3
New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents:
10743
diff
changeset
|
2238 if test -n "$incobsolete" \ |
|
7fb7b37150b3
New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents:
10743
diff
changeset
|
2239 || { status=`func_get_status $dep`; test "$status" != obsolete; }; then |
|
7fb7b37150b3
New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents:
10743
diff
changeset
|
2240 func_append inmodules " $dep" |
|
7fb7b37150b3
New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents:
10743
diff
changeset
|
2241 fi |
|
7fb7b37150b3
New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents:
10743
diff
changeset
|
2242 done |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
2243 if test -n "$inctests"; then |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
2244 testsmodule=`func_get_tests_module $module` |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
2245 if test -n "$testsmodule"; then |
|
7323
7ca0e325d5db
Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents:
7322
diff
changeset
|
2246 func_append inmodules " $testsmodule" |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
2247 fi |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
2248 fi |
| 5981 | 2249 fi |
|
5345
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
2250 fi |
|
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
2251 done |
|
7320
9349ee4e633c
Speed up func_modules_transitive_closure.
Bruno Haible <bruno@clisp.org>
parents:
7319
diff
changeset
|
2252 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
|
2253 # Remove $handledmodules from $inmodules. |
|
9349ee4e633c
Speed up func_modules_transitive_closure.
Bruno Haible <bruno@clisp.org>
parents:
7319
diff
changeset
|
2254 for m in $inmodules; do echo $m; done | LC_ALL=C sort -u > "$tmp"/queued-modules |
|
10379
a4e295b67e54
Attempt to avoid error messages like "echo: write error: Broken pipe".
Bruno Haible <bruno@clisp.org>
parents:
10298
diff
changeset
|
2255 inmodules=`func_reset_sigpipe; echo "$handledmodules" | LC_ALL=C join -v 2 - "$tmp"/queued-modules` |
|
5345
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
2256 done |
|
7320
9349ee4e633c
Speed up func_modules_transitive_closure.
Bruno Haible <bruno@clisp.org>
parents:
7319
diff
changeset
|
2257 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
|
2258 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
|
2259 } |
|
0318c37925dc
Move duplicated code into function func_modules_transitive_closure().
Bruno Haible <bruno@clisp.org>
parents:
5346
diff
changeset
|
2260 |
|
6550
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
2261 # func_modules_add_dummy |
|
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
2262 # Input: |
|
7214
eb43edab28c3
Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents:
7213
diff
changeset
|
2263 # - local_gnulib_dir from --local-dir |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2264 # - 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
|
2265 # - 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
|
2266 # Output: |
|
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
2267 # - 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
|
2268 func_modules_add_dummy () |
|
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
2269 { |
|
10985
32537aa6364d
Terminate loops early when possible.
Bruno Haible <bruno@clisp.org>
parents:
10981
diff
changeset
|
2270 # 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
|
2271 have_lib_SOURCES= |
|
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
2272 sed_remove_backslash_newline=':a |
|
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
2273 /\\$/{ |
|
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
2274 s/\\$// |
|
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
2275 N |
|
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
2276 s/\n// |
|
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
2277 ba |
|
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
2278 }' |
|
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
2279 for module in $modules; do |
|
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
2280 func_verify_nontests_module |
|
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
2281 if test -n "$module"; then |
|
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
2282 # Extract the value of "lib_SOURCES += ...". |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
2283 for file in `func_get_automake_snippet "$module" | sed -e "$sed_remove_backslash_newline" | 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
|
2284 # 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
|
2285 case "$file" in |
|
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
2286 *.h) ;; |
|
10985
32537aa6364d
Terminate loops early when possible.
Bruno Haible <bruno@clisp.org>
parents:
10981
diff
changeset
|
2287 *) |
|
32537aa6364d
Terminate loops early when possible.
Bruno Haible <bruno@clisp.org>
parents:
10981
diff
changeset
|
2288 have_lib_SOURCES=yes |
|
32537aa6364d
Terminate loops early when possible.
Bruno Haible <bruno@clisp.org>
parents:
10981
diff
changeset
|
2289 break 2 |
|
32537aa6364d
Terminate loops early when possible.
Bruno Haible <bruno@clisp.org>
parents:
10981
diff
changeset
|
2290 ;; |
|
6550
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
2291 esac |
|
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
2292 done |
|
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
2293 fi |
|
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
2294 done |
|
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
2295 # 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
|
2296 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
|
2297 if func_acceptable "dummy"; then |
|
9c0fa5819ce3
2007-04-12 Simon Josefsson <simon@josefsson.org>
Simon Josefsson <simon@josefsson.org>
parents:
8626
diff
changeset
|
2298 func_append modules " dummy" |
|
9c0fa5819ce3
2007-04-12 Simon Josefsson <simon@josefsson.org>
Simon Josefsson <simon@josefsson.org>
parents:
8626
diff
changeset
|
2299 fi |
|
6550
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
2300 fi |
|
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
2301 } |
|
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
2302 |
|
9189
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
2303 # func_modules_notice |
|
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
2304 # Input: |
|
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
2305 # - local_gnulib_dir from --local-dir |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2306 # - 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
|
2307 # - 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
|
2308 # - modules list of modules, including dependencies |
|
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
2309 func_modules_notice () |
|
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
2310 { |
|
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
2311 if test $verbose -ge -1; then |
|
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
2312 for module in $modules; do |
|
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
2313 func_verify_module |
|
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
2314 if test -n "$module"; then |
|
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
2315 msg=`func_get_notice $module` |
|
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
2316 if test -n "$msg"; then |
|
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
2317 echo "Notice from module $module:" |
|
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
2318 echo "$msg" | sed -e 's/^/ /' |
|
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
2319 fi |
|
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
2320 fi |
|
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
2321 done |
|
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
2322 fi |
|
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
2323 } |
|
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
2324 |
|
5348
6afb021e2fc1
Move duplicated code into function func_modules_to_filelist().
Bruno Haible <bruno@clisp.org>
parents:
5347
diff
changeset
|
2325 # func_modules_to_filelist |
|
6afb021e2fc1
Move duplicated code into function func_modules_to_filelist().
Bruno Haible <bruno@clisp.org>
parents:
5347
diff
changeset
|
2326 # Input: |
|
7214
eb43edab28c3
Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents:
7213
diff
changeset
|
2327 # - local_gnulib_dir from --local-dir |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2328 # - 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
|
2329 # - 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
|
2330 # Output: |
|
6afb021e2fc1
Move duplicated code into function func_modules_to_filelist().
Bruno Haible <bruno@clisp.org>
parents:
5347
diff
changeset
|
2331 # - files list of files |
|
6afb021e2fc1
Move duplicated code into function func_modules_to_filelist().
Bruno Haible <bruno@clisp.org>
parents:
5347
diff
changeset
|
2332 func_modules_to_filelist () |
|
6afb021e2fc1
Move duplicated code into function func_modules_to_filelist().
Bruno Haible <bruno@clisp.org>
parents:
5347
diff
changeset
|
2333 { |
|
6afb021e2fc1
Move duplicated code into function func_modules_to_filelist().
Bruno Haible <bruno@clisp.org>
parents:
5347
diff
changeset
|
2334 files= |
|
6afb021e2fc1
Move duplicated code into function func_modules_to_filelist().
Bruno Haible <bruno@clisp.org>
parents:
5347
diff
changeset
|
2335 for module in $modules; do |
|
6afb021e2fc1
Move duplicated code into function func_modules_to_filelist().
Bruno Haible <bruno@clisp.org>
parents:
5347
diff
changeset
|
2336 func_verify_module |
|
6afb021e2fc1
Move duplicated code into function func_modules_to_filelist().
Bruno Haible <bruno@clisp.org>
parents:
5347
diff
changeset
|
2337 if test -n "$module"; then |
|
7323
7ca0e325d5db
Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents:
7322
diff
changeset
|
2338 fs=`func_get_filelist $module` |
|
7ca0e325d5db
Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents:
7322
diff
changeset
|
2339 func_append files " $fs" |
|
5348
6afb021e2fc1
Move duplicated code into function func_modules_to_filelist().
Bruno Haible <bruno@clisp.org>
parents:
5347
diff
changeset
|
2340 fi |
|
6afb021e2fc1
Move duplicated code into function func_modules_to_filelist().
Bruno Haible <bruno@clisp.org>
parents:
5347
diff
changeset
|
2341 done |
|
7319
1726cc39709b
Use "sort -u" where it makes sense.
Bruno Haible <bruno@clisp.org>
parents:
7299
diff
changeset
|
2342 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
|
2343 } |
|
6afb021e2fc1
Move duplicated code into function func_modules_to_filelist().
Bruno Haible <bruno@clisp.org>
parents:
5347
diff
changeset
|
2344 |
|
9188
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
2345 # func_execute_command command [args...] |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
2346 # Executes a command. |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
2347 # Uses also the variables |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
2348 # - verbose integer, default 0, inc/decremented by --verbose/--quiet |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
2349 func_execute_command () |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
2350 { |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
2351 if test $verbose -ge 0; then |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
2352 echo "executing $*" |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
2353 "$@" |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
2354 else |
|
10065
e1449fcc7ecb
* gnulib-tool: Fix various comment typos.
Eric Blake <ebb9@byu.net>
parents:
9887
diff
changeset
|
2355 # 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
|
2356 # Turn this output off if the command succeeds. |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
2357 "$@" > "$tmp"/cmdout 2>&1 |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
2358 cmdret=$? |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
2359 if test $cmdret = 0; then |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
2360 rm -f "$tmp"/cmdout |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
2361 else |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
2362 echo "executing $*" |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
2363 cat "$tmp"/cmdout 1>&2 |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
2364 rm -f "$tmp"/cmdout |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
2365 (exit $cmdret) |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
2366 fi |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
2367 fi |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
2368 } |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
2369 |
|
11461
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2370 # func_dest_tmpfilename file |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2371 # 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
|
2372 # Input: |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2373 # - destdir target directory |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2374 # - 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
|
2375 # - tmp pathname of a temporary directory |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2376 # Sets variable: |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2377 # - tmpfile absolute filename of the temporary file |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2378 func_dest_tmpfilename () |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2379 { |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2380 if $doit; then |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2381 # 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
|
2382 # 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
|
2383 tmpfile="$destdir/$1.tmp" |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2384 else |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2385 # 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
|
2386 # (because the directory of "$file" might not exist). |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2387 tmpfile="$tmp"/`basename "$1"`.tmp |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2388 fi |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2389 } |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2390 |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2391 # func_add_file |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2392 # 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
|
2393 # is known to not exist. |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2394 # Input: |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2395 # - destdir target directory |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2396 # - local_gnulib_dir from --local-dir |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2397 # - 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
|
2398 # - f the original file name |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2399 # - lookedup_file name of the merged (combined) file |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2400 # - 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
|
2401 # - g the rewritten file name |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2402 # - tmpfile absolute filename of the temporary file |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2403 # - 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
|
2404 # - symbolic true if files should be symlinked, copied otherwise |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2405 # - lsymbolic true if files from local_gnulib_dir should be symlinked, |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2406 # copied otherwise |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2407 func_add_file () |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2408 { |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2409 if $doit; then |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2410 echo "Copying file $g" |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2411 if { test -n "$symbolic" \ |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2412 || { test -n "$lsymbolic" \ |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2413 && test "$lookedup_file" = "$local_gnulib_dir/$f"; }; } \ |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2414 && test -z "$lookedup_tmp" \ |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2415 && cmp "$lookedup_file" "$tmpfile" > /dev/null; then |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2416 func_ln_if_changed "$lookedup_file" "$destdir/$g" |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2417 else |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2418 mv -f "$tmpfile" "$destdir/${g}" || func_fatal_error "failed" |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2419 fi |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2420 else |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2421 echo "Copy file $g" |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2422 fi |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2423 } |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2424 |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2425 # func_update_file |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2426 # 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
|
2427 # is known to exist. |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2428 # Input: |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2429 # - destdir target directory |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2430 # - local_gnulib_dir from --local-dir |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2431 # - 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
|
2432 # - f the original file name |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2433 # - lookedup_file name of the merged (combined) file |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2434 # - 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
|
2435 # - g the rewritten file name |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2436 # - tmpfile absolute filename of the temporary file |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2437 # - 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
|
2438 # - symbolic true if files should be symlinked, copied otherwise |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2439 # - lsymbolic true if files from local_gnulib_dir should be symlinked, |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2440 # copied otherwise |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2441 # - 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
|
2442 func_update_file () |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2443 { |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2444 if cmp "$destdir/$g" "$tmpfile" > /dev/null; then |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2445 : # The file has not changed. |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2446 else |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2447 # Replace the file. |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2448 if $doit; then |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2449 if test -n "$already_present"; then |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2450 echo "Updating file $g (backup in ${g}~)" |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2451 else |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2452 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
|
2453 fi |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2454 mv -f "$destdir/$g" "$destdir/${g}~" || func_fatal_error "failed" |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2455 if { test -n "$symbolic" \ |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2456 || { test -n "$lsymbolic" \ |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2457 && test "$lookedup_file" = "$local_gnulib_dir/$f"; }; } \ |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2458 && test -z "$lookedup_tmp" \ |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2459 && cmp "$lookedup_file" "$tmpfile" > /dev/null; then |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2460 func_ln_if_changed "$lookedup_file" "$destdir/$g" |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2461 else |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2462 mv -f "$tmpfile" "$destdir/${g}" || func_fatal_error "failed" |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2463 fi |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2464 else |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2465 if test -n "$already_present"; then |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2466 echo "Update file $g (backup in ${g}~)" |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2467 else |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2468 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
|
2469 fi |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2470 fi |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2471 fi |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2472 } |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
2473 |
|
5351
7c565c8ecabc
Move duplicated code into function func_emit_lib_Makefile_am().
Bruno Haible <bruno@clisp.org>
parents:
5350
diff
changeset
|
2474 # 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
|
2475 # 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
|
2476 # Input: |
|
7214
eb43edab28c3
Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents:
7213
diff
changeset
|
2477 # - local_gnulib_dir from --local-dir |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2478 # - 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
|
2479 # - 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
|
2480 # - libname library name |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
2481 # - 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
|
2482 # - auxdir directory relative to destdir where to place build aux files |
|
7216
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
2483 # - makefile_name from --makefile-name |
| 7077 | 2484 # - 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
|
2485 # - 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
|
2486 # - po_domain prefix of i18n domain to use (without -gnulib suffix) |
|
5351
7c565c8ecabc
Move duplicated code into function func_emit_lib_Makefile_am().
Bruno Haible <bruno@clisp.org>
parents:
5350
diff
changeset
|
2487 # - 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
|
2488 # - for_test true if creating a package for testing, false otherwise |
|
10476
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
2489 # - 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
|
2490 # Input/Output: |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
2491 # - makefile_am_edits and makefile_am_edit${edit}_{dir,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
|
2492 # 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
|
2493 # Output: |
|
d6fbdb213b01
Finish support for source files in subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7640
diff
changeset
|
2494 # - 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
|
2495 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
|
2496 { |
|
7240
e9d3ace50303
Slightly change the output generated by --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7239
diff
changeset
|
2497 # When creating an includable Makefile.am snippet, augment variables with |
|
e9d3ace50303
Slightly change the output generated by --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7239
diff
changeset
|
2498 # += instead of assigning them. |
|
e9d3ace50303
Slightly change the output generated by --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7239
diff
changeset
|
2499 if test -n "$makefile_name"; then |
|
e9d3ace50303
Slightly change the output generated by --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7239
diff
changeset
|
2500 assign='+=' |
|
e9d3ace50303
Slightly change the output generated by --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7239
diff
changeset
|
2501 else |
|
e9d3ace50303
Slightly change the output generated by --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7239
diff
changeset
|
2502 assign='=' |
|
e9d3ace50303
Slightly change the output generated by --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7239
diff
changeset
|
2503 fi |
| 7077 | 2504 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
|
2505 libext=la |
|
7c565c8ecabc
Move duplicated code into function func_emit_lib_Makefile_am().
Bruno Haible <bruno@clisp.org>
parents:
5350
diff
changeset
|
2506 perhapsLT=LT |
|
10400
817f1418bbde
Make gnulib-tool work with native 'sed' on AIX.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
10380
diff
changeset
|
2507 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
|
2508 else |
|
7c565c8ecabc
Move duplicated code into function func_emit_lib_Makefile_am().
Bruno Haible <bruno@clisp.org>
parents:
5350
diff
changeset
|
2509 libext=a |
|
7c565c8ecabc
Move duplicated code into function func_emit_lib_Makefile_am().
Bruno Haible <bruno@clisp.org>
parents:
5350
diff
changeset
|
2510 perhapsLT= |
| 7335 | 2511 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
|
2512 fi |
|
7981
41421349e26b
In testing directories, link the test programs already during "make", not
Bruno Haible <bruno@clisp.org>
parents:
7911
diff
changeset
|
2513 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
|
2514 # 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
|
2515 # 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
|
2516 # "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
|
2517 # 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
|
2518 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
|
2519 else |
|
10400
817f1418bbde
Make gnulib-tool work with native 'sed' on AIX.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
10380
diff
changeset
|
2520 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
|
2521 fi |
|
7421
8bace4b08db5
Mark generated files as "DO NOT EDIT".
Bruno Haible <bruno@clisp.org>
parents:
7391
diff
changeset
|
2522 echo "## DO NOT EDIT! GENERATED AUTOMATICALLY!" |
|
5351
7c565c8ecabc
Move duplicated code into function func_emit_lib_Makefile_am().
Bruno Haible <bruno@clisp.org>
parents:
5350
diff
changeset
|
2523 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
|
2524 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
|
2525 if test -n "$actioncmd"; then |
|
11465
618e55f1fba9
Work around an autoconf limitation on line lengths.
Bruno Haible <bruno@clisp.org>
parents:
11463
diff
changeset
|
2526 # The maximum line length (excluding the terminating newline) of any file |
|
618e55f1fba9
Work around an autoconf limitation on line lengths.
Bruno Haible <bruno@clisp.org>
parents:
11463
diff
changeset
|
2527 # that is to be preprocessed by config.status is 3070. config.status uses |
|
618e55f1fba9
Work around an autoconf limitation on line lengths.
Bruno Haible <bruno@clisp.org>
parents:
11463
diff
changeset
|
2528 # awk, and the HP-UX 11.00 awk fails if a line has length >= 3071; |
|
618e55f1fba9
Work around an autoconf limitation on line lengths.
Bruno Haible <bruno@clisp.org>
parents:
11463
diff
changeset
|
2529 # similarly, the IRIX 6.5 awk fails if a line has length >= 3072. |
|
618e55f1fba9
Work around an autoconf limitation on line lengths.
Bruno Haible <bruno@clisp.org>
parents:
11463
diff
changeset
|
2530 len=`echo "$actioncmd" | wc -c` |
|
618e55f1fba9
Work around an autoconf limitation on line lengths.
Bruno Haible <bruno@clisp.org>
parents:
11463
diff
changeset
|
2531 if test -n "$len" && test "$len" -le 3000; then |
|
618e55f1fba9
Work around an autoconf limitation on line lengths.
Bruno Haible <bruno@clisp.org>
parents:
11463
diff
changeset
|
2532 echo "# Reproduce by: $actioncmd" |
|
618e55f1fba9
Work around an autoconf limitation on line lengths.
Bruno Haible <bruno@clisp.org>
parents:
11463
diff
changeset
|
2533 fi |
|
5351
7c565c8ecabc
Move duplicated code into function func_emit_lib_Makefile_am().
Bruno Haible <bruno@clisp.org>
parents:
5350
diff
changeset
|
2534 fi |
|
7c565c8ecabc
Move duplicated code into function func_emit_lib_Makefile_am().
Bruno Haible <bruno@clisp.org>
parents:
5350
diff
changeset
|
2535 echo |
|
7641
d6fbdb213b01
Finish support for source files in subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7640
diff
changeset
|
2536 uses_subdirs= |
|
d6fbdb213b01
Finish support for source files in subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7640
diff
changeset
|
2537 { |
|
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
|
2538 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
|
2539 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
|
2540 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
|
2541 { |
|
cb505deddb22
Don't create a $(pkgdatadir) if there's nothing to be installed in it.
Bruno Haible <bruno@clisp.org>
parents:
7168
diff
changeset
|
2542 func_get_automake_snippet "$module" | |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
2543 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
|
2544 -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
|
2545 -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
|
2546 -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
|
2547 -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
|
2548 -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
|
2549 -e "$sed_transform_check_PROGRAMS" |
|
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
|
2550 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
|
2551 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
|
2552 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
|
2553 fi |
|
12741
12d8c6b23748
gnulib-tool: avoid writing in the current directory.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12559
diff
changeset
|
2554 } > "$tmp"/amsnippet |
|
10065
e1449fcc7ecb
* gnulib-tool: Fix various comment typos.
Eric Blake <ebb9@byu.net>
parents:
9887
diff
changeset
|
2555 # 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
|
2556 if grep '[^ ]' "$tmp"/amsnippet > /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
|
2557 echo "## begin 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
|
2558 echo |
|
12741
12d8c6b23748
gnulib-tool: avoid writing in the current directory.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12559
diff
changeset
|
2559 cat "$tmp"/amsnippet |
|
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
|
2560 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
|
2561 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
|
2562 fi |
|
12741
12d8c6b23748
gnulib-tool: avoid writing in the current directory.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12559
diff
changeset
|
2563 rm -f "$tmp"/amsnippet |
|
7641
d6fbdb213b01
Finish support for source files in subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7640
diff
changeset
|
2564 # 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
|
2565 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
|
2566 case $f in |
|
10985
32537aa6364d
Terminate loops early when possible.
Bruno Haible <bruno@clisp.org>
parents:
10981
diff
changeset
|
2567 lib/*/*.c) |
|
32537aa6364d
Terminate loops early when possible.
Bruno Haible <bruno@clisp.org>
parents:
10981
diff
changeset
|
2568 uses_subdirs=yes |
|
32537aa6364d
Terminate loops early when possible.
Bruno Haible <bruno@clisp.org>
parents:
10981
diff
changeset
|
2569 break |
|
32537aa6364d
Terminate loops early when possible.
Bruno Haible <bruno@clisp.org>
parents:
10981
diff
changeset
|
2570 ;; |
|
7641
d6fbdb213b01
Finish support for source files in subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7640
diff
changeset
|
2571 esac |
|
d6fbdb213b01
Finish support for source files in subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7640
diff
changeset
|
2572 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
|
2573 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
|
2574 done |
|
12741
12d8c6b23748
gnulib-tool: avoid writing in the current directory.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12559
diff
changeset
|
2575 } > "$tmp"/allsnippets |
|
7641
d6fbdb213b01
Finish support for source files in subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7640
diff
changeset
|
2576 if test -z "$makefile_name"; then |
|
d6fbdb213b01
Finish support for source files in subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7640
diff
changeset
|
2577 # 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
|
2578 # 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
|
2579 subdir_options= |
|
d6fbdb213b01
Finish support for source files in subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7640
diff
changeset
|
2580 if test -n "$uses_subdirs"; then |
|
d6fbdb213b01
Finish support for source files in subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7640
diff
changeset
|
2581 subdir_options=' subdir-objects' |
|
d6fbdb213b01
Finish support for source files in subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7640
diff
changeset
|
2582 fi |
|
d6fbdb213b01
Finish support for source files in subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7640
diff
changeset
|
2583 echo "AUTOMAKE_OPTIONS = 1.5 gnits${subdir_options}" |
|
d6fbdb213b01
Finish support for source files in subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7640
diff
changeset
|
2584 fi |
|
d6fbdb213b01
Finish support for source files in subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7640
diff
changeset
|
2585 echo |
|
7246
4a748ab30907
* gnulib-tool (func_emit_lib_Makefile_am): Fix typos in
Paul Eggert <eggert@cs.ucla.edu>
parents:
7245
diff
changeset
|
2586 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
|
2587 echo "SUBDIRS =" |
|
7240
e9d3ace50303
Slightly change the output generated by --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7239
diff
changeset
|
2588 echo "noinst_HEADERS =" |
|
7701
c59b96cb52c7
Fix double initialization of noinst_LTLIBRARIES.
Bruno Haible <bruno@clisp.org>
parents:
7691
diff
changeset
|
2589 echo "noinst_LIBRARIES =" |
|
7691
33b654c2cba8
Initialize also noinst_LTLIBRARIES.
Bruno Haible <bruno@clisp.org>
parents:
7660
diff
changeset
|
2590 echo "noinst_LTLIBRARIES =" |
|
7270
3d4ebfd658b2
A comment about automake-1.9b.
Bruno Haible <bruno@clisp.org>
parents:
7264
diff
changeset
|
2591 # Automake versions < 1.9b create an empty pkgdatadir at installation time |
|
3d4ebfd658b2
A comment about automake-1.9b.
Bruno Haible <bruno@clisp.org>
parents:
7264
diff
changeset
|
2592 # if you specify pkgdata_DATA to empty. This is a workaround. |
|
12741
12d8c6b23748
gnulib-tool: avoid writing in the current directory.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12559
diff
changeset
|
2593 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
|
2594 echo "pkgdata_DATA =" |
|
e9d3ace50303
Slightly change the output generated by --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7239
diff
changeset
|
2595 fi |
|
e9d3ace50303
Slightly change the output generated by --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7239
diff
changeset
|
2596 echo "EXTRA_DIST =" |
|
e9d3ace50303
Slightly change the output generated by --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7239
diff
changeset
|
2597 echo "BUILT_SOURCES =" |
|
e9d3ace50303
Slightly change the output generated by --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7239
diff
changeset
|
2598 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
|
2599 fi |
|
7240
e9d3ace50303
Slightly change the output generated by --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7239
diff
changeset
|
2600 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
|
2601 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
|
2602 echo "MOSTLYCLEANDIRS =" |
|
e9d3ace50303
Slightly change the output generated by --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7239
diff
changeset
|
2603 echo "CLEANFILES =" |
|
e9d3ace50303
Slightly change the output generated by --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7239
diff
changeset
|
2604 echo "DISTCLEANFILES =" |
|
e9d3ace50303
Slightly change the output generated by --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7239
diff
changeset
|
2605 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
|
2606 fi |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
2607 # 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
|
2608 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
|
2609 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
|
2610 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
|
2611 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
|
2612 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
|
2613 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
|
2614 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
|
2615 if test "${dir}Makefile.am" = "$destfile" || test "./${dir}Makefile.am" = "$destfile"; then |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
2616 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
|
2617 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
|
2618 fi |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
2619 fi |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
2620 done |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
2621 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
|
2622 echo |
|
e9d3ace50303
Slightly change the output generated by --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7239
diff
changeset
|
2623 echo "AM_CPPFLAGS =" |
|
11261
f0359b41944f
Make it easier to use the 'visibility' module.
Bruno Haible <bruno@clisp.org>
parents:
11249
diff
changeset
|
2624 echo "AM_CFLAGS =" |
|
7240
e9d3ace50303
Slightly change the output generated by --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7239
diff
changeset
|
2625 fi |
|
6750
608add4e5b80
Support for packages that use "gettextize --intl". From Claudio Fontana.
Bruno Haible <bruno@clisp.org>
parents:
6745
diff
changeset
|
2626 echo |
|
12741
12d8c6b23748
gnulib-tool: avoid writing in the current directory.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12559
diff
changeset
|
2627 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
|
2628 || { test -n "$makefile_name" \ |
|
9b74d1d0b267
Make it easier to distribute gnulib-built libraries.
Bruno Haible <bruno@clisp.org>
parents:
11461
diff
changeset
|
2629 && test -f "$sourcebase/Makefile.am" \ |
|
9b74d1d0b267
Make it easier to distribute gnulib-built libraries.
Bruno Haible <bruno@clisp.org>
parents:
11461
diff
changeset
|
2630 && 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
|
2631 }; then |
|
9b74d1d0b267
Make it easier to distribute gnulib-built libraries.
Bruno Haible <bruno@clisp.org>
parents:
11461
diff
changeset
|
2632 # 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
|
2633 # 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
|
2634 # it should not be installed. |
|
7701
c59b96cb52c7
Fix double initialization of noinst_LTLIBRARIES.
Bruno Haible <bruno@clisp.org>
parents:
7691
diff
changeset
|
2635 : |
|
c59b96cb52c7
Fix double initialization of noinst_LTLIBRARIES.
Bruno Haible <bruno@clisp.org>
parents:
7691
diff
changeset
|
2636 else |
|
c59b96cb52c7
Fix double initialization of noinst_LTLIBRARIES.
Bruno Haible <bruno@clisp.org>
parents:
7691
diff
changeset
|
2637 # 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
|
2638 echo "noinst_${perhapsLT}LIBRARIES += $libname.$libext" |
|
c59b96cb52c7
Fix double initialization of noinst_LTLIBRARIES.
Bruno Haible <bruno@clisp.org>
parents:
7691
diff
changeset
|
2639 fi |
|
c59b96cb52c7
Fix double initialization of noinst_LTLIBRARIES.
Bruno Haible <bruno@clisp.org>
parents:
7691
diff
changeset
|
2640 echo |
|
c59b96cb52c7
Fix double initialization of noinst_LTLIBRARIES.
Bruno Haible <bruno@clisp.org>
parents:
7691
diff
changeset
|
2641 echo "${libname}_${libext}_SOURCES =" |
|
c59b96cb52c7
Fix double initialization of noinst_LTLIBRARIES.
Bruno Haible <bruno@clisp.org>
parents:
7691
diff
changeset
|
2642 # 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
|
2643 # 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
|
2644 echo "${libname}_${libext}_LIBADD = \$(${macro_prefix}_${perhapsLT}LIBOBJS)" |
|
c59b96cb52c7
Fix double initialization of noinst_LTLIBRARIES.
Bruno Haible <bruno@clisp.org>
parents:
7691
diff
changeset
|
2645 echo "${libname}_${libext}_DEPENDENCIES = \$(${macro_prefix}_${perhapsLT}LIBOBJS)" |
|
c59b96cb52c7
Fix double initialization of noinst_LTLIBRARIES.
Bruno Haible <bruno@clisp.org>
parents:
7691
diff
changeset
|
2646 echo "EXTRA_${libname}_${libext}_SOURCES =" |
|
c59b96cb52c7
Fix double initialization of noinst_LTLIBRARIES.
Bruno Haible <bruno@clisp.org>
parents:
7691
diff
changeset
|
2647 if test "$libtool" = true; then |
|
c59b96cb52c7
Fix double initialization of noinst_LTLIBRARIES.
Bruno Haible <bruno@clisp.org>
parents:
7691
diff
changeset
|
2648 echo "${libname}_${libext}_LDFLAGS = \$(AM_LDFLAGS)" |
|
c59b96cb52c7
Fix double initialization of noinst_LTLIBRARIES.
Bruno Haible <bruno@clisp.org>
parents:
7691
diff
changeset
|
2649 fi |
|
c59b96cb52c7
Fix double initialization of noinst_LTLIBRARIES.
Bruno Haible <bruno@clisp.org>
parents:
7691
diff
changeset
|
2650 echo |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
2651 if test -n "$pobase"; then |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
2652 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
|
2653 echo |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
2654 fi |
|
12741
12d8c6b23748
gnulib-tool: avoid writing in the current directory.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12559
diff
changeset
|
2655 cat "$tmp"/allsnippets \ |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
2656 | 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
|
2657 echo |
| 7086 | 2658 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
|
2659 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
|
2660 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
|
2661 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
|
2662 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
|
2663 echo " done; \\" |
|
03602a916a9a
Don't let the 'mostlyclean' target fail because of a nonempty directory.
Bruno Haible <bruno@clisp.org>
parents:
9009
diff
changeset
|
2664 echo " :" |
|
12741
12d8c6b23748
gnulib-tool: avoid writing in the current directory.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12559
diff
changeset
|
2665 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
|
2666 } |
|
7c565c8ecabc
Move duplicated code into function func_emit_lib_Makefile_am().
Bruno Haible <bruno@clisp.org>
parents:
5350
diff
changeset
|
2667 |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
2668 # func_emit_po_Makevars |
|
10065
e1449fcc7ecb
* gnulib-tool: Fix various comment typos.
Eric Blake <ebb9@byu.net>
parents:
9887
diff
changeset
|
2669 # 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
|
2670 # Input: |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
2671 # - local_gnulib_dir from --local-dir |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2672 # - 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
|
2673 # - 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
|
2674 # - 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
|
2675 # - 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
|
2676 func_emit_po_Makevars () |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
2677 { |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
2678 echo "## DO NOT EDIT! GENERATED AUTOMATICALLY!" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
2679 func_emit_copyright_notice |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
2680 echo |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
2681 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
|
2682 echo "# But here it has a '-gnulib' suffix." |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
2683 echo "DOMAIN = ${po_domain}-gnulib" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
2684 echo |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
2685 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
|
2686 echo "subdir = ${pobase}" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
2687 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
|
2688 echo |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
2689 cat <<\EOF |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
2690 # These options get passed to xgettext. |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
2691 XGETTEXT_OPTIONS = \ |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
2692 --keyword=_ --flag=_:1:pass-c-format \ |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
2693 --keyword=N_ --flag=N_:1:pass-c-format \ |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
2694 --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
|
2695 --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
|
2696 --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
|
2697 |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
2698 # 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
|
2699 # $(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
|
2700 COPYRIGHT_HOLDER = Free Software Foundation, Inc. |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
2701 |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
2702 # 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
|
2703 # bugs in the untranslated strings: |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
2704 # - 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
|
2705 # in the GNU gettext documentation, section 'Preparing Strings'. |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
2706 # - 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
|
2707 # understood. |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
2708 # - 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
|
2709 # money. |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
2710 # - Pluralisation problems. |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
2711 # - Incorrect English spelling. |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
2712 # - Incorrect formatting. |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
2713 # 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
|
2714 # 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
|
2715 # which the translators can contact you. |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
2716 MSGID_BUGS_ADDRESS = bug-gnulib@gnu.org |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
2717 |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
2718 # 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
|
2719 # 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
|
2720 EXTRA_LOCALE_CATEGORIES = |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
2721 |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
2722 # 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
|
2723 # 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
|
2724 # 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
|
2725 # 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
|
2726 USE_MSGCTXT = no |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
2727 EOF |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
2728 } |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
2729 |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
2730 # func_emit_po_POTFILES_in |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
2731 # 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
|
2732 # Input: |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
2733 # - local_gnulib_dir from --local-dir |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2734 # - 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
|
2735 # - 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
|
2736 # - files list of new files |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
2737 func_emit_po_POTFILES_in () |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
2738 { |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
2739 echo "## DO NOT EDIT! GENERATED AUTOMATICALLY!" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
2740 func_emit_copyright_notice |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
2741 echo |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
2742 echo "# List of files which contain translatable strings." |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
2743 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
|
2744 } |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
2745 |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
2746 # func_emit_tests_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
|
2747 # 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
|
2748 # Input: |
|
7214
eb43edab28c3
Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents:
7213
diff
changeset
|
2749 # - local_gnulib_dir from --local-dir |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
2750 # - 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
|
2751 # - modules list of modules, including dependencies |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
2752 # - 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
|
2753 # - auxdir directory relative to destdir where to place build aux files |
|
7216
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
2754 # - makefile_name from --makefile-name |
| 7077 | 2755 # - 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
|
2756 # - sourcebase relative directory containing lib source code |
|
6250
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
2757 # - m4base relative directory containing autoconf macros |
|
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
2758 # - 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
|
2759 # - macro_prefix prefix of gl_LIBOBJS macros to use |
|
7981
41421349e26b
In testing directories, link the test programs already during "make", not
Bruno Haible <bruno@clisp.org>
parents:
7911
diff
changeset
|
2760 # - for_test true if creating a package for testing, false otherwise |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
2761 # - use_libtests true if a libtests.a should be built, false otherwise |
|
10476
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
2762 # - 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
|
2763 # Input/Output: |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
2764 # - makefile_am_edits and makefile_am_edit${edit}_{dir,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
|
2765 # 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
|
2766 # Output: |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
2767 # - 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
|
2768 func_emit_tests_Makefile_am () |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
2769 { |
| 7077 | 2770 if test "$libtool" = true; then |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
2771 libext=la |
|
10400
817f1418bbde
Make gnulib-tool work with native 'sed' on AIX.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
10380
diff
changeset
|
2772 sed_eliminate_LDFLAGS="$sed_noop" |
|
7286
727bb5526bad
For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents:
7270
diff
changeset
|
2773 else |
|
727bb5526bad
For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents:
7270
diff
changeset
|
2774 libext=a |
| 7335 | 2775 sed_eliminate_LDFLAGS='/^lib_LDFLAGS[ ]*+=/d' |
|
7286
727bb5526bad
For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents:
7270
diff
changeset
|
2776 fi |
|
7981
41421349e26b
In testing directories, link the test programs already during "make", not
Bruno Haible <bruno@clisp.org>
parents:
7911
diff
changeset
|
2777 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
|
2778 # 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
|
2779 # 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
|
2780 # "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
|
2781 # 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
|
2782 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
|
2783 else |
|
10400
817f1418bbde
Make gnulib-tool work with native 'sed' on AIX.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
10380
diff
changeset
|
2784 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
|
2785 fi |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
2786 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
|
2787 echo "## DO NOT EDIT! GENERATED AUTOMATICALLY!" |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
2788 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
|
2789 func_emit_copyright_notice |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
2790 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
|
2791 uses_subdirs= |
|
12054
1c9a8901e75c
Fix value of uses_subdirs in tests/Makefile.am.
Bruno Haible <bruno@clisp.org>
parents:
12021
diff
changeset
|
2792 { |
|
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
|
2793 for module in $modules; 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
|
2794 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
|
2795 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
|
2796 else |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
2797 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
|
2798 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
|
2799 if test -n "$module"; then |
|
7286
727bb5526bad
For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents:
7270
diff
changeset
|
2800 { |
|
727bb5526bad
For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents:
7270
diff
changeset
|
2801 func_get_automake_snippet "$module" | |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
2802 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
|
2803 -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
|
2804 -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
|
2805 -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
|
2806 -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
|
2807 -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
|
2808 -e "$sed_transform_check_PROGRAMS" |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
2809 if $use_libtests && test "$module" = 'alloca'; then |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
2810 echo "libtests_a_LIBADD += @${perhapsLT}ALLOCA@" |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
2811 echo "libtests_a_DEPENDENCIES += @${perhapsLT}ALLOCA@" |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
2812 fi |
|
12741
12d8c6b23748
gnulib-tool: avoid writing in the current directory.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12559
diff
changeset
|
2813 } > "$tmp"/amsnippet |
|
10065
e1449fcc7ecb
* gnulib-tool: Fix various comment typos.
Eric Blake <ebb9@byu.net>
parents:
9887
diff
changeset
|
2814 # 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
|
2815 if grep '[^ ]' "$tmp"/amsnippet > /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
|
2816 echo "## begin 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
|
2817 echo |
|
12741
12d8c6b23748
gnulib-tool: avoid writing in the current directory.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12559
diff
changeset
|
2818 cat "$tmp"/amsnippet |
|
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
|
2819 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
|
2820 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
|
2821 fi |
|
12741
12d8c6b23748
gnulib-tool: avoid writing in the current directory.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12559
diff
changeset
|
2822 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
|
2823 # 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
|
2824 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
|
2825 case $f in |
|
10985
32537aa6364d
Terminate loops early when possible.
Bruno Haible <bruno@clisp.org>
parents:
10981
diff
changeset
|
2826 lib/*/*.c | tests/*/*.c) |
|
32537aa6364d
Terminate loops early when possible.
Bruno Haible <bruno@clisp.org>
parents:
10981
diff
changeset
|
2827 uses_subdirs=yes |
|
32537aa6364d
Terminate loops early when possible.
Bruno Haible <bruno@clisp.org>
parents:
10981
diff
changeset
|
2828 break |
|
32537aa6364d
Terminate loops early when possible.
Bruno Haible <bruno@clisp.org>
parents:
10981
diff
changeset
|
2829 ;; |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
2830 esac |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
2831 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
|
2832 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
|
2833 done |
|
12741
12d8c6b23748
gnulib-tool: avoid writing in the current directory.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12559
diff
changeset
|
2834 } > "$tmp"/allsnippets |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
2835 # 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
|
2836 # 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
|
2837 # 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
|
2838 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
|
2839 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
|
2840 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
|
2841 fi |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
2842 echo "AUTOMAKE_OPTIONS = 1.5 foreign${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
|
2843 echo |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
2844 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
|
2845 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
|
2846 echo |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
2847 fi |
|
6533
6bc4290ca85f
Avoid an automake error regarding the 'gettext' module.
Bruno Haible <bruno@clisp.org>
parents:
6512
diff
changeset
|
2848 # 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
|
2849 # 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
|
2850 # "AM_GNU_GETTEXT used but SUBDIRS not defined" |
|
6bc4290ca85f
Avoid an automake error regarding the 'gettext' module.
Bruno Haible <bruno@clisp.org>
parents:
6512
diff
changeset
|
2851 echo "SUBDIRS =" |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
2852 echo "TESTS =" |
|
12295
b8c65d432a3e
Add xalloc-die self-test.
Simon Josefsson <simon@josefsson.org>
parents:
12288
diff
changeset
|
2853 echo "XFAIL_TESTS =" |
|
10732
a97c57b9b48e
argp: Use standard gnulib idiom for EXEEXT.
Simon Josefsson <simon@josefsson.org>
parents:
10729
diff
changeset
|
2854 echo "TESTS_ENVIRONMENT =" |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
2855 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
|
2856 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
|
2857 echo "check_PROGRAMS =" |
|
41421349e26b
In testing directories, link the test programs already during "make", not
Bruno Haible <bruno@clisp.org>
parents:
7911
diff
changeset
|
2858 fi |
|
6548
060487c0b13c
Initialize also noinst_HEADERS to empty.
Bruno Haible <bruno@clisp.org>
parents:
6547
diff
changeset
|
2859 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
|
2860 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
|
2861 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
|
2862 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
|
2863 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
|
2864 else |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
2865 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
|
2866 fi |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
2867 fi |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
2868 # Automake versions < 1.9b create an empty pkgdatadir at installation time |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
2869 # if you specify pkgdata_DATA to empty. This is a workaround. |
|
12741
12d8c6b23748
gnulib-tool: avoid writing in the current directory.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12559
diff
changeset
|
2870 if grep '^pkgdata_DATA *+=' "$tmp"/allsnippets > /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
|
2871 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
|
2872 fi |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
2873 echo "EXTRA_DIST =" |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
2874 echo "BUILT_SOURCES =" |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
2875 echo "SUFFIXES =" |
| 7079 | 2876 echo "MOSTLYCLEANFILES = core *.stackdump" |
| 6862 | 2877 echo "MOSTLYCLEANDIRS =" |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
2878 echo "CLEANFILES =" |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
2879 echo "DISTCLEANFILES =" |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
2880 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
|
2881 # 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
|
2882 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
|
2883 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
|
2884 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
|
2885 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
|
2886 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
|
2887 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
|
2888 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
|
2889 if test "${dir}Makefile.am" = "$destfile" || test "./${dir}Makefile.am" = "$destfile"; then |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
2890 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
|
2891 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
|
2892 fi |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
2893 fi |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
2894 done |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
2895 echo |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
2896 echo "AM_CPPFLAGS = \\" |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
2897 echo " -I. -I\$(srcdir) \\" |
|
6250
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
2898 echo " -I${testsbase_inverse} -I\$(srcdir)/${testsbase_inverse} \\" |
|
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
2899 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
|
2900 echo |
|
9540
56fe79dce87d
Remove unnecessary -l options from LDFLAGS.
Bruno Haible <bruno@clisp.org>
parents:
9523
diff
changeset
|
2901 local_ldadd_before='' |
|
56fe79dce87d
Remove unnecessary -l options from LDFLAGS.
Bruno Haible <bruno@clisp.org>
parents:
9523
diff
changeset
|
2902 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
|
2903 if $use_libtests; then |
|
9540
56fe79dce87d
Remove unnecessary -l options from LDFLAGS.
Bruno Haible <bruno@clisp.org>
parents:
9523
diff
changeset
|
2904 # 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
|
2905 # 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
|
2906 # 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
|
2907 # 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
|
2908 # 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
|
2909 # module whose dependency to 'progname' is voluntarily omitted). |
|
56fe79dce87d
Remove unnecessary -l options from LDFLAGS.
Bruno Haible <bruno@clisp.org>
parents:
9523
diff
changeset
|
2910 # 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
|
2911 # not matter. |
|
56fe79dce87d
Remove unnecessary -l options from LDFLAGS.
Bruno Haible <bruno@clisp.org>
parents:
9523
diff
changeset
|
2912 local_ldadd_before=' libtests.a' |
|
56fe79dce87d
Remove unnecessary -l options from LDFLAGS.
Bruno Haible <bruno@clisp.org>
parents:
9523
diff
changeset
|
2913 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
|
2914 fi |
|
9540
56fe79dce87d
Remove unnecessary -l options from LDFLAGS.
Bruno Haible <bruno@clisp.org>
parents:
9523
diff
changeset
|
2915 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
|
2916 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
|
2917 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
|
2918 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
|
2919 # 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
|
2920 # 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
|
2921 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
|
2922 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
|
2923 echo "EXTRA_libtests_a_SOURCES =" |
|
9523
49f7561fc2d3
Allow circular dependency of separate libtests.a
Eric Blake <ebb9@byu.net>
parents:
9520
diff
changeset
|
2924 # The circular dependency in LDADD requires this. |
|
49f7561fc2d3
Allow circular dependency of separate libtests.a
Eric Blake <ebb9@byu.net>
parents:
9520
diff
changeset
|
2925 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
|
2926 echo |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
2927 fi |
|
12775
03aab12b3f15
Provide EXEEXT and srcdir in TESTS_ENVIRONMENT by default.
Bruno Haible <bruno@clisp.org>
parents:
12743
diff
changeset
|
2928 # 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
|
2929 # 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
|
2930 # 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
|
2931 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
|
2932 echo |
|
12741
12d8c6b23748
gnulib-tool: avoid writing in the current directory.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12559
diff
changeset
|
2933 cat "$tmp"/allsnippets \ |
|
9515
b0f1495adfd8
Fix references to the build-aux directory in the generated tests/Makefile.am.
Bruno Haible <bruno@clisp.org>
parents:
9514
diff
changeset
|
2934 | 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
|
2935 echo "# Clean up after Solaris cc." |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
2936 echo "clean-local:" |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
2937 echo " rm -rf SunWS_cache" |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
2938 echo |
| 7086 | 2939 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
|
2940 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
|
2941 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
|
2942 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
|
2943 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
|
2944 echo " done; \\" |
|
03602a916a9a
Don't let the 'mostlyclean' target fail because of a nonempty directory.
Bruno Haible <bruno@clisp.org>
parents:
9009
diff
changeset
|
2945 echo " :" |
|
12741
12d8c6b23748
gnulib-tool: avoid writing in the current directory.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
12559
diff
changeset
|
2946 rm -f "$tmp"/allsnippets |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
2947 } |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
2948 |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
2949 # 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
|
2950 # 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
|
2951 # - 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
|
2952 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
|
2953 { |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
2954 macro_prefix_arg="$1" |
|
7646
33bd42644eec
Override also AC_LIBSOURCES. Works around an automake error
Bruno Haible <bruno@clisp.org>
parents:
7644
diff
changeset
|
2955 # 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
|
2956 # 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
|
2957 # 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
|
2958 # 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
|
2959 # flexibility.) |
|
33bd42644eec
Override also AC_LIBSOURCES. Works around an automake error
Bruno Haible <bruno@clisp.org>
parents:
7644
diff
changeset
|
2960 # 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
|
2961 # 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
|
2962 # 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
|
2963 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
|
2964 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
|
2965 # 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
|
2966 # 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
|
2967 # 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
|
2968 # 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
|
2969 # 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
|
2970 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
|
2971 # 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
|
2972 # 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
|
2973 # 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
|
2974 # 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
|
2975 # 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
|
2976 # in which to expect them. |
|
9a2a9c43db65
Reduce number of forks required during autoconf.
Eric Blake <ebb9@byu.net>
parents:
10065
diff
changeset
|
2977 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
|
2978 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
|
2979 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
|
2980 } |
|
46b72819ef52
Add support for multiple gnulib-tool invocations in the scope of a single
Bruno Haible <bruno@clisp.org>
parents:
7485
diff
changeset
|
2981 |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
2982 # 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
|
2983 # 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
|
2984 # - 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
|
2985 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
|
2986 { |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
2987 macro_prefix_arg="$1" |
|
10066
9a2a9c43db65
Reduce number of forks required during autoconf.
Eric Blake <ebb9@byu.net>
parents:
10065
diff
changeset
|
2988 # 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
|
2989 # 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
|
2990 # 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
|
2991 # check is skipped. |
|
10067
40a8c0b4f5e0
Oops, fix small mistake in last commit.
Bruno Haible <bruno@clisp.org>
parents:
10066
diff
changeset
|
2992 echo " m4_ifval(${macro_prefix_arg}_LIBSOURCES_LIST, [" |
| 10261 | 2993 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
|
2994 echo " for gl_file in ]${macro_prefix_arg}_LIBSOURCES_LIST[ ; do" |
| 10261 | 2995 echo " if test ! -r ]m4_defn([${macro_prefix_arg}_LIBSOURCES_DIR])[/\$gl_file ; then" |
| 2996 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
|
2997 echo " exit 1" |
|
9a2a9c43db65
Reduce number of forks required during autoconf.
Eric Blake <ebb9@byu.net>
parents:
10065
diff
changeset
|
2998 echo " fi" |
|
9a2a9c43db65
Reduce number of forks required during autoconf.
Eric Blake <ebb9@byu.net>
parents:
10065
diff
changeset
|
2999 echo " done])dnl" |
|
9a2a9c43db65
Reduce number of forks required during autoconf.
Eric Blake <ebb9@byu.net>
parents:
10065
diff
changeset
|
3000 echo " m4_if(m4_sysval, [0], []," |
|
9a2a9c43db65
Reduce number of forks required during autoconf.
Eric Blake <ebb9@byu.net>
parents:
10065
diff
changeset
|
3001 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
|
3002 echo " ])" |
|
9a2a9c43db65
Reduce number of forks required during autoconf.
Eric Blake <ebb9@byu.net>
parents:
10065
diff
changeset
|
3003 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
|
3004 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
|
3005 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
|
3006 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
|
3007 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
|
3008 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
|
3009 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
|
3010 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
|
3011 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
|
3012 echo " # Remove the extension." |
|
472795eea368
Remove duplicates from the gl_LIBOBJS list.
Bruno Haible <bruno@clisp.org>
parents:
7497
diff
changeset
|
3013 echo " sed_drop_objext='s/\\.o\$//;s/\\.obj\$//'" |
| 12417 | 3014 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
|
3015 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
|
3016 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
|
3017 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
|
3018 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
|
3019 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
|
3020 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
|
3021 echo " ])" |
|
46b72819ef52
Add support for multiple gnulib-tool invocations in the scope of a single
Bruno Haible <bruno@clisp.org>
parents:
7485
diff
changeset
|
3022 } |
|
46b72819ef52
Add support for multiple gnulib-tool invocations in the scope of a single
Bruno Haible <bruno@clisp.org>
parents:
7485
diff
changeset
|
3023 |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3024 # 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
|
3025 # 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
|
3026 # - 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
|
3027 # - 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
|
3028 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
|
3029 { |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3030 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
|
3031 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
|
3032 echo |
|
46b72819ef52
Add support for multiple gnulib-tool invocations in the scope of a single
Bruno Haible <bruno@clisp.org>
parents:
7485
diff
changeset
|
3033 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
|
3034 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
|
3035 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
|
3036 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
|
3037 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
|
3038 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
|
3039 echo |
|
46b72819ef52
Add support for multiple gnulib-tool invocations in the scope of a single
Bruno Haible <bruno@clisp.org>
parents:
7485
diff
changeset
|
3040 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
|
3041 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
|
3042 echo "AC_DEFUN([${macro_prefix_arg}_REPLACE_FUNCS], [" |
|
9237
aeb8e2d99afa
m4 macro indentation.
Bruno Haible <bruno@linuix.haible.de>
parents:
9232
diff
changeset
|
3043 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
|
3044 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
|
3045 echo "])" |
|
7646
33bd42644eec
Override also AC_LIBSOURCES. Works around an automake error
Bruno Haible <bruno@clisp.org>
parents:
7644
diff
changeset
|
3046 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
|
3047 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
|
3048 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
|
3049 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
|
3050 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
|
3051 echo "AC_DEFUN([${macro_prefix_arg}_LIBSOURCES], [" |
|
9237
aeb8e2d99afa
m4 macro indentation.
Bruno Haible <bruno@linuix.haible.de>
parents:
9232
diff
changeset
|
3052 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
|
3053 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
|
3054 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
|
3055 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
|
3056 echo " ])" |
|
9237
aeb8e2d99afa
m4 macro indentation.
Bruno Haible <bruno@linuix.haible.de>
parents:
9232
diff
changeset
|
3057 echo " ])" |
|
aeb8e2d99afa
m4 macro indentation.
Bruno Haible <bruno@linuix.haible.de>
parents:
9232
diff
changeset
|
3058 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
|
3059 } |
|
46b72819ef52
Add support for multiple gnulib-tool invocations in the scope of a single
Bruno Haible <bruno@clisp.org>
parents:
7485
diff
changeset
|
3060 |
|
5347
0318c37925dc
Move duplicated code into function func_modules_transitive_closure().
Bruno Haible <bruno@clisp.org>
parents:
5346
diff
changeset
|
3061 # func_import modules |
|
0318c37925dc
Move duplicated code into function func_modules_transitive_closure().
Bruno Haible <bruno@clisp.org>
parents:
5346
diff
changeset
|
3062 # Uses also the variables |
|
0318c37925dc
Move duplicated code into function func_modules_transitive_closure().
Bruno Haible <bruno@clisp.org>
parents:
5346
diff
changeset
|
3063 # - destdir target directory |
|
7214
eb43edab28c3
Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents:
7213
diff
changeset
|
3064 # - local_gnulib_dir from --local-dir |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
3065 # - 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
|
3066 # - 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
|
3067 # - libname library name |
|
0318c37925dc
Move duplicated code into function func_modules_transitive_closure().
Bruno Haible <bruno@clisp.org>
parents:
5346
diff
changeset
|
3068 # - 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
|
3069 # - 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
|
3070 # - 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
|
3071 # - 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
|
3072 # - 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
|
3073 # - auxdir directory relative to destdir where to place build aux files |
|
6250
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
3074 # - inctests true if --with-tests was given, blank otherwise |
|
10744
7fb7b37150b3
New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents:
10743
diff
changeset
|
3075 # - incobsolete true if --with-obsolete was given, blank otherwise |
| 5981 | 3076 # - avoidlist list of modules to avoid, from --avoid |
|
9417
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
3077 # - 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
|
3078 # blank otherwise |
|
7216
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
3079 # - makefile_name from --makefile-name |
| 7077 | 3080 # - libtool true if --libtool was given, false if --no-libtool was |
| 3081 # given, blank otherwise | |
| 3082 # - guessed_libtool true if the configure.ac file uses libtool, false otherwise | |
| 6176 | 3083 # - 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
|
3084 # - po_domain prefix of i18n domain to use (without -gnulib suffix) |
|
9810
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
3085 # - 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
|
3086 # given, blank otherwise |
|
6994
3484a8772427
Add option --assume-autoconf. Default is back to 2.59.
Bruno Haible <bruno@clisp.org>
parents:
6993
diff
changeset
|
3087 # - autoconf_minversion minimum supported autoconf version |
|
6246
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
3088 # - doit : if actions shall be executed, false if only to be printed |
|
5799
ad9eff556694
2005-04-15 Simon Josefsson <jas@extundo.com>
Simon Josefsson <simon@josefsson.org>
parents:
5798
diff
changeset
|
3089 # - symbolic true if files should be symlinked, copied otherwise |
|
7643
d67f9dc6019d
New option --local-symlink.
Bruno Haible <bruno@clisp.org>
parents:
7642
diff
changeset
|
3090 # - lsymbolic true if files from local_gnulib_dir should be symlinked, |
|
d67f9dc6019d
New option --local-symlink.
Bruno Haible <bruno@clisp.org>
parents:
7642
diff
changeset
|
3091 # copied otherwise |
|
9096
7f1880b27b89
New gnulib-tool option --more-symlinks.
Bruno Haible <bruno@clisp.org>
parents:
9090
diff
changeset
|
3092 # - 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
|
3093 # blank otherwise |
|
5347
0318c37925dc
Move duplicated code into function func_modules_transitive_closure().
Bruno Haible <bruno@clisp.org>
parents:
5346
diff
changeset
|
3094 func_import () |
|
0318c37925dc
Move duplicated code into function func_modules_transitive_closure().
Bruno Haible <bruno@clisp.org>
parents:
5346
diff
changeset
|
3095 { |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3096 # Get the cached settings. |
|
7213
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
3097 cached_local_gnulib_dir= |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3098 cached_specified_modules= |
|
10744
7fb7b37150b3
New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents:
10743
diff
changeset
|
3099 cached_incobsolete= |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3100 cached_avoidlist= |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3101 cached_sourcebase= |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3102 cached_m4base= |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3103 cached_pobase= |
|
6955
7715890c929a
* gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents:
6952
diff
changeset
|
3104 cached_docbase= |
|
6250
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
3105 cached_testsbase= |
|
8890
576d3e4f31c2
Remember the presence of the --with-tests command-line option through
Bruno Haible <bruno@clisp.org>
parents:
8672
diff
changeset
|
3106 cached_inctests= |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3107 cached_libname= |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3108 cached_lgpl= |
|
7216
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
3109 cached_makefile_name= |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3110 cached_libtool= |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3111 cached_macro_prefix= |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3112 cached_po_domain= |
|
9810
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
3113 cached_vc_files= |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3114 cached_files= |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3115 if test -f "$destdir"/$m4base/gnulib-cache.m4; then |
| 7077 | 3116 cached_libtool=false |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3117 my_sed_traces=' |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3118 s,#.*$,, |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3119 s,^dnl .*$,, |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3120 s, dnl .*$,, |
|
7213
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
3121 /gl_LOCAL_DIR(/ { |
| 10987 | 3122 s,^.*gl_LOCAL_DIR([[ ]*\([^]"$`\\)]*\).*$,cached_local_gnulib_dir="\1",p |
|
7213
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
3123 } |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3124 /gl_MODULES(/ { |
|
10293
3c624b3d1039
Make a sed program more robust.
Bruno Haible <bruno@clisp.org>
parents:
10261
diff
changeset
|
3125 ta |
|
10246
50a9076d476d
Make gnulib-cache.m4 easier to diff.
Eric Blake <ebb9@byu.net>
parents:
10157
diff
changeset
|
3126 :a |
|
50a9076d476d
Make gnulib-cache.m4 easier to diff.
Eric Blake <ebb9@byu.net>
parents:
10157
diff
changeset
|
3127 s/)/)/ |
|
50a9076d476d
Make gnulib-cache.m4 easier to diff.
Eric Blake <ebb9@byu.net>
parents:
10157
diff
changeset
|
3128 tb |
|
50a9076d476d
Make gnulib-cache.m4 easier to diff.
Eric Blake <ebb9@byu.net>
parents:
10157
diff
changeset
|
3129 N |
|
50a9076d476d
Make gnulib-cache.m4 easier to diff.
Eric Blake <ebb9@byu.net>
parents:
10157
diff
changeset
|
3130 ba |
|
50a9076d476d
Make gnulib-cache.m4 easier to diff.
Eric Blake <ebb9@byu.net>
parents:
10157
diff
changeset
|
3131 :b |
| 10987 | 3132 s,^.*gl_MODULES([[ ]*\([^]"$`\\)]*\).*$,cached_specified_modules="\1",p |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3133 } |
|
10744
7fb7b37150b3
New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents:
10743
diff
changeset
|
3134 /gl_WITH_OBSOLETE/ { |
|
7fb7b37150b3
New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents:
10743
diff
changeset
|
3135 s,^.*$,cached_incobsolete=true,p |
|
7fb7b37150b3
New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents:
10743
diff
changeset
|
3136 } |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3137 /gl_AVOID(/ { |
| 10987 | 3138 s,^.*gl_AVOID([[ ]*\([^]"$`\\)]*\).*$,cached_avoidlist="\1",p |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3139 } |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3140 /gl_SOURCE_BASE(/ { |
| 10987 | 3141 s,^.*gl_SOURCE_BASE([[ ]*\([^]"$`\\)]*\).*$,cached_sourcebase="\1",p |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3142 } |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3143 /gl_M4_BASE(/ { |
| 10987 | 3144 s,^.*gl_M4_BASE([[ ]*\([^]"$`\\)]*\).*$,cached_m4base="\1",p |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3145 } |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3146 /gl_PO_BASE(/ { |
| 10987 | 3147 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
|
3148 } |
|
6955
7715890c929a
* gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents:
6952
diff
changeset
|
3149 /gl_DOC_BASE(/ { |
| 10987 | 3150 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
|
3151 } |
|
6250
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
3152 /gl_TESTS_BASE(/ { |
| 10987 | 3153 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
|
3154 } |
|
8890
576d3e4f31c2
Remember the presence of the --with-tests command-line option through
Bruno Haible <bruno@clisp.org>
parents:
8672
diff
changeset
|
3155 /gl_WITH_TESTS/ { |
|
576d3e4f31c2
Remember the presence of the --with-tests command-line option through
Bruno Haible <bruno@clisp.org>
parents:
8672
diff
changeset
|
3156 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
|
3157 } |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3158 /gl_LIB(/ { |
| 10987 | 3159 s,^.*gl_LIB([[ ]*\([^]"$`\\)]*\).*$,cached_libname="\1",p |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3160 } |
|
9417
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
3161 /gl_LGPL(/ { |
| 10987 | 3162 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
|
3163 } |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3164 /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
|
3165 s,^.*$,cached_lgpl=yes,p |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3166 } |
|
7216
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
3167 /gl_MAKEFILE_NAME(/ { |
| 10987 | 3168 s,^.*gl_MAKEFILE_NAME([[ ]*\([^]"$`\\)]*\).*$,cached_makefile_name="\1",p |
|
7216
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
3169 } |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3170 /gl_LIBTOOL/ { |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3171 s,^.*$,cached_libtool=true,p |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3172 } |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3173 /gl_MACRO_PREFIX(/ { |
| 10987 | 3174 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
|
3175 } |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3176 /gl_PO_DOMAIN(/ { |
| 10987 | 3177 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
|
3178 } |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
3179 /gl_VC_FILES(/ { |
| 10987 | 3180 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
|
3181 }' |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
3182 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
|
3183 if test -f "$destdir"/$m4base/gnulib-comp.m4; then |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3184 my_sed_traces=' |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3185 s,#.*$,, |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3186 s,^dnl .*$,, |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3187 s, dnl .*$,, |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3188 /AC_DEFUN(\['"${cached_macro_prefix}"'_FILE_LIST\], \[/ { |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3189 s,^.*$,cached_files=",p |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3190 n |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3191 ta |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3192 :a |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3193 s,^\]).*$,", |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3194 tb |
| 10987 | 3195 s,["$`\\],,g |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3196 p |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3197 n |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3198 ba |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3199 :b |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3200 p |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3201 }' |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
3202 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
|
3203 fi |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3204 fi |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3205 |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3206 # Merge the cached settings with the specified ones. |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3207 # The m4base must be the same as expected from the pathname. |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3208 if test -n "$cached_m4base" && test "$cached_m4base" != "$m4base"; then |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3209 func_fatal_error "$m4base/gnulib-cache.m4 is expected to contain gl_M4_BASE([$m4base])" |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3210 fi |
|
7213
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
3211 # The local_gnulib_dir defaults to the cached one. Recall that the cached one |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
3212 # is relative to $destdir, whereas the one we use is relative to . or absolute. |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
3213 if test -z "$local_gnulib_dir"; then |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
3214 if test -n "$cached_local_gnulib_dir"; then |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
3215 case "$destdir" in |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
3216 /*) |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
3217 local_gnulib_dir="$destdir/$cached_local_gnulib_dir" ;; |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
3218 *) |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
3219 case "$cached_local_gnulib_dir" in |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
3220 /*) |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
3221 local_gnulib_dir="$destdir/$cached_local_gnulib_dir" ;; |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
3222 *) |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
3223 func_relconcat "$destdir" "$cached_local_gnulib_dir" |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
3224 local_gnulib_dir="$relconcat" ;; |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
3225 esac ;; |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
3226 esac |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
3227 fi |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
3228 fi |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3229 # Append the cached and the specified module names. So that |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3230 # "gnulib-tool --import foo" means to add the module foo. |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3231 specified_modules="$cached_specified_modules $1" |
|
10744
7fb7b37150b3
New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents:
10743
diff
changeset
|
3232 # Included obsolete modules among the dependencies if specified either way. |
|
7fb7b37150b3
New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents:
10743
diff
changeset
|
3233 if test -z "$incobsolete"; then |
|
7fb7b37150b3
New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents:
10743
diff
changeset
|
3234 incobsolete="$cached_incobsolete" |
|
7fb7b37150b3
New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents:
10743
diff
changeset
|
3235 fi |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3236 # Append the cached and the specified avoidlist. This is probably better |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3237 # than dropping the cached one when --avoid is specified at least once. |
|
9086
110e60d88fad
(func_import): Avoid duplication of --avoid statements
Sergey Poznyakoff <gray@gnu.org.ua>
parents:
9025
diff
changeset
|
3238 avoidlist=`for m in $cached_avoidlist $avoidlist; do echo $m; done | LC_ALL=C sort -u` |
|
110e60d88fad
(func_import): Avoid duplication of --avoid statements
Sergey Poznyakoff <gray@gnu.org.ua>
parents:
9025
diff
changeset
|
3239 avoidlist=`echo $avoidlist` |
|
110e60d88fad
(func_import): Avoid duplication of --avoid statements
Sergey Poznyakoff <gray@gnu.org.ua>
parents:
9025
diff
changeset
|
3240 |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3241 # The sourcebase defaults to the cached one. |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3242 if test -z "$sourcebase"; then |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3243 sourcebase="$cached_sourcebase" |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3244 if test -z "$sourcebase"; then |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3245 func_fatal_error "missing --source-base option" |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3246 fi |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3247 fi |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3248 # The pobase defaults to the cached one. |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3249 if test -z "$pobase"; then |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3250 pobase="$cached_pobase" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3251 fi |
|
6955
7715890c929a
* gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents:
6952
diff
changeset
|
3252 # The docbase defaults to the cached one. |
|
7715890c929a
* gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents:
6952
diff
changeset
|
3253 if test -z "$docbase"; then |
|
7715890c929a
* gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents:
6952
diff
changeset
|
3254 docbase="$cached_docbase" |
|
7715890c929a
* gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents:
6952
diff
changeset
|
3255 if test -z "$docbase"; then |
|
7076
0e471c8eb020
Tweak error message about missing --doc-base.
Bruno Haible <bruno@clisp.org>
parents:
7073
diff
changeset
|
3256 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." |
|
6955
7715890c929a
* gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents:
6952
diff
changeset
|
3257 fi |
|
7715890c929a
* gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents:
6952
diff
changeset
|
3258 fi |
|
6250
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
3259 # The testsbase defaults to the cached one. |
|
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
3260 if test -z "$testsbase"; then |
|
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
3261 testsbase="$cached_testsbase" |
|
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
3262 if test -z "$testsbase"; then |
|
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
3263 func_fatal_error "missing --tests-base option" |
|
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
3264 fi |
|
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
3265 fi |
|
8890
576d3e4f31c2
Remember the presence of the --with-tests command-line option through
Bruno Haible <bruno@clisp.org>
parents:
8672
diff
changeset
|
3266 # Require the tests if specified either way. |
|
576d3e4f31c2
Remember the presence of the --with-tests command-line option through
Bruno Haible <bruno@clisp.org>
parents:
8672
diff
changeset
|
3267 if test -z "$inctests"; then |
|
576d3e4f31c2
Remember the presence of the --with-tests command-line option through
Bruno Haible <bruno@clisp.org>
parents:
8672
diff
changeset
|
3268 inctests="$cached_inctests" |
|
576d3e4f31c2
Remember the presence of the --with-tests command-line option through
Bruno Haible <bruno@clisp.org>
parents:
8672
diff
changeset
|
3269 fi |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3270 # The libname defaults to the cached one. |
|
6183
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
3271 if test -z "$supplied_libname"; then |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3272 libname="$cached_libname" |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3273 if test -z "$libname"; then |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3274 func_fatal_error "missing --lib option" |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3275 fi |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3276 fi |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3277 # Require LGPL if specified either way. |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3278 if test -z "$lgpl"; then |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3279 lgpl="$cached_lgpl" |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3280 fi |
|
7216
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
3281 # The makefile_name defaults to the cached one. |
|
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
3282 if test -z "$makefile_name"; then |
|
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
3283 makefile_name="$cached_makefile_name" |
|
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
3284 fi |
|
6183
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
3285 # Use libtool if specified either way, or if guessed. |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3286 if test -z "$libtool"; then |
|
6183
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
3287 if test -n "$cached_m4base"; then |
|
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
3288 libtool="$cached_libtool" |
|
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
3289 else |
|
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
3290 libtool="$guessed_libtool" |
|
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
3291 fi |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3292 fi |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3293 # The macro_prefix defaults to the cached one. |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3294 if test -z "$macro_prefix"; then |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3295 macro_prefix="$cached_macro_prefix" |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3296 if test -z "$macro_prefix"; then |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3297 func_fatal_error "missing --macro-prefix option" |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3298 fi |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3299 fi |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3300 # The po_domain defaults to the cached one. |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3301 if test -z "$po_domain"; then |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3302 po_domain="$cached_po_domain" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3303 fi |
|
9810
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
3304 # The vc_files defaults to the cached one. |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
3305 if test -z "$vc_files"; then |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
3306 vc_files="$cached_vc_files" |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
3307 fi |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3308 |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3309 # Canonicalize the list of specified modules. |
|
7319
1726cc39709b
Use "sort -u" where it makes sense.
Bruno Haible <bruno@clisp.org>
parents:
7299
diff
changeset
|
3310 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
|
3311 |
|
0318c37925dc
Move duplicated code into function func_modules_transitive_closure().
Bruno Haible <bruno@clisp.org>
parents:
5346
diff
changeset
|
3312 # Determine final module list. |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3313 modules="$specified_modules" |
|
5347
0318c37925dc
Move duplicated code into function func_modules_transitive_closure().
Bruno Haible <bruno@clisp.org>
parents:
5346
diff
changeset
|
3314 func_modules_transitive_closure |
|
9188
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
3315 if test $verbose -ge 0; then |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
3316 echo "Module list with included dependencies:" |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
3317 echo "$modules" | sed -e 's/^/ /' |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
3318 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
|
3319 final_modules="$modules" |
|
5345
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
3320 |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3321 # Determine main module list and tests-related module list separately. |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3322 # The main module list is the transitive closure of the specified modules, |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3323 # ignoring tests modules. Its lib/* sources go into $sourcebase/. If --lgpl |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3324 # is specified, it will consist only of LGPLed source. |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3325 # The tests-related module list is the transitive closure of the specified |
|
12055
4d4f9a27cde5
Add 'link-warning' to testsrelated_modules during --import.
Bruno Haible <bruno@clisp.org>
parents:
12054
diff
changeset
|
3326 # modules, including tests modules, minus the main module list excluding |
|
12460
282eecca2301
New module attribute 'Applicability'.
Bruno Haible <bruno@clisp.org>
parents:
12417
diff
changeset
|
3327 # modules of applicability 'all'. Its lib/* sources (brought in through |
|
282eecca2301
New module attribute 'Applicability'.
Bruno Haible <bruno@clisp.org>
parents:
12417
diff
changeset
|
3328 # dependencies of *-tests modules) go into $testsbase/. It may contain GPLed |
|
282eecca2301
New module attribute 'Applicability'.
Bruno Haible <bruno@clisp.org>
parents:
12417
diff
changeset
|
3329 # source, even if --lgpl is specified. |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3330 # Determine main module list. |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3331 saved_inctests="$inctests" |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3332 inctests="" |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3333 modules="$specified_modules" |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3334 func_modules_transitive_closure |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3335 main_modules="$modules" |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3336 inctests="$saved_inctests" |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3337 if test $verbose -ge 1; then |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3338 echo "Main module list:" |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3339 echo "$main_modules" | sed -e 's/^/ /' |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3340 fi |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3341 # Determine tests-related module list. |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3342 echo "$final_modules" | LC_ALL=C sort -u > "$tmp"/final-modules |
|
12460
282eecca2301
New module attribute 'Applicability'.
Bruno Haible <bruno@clisp.org>
parents:
12417
diff
changeset
|
3343 testsrelated_modules=`func_reset_sigpipe |
|
282eecca2301
New module attribute 'Applicability'.
Bruno Haible <bruno@clisp.org>
parents:
12417
diff
changeset
|
3344 for module in $main_modules; do |
|
282eecca2301
New module attribute 'Applicability'.
Bruno Haible <bruno@clisp.org>
parents:
12417
diff
changeset
|
3345 if test \`func_get_applicability $module\` = main; then |
|
282eecca2301
New module attribute 'Applicability'.
Bruno Haible <bruno@clisp.org>
parents:
12417
diff
changeset
|
3346 echo $module |
|
282eecca2301
New module attribute 'Applicability'.
Bruno Haible <bruno@clisp.org>
parents:
12417
diff
changeset
|
3347 fi |
|
282eecca2301
New module attribute 'Applicability'.
Bruno Haible <bruno@clisp.org>
parents:
12417
diff
changeset
|
3348 done \ |
|
282eecca2301
New module attribute 'Applicability'.
Bruno Haible <bruno@clisp.org>
parents:
12417
diff
changeset
|
3349 | LC_ALL=C sort -u | LC_ALL=C join -v 2 - "$tmp"/final-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
|
3350 if test $verbose -ge 1; then |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3351 echo "Tests-related module list:" |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3352 echo "$testsrelated_modules" | sed -e 's/^/ /' |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3353 fi |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3354 |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3355 # Add the dummy module to the main module list if needed. |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3356 modules="$main_modules" |
|
6550
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
3357 func_modules_add_dummy |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3358 main_modules="$modules" |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3359 |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3360 # Determine whether a $testsbase/libtests.a is needed. |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3361 use_libtests=false |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3362 for module in $testsrelated_modules; do |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3363 func_verify_nontests_module |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3364 if test -n "$module"; then |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3365 all_files=`func_get_filelist $module` |
|
10985
32537aa6364d
Terminate loops early when possible.
Bruno Haible <bruno@clisp.org>
parents:
10981
diff
changeset
|
3366 # Test whether some file in $all_files lies in lib/. |
|
32537aa6364d
Terminate loops early when possible.
Bruno Haible <bruno@clisp.org>
parents:
10981
diff
changeset
|
3367 for f in $all_files; do |
|
32537aa6364d
Terminate loops early when possible.
Bruno Haible <bruno@clisp.org>
parents:
10981
diff
changeset
|
3368 case $f in |
|
32537aa6364d
Terminate loops early when possible.
Bruno Haible <bruno@clisp.org>
parents:
10981
diff
changeset
|
3369 lib/*) |
|
32537aa6364d
Terminate loops early when possible.
Bruno Haible <bruno@clisp.org>
parents:
10981
diff
changeset
|
3370 use_libtests=true |
|
32537aa6364d
Terminate loops early when possible.
Bruno Haible <bruno@clisp.org>
parents:
10981
diff
changeset
|
3371 break 2 |
|
32537aa6364d
Terminate loops early when possible.
Bruno Haible <bruno@clisp.org>
parents:
10981
diff
changeset
|
3372 ;; |
|
32537aa6364d
Terminate loops early when possible.
Bruno Haible <bruno@clisp.org>
parents:
10981
diff
changeset
|
3373 esac |
|
32537aa6364d
Terminate loops early when possible.
Bruno Haible <bruno@clisp.org>
parents:
10981
diff
changeset
|
3374 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
|
3375 fi |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3376 done |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3377 |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3378 # Add the dummy module to the tests-related module list if needed. |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3379 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
|
3380 modules="$testsrelated_modules" |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3381 func_modules_add_dummy |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3382 testsrelated_modules="$modules" |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3383 fi |
|
6550
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
3384 |
|
7235
3dbbe645b976
* MODULES.html.sh (Support for building documentation): Add gpl, lgpl.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7222
diff
changeset
|
3385 # 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
|
3386 if test -n "$lgpl"; then |
|
10479
74885eaea206
Report all license incompatibilities during --import.
Bruno Haible <bruno@clisp.org>
parents:
10478
diff
changeset
|
3387 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
|
3388 for module in $main_modules; do |
| 5346 | 3389 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
|
3390 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
|
3391 'GPLed build tool') ;; |
| 7245 | 3392 '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
|
3393 *) |
|
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
3394 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
|
3395 yes | 3) |
|
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
3396 case $license in |
|
12310
4473116f2155
Add `gnulib-tool --import' support for LGPLv3+.
Ludovic Courtès <ludo@gnu.org>
parents:
12295
diff
changeset
|
3397 LGPL | LGPLv2+ | LGPLv3+) ;; |
|
10479
74885eaea206
Report all license incompatibilities during --import.
Bruno Haible <bruno@clisp.org>
parents:
10478
diff
changeset
|
3398 *) 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
|
3399 esac |
|
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
3400 ;; |
|
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
3401 2) |
|
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
3402 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
|
3403 LGPLv2+) ;; |
|
10479
74885eaea206
Report all license incompatibilities during --import.
Bruno Haible <bruno@clisp.org>
parents:
10478
diff
changeset
|
3404 *) 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
|
3405 esac |
|
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
3406 ;; |
|
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
3407 *) 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
|
3408 esac |
|
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
3409 ;; |
|
5963
6fb8c48c4dcd
* gnulib-tool (func_import): Add support for 'public domain' license.
Paul Eggert <eggert@cs.ucla.edu>
parents:
5848
diff
changeset
|
3410 esac |
|
5345
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
3411 done |
|
10479
74885eaea206
Report all license incompatibilities during --import.
Bruno Haible <bruno@clisp.org>
parents:
10478
diff
changeset
|
3412 if test -n "$license_incompatibilities"; then |
|
74885eaea206
Report all license incompatibilities during --import.
Bruno Haible <bruno@clisp.org>
parents:
10478
diff
changeset
|
3413 # Format the license incompatibilities as a table. |
|
74885eaea206
Report all license incompatibilities during --import.
Bruno Haible <bruno@clisp.org>
parents:
10478
diff
changeset
|
3414 sed_expand_column1_width50_indent17='s,^\([^ ]*\) ,\1 , |
|
74885eaea206
Report all license incompatibilities during --import.
Bruno Haible <bruno@clisp.org>
parents:
10478
diff
changeset
|
3415 s,^\(.................................................[^ ]*\) *, \1 ,' |
|
74885eaea206
Report all license incompatibilities during --import.
Bruno Haible <bruno@clisp.org>
parents:
10478
diff
changeset
|
3416 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
|
3417 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
|
3418 fi |
|
5345
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
3419 fi |
|
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
3420 |
|
9189
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
3421 # 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
|
3422 modules="$main_modules" |
|
9189
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
3423 func_modules_notice |
|
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
3424 |
|
7199
85ef7b18536b
New config-h module, so that "make" output needn't be cluttered
Paul Eggert <eggert@cs.ucla.edu>
parents:
7195
diff
changeset
|
3425 # 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
|
3426 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
|
3427 for module in $main_modules; do |
| 7245 | 3428 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
|
3429 # 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
|
3430 sed_transform_lib_file=$sed_transform_lib_file' |
| 7245 | 3431 s/^#ifdef[ ]*HAVE_CONFIG_H[ ]*$/#if 1/ |
| 3432 ' | |
| 3433 break | |
| 3434 fi | |
| 3435 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
|
3436 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
|
3437 if test -n "$do_copyrights"; then |
|
7f1880b27b89
New gnulib-tool option --more-symlinks.
Bruno Haible <bruno@clisp.org>
parents:
9090
diff
changeset
|
3438 if test -n "$lgpl"; then |
|
7f1880b27b89
New gnulib-tool option --more-symlinks.
Bruno Haible <bruno@clisp.org>
parents:
9090
diff
changeset
|
3439 # 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
|
3440 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
|
3441 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
|
3442 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
|
3443 s/GNU General/GNU Lesser General/g |
|
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
3444 ' |
|
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
3445 ;; |
|
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
3446 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
|
3447 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
|
3448 s/GNU General/GNU Lesser General/g |
|
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
3449 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
|
3450 ' |
|
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
3451 ;; |
|
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
3452 *) 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
|
3453 esac |
|
9424
d852c1c185e4
If --lgpl is not specified, convert copyright headers to GPLv3+.
Bruno Haible <bruno@clisp.org>
parents:
9417
diff
changeset
|
3454 else |
|
d852c1c185e4
If --lgpl is not specified, convert copyright headers to GPLv3+.
Bruno Haible <bruno@clisp.org>
parents:
9417
diff
changeset
|
3455 # 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
|
3456 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
|
3457 s/GNU Lesser General/GNU General/g |
|
d852c1c185e4
If --lgpl is not specified, convert copyright headers to GPLv3+.
Bruno Haible <bruno@clisp.org>
parents:
9417
diff
changeset
|
3458 s/GNU Library General/GNU General/g |
|
11592
345504ca672e
gnulib-tool: Don't use non-POSIX regexps.
Simon Josefsson <simon@josefsson.org>
parents:
11560
diff
changeset
|
3459 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
|
3460 ' |
|
9096
7f1880b27b89
New gnulib-tool option --more-symlinks.
Bruno Haible <bruno@clisp.org>
parents:
9090
diff
changeset
|
3461 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
|
3462 fi |
|
85ef7b18536b
New config-h module, so that "make" output needn't be cluttered
Paul Eggert <eggert@cs.ucla.edu>
parents:
7195
diff
changeset
|
3463 |
|
11594
36af7f748bb9
Don't do HAVE_CONFIG_H replacements on build-aux/ files.
Bruno Haible <bruno@clisp.org>
parents:
11593
diff
changeset
|
3464 # 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
|
3465 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
|
3466 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
|
3467 # Update license. |
|
476a58fbc9b9
gnulib-tool: Transform license on build-aux/ files too.
Simon Josefsson <simon@josefsson.org>
parents:
11592
diff
changeset
|
3468 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
|
3469 s/GNU Lesser General/GNU General/g |
|
476a58fbc9b9
gnulib-tool: Transform license on build-aux/ files too.
Simon Josefsson <simon@josefsson.org>
parents:
11592
diff
changeset
|
3470 s/GNU Library General/GNU General/g |
|
476a58fbc9b9
gnulib-tool: Transform license on build-aux/ files too.
Simon Josefsson <simon@josefsson.org>
parents:
11592
diff
changeset
|
3471 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
|
3472 ' |
|
476a58fbc9b9
gnulib-tool: Transform license on build-aux/ files too.
Simon Josefsson <simon@josefsson.org>
parents:
11592
diff
changeset
|
3473 fi |
|
476a58fbc9b9
gnulib-tool: Transform license on build-aux/ files too.
Simon Josefsson <simon@josefsson.org>
parents:
11592
diff
changeset
|
3474 |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3475 # 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
|
3476 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
|
3477 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
|
3478 # 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
|
3479 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
|
3480 s/GNU Lesser General/GNU General/g |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3481 s/GNU Library General/GNU General/g |
|
11592
345504ca672e
gnulib-tool: Don't use non-POSIX regexps.
Simon Josefsson <simon@josefsson.org>
parents:
11560
diff
changeset
|
3482 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
|
3483 ' |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3484 fi |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3485 |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3486 # Determine the final file lists. |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3487 # They must be computed separately, because files in lib/* go into |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3488 # $sourcebase/ if they are in the main file list but 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
|
3489 # if they are in the tests-related file list. Furthermore lib/dummy.c |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3490 # can be in both. |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3491 # Determine final main file list. |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3492 modules="$main_modules" |
|
5348
6afb021e2fc1
Move duplicated code into function func_modules_to_filelist().
Bruno Haible <bruno@clisp.org>
parents:
5347
diff
changeset
|
3493 func_modules_to_filelist |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3494 main_files="$files" |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3495 # Determine final tests-related file list. |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3496 modules="$testsrelated_modules" |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3497 func_modules_to_filelist |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3498 testsrelated_files=`echo "$files" | sed -e 's,^lib/,tests=lib/,'` |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3499 # Merge both file lists. |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3500 sed_remove_empty_lines='/^$/d' |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3501 files=`{ echo "$main_files"; echo "$testsrelated_files"; } | sed -e "$sed_remove_empty_lines" | LC_ALL=C sort -u` |
|
9188
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
3502 if test $verbose -ge 0; then |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
3503 echo "File list:" |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3504 sed_prettyprint_files='s,^tests=lib/\(.*\)$,lib/\1 -> tests/\1,' |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3505 echo "$files" | sed -e "$sed_prettyprint_files" -e 's/^/ /' |
|
9188
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
3506 fi |
|
5345
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
3507 |
|
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
3508 test -n "$files" \ |
|
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
3509 || 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
|
3510 |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3511 # 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
|
3512 new_files="$files m4/gnulib-tool.m4" |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3513 old_files="$cached_files" |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3514 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
|
3515 func_append old_files " m4/gnulib-tool.m4" |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3516 fi |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3517 |
|
11560
987b2dec97b7
Fix the rewriting rules for file names.
Bruno Haible <bruno@clisp.org>
parents:
11533
diff
changeset
|
3518 rewritten='%REWRITTEN%' |
|
7605
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
3519 sed_rewrite_old_files="\ |
|
11560
987b2dec97b7
Fix the rewriting rules for file names.
Bruno Haible <bruno@clisp.org>
parents:
11533
diff
changeset
|
3520 s,^build-aux/,$rewritten$auxdir/, |
|
987b2dec97b7
Fix the rewriting rules for file names.
Bruno Haible <bruno@clisp.org>
parents:
11533
diff
changeset
|
3521 s,^doc/,$rewritten$cached_docbase/, |
|
987b2dec97b7
Fix the rewriting rules for file names.
Bruno Haible <bruno@clisp.org>
parents:
11533
diff
changeset
|
3522 s,^lib/,$rewritten$cached_sourcebase/, |
|
987b2dec97b7
Fix the rewriting rules for file names.
Bruno Haible <bruno@clisp.org>
parents:
11533
diff
changeset
|
3523 s,^m4/,$rewritten$cached_m4base/, |
|
987b2dec97b7
Fix the rewriting rules for file names.
Bruno Haible <bruno@clisp.org>
parents:
11533
diff
changeset
|
3524 s,^tests/,$rewritten$cached_testsbase/, |
|
987b2dec97b7
Fix the rewriting rules for file names.
Bruno Haible <bruno@clisp.org>
parents:
11533
diff
changeset
|
3525 s,^tests=lib/,$rewritten$cached_testsbase/, |
|
987b2dec97b7
Fix the rewriting rules for file names.
Bruno Haible <bruno@clisp.org>
parents:
11533
diff
changeset
|
3526 s,^top/,$rewritten, |
|
987b2dec97b7
Fix the rewriting rules for file names.
Bruno Haible <bruno@clisp.org>
parents:
11533
diff
changeset
|
3527 s,^$rewritten,," |
|
7605
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
3528 sed_rewrite_new_files="\ |
|
11560
987b2dec97b7
Fix the rewriting rules for file names.
Bruno Haible <bruno@clisp.org>
parents:
11533
diff
changeset
|
3529 s,^build-aux/,$rewritten$auxdir/, |
|
987b2dec97b7
Fix the rewriting rules for file names.
Bruno Haible <bruno@clisp.org>
parents:
11533
diff
changeset
|
3530 s,^doc/,$rewritten$docbase/, |
|
987b2dec97b7
Fix the rewriting rules for file names.
Bruno Haible <bruno@clisp.org>
parents:
11533
diff
changeset
|
3531 s,^lib/,$rewritten$sourcebase/, |
|
987b2dec97b7
Fix the rewriting rules for file names.
Bruno Haible <bruno@clisp.org>
parents:
11533
diff
changeset
|
3532 s,^m4/,$rewritten$m4base/, |
|
987b2dec97b7
Fix the rewriting rules for file names.
Bruno Haible <bruno@clisp.org>
parents:
11533
diff
changeset
|
3533 s,^tests/,$rewritten$testsbase/, |
|
987b2dec97b7
Fix the rewriting rules for file names.
Bruno Haible <bruno@clisp.org>
parents:
11533
diff
changeset
|
3534 s,^tests=lib/,$rewritten$testsbase/, |
|
987b2dec97b7
Fix the rewriting rules for file names.
Bruno Haible <bruno@clisp.org>
parents:
11533
diff
changeset
|
3535 s,^top/,$rewritten, |
|
987b2dec97b7
Fix the rewriting rules for file names.
Bruno Haible <bruno@clisp.org>
parents:
11533
diff
changeset
|
3536 s,^$rewritten,," |
|
7605
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
3537 |
|
6183
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
3538 # Create directories. |
|
7605
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
3539 { echo "$sourcebase" |
|
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
3540 echo "$m4base" |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3541 if test -n "$pobase"; then |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3542 echo "$pobase" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3543 fi |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
3544 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
|
3545 if test -n "$docfiles"; then |
|
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
3546 echo "$docbase" |
|
6246
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
3547 fi |
|
7605
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
3548 if test -n "$inctests"; then |
|
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
3549 echo "$testsbase" |
|
6955
7715890c929a
* gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents:
6952
diff
changeset
|
3550 fi |
|
7605
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
3551 echo "$auxdir" |
|
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
3552 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
|
3553 | sed -e "$sed_rewrite_new_files" \ |
|
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
3554 | sed -n -e 's,^\(.*\)/[^/]*,\1,p' \ |
|
7605
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
3555 | LC_ALL=C sort -u |
|
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
3556 } > "$tmp"/dirs |
|
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
3557 { # Rearrange file descriptors. Needed because "while ... done < ..." |
|
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
3558 # 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
|
3559 exec 5<&0 < "$tmp"/dirs |
|
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
3560 while read d; do |
|
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
3561 if test ! -d "$destdir/$d"; then |
|
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
3562 if $doit; then |
|
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
3563 echo "Creating directory $destdir/$d" |
|
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
3564 mkdir -p "$destdir/$d" || func_fatal_error "failed" |
|
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
3565 else |
|
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
3566 echo "Create directory $destdir/$d" |
|
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
3567 fi |
|
6250
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
3568 fi |
|
7605
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
3569 done |
|
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
3570 exec 0<&5 5<&- |
|
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
3571 } |
|
6183
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
3572 |
|
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
|
3573 # Copy files or make symbolic links. Remove obsolete files. |
|
8451
ba5ed28cb276
Update .cvsignore and .gitignore files.
Bruno Haible <bruno@clisp.org>
parents:
8432
diff
changeset
|
3574 added_files='' |
|
ba5ed28cb276
Update .cvsignore and .gitignore files.
Bruno Haible <bruno@clisp.org>
parents:
8432
diff
changeset
|
3575 removed_files='' |
|
6245
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
3576 delimiter=' ' |
|
7321
3bf1b669d1e1
Rewrite all file names at once.
Bruno Haible <bruno@clisp.org>
parents:
7320
diff
changeset
|
3577 # 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
|
3578 # 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
|
3579 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
|
3580 | 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
|
3581 | LC_ALL=C sort \ |
|
3bf1b669d1e1
Rewrite all file names at once.
Bruno Haible <bruno@clisp.org>
parents:
7320
diff
changeset
|
3582 > "$tmp"/old-files |
|
3bf1b669d1e1
Rewrite all file names at once.
Bruno Haible <bruno@clisp.org>
parents:
7320
diff
changeset
|
3583 # 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
|
3584 # representing the files after this gnulib-tool invocation. |
|
3bf1b669d1e1
Rewrite all file names at once.
Bruno Haible <bruno@clisp.org>
parents:
7320
diff
changeset
|
3585 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
|
3586 | 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
|
3587 | LC_ALL=C sort \ |
|
3bf1b669d1e1
Rewrite all file names at once.
Bruno Haible <bruno@clisp.org>
parents:
7320
diff
changeset
|
3588 > "$tmp"/new-files |
|
6245
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
3589 # 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
|
3590 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
|
3591 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
|
3592 # 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
|
3593 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
|
3594 if $doit; then |
|
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
3595 echo "Removing file $g (backup in ${g}~)" |
|
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
3596 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
|
3597 else |
|
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
3598 echo "Remove file $g (backup in ${g}~)" |
|
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
3599 fi |
|
8451
ba5ed28cb276
Update .cvsignore and .gitignore files.
Bruno Haible <bruno@clisp.org>
parents:
8432
diff
changeset
|
3600 func_append removed_files "$g$nl" |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3601 fi |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3602 done |
|
6245
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
3603 # 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
|
3604 # Uses parameters |
|
3bf1b669d1e1
Rewrite all file names at once.
Bruno Haible <bruno@clisp.org>
parents:
7320
diff
changeset
|
3605 # - f the original file name |
|
3bf1b669d1e1
Rewrite all file names at once.
Bruno Haible <bruno@clisp.org>
parents:
7320
diff
changeset
|
3606 # - g the rewritten file name |
|
11461
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3607 # - 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
|
3608 # otherwise |
|
6245
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
3609 func_add_or_update () |
|
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
3610 { |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3611 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
|
3612 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
|
3613 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
|
3614 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
|
3615 func_dest_tmpfilename "$g" |
|
7073
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
3616 func_lookup_file "$f" |
|
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
3617 cp "$lookedup_file" "$tmpfile" || func_fatal_error "failed" |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3618 if test -n "$sed_transform_main_lib_file"; then |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3619 case "$of" in |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3620 lib/*) |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3621 sed -e "$sed_transform_main_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
|
3622 < "$lookedup_file" > "$tmpfile" || func_fatal_error "failed" |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3623 ;; |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3624 esac |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3625 fi |
|
11593
476a58fbc9b9
gnulib-tool: Transform license on build-aux/ files too.
Simon Josefsson <simon@josefsson.org>
parents:
11592
diff
changeset
|
3626 if test -n "$sed_transform_build_aux_file"; then |
|
476a58fbc9b9
gnulib-tool: Transform license on build-aux/ files too.
Simon Josefsson <simon@josefsson.org>
parents:
11592
diff
changeset
|
3627 case "$of" in |
|
476a58fbc9b9
gnulib-tool: Transform license on build-aux/ files too.
Simon Josefsson <simon@josefsson.org>
parents:
11592
diff
changeset
|
3628 build-aux/*) |
|
476a58fbc9b9
gnulib-tool: Transform license on build-aux/ files too.
Simon Josefsson <simon@josefsson.org>
parents:
11592
diff
changeset
|
3629 sed -e "$sed_transform_build_aux_file" \ |
|
476a58fbc9b9
gnulib-tool: Transform license on build-aux/ files too.
Simon Josefsson <simon@josefsson.org>
parents:
11592
diff
changeset
|
3630 < "$lookedup_file" > "$tmpfile" || func_fatal_error "failed" |
|
476a58fbc9b9
gnulib-tool: Transform license on build-aux/ files too.
Simon Josefsson <simon@josefsson.org>
parents:
11592
diff
changeset
|
3631 ;; |
|
476a58fbc9b9
gnulib-tool: Transform license on build-aux/ files too.
Simon Josefsson <simon@josefsson.org>
parents:
11592
diff
changeset
|
3632 esac |
|
476a58fbc9b9
gnulib-tool: Transform license on build-aux/ files too.
Simon Josefsson <simon@josefsson.org>
parents:
11592
diff
changeset
|
3633 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
|
3634 if test -n "$sed_transform_testsrelated_lib_file"; then |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3635 case "$of" in |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3636 tests=lib/*) |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
3637 sed -e "$sed_transform_testsrelated_lib_file" \ |
|
7073
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
3638 < "$lookedup_file" > "$tmpfile" || func_fatal_error "failed" |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3639 ;; |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3640 esac |
|
5798
49900d80eaaf
2005-04-15 Oskar Liljeblad <oskar@osk.mine.nu>
Simon Josefsson <simon@josefsson.org>
parents:
5685
diff
changeset
|
3641 fi |
|
6245
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
3642 if test -f "$destdir/$g"; then |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3643 # The file already exists. |
|
11461
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3644 func_update_file |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3645 else |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3646 # Install the file. |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3647 # Don't protest if the file should be there but isn't: it happens |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3648 # frequently that developers don't put autogenerated files into CVS. |
|
11461
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
3649 func_add_file |
|
8451
ba5ed28cb276
Update .cvsignore and .gitignore files.
Bruno Haible <bruno@clisp.org>
parents:
8432
diff
changeset
|
3650 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
|
3651 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
|
3652 rm -f "$tmpfile" |
|
6245
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
3653 } |
|
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
3654 # 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
|
3655 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
|
3656 already_present= |
|
7321
3bf1b669d1e1
Rewrite all file names at once.
Bruno Haible <bruno@clisp.org>
parents:
7320
diff
changeset
|
3657 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
|
3658 | sed -e "$sed_take_last_column" \ |
|
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
3659 | 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
|
3660 { # 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
|
3661 # 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
|
3662 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
|
3663 while read g f; do |
|
1ca1035630dd
Avoid to execute while loops in a subshell.
Bruno Haible <bruno@clisp.org>
parents:
7323
diff
changeset
|
3664 func_add_or_update |
|
1ca1035630dd
Avoid to execute while loops in a subshell.
Bruno Haible <bruno@clisp.org>
parents:
7323
diff
changeset
|
3665 done |
|
7373
330a972d58f0
Tweak last patch, for symmetry.
Bruno Haible <bruno@clisp.org>
parents:
7368
diff
changeset
|
3666 exec 0<&5 5<&- |
|
7326
1ca1035630dd
Avoid to execute while loops in a subshell.
Bruno Haible <bruno@clisp.org>
parents:
7323
diff
changeset
|
3667 } |
|
6245
07b16a28510d
Speed up the matching of new and old files.
Bruno Haible <bruno@clisp.org>
parents:
6213
diff
changeset
|
3668 # 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
|
3669 already_present=true |
|
7321
3bf1b669d1e1
Rewrite all file names at once.
Bruno Haible <bruno@clisp.org>
parents:
7320
diff
changeset
|
3670 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
|
3671 | sed -e "$sed_take_last_column" \ |
|
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
3672 | 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
|
3673 { # 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
|
3674 # 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
|
3675 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
|
3676 while read g f; do |
|
1ca1035630dd
Avoid to execute while loops in a subshell.
Bruno Haible <bruno@clisp.org>
parents:
7323
diff
changeset
|
3677 func_add_or_update |
|
1ca1035630dd
Avoid to execute while loops in a subshell.
Bruno Haible <bruno@clisp.org>
parents:
7323
diff
changeset
|
3678 done |
|
7373
330a972d58f0
Tweak last patch, for symmetry.
Bruno Haible <bruno@clisp.org>
parents:
7368
diff
changeset
|
3679 exec 0<&5 5<&- |
|
7326
1ca1035630dd
Avoid to execute while loops in a subshell.
Bruno Haible <bruno@clisp.org>
parents:
7323
diff
changeset
|
3680 } |
|
5345
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
3681 |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3682 # Command-line invocation printed in a comment in generated gnulib-cache.m4. |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3683 actioncmd="gnulib-tool --import" |
|
7323
7ca0e325d5db
Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents:
7322
diff
changeset
|
3684 func_append actioncmd " --dir=$destdir" |
|
7213
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
3685 if test -n "$local_gnulib_dir"; then |
|
7323
7ca0e325d5db
Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents:
7322
diff
changeset
|
3686 func_append actioncmd " --local-dir=$local_gnulib_dir" |
|
7213
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
3687 fi |
|
7323
7ca0e325d5db
Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents:
7322
diff
changeset
|
3688 func_append actioncmd " --lib=$libname" |
|
7ca0e325d5db
Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents:
7322
diff
changeset
|
3689 func_append actioncmd " --source-base=$sourcebase" |
|
7ca0e325d5db
Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents:
7322
diff
changeset
|
3690 func_append actioncmd " --m4-base=$m4base" |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3691 if test -n "$pobase"; then |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3692 func_append actioncmd " --po-base=$pobase" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3693 fi |
|
7323
7ca0e325d5db
Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents:
7322
diff
changeset
|
3694 func_append actioncmd " --doc-base=$docbase" |
|
10475
b80084824a77
Store the --tests-base option in the comment in gnulib-cache.m4.
Yoann Vandoorselaere <yoann.v@prelude-ids.com>
parents:
10453
diff
changeset
|
3695 func_append actioncmd " --tests-base=$testsbase" |
|
7323
7ca0e325d5db
Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents:
7322
diff
changeset
|
3696 func_append actioncmd " --aux-dir=$auxdir" |
|
8890
576d3e4f31c2
Remember the presence of the --with-tests command-line option through
Bruno Haible <bruno@clisp.org>
parents:
8672
diff
changeset
|
3697 if test -n "$inctests"; then |
|
576d3e4f31c2
Remember the presence of the --with-tests command-line option through
Bruno Haible <bruno@clisp.org>
parents:
8672
diff
changeset
|
3698 func_append actioncmd " --with-tests" |
|
576d3e4f31c2
Remember the presence of the --with-tests command-line option through
Bruno Haible <bruno@clisp.org>
parents:
8672
diff
changeset
|
3699 fi |
|
10744
7fb7b37150b3
New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents:
10743
diff
changeset
|
3700 if test -n "$incobsolete"; then |
|
7fb7b37150b3
New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents:
10743
diff
changeset
|
3701 func_append actioncmd " --with-obsolete" |
|
7fb7b37150b3
New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents:
10743
diff
changeset
|
3702 fi |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3703 for module in $avoidlist; do |
|
7323
7ca0e325d5db
Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents:
7322
diff
changeset
|
3704 func_append actioncmd " --avoid=$module" |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3705 done |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3706 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
|
3707 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
|
3708 func_append actioncmd " --lgpl" |
|
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
3709 else |
|
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
3710 func_append actioncmd " --lgpl=$lgpl" |
|
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
3711 fi |
|
5345
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
3712 fi |
|
7216
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
3713 if test -n "$makefile_name"; then |
|
7600
42c51a6fef88
Fix typo in actioncmd. From Charles WIlson.
Bruno Haible <bruno@clisp.org>
parents:
7599
diff
changeset
|
3714 func_append actioncmd " --makefile-name=$makefile_name" |
|
7216
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
3715 fi |
| 7077 | 3716 if test "$libtool" = true; then |
|
7323
7ca0e325d5db
Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents:
7322
diff
changeset
|
3717 func_append actioncmd " --libtool" |
| 7077 | 3718 else |
|
7323
7ca0e325d5db
Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents:
7322
diff
changeset
|
3719 func_append actioncmd " --no-libtool" |
|
5345
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
3720 fi |
|
7323
7ca0e325d5db
Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents:
7322
diff
changeset
|
3721 func_append actioncmd " --macro-prefix=$macro_prefix" |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3722 if test -n "$po_domain"; then |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3723 func_append actioncmd " --po-domain=$po_domain" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3724 fi |
|
9810
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
3725 if test -n "$vc_files"; then |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
3726 if test "$vc_files" = true; then |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
3727 func_append actioncmd " --vc-files" |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
3728 else |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
3729 func_append actioncmd " --no-vc-files" |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
3730 fi |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
3731 fi |
|
7323
7ca0e325d5db
Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents:
7322
diff
changeset
|
3732 func_append actioncmd " `echo $specified_modules`" |
|
5345
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
3733 |
|
7222
06eec4eaf416
* gnulib-tool (emit_lib_Makefile_am): Don't put $makefile_name
Paul Eggert <eggert@cs.ucla.edu>
parents:
7216
diff
changeset
|
3734 # 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
|
3735 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
|
3736 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
|
3737 else |
|
06eec4eaf416
* gnulib-tool (emit_lib_Makefile_am): Don't put $makefile_name
Paul Eggert <eggert@cs.ucla.edu>
parents:
7216
diff
changeset
|
3738 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
|
3739 fi |
|
06eec4eaf416
* gnulib-tool (emit_lib_Makefile_am): Don't put $makefile_name
Paul Eggert <eggert@cs.ucla.edu>
parents:
7216
diff
changeset
|
3740 |
|
7981
41421349e26b
In testing directories, link the test programs already during "make", not
Bruno Haible <bruno@clisp.org>
parents:
7911
diff
changeset
|
3741 # 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
|
3742 for_test=false |
|
41421349e26b
In testing directories, link the test programs already during "make", not
Bruno Haible <bruno@clisp.org>
parents:
7911
diff
changeset
|
3743 |
|
10476
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
3744 # 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
|
3745 # 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
|
3746 # 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
|
3747 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
|
3748 # func_note_Makefile_am_edit dir var value |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
3749 # 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
|
3750 # ${value}. |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
3751 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
|
3752 { |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
3753 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
|
3754 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
|
3755 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
|
3756 eval makefile_am_edit${makefile_am_edits}_val=\"\$3\" |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
3757 } |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
3758 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
|
3759 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
|
3760 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
|
3761 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
|
3762 fi |
|
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 "$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
|
3764 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
|
3765 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
|
3766 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
|
3767 fi |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
3768 if test -n "$inctests"; then |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
3769 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
|
3770 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
|
3771 testsbase_base=`basename "$testsbase"` |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
3772 func_note_Makefile_am_edit "$testsbase_dir" SUBDIRS "$testsbase_base" |
|
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 fi |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
3775 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
|
3776 { |
|
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
|
3777 # 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
|
3778 # 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
|
3779 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
|
3780 s,//*$,/,' |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
3781 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
|
3782 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
|
3783 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
|
3784 && ! { 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
|
3785 || 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
|
3786 || 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
|
3787 || { test -n "$inctests" \ |
|
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
|
3788 && { 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
|
3789 || 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
|
3790 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
|
3791 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
|
3792 done |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
3793 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
|
3794 } |
|
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
3795 |
|
7222
06eec4eaf416
* gnulib-tool (emit_lib_Makefile_am): Don't put $makefile_name
Paul Eggert <eggert@cs.ucla.edu>
parents:
7216
diff
changeset
|
3796 # Create library makefile. |
|
7216
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
3797 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
|
3798 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
|
3799 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
|
3800 func_emit_lib_Makefile_am > "$tmpfile" |
|
7216
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
3801 if test -f "$destdir"/$sourcebase/$makefile_am; then |
|
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
3802 if cmp "$destdir"/$sourcebase/$makefile_am "$tmpfile" > /dev/null; 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
|
3803 rm -f "$tmpfile" |
|
6246
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
3804 else |
|
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
3805 if $doit; then |
|
7216
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
3806 echo "Updating $sourcebase/$makefile_am (backup in $sourcebase/$makefile_am~)" |
|
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
3807 mv -f "$destdir"/$sourcebase/$makefile_am "$destdir"/$sourcebase/$makefile_am~ |
|
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
3808 mv -f "$tmpfile" "$destdir"/$sourcebase/$makefile_am |
|
6246
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
3809 else |
|
7216
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
3810 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
|
3811 rm -f "$tmpfile" |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3812 fi |
|
6246
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
3813 fi |
|
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
3814 else |
|
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
3815 if $doit; then |
|
7216
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
3816 echo "Creating $sourcebase/$makefile_am" |
|
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
3817 mv -f "$tmpfile" "$destdir"/$sourcebase/$makefile_am |
|
6246
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
3818 else |
|
7216
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
3819 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
|
3820 rm -f "$tmpfile" |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
3821 fi |
|
8451
ba5ed28cb276
Update .cvsignore and .gitignore files.
Bruno Haible <bruno@clisp.org>
parents:
8432
diff
changeset
|
3822 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
|
3823 fi |
|
5345
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
3824 |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3825 # Create po/ directory. |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3826 if test -n "$pobase"; then |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3827 # Create po makefile and auxiliary files. |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3828 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
|
3829 func_dest_tmpfilename $pobase/$file |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3830 func_lookup_file build-aux/po/$file |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3831 cat "$lookedup_file" > "$tmpfile" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3832 if test -f "$destdir"/$pobase/$file; then |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3833 if cmp "$destdir"/$pobase/$file "$tmpfile" > /dev/null; then |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3834 rm -f "$tmpfile" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3835 else |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3836 if $doit; then |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3837 echo "Updating $pobase/$file (backup in $pobase/$file~)" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3838 mv -f "$destdir"/$pobase/$file "$destdir"/$pobase/$file~ |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3839 mv -f "$tmpfile" "$destdir"/$pobase/$file |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3840 else |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3841 echo "Update $pobase/$file (backup in $pobase/$file~)" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3842 rm -f "$tmpfile" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3843 fi |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3844 fi |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3845 else |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3846 if $doit; then |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3847 echo "Creating $pobase/$file" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3848 mv -f "$tmpfile" "$destdir"/$pobase/$file |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3849 else |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3850 echo "Create $pobase/$file" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3851 rm -f "$tmpfile" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3852 fi |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3853 func_append added_files "$pobase/$file$nl" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3854 fi |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3855 done |
|
10065
e1449fcc7ecb
* gnulib-tool: Fix various comment typos.
Eric Blake <ebb9@byu.net>
parents:
9887
diff
changeset
|
3856 # Create po makefile parameterization, part 1. |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3857 func_dest_tmpfilename $pobase/Makevars |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3858 func_emit_po_Makevars > "$tmpfile" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3859 if test -f "$destdir"/$pobase/Makevars; then |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3860 if cmp "$destdir"/$pobase/Makevars "$tmpfile" > /dev/null; then |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3861 rm -f "$tmpfile" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3862 else |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3863 if $doit; then |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3864 echo "Updating $pobase/Makevars (backup in $pobase/Makevars~)" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3865 mv -f "$destdir"/$pobase/Makevars "$destdir"/$pobase/Makevars~ |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3866 mv -f "$tmpfile" "$destdir"/$pobase/Makevars |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3867 else |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3868 echo "Update $pobase/Makevars (backup in $pobase/Makevars~)" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3869 rm -f "$tmpfile" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3870 fi |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3871 fi |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3872 else |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3873 if $doit; then |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3874 echo "Creating $pobase/Makevars" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3875 mv -f "$tmpfile" "$destdir"/$pobase/Makevars |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3876 else |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3877 echo "Create $pobase/Makevars" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3878 rm -f "$tmpfile" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3879 fi |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3880 func_append added_files "$pobase/Makevars$nl" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3881 fi |
|
10065
e1449fcc7ecb
* gnulib-tool: Fix various comment typos.
Eric Blake <ebb9@byu.net>
parents:
9887
diff
changeset
|
3882 # Create po makefile parameterization, part 2. |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3883 func_dest_tmpfilename $pobase/POTFILES.in |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3884 func_emit_po_POTFILES_in > "$tmpfile" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3885 if test -f "$destdir"/$pobase/POTFILES.in; then |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3886 if cmp "$destdir"/$pobase/POTFILES.in "$tmpfile" > /dev/null; then |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3887 rm -f "$tmpfile" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3888 else |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3889 if $doit; then |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3890 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
|
3891 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
|
3892 mv -f "$tmpfile" "$destdir"/$pobase/POTFILES.in |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3893 else |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3894 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
|
3895 rm -f "$tmpfile" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3896 fi |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3897 fi |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3898 else |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3899 if $doit; then |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3900 echo "Creating $pobase/POTFILES.in" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3901 mv -f "$tmpfile" "$destdir"/$pobase/POTFILES.in |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3902 else |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3903 echo "Create $pobase/POTFILES.in" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3904 rm -f "$tmpfile" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3905 fi |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3906 func_append added_files "$pobase/POTFILES.in$nl" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3907 fi |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3908 # Fetch PO files. |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3909 TP_URL="http://translationproject.org/latest/" |
|
9187
9d2d1cd46644
Prefer rsync over wget when available.
Bruno Haible <bruno@clisp.org>
parents:
9168
diff
changeset
|
3910 TP_RSYNC_URI="translationproject.org::tp/latest/" |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3911 if $doit; then |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3912 echo "Fetching gnulib PO files from $TP_URL" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3913 (cd "$destdir"/$pobase \ |
|
9187
9d2d1cd46644
Prefer rsync over wget when available.
Bruno Haible <bruno@clisp.org>
parents:
9168
diff
changeset
|
3914 && { # Prefer rsync over wget if it is available, since it consumes |
|
9d2d1cd46644
Prefer rsync over wget when available.
Bruno Haible <bruno@clisp.org>
parents:
9168
diff
changeset
|
3915 # less network bandwidth, due to compression. |
|
9d2d1cd46644
Prefer rsync over wget when available.
Bruno Haible <bruno@clisp.org>
parents:
9168
diff
changeset
|
3916 if type rsync 2>/dev/null | grep / > /dev/null; then |
|
9d2d1cd46644
Prefer rsync over wget when available.
Bruno Haible <bruno@clisp.org>
parents:
9168
diff
changeset
|
3917 rsync -Lrtz "${TP_RSYNC_URI}gnulib/" . |
|
9d2d1cd46644
Prefer rsync over wget when available.
Bruno Haible <bruno@clisp.org>
parents:
9168
diff
changeset
|
3918 else |
|
9d2d1cd46644
Prefer rsync over wget when available.
Bruno Haible <bruno@clisp.org>
parents:
9168
diff
changeset
|
3919 wget --quiet -r -l1 -nd -np -A.po "${TP_URL}gnulib" |
|
9d2d1cd46644
Prefer rsync over wget when available.
Bruno Haible <bruno@clisp.org>
parents:
9168
diff
changeset
|
3920 fi |
|
9d2d1cd46644
Prefer rsync over wget when available.
Bruno Haible <bruno@clisp.org>
parents:
9168
diff
changeset
|
3921 } |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3922 ) |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3923 else |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3924 echo "Fetch gnulib PO files from $TP_URL" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3925 fi |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3926 # Create po/LINGUAS. |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3927 if $doit; then |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3928 func_dest_tmpfilename $pobase/LINGUAS |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3929 (cd "$destdir"/$pobase \ |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3930 && { echo '# Set of available languages.' |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3931 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
|
3932 } |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3933 ) > "$tmpfile" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3934 if test -f "$destdir"/$pobase/LINGUAS; then |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3935 if cmp "$destdir"/$pobase/LINGUAS "$tmpfile" > /dev/null; then |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3936 rm -f "$tmpfile" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3937 else |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3938 echo "Updating $pobase/LINGUAS (backup in $pobase/LINGUAS~)" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3939 mv -f "$destdir"/$pobase/LINGUAS "$destdir"/$pobase/LINGUAS~ |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3940 mv -f "$tmpfile" "$destdir"/$pobase/LINGUAS |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3941 fi |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3942 else |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3943 echo "Creating $pobase/LINGUAS" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3944 mv -f "$tmpfile" "$destdir"/$pobase/LINGUAS |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3945 func_append added_files "$pobase/LINGUAS$nl" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3946 fi |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3947 else |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3948 if test -f "$destdir"/$pobase/LINGUAS; then |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3949 echo "Update $pobase/LINGUAS (backup in $pobase/LINGUAS~)" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3950 else |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3951 echo "Create $pobase/LINGUAS" |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3952 fi |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3953 fi |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3954 fi |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3955 |
|
6180
a0904de304e5
Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents:
6179
diff
changeset
|
3956 # 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
|
3957 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
|
3958 ( |
|
6777
d9b10884dc69
* gnulib-tool (func_version): Base copyright year on CVS date.
Eric Blake <ebb9@byu.net>
parents:
6765
diff
changeset
|
3959 func_emit_copyright_notice |
|
5345
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
3960 echo "#" |
|
6180
a0904de304e5
Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents:
6179
diff
changeset
|
3961 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
|
3962 echo "# It acts as a cache: It is written and read by gnulib-tool." |
|
a0904de304e5
Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents:
6179
diff
changeset
|
3963 echo "# In projects using CVS, this file is meant to be stored in CVS," |
|
a0904de304e5
Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents:
6179
diff
changeset
|
3964 echo "# like the configure.ac and various Makefile.am files." |
|
a0904de304e5
Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents:
6179
diff
changeset
|
3965 echo |
|
a0904de304e5
Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents:
6179
diff
changeset
|
3966 echo |
|
a0904de304e5
Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents:
6179
diff
changeset
|
3967 echo "# Specification in the form of a command-line invocation:" |
|
a0904de304e5
Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents:
6179
diff
changeset
|
3968 echo "# $actioncmd" |
|
a0904de304e5
Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents:
6179
diff
changeset
|
3969 echo |
|
a0904de304e5
Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents:
6179
diff
changeset
|
3970 echo "# Specification in the form of a few gnulib-tool.m4 macro invocations:" |
|
7213
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
3971 # Store the local_gnulib_dir relative to destdir. |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
3972 case "$local_gnulib_dir" in |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
3973 "" | /*) |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
3974 relative_local_gnulib_dir="$local_gnulib_dir" ;; |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
3975 * ) |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
3976 case "$destdir" in |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
3977 /*) relative_local_gnulib_dir="$local_gnulib_dir" ;; |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
3978 *) |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
3979 # destdir, local_gnulib_dir are both relative. |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
3980 func_relativize "$destdir" "$local_gnulib_dir" |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
3981 relative_local_gnulib_dir="$reldir" ;; |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
3982 esac ;; |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
3983 esac |
|
0f2957c42e86
Save the --local-dir value in the cache file.
Bruno Haible <bruno@clisp.org>
parents:
7212
diff
changeset
|
3984 echo "gl_LOCAL_DIR([$relative_local_gnulib_dir])" |
|
10246
50a9076d476d
Make gnulib-cache.m4 easier to diff.
Eric Blake <ebb9@byu.net>
parents:
10157
diff
changeset
|
3985 echo "gl_MODULES([" |
| 12417 | 3986 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
|
3987 echo "])" |
|
10744
7fb7b37150b3
New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents:
10743
diff
changeset
|
3988 test -z "$incobsolete" || echo "gl_WITH_OBSOLETE" |
|
6180
a0904de304e5
Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents:
6179
diff
changeset
|
3989 echo "gl_AVOID([$avoidlist])" |
|
a0904de304e5
Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents:
6179
diff
changeset
|
3990 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
|
3991 echo "gl_M4_BASE([$m4base])" |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
3992 echo "gl_PO_BASE([$pobase])" |
|
6955
7715890c929a
* gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents:
6952
diff
changeset
|
3993 echo "gl_DOC_BASE([$docbase])" |
|
6250
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
3994 echo "gl_TESTS_BASE([$testsbase])" |
|
8890
576d3e4f31c2
Remember the presence of the --with-tests command-line option through
Bruno Haible <bruno@clisp.org>
parents:
8672
diff
changeset
|
3995 test -z "$inctests" || echo "gl_WITH_TESTS" |
|
6180
a0904de304e5
Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents:
6179
diff
changeset
|
3996 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
|
3997 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
|
3998 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
|
3999 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
|
4000 else |
|
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
4001 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
|
4002 fi |
|
95cbd64f5138
Allow specifying the LGPL version number through --lgpl=2 or --lgpl=3.
Bruno Haible <bruno@clisp.org>
parents:
9377
diff
changeset
|
4003 fi |
|
7216
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
4004 echo "gl_MAKEFILE_NAME([$makefile_name])" |
| 7077 | 4005 if test "$libtool" = true; then |
| 4006 echo "gl_LIBTOOL" | |
| 4007 fi | |
|
6180
a0904de304e5
Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents:
6179
diff
changeset
|
4008 echo "gl_MACRO_PREFIX([$macro_prefix])" |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
4009 echo "gl_PO_DOMAIN([$po_domain])" |
|
9810
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
4010 if test -n "$vc_files"; then |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
4011 echo "gl_VC_FILES([$vc_files])" |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
4012 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
|
4013 ) > "$tmpfile" |
|
6246
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
4014 if test -f "$destdir"/$m4base/gnulib-cache.m4; 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
|
4015 if cmp "$destdir"/$m4base/gnulib-cache.m4 "$tmpfile" > /dev/null; then |
|
aca74c06bca0
Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and
Bruno Haible <bruno@clisp.org>
parents:
6633
diff
changeset
|
4016 rm -f "$tmpfile" |
|
6246
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
4017 else |
|
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
4018 if $doit; then |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
4019 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
|
4020 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
|
4021 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
|
4022 else |
|
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
4023 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
|
4024 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
|
4025 cat "$tmpfile" |
|
6249
564133adbd69
Comment out too much verbosity in --dry-run.
Bruno Haible <bruno@clisp.org>
parents:
6248
diff
changeset
|
4026 echo |
|
564133adbd69
Comment out too much verbosity in --dry-run.
Bruno Haible <bruno@clisp.org>
parents:
6248
diff
changeset
|
4027 echo "# gnulib-cache.m4 ends here" |
|
564133adbd69
Comment out too much verbosity in --dry-run.
Bruno Haible <bruno@clisp.org>
parents:
6248
diff
changeset
|
4028 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
|
4029 rm -f "$tmpfile" |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
4030 fi |
|
6246
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
4031 fi |
|
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
4032 else |
|
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
4033 if $doit; then |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
4034 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
|
4035 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
|
4036 else |
|
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
4037 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
|
4038 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
|
4039 rm -f "$tmpfile" |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
4040 fi |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
4041 fi |
|
6180
a0904de304e5
Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents:
6179
diff
changeset
|
4042 |
|
a0904de304e5
Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents:
6179
diff
changeset
|
4043 # 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
|
4044 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
|
4045 ( |
|
7421
8bace4b08db5
Mark generated files as "DO NOT EDIT".
Bruno Haible <bruno@clisp.org>
parents:
7391
diff
changeset
|
4046 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
|
4047 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
|
4048 echo "#" |
|
a0904de304e5
Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents:
6179
diff
changeset
|
4049 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
|
4050 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
|
4051 echo "# to be invoked from configure.ac." |
|
a0904de304e5
Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents:
6179
diff
changeset
|
4052 echo "# In projects using CVS, this file can be treated like other built files." |
|
a0904de304e5
Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents:
6179
diff
changeset
|
4053 echo |
|
5345
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
4054 echo |
|
6160
2fb771c0af6b
Emit more comments and advice.
Bruno Haible <bruno@clisp.org>
parents:
6159
diff
changeset
|
4055 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
|
4056 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
|
4057 echo "# any checks for libraries, header files, types and library functions." |
| 6176 | 4058 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
|
4059 echo "[" |
|
7105
641bac73140c
* gnulib-tool (func_import): Detect unexpanded macros in gnulib
Eric Blake <ebb9@byu.net>
parents:
7090
diff
changeset
|
4060 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
|
4061 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
|
4062 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
|
4063 echo " m4_pattern_allow([^gl_LTLIBOBJS\$])dnl a variable" |
| 6512 | 4064 echo " AC_REQUIRE([AC_PROG_RANLIB])" |
|
7641
d6fbdb213b01
Finish support for source files in subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7640
diff
changeset
|
4065 if test -n "$uses_subdirs"; then |
|
d6fbdb213b01
Finish support for source files in subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7640
diff
changeset
|
4066 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
|
4067 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
|
4068 for module in $final_modules; do |
|
8079
0951beec5b89
New module description section 'configure.ac-early'.
Bruno Haible <bruno@clisp.org>
parents:
8055
diff
changeset
|
4069 func_verify_module |
|
0951beec5b89
New module description section 'configure.ac-early'.
Bruno Haible <bruno@clisp.org>
parents:
8055
diff
changeset
|
4070 if test -n "$module"; then |
|
0951beec5b89
New module description section 'configure.ac-early'.
Bruno Haible <bruno@clisp.org>
parents:
8055
diff
changeset
|
4071 func_get_autoconf_early_snippet "$module" |
|
0951beec5b89
New module description section 'configure.ac-early'.
Bruno Haible <bruno@clisp.org>
parents:
8055
diff
changeset
|
4072 fi |
|
0951beec5b89
New module description section 'configure.ac-early'.
Bruno Haible <bruno@clisp.org>
parents:
8055
diff
changeset
|
4073 done \ |
|
0951beec5b89
New module description section 'configure.ac-early'.
Bruno Haible <bruno@clisp.org>
parents:
8055
diff
changeset
|
4074 | 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
|
4075 echo "])" |
|
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
4076 echo |
|
6160
2fb771c0af6b
Emit more comments and advice.
Bruno Haible <bruno@clisp.org>
parents:
6159
diff
changeset
|
4077 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
|
4078 echo "# \"Check for header files, types and library functions\"." |
| 6176 | 4079 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
|
4080 echo "[" |
| 7077 | 4081 if test "$libtool" = true; then |
| 4082 echo " AM_CONDITIONAL([GL_COND_LIBTOOL], [true])" | |
|
7286
727bb5526bad
For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents:
7270
diff
changeset
|
4083 echo " gl_cond_libtool=true" |
| 7077 | 4084 else |
| 6512 | 4085 echo " AM_CONDITIONAL([GL_COND_LIBTOOL], [false])" |
|
7286
727bb5526bad
For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents:
7270
diff
changeset
|
4086 echo " gl_cond_libtool=false" |
|
727bb5526bad
For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents:
7270
diff
changeset
|
4087 echo " gl_libdeps=" |
|
727bb5526bad
For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents:
7270
diff
changeset
|
4088 echo " gl_ltlibdeps=" |
|
6414
46d47c8fe734
* gnulib-tool: Define automake conditional GL_COND_LIBTOOL if
Simon Josefsson <simon@josefsson.org>
parents:
6389
diff
changeset
|
4089 fi |
| 6556 | 4090 if test "$auxdir" != "build-aux"; then |
| 4091 sed_replace_build_aux=' | |
| 4092 :a | |
| 4093 /AC_CONFIG_FILES(.*:build-aux\/.*)/{ | |
| 4094 s|AC_CONFIG_FILES(\(.*\):build-aux/\(.*\))|AC_CONFIG_FILES(\1:'"$auxdir"'/\2)| | |
| 4095 ba | |
| 4096 }' | |
| 4097 else | |
|
10400
817f1418bbde
Make gnulib-tool work with native 'sed' on AIX.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
10380
diff
changeset
|
4098 sed_replace_build_aux="$sed_noop" |
| 6556 | 4099 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
|
4100 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
|
4101 echo " gl_source_base='$sourcebase'" |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4102 for module in $main_modules; do |
|
5345
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
4103 func_verify_module |
|
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
4104 if test -n "$module"; then |
|
6546
b32846b4d88d
Replace build-aux when it occurs in the autoconf snippet.
Bruno Haible <bruno@clisp.org>
parents:
6533
diff
changeset
|
4105 func_get_autoconf_snippet "$module" \ |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
4106 | sed -e '/^$/d;' -e 's/^/ /' \ |
|
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
4107 -e 's/AM_GNU_GETTEXT(\[external\])/dnl you must add AM_GNU_GETTEXT([external]) or similar to configure.ac./' \ |
|
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
4108 -e "$sed_replace_build_aux" |
| 7077 | 4109 if test "$module" = 'alloca' && test "$libtool" = true; then |
|
5356
144b29bba7b7
Provisions for defining LTALLOCA.
Bruno Haible <bruno@clisp.org>
parents:
5353
diff
changeset
|
4110 echo 'changequote(,)dnl' |
| 12417 | 4111 echo 'LTALLOCA=`echo "$ALLOCA" | sed -e '"'"'s/\.[^.]* /.lo /g;s/\.[^.]*$/.lo/'"'"'`' |
|
5356
144b29bba7b7
Provisions for defining LTALLOCA.
Bruno Haible <bruno@clisp.org>
parents:
5353
diff
changeset
|
4112 echo 'changequote([, ])dnl' |
|
6106
66bd85c8a9cd
Proper autoconf macro argument quoting.
Bruno Haible <bruno@clisp.org>
parents:
6039
diff
changeset
|
4113 echo 'AC_SUBST([LTALLOCA])' |
|
5356
144b29bba7b7
Provisions for defining LTALLOCA.
Bruno Haible <bruno@clisp.org>
parents:
5353
diff
changeset
|
4114 fi |
|
5345
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
4115 fi |
|
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
4116 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
|
4117 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
|
4118 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
|
4119 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
|
4120 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
|
4121 echo " gl_source_base='$testsbase'" |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4122 for module in $testsrelated_modules; do |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4123 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
|
4124 if test -n "$module"; then |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4125 func_get_autoconf_snippet "$module" \ |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4126 | sed -e '/^$/d;' -e 's/^/ /' \ |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4127 -e 's/AM_GNU_GETTEXT(\[external\])/dnl you must add AM_GNU_GETTEXT([external]) or similar to configure.ac./' \ |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4128 -e "$sed_replace_build_aux" \ |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4129 -e 's/\$gl_cond_libtool/false/g' \ |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4130 -e 's/gl_libdeps/gltests_libdeps/g' \ |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4131 -e 's/gl_ltlibdeps/gltests_ltlibdeps/g' |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4132 fi |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4133 done |
|
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4134 func_emit_initmacro_end ${macro_prefix}tests |
|
7286
727bb5526bad
For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents:
7270
diff
changeset
|
4135 # _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
|
4136 # 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
|
4137 if test "$libtool" != true; then |
|
9086
110e60d88fad
(func_import): Avoid duplication of --avoid statements
Sergey Poznyakoff <gray@gnu.org.ua>
parents:
9025
diff
changeset
|
4138 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
|
4139 echo " ${libname_upper}_LIBDEPS=\"\$gl_libdeps\"" |
|
727bb5526bad
For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents:
7270
diff
changeset
|
4140 echo " AC_SUBST([${libname_upper}_LIBDEPS])" |
|
727bb5526bad
For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents:
7270
diff
changeset
|
4141 echo " ${libname_upper}_LTLIBDEPS=\"\$gl_ltlibdeps\"" |
|
727bb5526bad
For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents:
7270
diff
changeset
|
4142 echo " AC_SUBST([${libname_upper}_LTLIBDEPS])" |
|
727bb5526bad
For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents:
7270
diff
changeset
|
4143 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
|
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_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
|
4146 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
|
4147 fi |
|
5345
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
4148 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
|
4149 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
|
4150 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
|
4151 echo |
|
6180
a0904de304e5
Separate the generates files into cvs-committable files and frequently
Bruno Haible <bruno@clisp.org>
parents:
6179
diff
changeset
|
4152 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
|
4153 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
|
4154 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
|
4155 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
|
4156 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
|
4157 ) > "$tmpfile" |
|
6246
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
4158 if test -f "$destdir"/$m4base/gnulib-comp.m4; 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
|
4159 if cmp "$destdir"/$m4base/gnulib-comp.m4 "$tmpfile" > /dev/null; then |
|
aca74c06bca0
Fix "gnulib-tool --dry-run --import" in a package that has no lib/ and
Bruno Haible <bruno@clisp.org>
parents:
6633
diff
changeset
|
4160 rm -f "$tmpfile" |
|
6246
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
4161 else |
|
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
4162 if $doit; then |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
4163 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
|
4164 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
|
4165 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
|
4166 else |
|
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
4167 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
|
4168 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
|
4169 cat "$tmpfile" |
|
6249
564133adbd69
Comment out too much verbosity in --dry-run.
Bruno Haible <bruno@clisp.org>
parents:
6248
diff
changeset
|
4170 echo |
|
564133adbd69
Comment out too much verbosity in --dry-run.
Bruno Haible <bruno@clisp.org>
parents:
6248
diff
changeset
|
4171 echo "# gnulib-comp.m4 ends here" |
|
564133adbd69
Comment out too much verbosity in --dry-run.
Bruno Haible <bruno@clisp.org>
parents:
6248
diff
changeset
|
4172 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
|
4173 rm -f "$tmpfile" |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
4174 fi |
|
6246
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
4175 fi |
|
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
4176 else |
|
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
4177 if $doit; then |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
4178 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
|
4179 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
|
4180 else |
|
7c089b3b2200
Rework the way --dry-run works.
Bruno Haible <bruno@clisp.org>
parents:
6245
diff
changeset
|
4181 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
|
4182 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
|
4183 rm -f "$tmpfile" |
|
6181
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
4184 fi |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
4185 fi |
|
95b89dc3f638
Read the previous cached settings.
Bruno Haible <bruno@clisp.org>
parents:
6180
diff
changeset
|
4186 |
|
6250
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
4187 if test -n "$inctests"; then |
|
7222
06eec4eaf416
* gnulib-tool (emit_lib_Makefile_am): Don't put $makefile_name
Paul Eggert <eggert@cs.ucla.edu>
parents:
7216
diff
changeset
|
4188 # Create tests makefile. |
|
7216
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
4189 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
|
4190 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
|
4191 modules="$testsrelated_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
|
4192 func_emit_tests_Makefile_am > "$tmpfile" |
|
7216
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
4193 if test -f "$destdir"/$testsbase/$makefile_am; then |
|
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
4194 if cmp "$destdir"/$testsbase/$makefile_am "$tmpfile" > /dev/null; 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
|
4195 rm -f "$tmpfile" |
|
6250
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
4196 else |
|
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
4197 if $doit; then |
|
7216
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
4198 echo "Updating $testsbase/$makefile_am (backup in $testsbase/$makefile_am~)" |
|
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
4199 mv -f "$destdir"/$testsbase/$makefile_am "$destdir"/$testsbase/$makefile_am~ |
|
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
4200 mv -f "$tmpfile" "$destdir"/$testsbase/$makefile_am |
|
6250
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
4201 else |
|
7216
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
4202 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
|
4203 rm -f "$tmpfile" |
|
6250
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
4204 fi |
|
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
4205 fi |
|
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
4206 else |
|
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
4207 if $doit; then |
|
7216
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
4208 echo "Creating $testsbase/$makefile_am" |
|
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
4209 mv -f "$tmpfile" "$destdir"/$testsbase/$makefile_am |
|
6250
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
4210 else |
|
7216
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
4211 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
|
4212 rm -f "$tmpfile" |
|
6250
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
4213 fi |
|
8451
ba5ed28cb276
Update .cvsignore and .gitignore files.
Bruno Haible <bruno@clisp.org>
parents:
8432
diff
changeset
|
4214 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
|
4215 fi |
|
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
4216 fi |
|
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
4217 |
|
9810
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
4218 if test "$vc_files" != false; then |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
4219 # Update the .cvsignore and .gitignore files. |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
4220 { 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
|
4221 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
|
4222 # 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
|
4223 echo "$m4base/|A|gnulib-comp.m4" |
|
9810
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
4224 } | 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
|
4225 { # Rearrange file descriptors. Needed because "while ... done < ..." |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
4226 # 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
|
4227 exec 5<&0 < "$tmp"/fileset-changes |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
4228 func_update_ignorelist () |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
4229 { |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
4230 ignore="$1" |
|
10298
9b0ceb24a573
Prepend each added line in .gitignore files with a slash.
Bruno Haible <bruno@clisp.org>
parents:
10293
diff
changeset
|
4231 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
|
4232 # 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
|
4233 # 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
|
4234 anchor='/' |
|
9b0ceb24a573
Prepend each added line in .gitignore files with a slash.
Bruno Haible <bruno@clisp.org>
parents:
10293
diff
changeset
|
4235 escaped_anchor='\/' |
|
9b0ceb24a573
Prepend each added line in .gitignore files with a slash.
Bruno Haible <bruno@clisp.org>
parents:
10293
diff
changeset
|
4236 doubly_escaped_anchor='\\/' |
|
9b0ceb24a573
Prepend each added line in .gitignore files with a slash.
Bruno Haible <bruno@clisp.org>
parents:
10293
diff
changeset
|
4237 else |
|
9b0ceb24a573
Prepend each added line in .gitignore files with a slash.
Bruno Haible <bruno@clisp.org>
parents:
10293
diff
changeset
|
4238 anchor='' |
|
9b0ceb24a573
Prepend each added line in .gitignore files with a slash.
Bruno Haible <bruno@clisp.org>
parents:
10293
diff
changeset
|
4239 escaped_anchor='' |
|
9b0ceb24a573
Prepend each added line in .gitignore files with a slash.
Bruno Haible <bruno@clisp.org>
parents:
10293
diff
changeset
|
4240 doubly_escaped_anchor='' |
|
9b0ceb24a573
Prepend each added line in .gitignore files with a slash.
Bruno Haible <bruno@clisp.org>
parents:
10293
diff
changeset
|
4241 fi |
|
9810
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
4242 if test -f "$destdir/$dir$ignore"; then |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
4243 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
|
4244 sed -e "s|^$anchor||" < "$destdir/$dir$ignore" | LC_ALL=C sort > "$tmp"/ignore |
|
10379
a4e295b67e54
Attempt to avoid error messages like "echo: write error: Broken pipe".
Bruno Haible <bruno@clisp.org>
parents:
10298
diff
changeset
|
4245 (func_reset_sigpipe |
|
a4e295b67e54
Attempt to avoid error messages like "echo: write error: Broken pipe".
Bruno Haible <bruno@clisp.org>
parents:
10298
diff
changeset
|
4246 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
|
4247 | 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
|
4248 echo "$dir_removed" | 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
|
4249 | LC_ALL=C join -v 1 - "$tmp"/ignore > "$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
|
4250 ) |
|
9810
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
4251 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
|
4252 if $doit; then |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
4253 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
|
4254 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
|
4255 { 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
|
4256 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
|
4257 } > "$tmp"/sed-ignore-removed |
|
9b0ceb24a573
Prepend each added line in .gitignore files with a slash.
Bruno Haible <bruno@clisp.org>
parents:
10293
diff
changeset
|
4258 { cat "$destdir/$dir$ignore"~ |
|
9b0ceb24a573
Prepend each added line in .gitignore files with a slash.
Bruno Haible <bruno@clisp.org>
parents:
10293
diff
changeset
|
4259 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
|
4260 } | sed -f "$tmp"/sed-ignore-removed \ |
|
9810
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
4261 > "$destdir/$dir$ignore" |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
4262 else |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
4263 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
|
4264 fi |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
4265 fi |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
4266 fi |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
4267 else |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
4268 if test -n "$dir_added"; then |
|
8451
ba5ed28cb276
Update .cvsignore and .gitignore files.
Bruno Haible <bruno@clisp.org>
parents:
8432
diff
changeset
|
4269 if $doit; then |
|
9810
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
4270 echo "Creating $destdir/$dir$ignore" |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
4271 { |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
4272 if test "$ignore" = .cvsignore; then |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
4273 echo ".deps" |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
4274 # 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
|
4275 echo ".dirstamp" |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
4276 fi |
|
10298
9b0ceb24a573
Prepend each added line in .gitignore files with a slash.
Bruno Haible <bruno@clisp.org>
parents:
10293
diff
changeset
|
4277 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
|
4278 } > "$destdir/$dir$ignore" |
|
8451
ba5ed28cb276
Update .cvsignore and .gitignore files.
Bruno Haible <bruno@clisp.org>
parents:
8432
diff
changeset
|
4279 else |
|
9810
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
4280 echo "Create $destdir/$dir$ignore" |
|
8451
ba5ed28cb276
Update .cvsignore and .gitignore files.
Bruno Haible <bruno@clisp.org>
parents:
8432
diff
changeset
|
4281 fi |
|
ba5ed28cb276
Update .cvsignore and .gitignore files.
Bruno Haible <bruno@clisp.org>
parents:
8432
diff
changeset
|
4282 fi |
|
ba5ed28cb276
Update .cvsignore and .gitignore files.
Bruno Haible <bruno@clisp.org>
parents:
8432
diff
changeset
|
4283 fi |
|
9810
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
4284 } |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
4285 func_done_dir () |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
4286 { |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
4287 dir="$1" |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
4288 dir_added="$2" |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
4289 dir_removed="$3" |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
4290 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
|
4291 func_update_ignorelist .cvsignore |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
4292 fi |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
4293 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
|
4294 func_update_ignorelist .gitignore |
|
8451
ba5ed28cb276
Update .cvsignore and .gitignore files.
Bruno Haible <bruno@clisp.org>
parents:
8432
diff
changeset
|
4295 fi |
|
9810
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
4296 } |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
4297 last_dir= |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
4298 last_dir_added= |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
4299 last_dir_removed= |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
4300 while read line; do |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
4301 # 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
|
4302 next_dir=`echo "$line" | sed -e 's,|.*,,'` |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
4303 op=`echo "$line" | sed -e 's,^[^|]*|\([^|]*\)|.*$,\1,'` |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
4304 file=`echo "$line" | sed -e 's,^[^|]*|[^|]*|,,'` |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
4305 if test "$next_dir" != "$last_dir"; then |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
4306 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
|
4307 last_dir="$next_dir" |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
4308 last_dir_added= |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
4309 last_dir_removed= |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
4310 fi |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
4311 case $op in |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
4312 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
|
4313 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
|
4314 esac |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
4315 done |
|
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
4316 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
|
4317 exec 0<&5 5<&- |
|
8451
ba5ed28cb276
Update .cvsignore and .gitignore files.
Bruno Haible <bruno@clisp.org>
parents:
8432
diff
changeset
|
4318 } |
|
9810
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
4319 fi |
|
8451
ba5ed28cb276
Update .cvsignore and .gitignore files.
Bruno Haible <bruno@clisp.org>
parents:
8432
diff
changeset
|
4320 |
|
5345
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
4321 echo "Finished." |
|
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
4322 echo |
|
5572
54000928a33d
Print #include directives when --import'ing.
Simon Josefsson <simon@josefsson.org>
parents:
5527
diff
changeset
|
4323 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
|
4324 # 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
|
4325 # (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
|
4326 # - 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
|
4327 # $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
|
4328 # 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
|
4329 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
|
4330 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
|
4331 # 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
|
4332 # 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
|
4333 # then the #include directives that are surrounded by #ifs. Not sorted. |
| 7722 | 4334 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
|
4335 include_directive=`func_get_include_directive "$module"` |
|
46d98b687a87
Speed up presentation of the include files.
Bruno Haible <bruno@clisp.org>
parents:
7321
diff
changeset
|
4336 case "$nl$include_directive" in |
|
46d98b687a87
Speed up presentation of the include files.
Bruno Haible <bruno@clisp.org>
parents:
7321
diff
changeset
|
4337 *"$nl#if"*) |
|
46d98b687a87
Speed up presentation of the include files.
Bruno Haible <bruno@clisp.org>
parents:
7321
diff
changeset
|
4338 echo "$include_directive" 1>&5 |
|
46d98b687a87
Speed up presentation of the include files.
Bruno Haible <bruno@clisp.org>
parents:
7321
diff
changeset
|
4339 ;; |
|
46d98b687a87
Speed up presentation of the include files.
Bruno Haible <bruno@clisp.org>
parents:
7321
diff
changeset
|
4340 *) |
|
46d98b687a87
Speed up presentation of the include files.
Bruno Haible <bruno@clisp.org>
parents:
7321
diff
changeset
|
4341 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
|
4342 echo "$include_directive" | grep 'include "' 1>&7 |
|
46d98b687a87
Speed up presentation of the include files.
Bruno Haible <bruno@clisp.org>
parents:
7321
diff
changeset
|
4343 ;; |
|
46d98b687a87
Speed up presentation of the include files.
Bruno Haible <bruno@clisp.org>
parents:
7321
diff
changeset
|
4344 esac |
|
46d98b687a87
Speed up presentation of the include files.
Bruno Haible <bruno@clisp.org>
parents:
7321
diff
changeset
|
4345 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
|
4346 ( |
|
7322
46d98b687a87
Speed up presentation of the include files.
Bruno Haible <bruno@clisp.org>
parents:
7321
diff
changeset
|
4347 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
|
4348 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
|
4349 cat "$tmp"/include-if |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
4350 ) | sed -e '/^$/d' -e 's/^/ /' |
|
7322
46d98b687a87
Speed up presentation of the include files.
Bruno Haible <bruno@clisp.org>
parents:
7321
diff
changeset
|
4351 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
|
4352 |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4353 for module in $main_modules; do |
|
8055
5c79d44f739d
New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents:
8040
diff
changeset
|
4354 func_get_link_directive "$module" |
|
5c79d44f739d
New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents:
8040
diff
changeset
|
4355 done \ |
|
5c79d44f739d
New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents:
8040
diff
changeset
|
4356 | 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
|
4357 if test `wc -l < "$tmp"/link` != 0; then |
|
5c79d44f739d
New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents:
8040
diff
changeset
|
4358 echo |
|
5c79d44f739d
New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents:
8040
diff
changeset
|
4359 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
|
4360 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
|
4361 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
|
4362 cat "$tmp"/link |
|
5c79d44f739d
New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents:
8040
diff
changeset
|
4363 fi |
|
5c79d44f739d
New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents:
8040
diff
changeset
|
4364 rm -f "$tmp"/link |
|
5c79d44f739d
New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents:
8040
diff
changeset
|
4365 |
|
5572
54000928a33d
Print #include directives when --import'ing.
Simon Josefsson <simon@josefsson.org>
parents:
5527
diff
changeset
|
4366 echo |
|
6160
2fb771c0af6b
Emit more comments and advice.
Bruno Haible <bruno@clisp.org>
parents:
6159
diff
changeset
|
4367 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
|
4368 if test "$makefile_am" = Makefile.am; then |
|
7216
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
4369 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
|
4370 else |
|
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
4371 echo " - \"include $makefile_name\" from within \"$sourcebase/Makefile.am\"," |
|
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
4372 fi |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
4373 if test -n "$pobase"; then |
|
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
4374 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
|
4375 fi |
|
6250
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
4376 if test -n "$inctests"; then |
|
7222
06eec4eaf416
* gnulib-tool (emit_lib_Makefile_am): Don't put $makefile_name
Paul Eggert <eggert@cs.ucla.edu>
parents:
7216
diff
changeset
|
4377 if test "$makefile_am" = Makefile.am; then |
|
7216
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
4378 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
|
4379 else |
|
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
4380 echo " - \"include $makefile_name\" from within \"$testsbase/Makefile.am\"," |
|
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
4381 fi |
|
6250
2c772fe1e1d0
Support --with-tests also with --import.
Bruno Haible <bruno@clisp.org>
parents:
6249
diff
changeset
|
4382 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
|
4383 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
|
4384 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
|
4385 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
|
4386 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
|
4387 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
|
4388 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
|
4389 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
|
4390 echo " - mention \"${val}\" in ${var} in ${dir}Makefile.am," |
|
7216
91df49e70c77
New option --makefile-name.
Bruno Haible <bruno@clisp.org>
parents:
7215
diff
changeset
|
4391 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
|
4392 done |
| 6176 | 4393 echo " - invoke ${macro_prefix}_EARLY in $configure_ac, right after AC_PROG_CC," |
| 4394 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
|
4395 } |
|
8394c9bf619f
Move a lot of code into function func_import().
Bruno Haible <bruno@clisp.org>
parents:
5344
diff
changeset
|
4396 |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4397 # func_create_testdir testdir modules |
|
6109
a52f596fdf00
Generalize support for --aux-dir.
Bruno Haible <bruno@clisp.org>
parents:
6108
diff
changeset
|
4398 # Input: |
|
7214
eb43edab28c3
Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents:
7213
diff
changeset
|
4399 # - local_gnulib_dir from --local-dir |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
4400 # - 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
|
4401 # - 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
|
4402 func_create_testdir () |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4403 { |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4404 testdir="$1" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4405 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
|
4406 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
|
4407 # 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
|
4408 # Except config-h, which breaks all modules which use HAVE_CONFIG_H. |
|
7533
029a26ecb19a
Don't include ftruncate and mountlist by default.
Bruno Haible <bruno@clisp.org>
parents:
7530
diff
changeset
|
4409 # Except ftruncate, mountlist, which abort the configuration on mingw. FIXME. |
|
7484
57fe575409ae
--create-testdir without module names now means to use nearly all modules.
Bruno Haible <bruno@clisp.org>
parents:
7421
diff
changeset
|
4410 modules=`func_all_modules` |
|
11737
351c1d4b1ca6
Undo last gnulib-tool commit: maintainer-makefile is fixed.
Bruno Haible <bruno@clisp.org>
parents:
11734
diff
changeset
|
4411 modules=`for m in $modules; do case $m in config-h | ftruncate | mountlist) ;; *) 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
|
4412 fi |
|
7319
1726cc39709b
Use "sort -u" where it makes sense.
Bruno Haible <bruno@clisp.org>
parents:
7299
diff
changeset
|
4413 modules=`for m in $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
|
4414 |
|
7660
7aa6fbd6b3b7
Add license compatibility check in --create-testdir.
Bruno Haible <bruno@clisp.org>
parents:
7647
diff
changeset
|
4415 # 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
|
4416 # its dependencies. |
|
7aa6fbd6b3b7
Add license compatibility check in --create-testdir.
Bruno Haible <bruno@clisp.org>
parents:
7647
diff
changeset
|
4417 saved_modules="$modules" |
|
7896
cd3ed2fae0bf
Tests modules are under GPL now.
Bruno Haible <bruno@clisp.org>
parents:
7872
diff
changeset
|
4418 saved_inctests="$inctests" |
|
cd3ed2fae0bf
Tests modules are under GPL now.
Bruno Haible <bruno@clisp.org>
parents:
7872
diff
changeset
|
4419 # When computing transitive closures, don't consider $module to depend on |
|
cd3ed2fae0bf
Tests modules are under GPL now.
Bruno Haible <bruno@clisp.org>
parents:
7872
diff
changeset
|
4420 # $module-tests. Need this becauses tests are implicitly GPL and may depend |
|
cd3ed2fae0bf
Tests modules are under GPL now.
Bruno Haible <bruno@clisp.org>
parents:
7872
diff
changeset
|
4421 # on GPL modules - therefore we don't want a warning in this case. |
|
cd3ed2fae0bf
Tests modules are under GPL now.
Bruno Haible <bruno@clisp.org>
parents:
7872
diff
changeset
|
4422 inctests="" |
|
7660
7aa6fbd6b3b7
Add license compatibility check in --create-testdir.
Bruno Haible <bruno@clisp.org>
parents:
7647
diff
changeset
|
4423 for requested_module in $saved_modules; do |
|
7aa6fbd6b3b7
Add license compatibility check in --create-testdir.
Bruno Haible <bruno@clisp.org>
parents:
7647
diff
changeset
|
4424 requested_license=`func_get_license "$requested_module"` |
|
7aa6fbd6b3b7
Add license compatibility check in --create-testdir.
Bruno Haible <bruno@clisp.org>
parents:
7647
diff
changeset
|
4425 if test "$requested_license" != GPL; then |
|
7aa6fbd6b3b7
Add license compatibility check in --create-testdir.
Bruno Haible <bruno@clisp.org>
parents:
7647
diff
changeset
|
4426 # 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
|
4427 # 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
|
4428 # 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
|
4429 # on a GPL module. |
|
7aa6fbd6b3b7
Add license compatibility check in --create-testdir.
Bruno Haible <bruno@clisp.org>
parents:
7647
diff
changeset
|
4430 modules="$requested_module" |
|
7aa6fbd6b3b7
Add license compatibility check in --create-testdir.
Bruno Haible <bruno@clisp.org>
parents:
7647
diff
changeset
|
4431 func_modules_transitive_closure |
|
7aa6fbd6b3b7
Add license compatibility check in --create-testdir.
Bruno Haible <bruno@clisp.org>
parents:
7647
diff
changeset
|
4432 for module in $modules; do |
|
7aa6fbd6b3b7
Add license compatibility check in --create-testdir.
Bruno Haible <bruno@clisp.org>
parents:
7647
diff
changeset
|
4433 license=`func_get_license "$module"` |
|
9090
b1835d4a5e2a
Handle copying terms "GPLv2+" and "LGPLv2+".
Bruno Haible <bruno@clisp.org>
parents:
9086
diff
changeset
|
4434 case "$license" in |
|
b1835d4a5e2a
Handle copying terms "GPLv2+" and "LGPLv2+".
Bruno Haible <bruno@clisp.org>
parents:
9086
diff
changeset
|
4435 'GPLed build tool') ;; |
|
7660
7aa6fbd6b3b7
Add license compatibility check in --create-testdir.
Bruno Haible <bruno@clisp.org>
parents:
7647
diff
changeset
|
4436 'public domain' | 'unlimited' | 'unmodifiable license text') ;; |
|
9090
b1835d4a5e2a
Handle copying terms "GPLv2+" and "LGPLv2+".
Bruno Haible <bruno@clisp.org>
parents:
9086
diff
changeset
|
4437 *) |
|
b1835d4a5e2a
Handle copying terms "GPLv2+" and "LGPLv2+".
Bruno Haible <bruno@clisp.org>
parents:
9086
diff
changeset
|
4438 case "$requested_license" in |
|
b1835d4a5e2a
Handle copying terms "GPLv2+" and "LGPLv2+".
Bruno Haible <bruno@clisp.org>
parents:
9086
diff
changeset
|
4439 GPLv2+) |
|
b1835d4a5e2a
Handle copying terms "GPLv2+" and "LGPLv2+".
Bruno Haible <bruno@clisp.org>
parents:
9086
diff
changeset
|
4440 case "$license" in |
|
b1835d4a5e2a
Handle copying terms "GPLv2+" and "LGPLv2+".
Bruno Haible <bruno@clisp.org>
parents:
9086
diff
changeset
|
4441 GPLv2+ | LGPLv2+) ;; |
|
12819
4b5bf4c79e0c
gnulib-tool: Make warning diagnostics consistent.
Bruno Haible <bruno@clisp.org>
parents:
12775
diff
changeset
|
4442 *) 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
|
4443 esac |
|
b1835d4a5e2a
Handle copying terms "GPLv2+" and "LGPLv2+".
Bruno Haible <bruno@clisp.org>
parents:
9086
diff
changeset
|
4444 ;; |
|
b1835d4a5e2a
Handle copying terms "GPLv2+" and "LGPLv2+".
Bruno Haible <bruno@clisp.org>
parents:
9086
diff
changeset
|
4445 LGPL) |
|
b1835d4a5e2a
Handle copying terms "GPLv2+" and "LGPLv2+".
Bruno Haible <bruno@clisp.org>
parents:
9086
diff
changeset
|
4446 case "$license" in |
|
b1835d4a5e2a
Handle copying terms "GPLv2+" and "LGPLv2+".
Bruno Haible <bruno@clisp.org>
parents:
9086
diff
changeset
|
4447 LGPL | LGPLv2+) ;; |
|
12819
4b5bf4c79e0c
gnulib-tool: Make warning diagnostics consistent.
Bruno Haible <bruno@clisp.org>
parents:
12775
diff
changeset
|
4448 *) 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
|
4449 esac |
|
b1835d4a5e2a
Handle copying terms "GPLv2+" and "LGPLv2+".
Bruno Haible <bruno@clisp.org>
parents:
9086
diff
changeset
|
4450 ;; |
|
b1835d4a5e2a
Handle copying terms "GPLv2+" and "LGPLv2+".
Bruno Haible <bruno@clisp.org>
parents:
9086
diff
changeset
|
4451 LGPLv2+) |
|
b1835d4a5e2a
Handle copying terms "GPLv2+" and "LGPLv2+".
Bruno Haible <bruno@clisp.org>
parents:
9086
diff
changeset
|
4452 case "$license" in |
|
b1835d4a5e2a
Handle copying terms "GPLv2+" and "LGPLv2+".
Bruno Haible <bruno@clisp.org>
parents:
9086
diff
changeset
|
4453 LGPLv2+) ;; |
|
12819
4b5bf4c79e0c
gnulib-tool: Make warning diagnostics consistent.
Bruno Haible <bruno@clisp.org>
parents:
12775
diff
changeset
|
4454 *) 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
|
4455 esac |
|
b1835d4a5e2a
Handle copying terms "GPLv2+" and "LGPLv2+".
Bruno Haible <bruno@clisp.org>
parents:
9086
diff
changeset
|
4456 ;; |
|
b1835d4a5e2a
Handle copying terms "GPLv2+" and "LGPLv2+".
Bruno Haible <bruno@clisp.org>
parents:
9086
diff
changeset
|
4457 esac |
|
b1835d4a5e2a
Handle copying terms "GPLv2+" and "LGPLv2+".
Bruno Haible <bruno@clisp.org>
parents:
9086
diff
changeset
|
4458 ;; |
|
7660
7aa6fbd6b3b7
Add license compatibility check in --create-testdir.
Bruno Haible <bruno@clisp.org>
parents:
7647
diff
changeset
|
4459 esac |
|
7aa6fbd6b3b7
Add license compatibility check in --create-testdir.
Bruno Haible <bruno@clisp.org>
parents:
7647
diff
changeset
|
4460 done |
|
7aa6fbd6b3b7
Add license compatibility check in --create-testdir.
Bruno Haible <bruno@clisp.org>
parents:
7647
diff
changeset
|
4461 fi |
|
7aa6fbd6b3b7
Add license compatibility check in --create-testdir.
Bruno Haible <bruno@clisp.org>
parents:
7647
diff
changeset
|
4462 done |
|
7aa6fbd6b3b7
Add license compatibility check in --create-testdir.
Bruno Haible <bruno@clisp.org>
parents:
7647
diff
changeset
|
4463 modules="$saved_modules" |
|
7896
cd3ed2fae0bf
Tests modules are under GPL now.
Bruno Haible <bruno@clisp.org>
parents:
7872
diff
changeset
|
4464 inctests="$saved_inctests" |
|
7660
7aa6fbd6b3b7
Add license compatibility check in --create-testdir.
Bruno Haible <bruno@clisp.org>
parents:
7647
diff
changeset
|
4465 |
|
7195
e4a459055e78
Test other subdirectory names than 'lib' and 'm4'.
Bruno Haible <bruno@clisp.org>
parents:
7187
diff
changeset
|
4466 # Subdirectory names. |
|
e4a459055e78
Test other subdirectory names than 'lib' and 'm4'.
Bruno Haible <bruno@clisp.org>
parents:
7187
diff
changeset
|
4467 sourcebase=gllib |
|
e4a459055e78
Test other subdirectory names than 'lib' and 'm4'.
Bruno Haible <bruno@clisp.org>
parents:
7187
diff
changeset
|
4468 m4base=glm4 |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
4469 pobase= |
|
7321
3bf1b669d1e1
Rewrite all file names at once.
Bruno Haible <bruno@clisp.org>
parents:
7320
diff
changeset
|
4470 docbase=gldoc |
|
7195
e4a459055e78
Test other subdirectory names than 'lib' and 'm4'.
Bruno Haible <bruno@clisp.org>
parents:
7187
diff
changeset
|
4471 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
|
4472 macro_prefix=gl |
|
9108
33eb494700d6
New options --po-base, --po-domain.
Bruno Haible <bruno@clisp.org>
parents:
9107
diff
changeset
|
4473 po_domain= |
|
9810
f805ab5f1771
New options --vc-files, --no-vc-files.
Bruno Haible <bruno@clisp.org>
parents:
9807
diff
changeset
|
4474 vc_files= |
|
7195
e4a459055e78
Test other subdirectory names than 'lib' and 'm4'.
Bruno Haible <bruno@clisp.org>
parents:
7187
diff
changeset
|
4475 |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4476 # Determine final module list. |
|
5347
0318c37925dc
Move duplicated code into function func_modules_transitive_closure().
Bruno Haible <bruno@clisp.org>
parents:
5346
diff
changeset
|
4477 func_modules_transitive_closure |
|
9188
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
4478 if test $verbose -ge 0; then |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
4479 echo "Module list with included dependencies:" |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
4480 echo "$modules" | sed -e 's/^/ /' |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
4481 fi |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4482 |
|
6550
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
4483 # Add the dummy module if needed. |
|
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
4484 func_modules_add_dummy |
|
3bb57675fc1b
Avoid error due to empty archive on MacOS X.
Bruno Haible <bruno@clisp.org>
parents:
6549
diff
changeset
|
4485 |
|
9189
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
4486 # Show banner notice of every module. |
|
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
4487 func_modules_notice |
|
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
4488 |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4489 # Determine final file list. |
|
5348
6afb021e2fc1
Move duplicated code into function func_modules_to_filelist().
Bruno Haible <bruno@clisp.org>
parents:
5347
diff
changeset
|
4490 func_modules_to_filelist |
|
9188
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
4491 if test $verbose -ge 0; then |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
4492 echo "File list:" |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
4493 echo "$files" | sed -e 's/^/ /' |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
4494 fi |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4495 |
|
11560
987b2dec97b7
Fix the rewriting rules for file names.
Bruno Haible <bruno@clisp.org>
parents:
11533
diff
changeset
|
4496 rewritten='%REWRITTEN%' |
|
7321
3bf1b669d1e1
Rewrite all file names at once.
Bruno Haible <bruno@clisp.org>
parents:
7320
diff
changeset
|
4497 sed_rewrite_files="\ |
|
11560
987b2dec97b7
Fix the rewriting rules for file names.
Bruno Haible <bruno@clisp.org>
parents:
11533
diff
changeset
|
4498 s,^build-aux/,$rewritten$auxdir/, |
|
987b2dec97b7
Fix the rewriting rules for file names.
Bruno Haible <bruno@clisp.org>
parents:
11533
diff
changeset
|
4499 s,^doc/,$rewritten$docbase/, |
|
987b2dec97b7
Fix the rewriting rules for file names.
Bruno Haible <bruno@clisp.org>
parents:
11533
diff
changeset
|
4500 s,^lib/,$rewritten$sourcebase/, |
|
987b2dec97b7
Fix the rewriting rules for file names.
Bruno Haible <bruno@clisp.org>
parents:
11533
diff
changeset
|
4501 s,^m4/,$rewritten$m4base/, |
|
987b2dec97b7
Fix the rewriting rules for file names.
Bruno Haible <bruno@clisp.org>
parents:
11533
diff
changeset
|
4502 s,^tests/,$rewritten$testsbase/, |
|
987b2dec97b7
Fix the rewriting rules for file names.
Bruno Haible <bruno@clisp.org>
parents:
11533
diff
changeset
|
4503 s,^top/,$rewritten, |
|
987b2dec97b7
Fix the rewriting rules for file names.
Bruno Haible <bruno@clisp.org>
parents:
11533
diff
changeset
|
4504 s,^$rewritten,," |
|
7605
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
4505 |
|
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
4506 # Create directories. |
|
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
4507 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
|
4508 | sed -e "$sed_rewrite_files" \ |
|
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
4509 | sed -n -e 's,^\(.*\)/[^/]*,\1,p' \ |
|
7605
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
4510 | LC_ALL=C sort -u \ |
|
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
4511 > "$tmp"/dirs |
|
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
4512 { # Rearrange file descriptors. Needed because "while ... done < ..." |
|
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
4513 # 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
|
4514 exec 5<&0 < "$tmp"/dirs |
|
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
4515 while read d; do |
|
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
4516 mkdir -p "$testdir/$d" |
|
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
4517 done |
|
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
4518 exec 0<&5 5<&- |
|
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
4519 } |
|
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
4520 |
|
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
4521 # Copy files or make symbolic links. |
|
ae17dea0254d
Create also all needed subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7600
diff
changeset
|
4522 delimiter=' ' |
|
7321
3bf1b669d1e1
Rewrite all file names at once.
Bruno Haible <bruno@clisp.org>
parents:
7320
diff
changeset
|
4523 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
|
4524 | 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
|
4525 | LC_ALL=C sort \ |
|
3bf1b669d1e1
Rewrite all file names at once.
Bruno Haible <bruno@clisp.org>
parents:
7320
diff
changeset
|
4526 > "$tmp"/files |
|
7326
1ca1035630dd
Avoid to execute while loops in a subshell.
Bruno Haible <bruno@clisp.org>
parents:
7323
diff
changeset
|
4527 { # 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
|
4528 # 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
|
4529 exec 5<&0 < "$tmp"/files |
|
7326
1ca1035630dd
Avoid to execute while loops in a subshell.
Bruno Haible <bruno@clisp.org>
parents:
7323
diff
changeset
|
4530 while read g f; do |
|
1ca1035630dd
Avoid to execute while loops in a subshell.
Bruno Haible <bruno@clisp.org>
parents:
7323
diff
changeset
|
4531 func_lookup_file "$f" |
|
1ca1035630dd
Avoid to execute while loops in a subshell.
Bruno Haible <bruno@clisp.org>
parents:
7323
diff
changeset
|
4532 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
|
4533 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
|
4534 else |
|
7326
1ca1035630dd
Avoid to execute while loops in a subshell.
Bruno Haible <bruno@clisp.org>
parents:
7323
diff
changeset
|
4535 ln "$lookedup_file" "$testdir/$g" 2>/dev/null || |
|
7643
d67f9dc6019d
New option --local-symlink.
Bruno Haible <bruno@clisp.org>
parents:
7642
diff
changeset
|
4536 if { test -n "$symbolic" \ |
|
d67f9dc6019d
New option --local-symlink.
Bruno Haible <bruno@clisp.org>
parents:
7642
diff
changeset
|
4537 || { test -n "$lsymbolic" \ |
|
d67f9dc6019d
New option --local-symlink.
Bruno Haible <bruno@clisp.org>
parents:
7642
diff
changeset
|
4538 && test "$lookedup_file" = "$local_gnulib_dir/$f"; }; }; then |
|
d67f9dc6019d
New option --local-symlink.
Bruno Haible <bruno@clisp.org>
parents:
7642
diff
changeset
|
4539 func_ln "$lookedup_file" "$testdir/$g" |
|
d67f9dc6019d
New option --local-symlink.
Bruno Haible <bruno@clisp.org>
parents:
7642
diff
changeset
|
4540 else |
|
7326
1ca1035630dd
Avoid to execute while loops in a subshell.
Bruno Haible <bruno@clisp.org>
parents:
7323
diff
changeset
|
4541 cp -p "$lookedup_file" "$testdir/$g" |
|
1ca1035630dd
Avoid to execute while loops in a subshell.
Bruno Haible <bruno@clisp.org>
parents:
7323
diff
changeset
|
4542 fi |
|
7073
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
4543 fi |
|
7326
1ca1035630dd
Avoid to execute while loops in a subshell.
Bruno Haible <bruno@clisp.org>
parents:
7323
diff
changeset
|
4544 done |
|
7373
330a972d58f0
Tweak last patch, for symmetry.
Bruno Haible <bruno@clisp.org>
parents:
7368
diff
changeset
|
4545 exec 0<&5 5<&- |
|
7326
1ca1035630dd
Avoid to execute while loops in a subshell.
Bruno Haible <bruno@clisp.org>
parents:
7323
diff
changeset
|
4546 } |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4547 |
|
7981
41421349e26b
In testing directories, link the test programs already during "make", not
Bruno Haible <bruno@clisp.org>
parents:
7911
diff
changeset
|
4548 # 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
|
4549 for_test=true |
|
41421349e26b
In testing directories, link the test programs already during "make", not
Bruno Haible <bruno@clisp.org>
parents:
7911
diff
changeset
|
4550 |
|
10476
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
4551 # 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
|
4552 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
|
4553 |
|
7195
e4a459055e78
Test other subdirectory names than 'lib' and 'm4'.
Bruno Haible <bruno@clisp.org>
parents:
7187
diff
changeset
|
4554 # Create $sourcebase/Makefile.am. |
|
e4a459055e78
Test other subdirectory names than 'lib' and 'm4'.
Bruno Haible <bruno@clisp.org>
parents:
7187
diff
changeset
|
4555 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
|
4556 destfile="$sourcebase/Makefile.am" |
|
7195
e4a459055e78
Test other subdirectory names than 'lib' and 'm4'.
Bruno Haible <bruno@clisp.org>
parents:
7187
diff
changeset
|
4557 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
|
4558 any_uses_subdirs="$uses_subdirs" |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4559 |
|
7195
e4a459055e78
Test other subdirectory names than 'lib' and 'm4'.
Bruno Haible <bruno@clisp.org>
parents:
7187
diff
changeset
|
4560 # Create $m4base/Makefile.am. |
|
e4a459055e78
Test other subdirectory names than 'lib' and 'm4'.
Bruno Haible <bruno@clisp.org>
parents:
7187
diff
changeset
|
4561 mkdir -p "$testdir/$m4base" |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4562 (echo "## Process this file with automake to produce Makefile.in." |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4563 echo |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4564 echo "EXTRA_DIST =" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4565 for f in $files; do |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4566 case "$f" in |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4567 m4/* ) |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
4568 echo "EXTRA_DIST += "`echo "$f" | sed -e 's,^m4/,,'` ;; |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4569 esac |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4570 done |
|
7195
e4a459055e78
Test other subdirectory names than 'lib' and 'm4'.
Bruno Haible <bruno@clisp.org>
parents:
7187
diff
changeset
|
4571 ) > "$testdir/$m4base/Makefile.am" |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4572 |
|
7195
e4a459055e78
Test other subdirectory names than 'lib' and 'm4'.
Bruno Haible <bruno@clisp.org>
parents:
7187
diff
changeset
|
4573 subdirs="$sourcebase $m4base" |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
4574 subdirs_with_configure_ac="" |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4575 |
|
7485
0194db3ad154
Handle mismatch between latest gettext release and current gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7484
diff
changeset
|
4576 if false && test -f "$testdir"/$m4base/gettext.m4; then |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4577 # Avoid stupid error message from automake: |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4578 # "AM_GNU_GETTEXT used but `po' not in SUBDIRS" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4579 mkdir -p "$testdir/po" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4580 (echo "## Process this file with automake to produce Makefile.in." |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4581 ) > "$testdir/po/Makefile.am" |
|
7323
7ca0e325d5db
Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents:
7322
diff
changeset
|
4582 func_append subdirs " po" |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4583 fi |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4584 |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
4585 if test -n "$inctests"; then |
|
7195
e4a459055e78
Test other subdirectory names than 'lib' and 'm4'.
Bruno Haible <bruno@clisp.org>
parents:
7187
diff
changeset
|
4586 test -d "$testdir/$testsbase" || mkdir "$testdir/$testsbase" |
|
9541
aad8160fa3ef
Fix the value of $auxdir used when generating the tests directory.
Bruno Haible <bruno@clisp.org>
parents:
9540
diff
changeset
|
4587 # Viewed from the $testsbase subdirectory, $auxdir is different. |
|
aad8160fa3ef
Fix the value of $auxdir used when generating the tests directory.
Bruno Haible <bruno@clisp.org>
parents:
9540
diff
changeset
|
4588 saved_auxdir="$auxdir" |
| 12417 | 4589 auxdir=`echo "$testsbase/" | sed -e 's%[^/][^/]*//*%../%g'`"$auxdir" |
|
7195
e4a459055e78
Test other subdirectory names than 'lib' and 'm4'.
Bruno Haible <bruno@clisp.org>
parents:
7187
diff
changeset
|
4590 # Create $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
|
4591 use_libtests=false |
|
10476
429cc7a6da60
Don't ask the user to perform edits in the generated Makefile.ams.
Bruno Haible <bruno@clisp.org>
parents:
10475
diff
changeset
|
4592 destfile="$testsbase/Makefile.am" |
|
7195
e4a459055e78
Test other subdirectory names than 'lib' and 'm4'.
Bruno Haible <bruno@clisp.org>
parents:
7187
diff
changeset
|
4593 func_emit_tests_Makefile_am > "$testdir/$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
|
4594 any_uses_subdirs="$any_uses_subdirs$uses_subdirs" |
|
7195
e4a459055e78
Test other subdirectory names than 'lib' and 'm4'.
Bruno Haible <bruno@clisp.org>
parents:
7187
diff
changeset
|
4595 # Create $testsbase/configure.ac. |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
4596 (echo "# Process this file with autoconf to produce a configure script." |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
4597 echo "AC_INIT([dummy], [0])" |
|
9541
aad8160fa3ef
Fix the value of $auxdir used when generating the tests directory.
Bruno Haible <bruno@clisp.org>
parents:
9540
diff
changeset
|
4598 echo "AC_CONFIG_AUX_DIR([$auxdir])" |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
4599 echo "AM_INIT_AUTOMAKE" |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
4600 echo |
|
11931
d42b3b6f11d3
Replace uses of obsolete Autoconf macros with modern counterparts.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
11919
diff
changeset
|
4601 echo "AC_CONFIG_HEADERS([config.h])" |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
4602 echo |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
4603 echo "AC_PROG_CC" |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
4604 echo "AC_PROG_INSTALL" |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
4605 echo "AC_PROG_MAKE_SET" |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
4606 echo "AC_PROG_RANLIB" |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
4607 echo |
|
12109
b56c1bd3de46
Conditionally emit AM_PROG_CC_C_O invocation to tests/configure.ac.
Bruno Haible <bruno@clisp.org>
parents:
12055
diff
changeset
|
4608 if test -n "$uses_subdirs"; then |
|
b56c1bd3de46
Conditionally emit AM_PROG_CC_C_O invocation to tests/configure.ac.
Bruno Haible <bruno@clisp.org>
parents:
12055
diff
changeset
|
4609 echo "AM_PROG_CC_C_O" |
|
b56c1bd3de46
Conditionally emit AM_PROG_CC_C_O invocation to tests/configure.ac.
Bruno Haible <bruno@clisp.org>
parents:
12055
diff
changeset
|
4610 echo |
|
b56c1bd3de46
Conditionally emit AM_PROG_CC_C_O invocation to tests/configure.ac.
Bruno Haible <bruno@clisp.org>
parents:
12055
diff
changeset
|
4611 fi |
|
8079
0951beec5b89
New module description section 'configure.ac-early'.
Bruno Haible <bruno@clisp.org>
parents:
8055
diff
changeset
|
4612 for module in $modules; do |
|
0951beec5b89
New module description section 'configure.ac-early'.
Bruno Haible <bruno@clisp.org>
parents:
8055
diff
changeset
|
4613 func_verify_module |
|
0951beec5b89
New module description section 'configure.ac-early'.
Bruno Haible <bruno@clisp.org>
parents:
8055
diff
changeset
|
4614 if test -n "$module"; then |
|
10854
4e7233d13083
Don't use modules gnumakefile and maintainer-makefile in subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
10744
diff
changeset
|
4615 case $module in |
|
4e7233d13083
Don't use modules gnumakefile and maintainer-makefile in subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
10744
diff
changeset
|
4616 gnumakefile | maintainer-makefile) |
|
4e7233d13083
Don't use modules gnumakefile and maintainer-makefile in subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
10744
diff
changeset
|
4617 # These modules are meant to be used only in the top-level directory. |
|
4e7233d13083
Don't use modules gnumakefile and maintainer-makefile in subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
10744
diff
changeset
|
4618 ;; |
|
4e7233d13083
Don't use modules gnumakefile and maintainer-makefile in subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
10744
diff
changeset
|
4619 *) |
|
4e7233d13083
Don't use modules gnumakefile and maintainer-makefile in subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
10744
diff
changeset
|
4620 func_get_autoconf_early_snippet "$module" |
|
4e7233d13083
Don't use modules gnumakefile and maintainer-makefile in subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
10744
diff
changeset
|
4621 ;; |
|
4e7233d13083
Don't use modules gnumakefile and maintainer-makefile in subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
10744
diff
changeset
|
4622 esac |
|
8079
0951beec5b89
New module description section 'configure.ac-early'.
Bruno Haible <bruno@clisp.org>
parents:
8055
diff
changeset
|
4623 fi |
|
0951beec5b89
New module description section 'configure.ac-early'.
Bruno Haible <bruno@clisp.org>
parents:
8055
diff
changeset
|
4624 done \ |
|
0951beec5b89
New module description section 'configure.ac-early'.
Bruno Haible <bruno@clisp.org>
parents:
8055
diff
changeset
|
4625 | sed -e '/^$/d;' -e 's/AC_REQUIRE(\[\([^()]*\)\])/\1/' |
| 7077 | 4626 if test "$libtool" = true; then |
| 4627 echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [true])" | |
|
7286
727bb5526bad
For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents:
7270
diff
changeset
|
4628 echo "gl_cond_libtool=true" |
| 7077 | 4629 else |
|
6418
e0a8b9b05999
Proper autoconf macro argument quoting.
Bruno Haible <bruno@clisp.org>
parents:
6414
diff
changeset
|
4630 echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [false])" |
|
7286
727bb5526bad
For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents:
7270
diff
changeset
|
4631 echo "gl_cond_libtool=false" |
|
727bb5526bad
For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents:
7270
diff
changeset
|
4632 echo "gl_libdeps=" |
|
727bb5526bad
For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents:
7270
diff
changeset
|
4633 echo "gl_ltlibdeps=" |
|
6414
46d47c8fe734
* gnulib-tool: Define automake conditional GL_COND_LIBTOOL if
Simon Josefsson <simon@josefsson.org>
parents:
6389
diff
changeset
|
4634 fi |
|
7090
dfc92f94c781
Allow AC_REQUIREs in the configure.ac snippet.
Bruno Haible <bruno@clisp.org>
parents:
7089
diff
changeset
|
4635 # 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
|
4636 # 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
|
4637 # at the top level: |
|
dfc92f94c781
Allow AC_REQUIREs in the configure.ac snippet.
Bruno Haible <bruno@clisp.org>
parents:
7089
diff
changeset
|
4638 # 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
|
4639 # 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
|
4640 # 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
|
4641 # expansion total). |
|
dfc92f94c781
Allow AC_REQUIREs in the configure.ac snippet.
Bruno Haible <bruno@clisp.org>
parents:
7089
diff
changeset
|
4642 echo "AC_DEFUN([gl_INIT], [" |
|
7638
581c011e05d6
* gnulib-tool (func_create_testdir): Fix replacement of
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7605
diff
changeset
|
4643 sed_replace_build_aux=' |
|
581c011e05d6
* gnulib-tool (func_create_testdir): Fix replacement of
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7605
diff
changeset
|
4644 :a |
|
581c011e05d6
* gnulib-tool (func_create_testdir): Fix replacement of
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7605
diff
changeset
|
4645 /AC_CONFIG_FILES(.*:build-aux\/.*)/{ |
|
9541
aad8160fa3ef
Fix the value of $auxdir used when generating the tests directory.
Bruno Haible <bruno@clisp.org>
parents:
9540
diff
changeset
|
4646 s|AC_CONFIG_FILES(\(.*\):build-aux/\(.*\))|AC_CONFIG_FILES(\1:'"$auxdir"'/\2)| |
| 9009 | 4647 ba |
|
7638
581c011e05d6
* gnulib-tool (func_create_testdir): Fix replacement of
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7605
diff
changeset
|
4648 }' |
|
9516
020ae1c236a0
Collect sources for tests-related modules in tests/, compile them to libtests.a.
Bruno Haible <bruno@clisp.org>
parents:
9515
diff
changeset
|
4649 func_emit_initmacro_start $macro_prefix |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
4650 # We don't have explicit ordering constraints between the various |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
4651 # autoconf snippets. It's cleanest to put those of the library before |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
4652 # those of the tests. |
|
7647
c26d75cebcfa
Fix --create-testdir --with-tests.
Bruno Haible <bruno@clisp.org>
parents:
7646
diff
changeset
|
4653 echo "gl_source_base='../$sourcebase'" |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
4654 for module in $modules; do |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
4655 func_verify_nontests_module |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
4656 if test -n "$module"; then |
|
10854
4e7233d13083
Don't use modules gnumakefile and maintainer-makefile in subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
10744
diff
changeset
|
4657 case $module in |
|
4e7233d13083
Don't use modules gnumakefile and maintainer-makefile in subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
10744
diff
changeset
|
4658 gnumakefile | maintainer-makefile) |
|
4e7233d13083
Don't use modules gnumakefile and maintainer-makefile in subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
10744
diff
changeset
|
4659 # These modules are meant to be used only in the top-level directory. |
|
4e7233d13083
Don't use modules gnumakefile and maintainer-makefile in subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
10744
diff
changeset
|
4660 ;; |
|
4e7233d13083
Don't use modules gnumakefile and maintainer-makefile in subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
10744
diff
changeset
|
4661 *) |
|
4e7233d13083
Don't use modules gnumakefile and maintainer-makefile in subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
10744
diff
changeset
|
4662 func_get_autoconf_snippet "$module" \ |
|
4e7233d13083
Don't use modules gnumakefile and maintainer-makefile in subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
10744
diff
changeset
|
4663 | sed -e "$sed_replace_build_aux" |
|
4e7233d13083
Don't use modules gnumakefile and maintainer-makefile in subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
10744
diff
changeset
|
4664 ;; |
|
4e7233d13083
Don't use modules gnumakefile and maintainer-makefile in subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
10744
diff
changeset
|
4665 esac |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
4666 fi |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
4667 done |
|
7647
c26d75cebcfa
Fix --create-testdir --with-tests.
Bruno Haible <bruno@clisp.org>
parents:
7646
diff
changeset
|
4668 echo "gl_source_base='.'" |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
4669 for module in $modules; do |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
4670 func_verify_tests_module |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
4671 if test -n "$module"; then |
|
6546
b32846b4d88d
Replace build-aux when it occurs in the autoconf snippet.
Bruno Haible <bruno@clisp.org>
parents:
6533
diff
changeset
|
4672 func_get_autoconf_snippet "$module" \ |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
4673 | sed -e "$sed_replace_build_aux" |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
4674 fi |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
4675 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
|
4676 func_emit_initmacro_end $macro_prefix |
|
7286
727bb5526bad
For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents:
7270
diff
changeset
|
4677 # _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
|
4678 # 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
|
4679 if test "$libtool" != true; then |
|
9086
110e60d88fad
(func_import): Avoid duplication of --avoid statements
Sergey Poznyakoff <gray@gnu.org.ua>
parents:
9025
diff
changeset
|
4680 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
|
4681 echo " ${libname_upper}_LIBDEPS=\"\$gl_libdeps\"" |
|
727bb5526bad
For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents:
7270
diff
changeset
|
4682 echo " AC_SUBST([${libname_upper}_LIBDEPS])" |
|
727bb5526bad
For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents:
7270
diff
changeset
|
4683 echo " ${libname_upper}_LTLIBDEPS=\"\$gl_ltlibdeps\"" |
|
727bb5526bad
For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents:
7270
diff
changeset
|
4684 echo " AC_SUBST([${libname_upper}_LTLIBDEPS])" |
|
727bb5526bad
For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents:
7270
diff
changeset
|
4685 fi |
|
7090
dfc92f94c781
Allow AC_REQUIREs in the configure.ac snippet.
Bruno Haible <bruno@clisp.org>
parents:
7089
diff
changeset
|
4686 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
|
4687 func_emit_initmacro_done $macro_prefix $sourcebase # FIXME use $sourcebase or $testsbase? |
|
7486
46b72819ef52
Add support for multiple gnulib-tool invocations in the scope of a single
Bruno Haible <bruno@clisp.org>
parents:
7485
diff
changeset
|
4688 echo |
|
7090
dfc92f94c781
Allow AC_REQUIREs in the configure.ac snippet.
Bruno Haible <bruno@clisp.org>
parents:
7089
diff
changeset
|
4689 echo "gl_INIT" |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
4690 echo |
|
7195
e4a459055e78
Test other subdirectory names than 'lib' and 'm4'.
Bruno Haible <bruno@clisp.org>
parents:
7187
diff
changeset
|
4691 # Usually $testsbase/config.h will be a superset of config.h. Verify this |
|
e4a459055e78
Test other subdirectory names than 'lib' and 'm4'.
Bruno Haible <bruno@clisp.org>
parents:
7187
diff
changeset
|
4692 # by "merging" config.h into $testsbase/config.h; look out for gcc warnings. |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
4693 echo "AH_TOP([#include \"../config.h\"])" |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
4694 echo |
|
11931
d42b3b6f11d3
Replace uses of obsolete Autoconf macros with modern counterparts.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
11919
diff
changeset
|
4695 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
|
4696 echo "AC_OUTPUT" |
|
7195
e4a459055e78
Test other subdirectory names than 'lib' and 'm4'.
Bruno Haible <bruno@clisp.org>
parents:
7187
diff
changeset
|
4697 ) > "$testdir/$testsbase/configure.ac" |
|
9541
aad8160fa3ef
Fix the value of $auxdir used when generating the tests directory.
Bruno Haible <bruno@clisp.org>
parents:
9540
diff
changeset
|
4698 auxdir="$saved_auxdir" |
|
7323
7ca0e325d5db
Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents:
7322
diff
changeset
|
4699 func_append subdirs " $testsbase" |
|
7195
e4a459055e78
Test other subdirectory names than 'lib' and 'm4'.
Bruno Haible <bruno@clisp.org>
parents:
7187
diff
changeset
|
4700 subdirs_with_configure_ac="$subdirs_with_configure_ac $testsbase" |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
4701 fi |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
4702 |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4703 # Create Makefile.am. |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4704 (echo "## Process this file with automake to produce Makefile.in." |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4705 echo |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4706 echo "AUTOMAKE_OPTIONS = 1.5 foreign" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4707 echo |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4708 echo "SUBDIRS = $subdirs" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4709 echo |
|
7195
e4a459055e78
Test other subdirectory names than 'lib' and 'm4'.
Bruno Haible <bruno@clisp.org>
parents:
7187
diff
changeset
|
4710 echo "ACLOCAL_AMFLAGS = -I $m4base" |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4711 ) > "$testdir/Makefile.am" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4712 |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4713 # Create configure.ac. |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4714 (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
|
4715 echo "AC_INIT([dummy], [0])" |
|
6109
a52f596fdf00
Generalize support for --aux-dir.
Bruno Haible <bruno@clisp.org>
parents:
6108
diff
changeset
|
4716 if test "$auxdir" != "."; then |
|
a52f596fdf00
Generalize support for --aux-dir.
Bruno Haible <bruno@clisp.org>
parents:
6108
diff
changeset
|
4717 echo "AC_CONFIG_AUX_DIR([$auxdir])" |
|
a52f596fdf00
Generalize support for --aux-dir.
Bruno Haible <bruno@clisp.org>
parents:
6108
diff
changeset
|
4718 fi |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4719 echo "AM_INIT_AUTOMAKE" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4720 echo |
|
11931
d42b3b6f11d3
Replace uses of obsolete Autoconf macros with modern counterparts.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
11919
diff
changeset
|
4721 echo "AC_CONFIG_HEADERS([config.h])" |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4722 echo |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4723 echo "AC_PROG_CC" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4724 echo "AC_PROG_INSTALL" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4725 echo "AC_PROG_MAKE_SET" |
|
7106
b9fff044578d
Apply last patch also to --create-testdir.
Bruno Haible <bruno@clisp.org>
parents:
7105
diff
changeset
|
4726 echo |
|
7777
b33956fbd953
2007-01-03 Simon Josefsson <simon@josefsson.org>
Simon Josefsson <simon@josefsson.org>
parents:
7771
diff
changeset
|
4727 echo "# For autobuild." |
|
b33956fbd953
2007-01-03 Simon Josefsson <simon@josefsson.org>
Simon Josefsson <simon@josefsson.org>
parents:
7771
diff
changeset
|
4728 echo "AC_CANONICAL_BUILD" |
|
b33956fbd953
2007-01-03 Simon Josefsson <simon@josefsson.org>
Simon Josefsson <simon@josefsson.org>
parents:
7771
diff
changeset
|
4729 echo "AC_CANONICAL_HOST" |
|
b33956fbd953
2007-01-03 Simon Josefsson <simon@josefsson.org>
Simon Josefsson <simon@josefsson.org>
parents:
7771
diff
changeset
|
4730 echo |
|
7106
b9fff044578d
Apply last patch also to --create-testdir.
Bruno Haible <bruno@clisp.org>
parents:
7105
diff
changeset
|
4731 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
|
4732 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
|
4733 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
|
4734 echo "m4_pattern_allow([^gl_LTLIBOBJS\$])dnl a variable" |
|
7106
b9fff044578d
Apply last patch also to --create-testdir.
Bruno Haible <bruno@clisp.org>
parents:
7105
diff
changeset
|
4735 echo |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4736 echo "AC_PROG_RANLIB" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4737 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
|
4738 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
|
4739 echo "AM_PROG_CC_C_O" |
|
d6fbdb213b01
Finish support for source files in subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7640
diff
changeset
|
4740 echo |
|
d6fbdb213b01
Finish support for source files in subdirectories.
Bruno Haible <bruno@clisp.org>
parents:
7640
diff
changeset
|
4741 fi |
|
8079
0951beec5b89
New module description section 'configure.ac-early'.
Bruno Haible <bruno@clisp.org>
parents:
8055
diff
changeset
|
4742 for module in $modules; do |
|
0951beec5b89
New module description section 'configure.ac-early'.
Bruno Haible <bruno@clisp.org>
parents:
8055
diff
changeset
|
4743 func_verify_nontests_module |
|
0951beec5b89
New module description section 'configure.ac-early'.
Bruno Haible <bruno@clisp.org>
parents:
8055
diff
changeset
|
4744 if test -n "$module"; then |
|
0951beec5b89
New module description section 'configure.ac-early'.
Bruno Haible <bruno@clisp.org>
parents:
8055
diff
changeset
|
4745 func_get_autoconf_early_snippet "$module" |
|
0951beec5b89
New module description section 'configure.ac-early'.
Bruno Haible <bruno@clisp.org>
parents:
8055
diff
changeset
|
4746 fi |
|
0951beec5b89
New module description section 'configure.ac-early'.
Bruno Haible <bruno@clisp.org>
parents:
8055
diff
changeset
|
4747 done \ |
|
0951beec5b89
New module description section 'configure.ac-early'.
Bruno Haible <bruno@clisp.org>
parents:
8055
diff
changeset
|
4748 | sed -e '/^$/d;' -e 's/AC_REQUIRE(\[\([^()]*\)\])/\1/' |
| 7077 | 4749 if test "$libtool" = true; then |
| 4750 echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [true])" | |
|
7286
727bb5526bad
For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents:
7270
diff
changeset
|
4751 echo "gl_cond_libtool=true" |
| 7077 | 4752 else |
|
6418
e0a8b9b05999
Proper autoconf macro argument quoting.
Bruno Haible <bruno@clisp.org>
parents:
6414
diff
changeset
|
4753 echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [false])" |
|
7286
727bb5526bad
For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents:
7270
diff
changeset
|
4754 echo "gl_cond_libtool=false" |
|
727bb5526bad
For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents:
7270
diff
changeset
|
4755 echo "gl_libdeps=" |
|
727bb5526bad
For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents:
7270
diff
changeset
|
4756 echo "gl_ltlibdeps=" |
|
6414
46d47c8fe734
* gnulib-tool: Define automake conditional GL_COND_LIBTOOL if
Simon Josefsson <simon@josefsson.org>
parents:
6389
diff
changeset
|
4757 fi |
|
7090
dfc92f94c781
Allow AC_REQUIREs in the configure.ac snippet.
Bruno Haible <bruno@clisp.org>
parents:
7089
diff
changeset
|
4758 # 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
|
4759 # 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
|
4760 # at the top level: |
|
dfc92f94c781
Allow AC_REQUIREs in the configure.ac snippet.
Bruno Haible <bruno@clisp.org>
parents:
7089
diff
changeset
|
4761 # 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
|
4762 # 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
|
4763 # 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
|
4764 # expansion total). |
|
dfc92f94c781
Allow AC_REQUIREs in the configure.ac snippet.
Bruno Haible <bruno@clisp.org>
parents:
7089
diff
changeset
|
4765 echo "AC_DEFUN([gl_INIT], [" |
| 6556 | 4766 if test "$auxdir" != "build-aux"; then |
| 4767 sed_replace_build_aux=' | |
| 4768 :a | |
| 4769 /AC_CONFIG_FILES(.*:build-aux\/.*)/{ | |
| 4770 s|AC_CONFIG_FILES(\(.*\):build-aux/\(.*\))|AC_CONFIG_FILES(\1:'"$auxdir"'/\2)| | |
| 4771 ba | |
| 4772 }' | |
| 4773 else | |
|
10400
817f1418bbde
Make gnulib-tool work with native 'sed' on AIX.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
10380
diff
changeset
|
4774 sed_replace_build_aux="$sed_noop" |
| 6556 | 4775 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
|
4776 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
|
4777 echo "gl_source_base='$sourcebase'" |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4778 for module in $modules; do |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
4779 func_verify_nontests_module |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4780 if test -n "$module"; then |
|
6546
b32846b4d88d
Replace build-aux when it occurs in the autoconf snippet.
Bruno Haible <bruno@clisp.org>
parents:
6533
diff
changeset
|
4781 func_get_autoconf_snippet "$module" \ |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
4782 | sed -e "$sed_replace_build_aux" |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4783 fi |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4784 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
|
4785 func_emit_initmacro_end $macro_prefix |
|
7286
727bb5526bad
For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents:
7270
diff
changeset
|
4786 # _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
|
4787 # 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
|
4788 if test "$libtool" != true; then |
|
9086
110e60d88fad
(func_import): Avoid duplication of --avoid statements
Sergey Poznyakoff <gray@gnu.org.ua>
parents:
9025
diff
changeset
|
4789 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
|
4790 echo " ${libname_upper}_LIBDEPS=\"\$gl_libdeps\"" |
|
727bb5526bad
For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents:
7270
diff
changeset
|
4791 echo " AC_SUBST([${libname_upper}_LIBDEPS])" |
|
727bb5526bad
For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents:
7270
diff
changeset
|
4792 echo " ${libname_upper}_LTLIBDEPS=\"\$gl_ltlibdeps\"" |
|
727bb5526bad
For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents:
7270
diff
changeset
|
4793 echo " AC_SUBST([${libname_upper}_LTLIBDEPS])" |
|
727bb5526bad
For libraries not built with libtool:
Bruno Haible <bruno@clisp.org>
parents:
7270
diff
changeset
|
4794 fi |
|
7090
dfc92f94c781
Allow AC_REQUIREs in the configure.ac snippet.
Bruno Haible <bruno@clisp.org>
parents:
7089
diff
changeset
|
4795 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
|
4796 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
|
4797 echo |
|
7090
dfc92f94c781
Allow AC_REQUIREs in the configure.ac snippet.
Bruno Haible <bruno@clisp.org>
parents:
7089
diff
changeset
|
4798 echo "gl_INIT" |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4799 echo |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
4800 if test -n "$subdirs_with_configure_ac"; then |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
4801 echo "AC_CONFIG_SUBDIRS(["`echo $subdirs_with_configure_ac`"])" |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
4802 fi |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4803 makefiles="Makefile" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4804 for d in $subdirs; do |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
4805 # 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
|
4806 # 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
|
4807 case " $subdirs_with_configure_ac " in |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
4808 *" $d "*) ;; |
|
7323
7ca0e325d5db
Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents:
7322
diff
changeset
|
4809 *) func_append makefiles " $d/Makefile" ;; |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
4810 esac |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4811 done |
|
11931
d42b3b6f11d3
Replace uses of obsolete Autoconf macros with modern counterparts.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
11919
diff
changeset
|
4812 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
|
4813 echo "AC_OUTPUT" |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4814 ) > "$testdir/configure.ac" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4815 |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4816 # Create autogenerated files. |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4817 (cd "$testdir" |
|
7485
0194db3ad154
Handle mismatch between latest gettext release and current gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7484
diff
changeset
|
4818 # 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
|
4819 # 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
|
4820 if test -f $m4base/gettext.m4; then |
|
9188
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
4821 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
|
4822 for f in $m4base/*.m4~; do |
|
10969
4c304a656b87
Fix a gnulib-tool failure.
Bruno Haible <bruno@clisp.org>
parents:
10854
diff
changeset
|
4823 if test -f $f; then |
|
4c304a656b87
Fix a gnulib-tool failure.
Bruno Haible <bruno@clisp.org>
parents:
10854
diff
changeset
|
4824 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
|
4825 fi |
|
7485
0194db3ad154
Handle mismatch between latest gettext release and current gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7484
diff
changeset
|
4826 done |
|
0194db3ad154
Handle mismatch between latest gettext release and current gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7484
diff
changeset
|
4827 fi |
|
9188
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
4828 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
|
4829 if ! test -d build-aux; then |
|
9188
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
4830 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
|
4831 fi |
|
9188
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
4832 func_execute_command ${AUTOCONF} || func_exit 1 |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
4833 func_execute_command ${AUTOHEADER} || func_exit 1 |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
4834 func_execute_command ${AUTOMAKE} --add-missing --copy || func_exit 1 |
|
7638
581c011e05d6
* gnulib-tool (func_create_testdir): Fix replacement of
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7605
diff
changeset
|
4835 ) || func_exit 1 |
|
581c011e05d6
* gnulib-tool (func_create_testdir): Fix replacement of
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7605
diff
changeset
|
4836 if test -n "$inctests"; then |
|
581c011e05d6
* gnulib-tool (func_create_testdir): Fix replacement of
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7605
diff
changeset
|
4837 # Create autogenerated files. |
|
581c011e05d6
* gnulib-tool (func_create_testdir): Fix replacement of
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7605
diff
changeset
|
4838 (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
|
4839 # 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
|
4840 # 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
|
4841 if test -f ../$m4base/gettext.m4; then |
|
9188
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
4842 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
|
4843 for f in ../$m4base/*.m4~; do |
|
10969
4c304a656b87
Fix a gnulib-tool failure.
Bruno Haible <bruno@clisp.org>
parents:
10854
diff
changeset
|
4844 if test -f $f; then |
|
4c304a656b87
Fix a gnulib-tool failure.
Bruno Haible <bruno@clisp.org>
parents:
10854
diff
changeset
|
4845 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
|
4846 fi |
|
7638
581c011e05d6
* gnulib-tool (func_create_testdir): Fix replacement of
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7605
diff
changeset
|
4847 done |
|
581c011e05d6
* gnulib-tool (func_create_testdir): Fix replacement of
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7605
diff
changeset
|
4848 fi |
|
9188
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
4849 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
|
4850 if ! test -d ../build-aux; then |
|
9188
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
4851 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
|
4852 fi |
|
9188
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
4853 func_execute_command ${AUTOCONF} || func_exit 1 |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
4854 func_execute_command ${AUTOHEADER} || func_exit 1 |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
4855 func_execute_command ${AUTOMAKE} --add-missing --copy || func_exit 1 |
|
7638
581c011e05d6
* gnulib-tool (func_create_testdir): Fix replacement of
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7605
diff
changeset
|
4856 ) || func_exit 1 |
|
581c011e05d6
* gnulib-tool (func_create_testdir): Fix replacement of
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7605
diff
changeset
|
4857 fi |
|
7866
58d9bcb3d6c4
Don't unnecessarily run configure and make.
Bruno Haible <bruno@clisp.org>
parents:
7858
diff
changeset
|
4858 # Need to run configure and make once, to create built files that are to be |
|
58d9bcb3d6c4
Don't unnecessarily run configure and make.
Bruno Haible <bruno@clisp.org>
parents:
7858
diff
changeset
|
4859 # distributed (such as getdate.c). |
|
8410
bf7fdc3211a4
Avoiding the "./configure && make && make distclean" did not work most of the
Bruno Haible <bruno@clisp.org>
parents:
8356
diff
changeset
|
4860 # Extract the value of "CLEANFILES += ..." and "MOSTLYCLEANFILES += ...". |
|
7866
58d9bcb3d6c4
Don't unnecessarily run configure and make.
Bruno Haible <bruno@clisp.org>
parents:
7858
diff
changeset
|
4861 cleaned_files=`sed -e "$sed_remove_backslash_newline" < "$testdir/$sourcebase/Makefile.am" \ |
|
8503
7c0e7f4f1ac1
* gnulib-tool: Rearrange space-tab sequences, since some editors
Eric Blake <ebb9@byu.net>
parents:
8451
diff
changeset
|
4862 | 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
|
4863 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
|
4864 # 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
|
4865 # such $(FOO_H) because they don't refer to distributed files. |
|
58d9bcb3d6c4
Don't unnecessarily run configure and make.
Bruno Haible <bruno@clisp.org>
parents:
7858
diff
changeset
|
4866 sed_remove_make_variables='s,[$]([A-Za-z0-9_]*),,g' |
|
58d9bcb3d6c4
Don't unnecessarily run configure and make.
Bruno Haible <bruno@clisp.org>
parents:
7858
diff
changeset
|
4867 built_sources=`sed -e "$sed_remove_backslash_newline" < "$testdir/$sourcebase/Makefile.am" \ |
|
8503
7c0e7f4f1ac1
* gnulib-tool: Rearrange space-tab sequences, since some editors
Eric Blake <ebb9@byu.net>
parents:
8451
diff
changeset
|
4868 | 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
|
4869 | sed -e "$sed_remove_make_variables"` |
|
58d9bcb3d6c4
Don't unnecessarily run configure and make.
Bruno Haible <bruno@clisp.org>
parents:
7858
diff
changeset
|
4870 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
|
4871 case "$cleaned_files" in |
|
58d9bcb3d6c4
Don't unnecessarily run configure and make.
Bruno Haible <bruno@clisp.org>
parents:
7858
diff
changeset
|
4872 *" "$file" "*) ;; |
|
58d9bcb3d6c4
Don't unnecessarily run configure and make.
Bruno Haible <bruno@clisp.org>
parents:
7858
diff
changeset
|
4873 *) echo $file ;; |
|
58d9bcb3d6c4
Don't unnecessarily run configure and make.
Bruno Haible <bruno@clisp.org>
parents:
7858
diff
changeset
|
4874 esac; |
|
58d9bcb3d6c4
Don't unnecessarily run configure and make.
Bruno Haible <bruno@clisp.org>
parents:
7858
diff
changeset
|
4875 done` |
|
58d9bcb3d6c4
Don't unnecessarily run configure and make.
Bruno Haible <bruno@clisp.org>
parents:
7858
diff
changeset
|
4876 if test -n "$distributed_built_sources"; then |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4877 (cd "$testdir" |
|
7638
581c011e05d6
* gnulib-tool (func_create_testdir): Fix replacement of
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7605
diff
changeset
|
4878 ./configure || func_exit 1 |
|
7195
e4a459055e78
Test other subdirectory names than 'lib' and 'm4'.
Bruno Haible <bruno@clisp.org>
parents:
7187
diff
changeset
|
4879 cd "$sourcebase" |
|
6389
c1766dccfd4f
Simplification, from Stepan Kasal.
Bruno Haible <bruno@clisp.org>
parents:
6380
diff
changeset
|
4880 echo 'built_sources: $(BUILT_SOURCES)' >> Makefile |
|
11404
eb725d01cd4c
gnulib-tool: execute $MAKE not make
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
11403
diff
changeset
|
4881 $MAKE built_sources || func_exit 1 |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4882 cd .. |
|
11404
eb725d01cd4c
gnulib-tool: execute $MAKE not make
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
11403
diff
changeset
|
4883 $MAKE distclean || func_exit 1 |
|
7638
581c011e05d6
* gnulib-tool (func_create_testdir): Fix replacement of
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7605
diff
changeset
|
4884 ) || func_exit 1 |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4885 fi |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4886 } |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4887 |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4888 # func_create_megatestdir megatestdir allmodules |
|
6109
a52f596fdf00
Generalize support for --aux-dir.
Bruno Haible <bruno@clisp.org>
parents:
6108
diff
changeset
|
4889 # Input: |
|
7214
eb43edab28c3
Small fix after --local-dir introduction.
Bruno Haible <bruno@clisp.org>
parents:
7213
diff
changeset
|
4890 # - local_gnulib_dir from --local-dir |
|
12857
dfbc7f3aa6d0
gnulib-tool: Fix up caching patches.
Bruno Haible <bruno@clisp.org>
parents:
12856
diff
changeset
|
4891 # - 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
|
4892 # - 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
|
4893 func_create_megatestdir () |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4894 { |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4895 megatestdir="$1" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4896 allmodules="$2" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4897 if test -z "$allmodules"; then |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4898 allmodules=`func_all_modules` |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4899 fi |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4900 |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4901 megasubdirs= |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4902 # First, all modules one by one. |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4903 for onemodule in $allmodules; do |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4904 func_create_testdir "$megatestdir/$onemodule" $onemodule |
|
7323
7ca0e325d5db
Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents:
7322
diff
changeset
|
4905 func_append megasubdirs "$onemodule " |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4906 done |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4907 # 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
|
4908 # 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
|
4909 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
|
4910 func_create_testdir "$megatestdir/ALL" "$allmodules" |
|
7323
7ca0e325d5db
Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents:
7322
diff
changeset
|
4911 func_append megasubdirs "ALL" |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4912 |
|
8416
0bf5cb89a6b9
Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents:
8410
diff
changeset
|
4913 # Create autobuild. |
|
9377
ca27c3808c95
Update after move from cvs to git.
Bruno Haible <bruno@clisp.org>
parents:
9355
diff
changeset
|
4914 cvsdate=`if test -f "$gnulib_dir/CVS/Entries"; then \ |
|
ca27c3808c95
Update after move from cvs to git.
Bruno Haible <bruno@clisp.org>
parents:
9355
diff
changeset
|
4915 vc_witness="$gnulib_dir/CVS/Entries"; \ |
|
ca27c3808c95
Update after move from cvs to git.
Bruno Haible <bruno@clisp.org>
parents:
9355
diff
changeset
|
4916 else \ |
|
ca27c3808c95
Update after move from cvs to git.
Bruno Haible <bruno@clisp.org>
parents:
9355
diff
changeset
|
4917 vc_witness="$gnulib_dir/.git/refs/heads/master"; \ |
|
ca27c3808c95
Update after move from cvs to git.
Bruno Haible <bruno@clisp.org>
parents:
9355
diff
changeset
|
4918 fi; \ |
|
ca27c3808c95
Update after move from cvs to git.
Bruno Haible <bruno@clisp.org>
parents:
9355
diff
changeset
|
4919 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
|
4920 | sed -e 's,January,01,' -e 's,Jan,01,' \ |
|
0bf5cb89a6b9
Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents:
8410
diff
changeset
|
4921 -e 's,February,02,' -e 's,Feb,02,' \ |
|
0bf5cb89a6b9
Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents:
8410
diff
changeset
|
4922 -e 's,March,03,' -e 's,Mar,03,' \ |
|
0bf5cb89a6b9
Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents:
8410
diff
changeset
|
4923 -e 's,April,04,' -e 's,Apr,04,' \ |
|
0bf5cb89a6b9
Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents:
8410
diff
changeset
|
4924 -e 's,May,05,' \ |
|
0bf5cb89a6b9
Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents:
8410
diff
changeset
|
4925 -e 's,June,06,' -e 's,Jun,06,' \ |
|
0bf5cb89a6b9
Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents:
8410
diff
changeset
|
4926 -e 's,July,07,' -e 's,Jul,07,' \ |
|
0bf5cb89a6b9
Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents:
8410
diff
changeset
|
4927 -e 's,August,08,' -e 's,Aug,08,' \ |
|
0bf5cb89a6b9
Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents:
8410
diff
changeset
|
4928 -e 's,September,09,' -e 's,Sep,09,' \ |
|
0bf5cb89a6b9
Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents:
8410
diff
changeset
|
4929 -e 's,October,10,' -e 's,Oct,10,' \ |
|
0bf5cb89a6b9
Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents:
8410
diff
changeset
|
4930 -e 's,November,11,' -e 's,Nov,11,' \ |
|
0bf5cb89a6b9
Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents:
8410
diff
changeset
|
4931 -e 's,December,12,' -e 's,Dec,12,' \ |
|
9022
44509698ba9d
* gnulib-tool: Fix indentation.
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
9010
diff
changeset
|
4932 -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
|
4933 -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
|
4934 (echo '#!/bin/sh' |
|
6840759b4ce2
Start the autobuild script with /bin/sh.
Bruno Haible <bruno@clisp.org>
parents:
8416
diff
changeset
|
4935 echo "CVSDATE=$cvsdate" |
|
11403
ec75c090b646
gnulib-tool: use $MAKE not make in generated files
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
11261
diff
changeset
|
4936 echo ": \${MAKE=make}" |
|
8416
0bf5cb89a6b9
Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents:
8410
diff
changeset
|
4937 echo "test -d logs || mkdir logs" |
|
0bf5cb89a6b9
Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents:
8410
diff
changeset
|
4938 echo "for module in $megasubdirs; do" |
|
0bf5cb89a6b9
Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents:
8410
diff
changeset
|
4939 echo " echo \"Working on module \$module...\"" |
|
0bf5cb89a6b9
Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents:
8410
diff
changeset
|
4940 echo " safemodule=\`echo \$module | sed -e 's|/|-|g'\`" |
|
0bf5cb89a6b9
Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents:
8410
diff
changeset
|
4941 echo " (echo \"To: gnulib@autobuild.josefsson.org\"" |
|
0bf5cb89a6b9
Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents:
8410
diff
changeset
|
4942 echo " echo" |
|
0bf5cb89a6b9
Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents:
8410
diff
changeset
|
4943 echo " set -x" |
|
0bf5cb89a6b9
Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents:
8410
diff
changeset
|
4944 echo " : autobuild project... \$module" |
|
0bf5cb89a6b9
Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents:
8410
diff
changeset
|
4945 echo " : autobuild revision... cvs-\$CVSDATE-000000" |
|
0bf5cb89a6b9
Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents:
8410
diff
changeset
|
4946 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
|
4947 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
|
4948 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
|
4949 echo " echo rc=\$?" |
|
8419
d5e85ac6458c
Avoid using sed -e "", not supported by AIX sed.
Bruno Haible <bruno@clisp.org>
parents:
8418
diff
changeset
|
4950 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
|
4951 echo "done" |
|
8672
c00e30e9aba4
2007-04-12 Simon Josefsson <simon@josefsson.org>
Simon Josefsson <simon@josefsson.org>
parents:
8668
diff
changeset
|
4952 ) > "$megatestdir/do-autobuild" |
|
c00e30e9aba4
2007-04-12 Simon Josefsson <simon@josefsson.org>
Simon Josefsson <simon@josefsson.org>
parents:
8668
diff
changeset
|
4953 chmod a+x "$megatestdir/do-autobuild" |
|
8416
0bf5cb89a6b9
Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents:
8410
diff
changeset
|
4954 |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4955 # Create Makefile.am. |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4956 (echo "## Process this file with automake to produce Makefile.in." |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4957 echo |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4958 echo "AUTOMAKE_OPTIONS = 1.5 foreign" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4959 echo |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4960 echo "SUBDIRS = $megasubdirs" |
|
8416
0bf5cb89a6b9
Create also an autobuild script.
Bruno Haible <bruno@clisp.org>
parents:
8410
diff
changeset
|
4961 echo |
|
8672
c00e30e9aba4
2007-04-12 Simon Josefsson <simon@josefsson.org>
Simon Josefsson <simon@josefsson.org>
parents:
8668
diff
changeset
|
4962 echo "EXTRA_DIST = do-autobuild" |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4963 ) > "$megatestdir/Makefile.am" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4964 |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4965 # Create configure.ac. |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4966 (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
|
4967 echo "AC_INIT([dummy], [0])" |
|
6109
a52f596fdf00
Generalize support for --aux-dir.
Bruno Haible <bruno@clisp.org>
parents:
6108
diff
changeset
|
4968 if test "$auxdir" != "."; then |
|
a52f596fdf00
Generalize support for --aux-dir.
Bruno Haible <bruno@clisp.org>
parents:
6108
diff
changeset
|
4969 echo "AC_CONFIG_AUX_DIR([$auxdir])" |
|
a52f596fdf00
Generalize support for --aux-dir.
Bruno Haible <bruno@clisp.org>
parents:
6108
diff
changeset
|
4970 fi |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4971 echo "AM_INIT_AUTOMAKE" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4972 echo |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4973 echo "AC_PROG_MAKE_SET" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4974 echo |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4975 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
|
4976 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
|
4977 echo "AC_OUTPUT" |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4978 ) > "$megatestdir/configure.ac" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4979 |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4980 # Create autogenerated files. |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4981 (cd "$megatestdir" |
|
6547
1a65fb7ddbbb
Don't waste time in a recursive autoreconf.
Bruno Haible <bruno@clisp.org>
parents:
6546
diff
changeset
|
4982 # 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
|
4983 # 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
|
4984 # 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
|
4985 func_execute_command ${ACLOCAL} || func_exit 1 |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
4986 func_execute_command mkdir build-aux |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
4987 func_execute_command ${AUTOCONF} || func_exit 1 |
|
7bf3aff81ae2
New options --verbose, --quiet.
Bruno Haible <bruno@clisp.org>
parents:
9187
diff
changeset
|
4988 func_execute_command ${AUTOMAKE} --add-missing --copy || func_exit 1 |
|
7638
581c011e05d6
* gnulib-tool (func_create_testdir): Fix replacement of
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7605
diff
changeset
|
4989 ) || func_exit 1 |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4990 } |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4991 |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4992 case $mode in |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4993 "" ) |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4994 func_fatal_error "no mode specified" ;; |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4995 |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4996 list ) |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4997 func_all_modules |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4998 ;; |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
4999 |
|
6443
1a35941d29ab
Implement the --update option.
Bruno Haible <bruno@clisp.org>
parents:
6425
diff
changeset
|
5000 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
|
5001 |
| 5343 | 5002 # Where to import. |
| 5003 if test -z "$destdir"; then | |
| 5004 destdir=. | |
| 5005 fi | |
| 5006 test -d "$destdir" \ | |
| 5007 || 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
|
5008 |
|
6183
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
5009 # 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
|
5010 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
|
5011 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
|
5012 else |
|
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
5013 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
|
5014 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
|
5015 else |
|
12021
d625e819e6ea
Add advice to an error message.
Bruno Haible <bruno@clisp.org>
parents:
11931
diff
changeset
|
5016 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
|
5017 fi |
|
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
5018 fi |
|
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
5019 |
|
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
5020 # Analyze configure.ac. |
|
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
5021 guessed_auxdir="." |
| 7077 | 5022 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
|
5023 my_sed_traces=' |
|
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
5024 s,#.*$,, |
|
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
5025 s,^dnl .*$,, |
|
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
5026 s, dnl .*$,, |
|
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
5027 /AC_CONFIG_AUX_DIR/ { |
| 10987 | 5028 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
|
5029 } |
|
6183
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
5030 /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
|
5031 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
|
5032 }' |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
5033 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
|
5034 |
|
6183
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
5035 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
|
5036 auxdir="$guessed_auxdir" |
| 5343 | 5037 fi |
|
5202
64446bf39961
Use sed instead of autoconf --trace, inspired by
Paul Eggert <eggert@cs.ucla.edu>
parents:
5198
diff
changeset
|
5038 |
|
6183
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
5039 # Determine where to apply func_import. |
|
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
5040 if test -n "$m4base"; then |
|
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
5041 # Apply func_import to a particular gnulib directory. |
|
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
5042 # Any number of additional modules can be given. |
|
6204
104bcb14d247
Provide defaults where needed.
Bruno Haible <bruno@clisp.org>
parents:
6199
diff
changeset
|
5043 if test ! -f "$destdir/$m4base"/gnulib-cache.m4; then |
|
104bcb14d247
Provide defaults where needed.
Bruno Haible <bruno@clisp.org>
parents:
6199
diff
changeset
|
5044 # First use of gnulib in the given m4base. |
|
104bcb14d247
Provide defaults where needed.
Bruno Haible <bruno@clisp.org>
parents:
6199
diff
changeset
|
5045 test -n "$supplied_libname" || supplied_libname=true |
|
104bcb14d247
Provide defaults where needed.
Bruno Haible <bruno@clisp.org>
parents:
6199
diff
changeset
|
5046 test -n "$sourcebase" || sourcebase="lib" |
|
6955
7715890c929a
* gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents:
6952
diff
changeset
|
5047 test -n "$docbase" || docbase="doc" |
|
6262
bef30dac846f
Provide a default for --tests-base.
Bruno Haible <bruno@clisp.org>
parents:
6250
diff
changeset
|
5048 test -n "$testsbase" || testsbase="tests" |
|
6204
104bcb14d247
Provide defaults where needed.
Bruno Haible <bruno@clisp.org>
parents:
6199
diff
changeset
|
5049 test -n "$macro_prefix" || macro_prefix="gl" |
|
104bcb14d247
Provide defaults where needed.
Bruno Haible <bruno@clisp.org>
parents:
6199
diff
changeset
|
5050 fi |
|
6183
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
5051 func_import "$*" |
|
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
5052 else |
|
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
5053 # Apply func_import to all gnulib directories. |
|
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
5054 # To get this list of directories, look at Makefile.am. (Not at |
|
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
5055 # configure, because it may be omitted from CVS. Also, don't run |
|
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
5056 # "find $destdir -name gnulib-cache.m4", as it might be too expensive.) |
|
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
5057 m4dirs= |
|
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
5058 m4dirs_count=0 |
|
7072
a1e9235fc6ff
Support projects without a top-level Makefile.am.
Bruno Haible <bruno@clisp.org>
parents:
7071
diff
changeset
|
5059 if test -f "$destdir"/Makefile.am; then |
| 12417 | 5060 aclocal_amflags=`sed -n -e 's/^ACLOCAL_AMFLAGS[ ]*=\(.*\)$/\1/p' "$destdir"/Makefile.am` |
|
7072
a1e9235fc6ff
Support projects without a top-level Makefile.am.
Bruno Haible <bruno@clisp.org>
parents:
7071
diff
changeset
|
5061 m4dir_is_next= |
|
a1e9235fc6ff
Support projects without a top-level Makefile.am.
Bruno Haible <bruno@clisp.org>
parents:
7071
diff
changeset
|
5062 for arg in $aclocal_amflags; do |
|
a1e9235fc6ff
Support projects without a top-level Makefile.am.
Bruno Haible <bruno@clisp.org>
parents:
7071
diff
changeset
|
5063 if test -n "$m4dir_is_next"; then |
|
a1e9235fc6ff
Support projects without a top-level Makefile.am.
Bruno Haible <bruno@clisp.org>
parents:
7071
diff
changeset
|
5064 # Ignore absolute directory pathnames, like /usr/local/share/aclocal. |
|
a1e9235fc6ff
Support projects without a top-level Makefile.am.
Bruno Haible <bruno@clisp.org>
parents:
7071
diff
changeset
|
5065 case "$arg" in |
|
a1e9235fc6ff
Support projects without a top-level Makefile.am.
Bruno Haible <bruno@clisp.org>
parents:
7071
diff
changeset
|
5066 /*) ;; |
|
a1e9235fc6ff
Support projects without a top-level Makefile.am.
Bruno Haible <bruno@clisp.org>
parents:
7071
diff
changeset
|
5067 *) |
|
a1e9235fc6ff
Support projects without a top-level Makefile.am.
Bruno Haible <bruno@clisp.org>
parents:
7071
diff
changeset
|
5068 if test -f "$destdir/$arg"/gnulib-cache.m4; then |
|
7323
7ca0e325d5db
Avoid quadratic complexity due to string concatenations.
Bruno Haible <bruno@clisp.org>
parents:
7322
diff
changeset
|
5069 func_append m4dirs " $arg" |
|
7072
a1e9235fc6ff
Support projects without a top-level Makefile.am.
Bruno Haible <bruno@clisp.org>
parents:
7071
diff
changeset
|
5070 m4dirs_count=`expr $m4dirs_count + 1` |
|
a1e9235fc6ff
Support projects without a top-level Makefile.am.
Bruno Haible <bruno@clisp.org>
parents:
7071
diff
changeset
|
5071 fi |
|
a1e9235fc6ff
Support projects without a top-level Makefile.am.
Bruno Haible <bruno@clisp.org>
parents:
7071
diff
changeset
|
5072 ;; |
|
a1e9235fc6ff
Support projects without a top-level Makefile.am.
Bruno Haible <bruno@clisp.org>
parents:
7071
diff
changeset
|
5073 esac |
|
8040
3905dae579b6
* gnulib-tool (func_emit_lib_Makefile_am, func_add_or_update)
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7981
diff
changeset
|
5074 m4dir_is_next= |
|
6183
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
5075 else |
|
7072
a1e9235fc6ff
Support projects without a top-level Makefile.am.
Bruno Haible <bruno@clisp.org>
parents:
7071
diff
changeset
|
5076 if test "X$arg" = "X-I"; then |
|
a1e9235fc6ff
Support projects without a top-level Makefile.am.
Bruno Haible <bruno@clisp.org>
parents:
7071
diff
changeset
|
5077 m4dir_is_next=yes |
|
a1e9235fc6ff
Support projects without a top-level Makefile.am.
Bruno Haible <bruno@clisp.org>
parents:
7071
diff
changeset
|
5078 else |
|
a1e9235fc6ff
Support projects without a top-level Makefile.am.
Bruno Haible <bruno@clisp.org>
parents:
7071
diff
changeset
|
5079 m4dir_is_next= |
|
a1e9235fc6ff
Support projects without a top-level Makefile.am.
Bruno Haible <bruno@clisp.org>
parents:
7071
diff
changeset
|
5080 fi |
|
6183
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
5081 fi |
|
7072
a1e9235fc6ff
Support projects without a top-level Makefile.am.
Bruno Haible <bruno@clisp.org>
parents:
7071
diff
changeset
|
5082 done |
|
a1e9235fc6ff
Support projects without a top-level Makefile.am.
Bruno Haible <bruno@clisp.org>
parents:
7071
diff
changeset
|
5083 else |
|
a1e9235fc6ff
Support projects without a top-level Makefile.am.
Bruno Haible <bruno@clisp.org>
parents:
7071
diff
changeset
|
5084 # No Makefile.am! Oh well. Look at the last generated aclocal.m4. |
|
a1e9235fc6ff
Support projects without a top-level Makefile.am.
Bruno Haible <bruno@clisp.org>
parents:
7071
diff
changeset
|
5085 if test -f "$destdir"/aclocal.m4; then |
|
a1e9235fc6ff
Support projects without a top-level Makefile.am.
Bruno Haible <bruno@clisp.org>
parents:
7071
diff
changeset
|
5086 sedexpr1='s,^m4_include(\[\(.*\)])$,\1,p' |
|
a1e9235fc6ff
Support projects without a top-level Makefile.am.
Bruno Haible <bruno@clisp.org>
parents:
7071
diff
changeset
|
5087 sedexpr2='s,^[^/]*$,.,' |
|
a1e9235fc6ff
Support projects without a top-level Makefile.am.
Bruno Haible <bruno@clisp.org>
parents:
7071
diff
changeset
|
5088 sedexpr3='s,/[^/]*$,,' |
|
7752
fc2ff707c74b
* gnulib-tool (SED): Remove, undoing previous change.
Paul Eggert <eggert@cs.ucla.edu>
parents:
7737
diff
changeset
|
5089 m4dirs=`sed -n -e "$sedexpr1" aclocal.m4 | sed -e "$sedexpr2" -e "$sedexpr3" | LC_ALL=C sort -u` |
|
12288
cbae19b6a9f8
gnulib-tool: correctly detect absence of m4 directories
Robert Millan <rmh.grub@aybabtu.com>
parents:
12109
diff
changeset
|
5090 m4dirs_count=`printf %s "$m4dirs" | wc -l` |
|
6183
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
5091 fi |
|
7072
a1e9235fc6ff
Support projects without a top-level Makefile.am.
Bruno Haible <bruno@clisp.org>
parents:
7071
diff
changeset
|
5092 fi |
|
6183
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
5093 if test $m4dirs_count = 0; then |
|
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
5094 # First use of gnulib in a package. |
|
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
5095 # Any number of additional modules can be given. |
|
6190
605b7cac11f2
Don't complain about missing options in the first-use case.
Bruno Haible <bruno@clisp.org>
parents:
6189
diff
changeset
|
5096 test -n "$supplied_libname" || supplied_libname=true |
|
605b7cac11f2
Don't complain about missing options in the first-use case.
Bruno Haible <bruno@clisp.org>
parents:
6189
diff
changeset
|
5097 test -n "$sourcebase" || sourcebase="lib" |
|
6183
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
5098 m4base="m4" |
|
6955
7715890c929a
* gnulib-tool: List --doc-base before --tests-base.
Eric Blake <ebb9@byu.net>
parents:
6952
diff
changeset
|
5099 test -n "$docbase" || docbase="doc" |
|
6262
bef30dac846f
Provide a default for --tests-base.
Bruno Haible <bruno@clisp.org>
parents:
6250
diff
changeset
|
5100 test -n "$testsbase" || testsbase="tests" |
|
6190
605b7cac11f2
Don't complain about missing options in the first-use case.
Bruno Haible <bruno@clisp.org>
parents:
6189
diff
changeset
|
5101 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
|
5102 func_import "$*" |
|
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
5103 else |
|
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
5104 if test $m4dirs_count = 1; then |
|
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
5105 # There's only one use of gnulib here. Assume the user means it. |
|
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
5106 # Any number of additional modules can be given. |
|
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
5107 for m4base in $m4dirs; do |
|
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
5108 func_import "$*" |
|
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
5109 done |
|
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
5110 else |
|
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
5111 # Ambiguous - guess what the user meant. |
|
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
5112 if test $# = 0; then |
|
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
5113 # No further arguments. Guess the user wants to update all of them. |
|
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
5114 for m4base in $m4dirs; do |
|
7239
e6f5fe9992ff
Fix problem when calling "gnulib-tool --update" on multiple directories.
Bruno Haible <bruno@clisp.org>
parents:
7235
diff
changeset
|
5115 # Perform func_import in a subshell, so that variable values |
|
e6f5fe9992ff
Fix problem when calling "gnulib-tool --update" on multiple directories.
Bruno Haible <bruno@clisp.org>
parents:
7235
diff
changeset
|
5116 # such as |
|
10744
7fb7b37150b3
New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents:
10743
diff
changeset
|
5117 # local_gnulib_dir, incobsolete, avoidlist, sourcebase, m4base, |
|
7fb7b37150b3
New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents:
10743
diff
changeset
|
5118 # pobase, docbase, testsbase, inctests, libname, lgpl, |
|
7fb7b37150b3
New option --with-obsolete.
Bruno Haible <bruno@clisp.org>
parents:
10743
diff
changeset
|
5119 # makefile_name, libtool, macro_prefix, po_domain, vc_files |
|
7239
e6f5fe9992ff
Fix problem when calling "gnulib-tool --update" on multiple directories.
Bruno Haible <bruno@clisp.org>
parents:
7235
diff
changeset
|
5120 # don't propagate from one directory to another. |
|
7332
dd6e80d0c89e
* gnulib-tool (func_exit): New function, to allow to pass the
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7327
diff
changeset
|
5121 (func_import) || func_exit 1 |
|
6183
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
5122 done |
|
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
5123 else |
|
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
5124 # Really ambiguous. |
|
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
5125 func_fatal_error "Ambiguity: to which directory should the modules be added? Please specify at least --m4-base=..." |
|
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
5126 fi |
|
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
5127 fi |
|
d12635ef6eb5
Make it possible to use multiple gnulib instantiations with the same
Bruno Haible <bruno@clisp.org>
parents:
6182
diff
changeset
|
5128 fi |
| 6178 | 5129 fi |
| 5343 | 5130 ;; |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5131 |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5132 create-testdir ) |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5133 if test -z "$destdir"; then |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5134 func_fatal_error "please specify --dir option" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5135 fi |
|
4126
e8caa337b4e1
(create-testdir): don't complain if destdir
Karl Berry <karl@freefriends.org>
parents:
4124
diff
changeset
|
5136 mkdir "$destdir" |
|
e8caa337b4e1
(create-testdir): don't complain if destdir
Karl Berry <karl@freefriends.org>
parents:
4124
diff
changeset
|
5137 test -d "$destdir" \ |
|
e8caa337b4e1
(create-testdir): don't complain if destdir
Karl Berry <karl@freefriends.org>
parents:
4124
diff
changeset
|
5138 || func_fatal_error "could not create destination directory" |
|
6109
a52f596fdf00
Generalize support for --aux-dir.
Bruno Haible <bruno@clisp.org>
parents:
6108
diff
changeset
|
5139 test -n "$auxdir" || auxdir="build-aux" |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5140 func_create_testdir "$destdir" "$*" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5141 ;; |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5142 |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5143 create-megatestdir ) |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5144 if test -z "$destdir"; then |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5145 func_fatal_error "please specify --dir option" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5146 fi |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5147 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
|
5148 test -n "$auxdir" || auxdir="build-aux" |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5149 func_create_megatestdir "$destdir" "$*" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5150 ;; |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5151 |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5152 test ) |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5153 test -n "$destdir" || destdir=testdir$$ |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5154 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
|
5155 test -n "$auxdir" || auxdir="build-aux" |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5156 func_create_testdir "$destdir" "$*" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5157 cd "$destdir" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5158 mkdir build |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5159 cd build |
|
7638
581c011e05d6
* gnulib-tool (func_create_testdir): Fix replacement of
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
7605
diff
changeset
|
5160 ../configure || func_exit 1 |
|
11404
eb725d01cd4c
gnulib-tool: execute $MAKE not make
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
11403
diff
changeset
|
5161 $MAKE || func_exit 1 |
|
eb725d01cd4c
gnulib-tool: execute $MAKE not make
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
11403
diff
changeset
|
5162 $MAKE check || func_exit 1 |
|
eb725d01cd4c
gnulib-tool: execute $MAKE not make
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
11403
diff
changeset
|
5163 $MAKE distclean || func_exit 1 |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5164 remaining=`find . -type f -print` |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5165 if test -n "$remaining"; then |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5166 echo "Remaining files:" $remaining 1>&2 |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5167 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
|
5168 func_exit 1 |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5169 fi |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5170 cd .. |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5171 cd .. |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5172 rm -rf "$destdir" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5173 ;; |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5174 |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5175 megatest ) |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5176 test -n "$destdir" || destdir=testdir$$ |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5177 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
|
5178 test -n "$auxdir" || auxdir="build-aux" |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5179 func_create_megatestdir "$destdir" "$*" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5180 cd "$destdir" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5181 mkdir build |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5182 cd build |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5183 ../configure |
|
11404
eb725d01cd4c
gnulib-tool: execute $MAKE not make
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
11403
diff
changeset
|
5184 $MAKE |
|
eb725d01cd4c
gnulib-tool: execute $MAKE not make
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
11403
diff
changeset
|
5185 $MAKE check |
|
eb725d01cd4c
gnulib-tool: execute $MAKE not make
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
parents:
11403
diff
changeset
|
5186 $MAKE distclean |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5187 remaining=`find . -type f -print` |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5188 if test -n "$remaining"; then |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5189 echo "Remaining files:" $remaining 1>&2 |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5190 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
|
5191 func_exit 1 |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5192 fi |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5193 cd .. |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5194 cd .. |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5195 rm -rf "$destdir" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5196 ;; |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5197 |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5198 extract-description ) |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5199 for module |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5200 do |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5201 func_verify_module |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5202 if test -n "$module"; then |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5203 func_get_description "$module" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5204 fi |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5205 done |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5206 ;; |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5207 |
|
10743
ec39330cb04e
Modules now have a 'status' attribute.
Bruno Haible <bruno@clisp.org>
parents:
10732
diff
changeset
|
5208 extract-status ) |
|
ec39330cb04e
Modules now have a 'status' attribute.
Bruno Haible <bruno@clisp.org>
parents:
10732
diff
changeset
|
5209 for module |
|
ec39330cb04e
Modules now have a 'status' attribute.
Bruno Haible <bruno@clisp.org>
parents:
10732
diff
changeset
|
5210 do |
|
ec39330cb04e
Modules now have a 'status' attribute.
Bruno Haible <bruno@clisp.org>
parents:
10732
diff
changeset
|
5211 func_verify_module |
|
ec39330cb04e
Modules now have a 'status' attribute.
Bruno Haible <bruno@clisp.org>
parents:
10732
diff
changeset
|
5212 if test -n "$module"; then |
|
ec39330cb04e
Modules now have a 'status' attribute.
Bruno Haible <bruno@clisp.org>
parents:
10732
diff
changeset
|
5213 func_get_status "$module" |
|
ec39330cb04e
Modules now have a 'status' attribute.
Bruno Haible <bruno@clisp.org>
parents:
10732
diff
changeset
|
5214 fi |
|
ec39330cb04e
Modules now have a 'status' attribute.
Bruno Haible <bruno@clisp.org>
parents:
10732
diff
changeset
|
5215 done |
|
ec39330cb04e
Modules now have a 'status' attribute.
Bruno Haible <bruno@clisp.org>
parents:
10732
diff
changeset
|
5216 ;; |
|
ec39330cb04e
Modules now have a 'status' attribute.
Bruno Haible <bruno@clisp.org>
parents:
10732
diff
changeset
|
5217 |
|
9189
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
5218 extract-notice ) |
|
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
5219 for module |
|
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
5220 do |
|
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
5221 func_verify_module |
|
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
5222 if test -n "$module"; then |
|
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
5223 func_get_notice "$module" |
|
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
5224 fi |
|
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
5225 done |
|
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
5226 ;; |
|
1d7d9694f1e2
Allow for modules to show an arbitrary notice.
Bruno Haible <bruno@clisp.org>
parents:
9188
diff
changeset
|
5227 |
|
12460
282eecca2301
New module attribute 'Applicability'.
Bruno Haible <bruno@clisp.org>
parents:
12417
diff
changeset
|
5228 extract-applicability ) |
|
282eecca2301
New module attribute 'Applicability'.
Bruno Haible <bruno@clisp.org>
parents:
12417
diff
changeset
|
5229 for module |
|
282eecca2301
New module attribute 'Applicability'.
Bruno Haible <bruno@clisp.org>
parents:
12417
diff
changeset
|
5230 do |
|
282eecca2301
New module attribute 'Applicability'.
Bruno Haible <bruno@clisp.org>
parents:
12417
diff
changeset
|
5231 func_verify_module |
|
282eecca2301
New module attribute 'Applicability'.
Bruno Haible <bruno@clisp.org>
parents:
12417
diff
changeset
|
5232 if test -n "$module"; then |
|
282eecca2301
New module attribute 'Applicability'.
Bruno Haible <bruno@clisp.org>
parents:
12417
diff
changeset
|
5233 func_get_applicability "$module" |
|
282eecca2301
New module attribute 'Applicability'.
Bruno Haible <bruno@clisp.org>
parents:
12417
diff
changeset
|
5234 fi |
|
282eecca2301
New module attribute 'Applicability'.
Bruno Haible <bruno@clisp.org>
parents:
12417
diff
changeset
|
5235 done |
|
282eecca2301
New module attribute 'Applicability'.
Bruno Haible <bruno@clisp.org>
parents:
12417
diff
changeset
|
5236 ;; |
|
282eecca2301
New module attribute 'Applicability'.
Bruno Haible <bruno@clisp.org>
parents:
12417
diff
changeset
|
5237 |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5238 extract-filelist ) |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5239 for module |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5240 do |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5241 func_verify_module |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5242 if test -n "$module"; then |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5243 func_get_filelist "$module" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5244 fi |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5245 done |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5246 ;; |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5247 |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5248 extract-dependencies ) |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5249 for module |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5250 do |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5251 func_verify_module |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5252 if test -n "$module"; then |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5253 func_get_dependencies "$module" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5254 fi |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5255 done |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5256 ;; |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5257 |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5258 extract-autoconf-snippet ) |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5259 for module |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5260 do |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5261 func_verify_module |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5262 if test -n "$module"; then |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5263 func_get_autoconf_snippet "$module" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5264 fi |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5265 done |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5266 ;; |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5267 |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5268 extract-automake-snippet ) |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5269 for module |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5270 do |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5271 func_verify_module |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5272 if test -n "$module"; then |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5273 func_get_automake_snippet "$module" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5274 fi |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5275 done |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5276 ;; |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5277 |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5278 extract-include-directive ) |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5279 for module |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5280 do |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5281 func_verify_module |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5282 if test -n "$module"; then |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5283 func_get_include_directive "$module" |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5284 fi |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5285 done |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5286 ;; |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5287 |
|
8055
5c79d44f739d
New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents:
8040
diff
changeset
|
5288 extract-link-directive ) |
|
5c79d44f739d
New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents:
8040
diff
changeset
|
5289 for module |
|
5c79d44f739d
New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents:
8040
diff
changeset
|
5290 do |
|
5c79d44f739d
New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents:
8040
diff
changeset
|
5291 func_verify_module |
|
5c79d44f739d
New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents:
8040
diff
changeset
|
5292 if test -n "$module"; then |
|
5c79d44f739d
New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents:
8040
diff
changeset
|
5293 func_get_link_directive "$module" |
|
5c79d44f739d
New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents:
8040
diff
changeset
|
5294 fi |
|
5c79d44f739d
New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents:
8040
diff
changeset
|
5295 done |
|
5c79d44f739d
New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents:
8040
diff
changeset
|
5296 ;; |
|
5c79d44f739d
New module description field 'Link'.
Bruno Haible <bruno@clisp.org>
parents:
8040
diff
changeset
|
5297 |
|
5251
42b53a22aee5
Add a license tag to every module.
Bruno Haible <bruno@clisp.org>
parents:
5250
diff
changeset
|
5298 extract-license ) |
|
42b53a22aee5
Add a license tag to every module.
Bruno Haible <bruno@clisp.org>
parents:
5250
diff
changeset
|
5299 for module |
|
42b53a22aee5
Add a license tag to every module.
Bruno Haible <bruno@clisp.org>
parents:
5250
diff
changeset
|
5300 do |
|
42b53a22aee5
Add a license tag to every module.
Bruno Haible <bruno@clisp.org>
parents:
5250
diff
changeset
|
5301 func_verify_module |
|
42b53a22aee5
Add a license tag to every module.
Bruno Haible <bruno@clisp.org>
parents:
5250
diff
changeset
|
5302 if test -n "$module"; then |
|
42b53a22aee5
Add a license tag to every module.
Bruno Haible <bruno@clisp.org>
parents:
5250
diff
changeset
|
5303 func_get_license "$module" |
|
42b53a22aee5
Add a license tag to every module.
Bruno Haible <bruno@clisp.org>
parents:
5250
diff
changeset
|
5304 fi |
|
42b53a22aee5
Add a license tag to every module.
Bruno Haible <bruno@clisp.org>
parents:
5250
diff
changeset
|
5305 done |
|
42b53a22aee5
Add a license tag to every module.
Bruno Haible <bruno@clisp.org>
parents:
5250
diff
changeset
|
5306 ;; |
|
42b53a22aee5
Add a license tag to every module.
Bruno Haible <bruno@clisp.org>
parents:
5250
diff
changeset
|
5307 |
| 4197 | 5308 extract-maintainer ) |
| 5309 for module | |
| 5310 do | |
| 5311 func_verify_module | |
| 5312 if test -n "$module"; then | |
| 5313 func_get_maintainer "$module" | |
| 5314 fi | |
| 5315 done | |
| 5316 ;; | |
| 5317 | |
|
6113
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
5318 extract-tests-module ) |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
5319 for module |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
5320 do |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
5321 func_verify_module |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
5322 if test -n "$module"; then |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
5323 func_get_tests_module "$module" |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
5324 fi |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
5325 done |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
5326 ;; |
|
dac0e048bd40
Support for unit test modules.
Bruno Haible <bruno@clisp.org>
parents:
6111
diff
changeset
|
5327 |
|
11461
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
5328 copy-file ) |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
5329 # Verify the number of arguments. |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
5330 if test $# -lt 1 || test $# -gt 2; then |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
5331 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
|
5332 fi |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
5333 |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
5334 # 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
|
5335 f="$1" |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
5336 # Verify the file exists. |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
5337 func_lookup_file "$f" |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
5338 |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
5339 # 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
|
5340 # It defaults to the current directory. |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
5341 dest="$2" |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
5342 test -n "$dest" || dest='.' |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
5343 test -n "$sourcebase" || sourcebase="lib" |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
5344 test -n "$m4base" || m4base="m4" |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
5345 test -n "$docbase" || docbase="doc" |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
5346 test -n "$testsbase" || testsbase="tests" |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
5347 test -n "$auxdir" || auxdir="build-aux" |
|
11560
987b2dec97b7
Fix the rewriting rules for file names.
Bruno Haible <bruno@clisp.org>
parents:
11533
diff
changeset
|
5348 rewritten='%REWRITTEN%' |
|
11461
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
5349 sed_rewrite_files="\ |
|
11560
987b2dec97b7
Fix the rewriting rules for file names.
Bruno Haible <bruno@clisp.org>
parents:
11533
diff
changeset
|
5350 s,^build-aux/,$rewritten$auxdir/, |
|
987b2dec97b7
Fix the rewriting rules for file names.
Bruno Haible <bruno@clisp.org>
parents:
11533
diff
changeset
|
5351 s,^doc/,$rewritten$docbase/, |
|
987b2dec97b7
Fix the rewriting rules for file names.
Bruno Haible <bruno@clisp.org>
parents:
11533
diff
changeset
|
5352 s,^lib/,$rewritten$sourcebase/, |
|
987b2dec97b7
Fix the rewriting rules for file names.
Bruno Haible <bruno@clisp.org>
parents:
11533
diff
changeset
|
5353 s,^m4/,$rewritten$m4base/, |
|
987b2dec97b7
Fix the rewriting rules for file names.
Bruno Haible <bruno@clisp.org>
parents:
11533
diff
changeset
|
5354 s,^tests/,$rewritten$testsbase/, |
|
987b2dec97b7
Fix the rewriting rules for file names.
Bruno Haible <bruno@clisp.org>
parents:
11533
diff
changeset
|
5355 s,^top/,$rewritten, |
|
987b2dec97b7
Fix the rewriting rules for file names.
Bruno Haible <bruno@clisp.org>
parents:
11533
diff
changeset
|
5356 s,^$rewritten,," |
|
11461
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
5357 if test -d "$dest"; then |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
5358 destdir="$dest" |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
5359 g=`echo "$f" | sed -e "$sed_rewrite_files"` |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
5360 else |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
5361 destdir=`dirname "$dest"` |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
5362 g=`basename "$dest"` |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
5363 fi |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
5364 |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
5365 # Create the directory for destfile. |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
5366 d=`dirname "$destdir/$g"` |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
5367 if $doit; then |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
5368 if test -n "$d" && test ! -d "$d"; then |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
5369 mkdir -p "$d" || func_fatal_error "failed" |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
5370 fi |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
5371 fi |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
5372 # Copy the file. |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
5373 func_dest_tmpfilename "$g" |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
5374 cp "$lookedup_file" "$tmpfile" || func_fatal_error "failed" |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
5375 already_present=true |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
5376 if test -f "$destdir/$g"; then |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
5377 # The file already exists. |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
5378 func_update_file |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
5379 else |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
5380 # Install the file. |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
5381 # Don't protest if the file should be there but isn't: it happens |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
5382 # frequently that developers don't put autogenerated files into CVS. |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
5383 func_add_file |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
5384 fi |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
5385 rm -f "$tmpfile" |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
5386 ;; |
|
263b7daa235d
New gnulib-tool option --copy-file.
Bruno Haible <bruno@clisp.org>
parents:
11421
diff
changeset
|
5387 |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5388 * ) |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5389 func_fatal_error "unknown operation mode --$mode" ;; |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5390 esac |
|
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5391 |
|
7073
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
5392 rm -rf "$tmp" |
|
eb23418a908e
Make it possible to use a locally augmented gnulib.
Bruno Haible <bruno@clisp.org>
parents:
7072
diff
changeset
|
5393 # 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
|
5394 # 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
|
5395 # 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
|
5396 # 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
|
5397 # 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
|
5398 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
|
5399 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
|
5400 |
|
4112
98e795b64056
Tool for managing gnulib modules.
Bruno Haible <bruno@clisp.org>
parents:
diff
changeset
|
5401 exit 0 |
|
7241
aed440dca701
* gnulib-tool: Don't let emacs change spaces to TAB.
Eric Blake <ebb9@byu.net>
parents:
7240
diff
changeset
|
5402 |
|
aed440dca701
* gnulib-tool: Don't let emacs change spaces to TAB.
Eric Blake <ebb9@byu.net>
parents:
7240
diff
changeset
|
5403 # Local Variables: |
|
aed440dca701
* gnulib-tool: Don't let emacs change spaces to TAB.
Eric Blake <ebb9@byu.net>
parents:
7240
diff
changeset
|
5404 # indent-tabs-mode: nil |
|
aed440dca701
* gnulib-tool: Don't let emacs change spaces to TAB.
Eric Blake <ebb9@byu.net>
parents:
7240
diff
changeset
|
5405 # 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
|
5406 # End: |