Mercurial > hg > octave-nkf
annotate build-aux/bootstrap @ 14101:ff5588774680 stable ss-3-5-91
snapshot 3.5.91
* configure.ac (AC_INIT): Version is now 3.5.91.
(OCTAVE_RELEASE_DATE): Now 2011-12-23.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Fri, 23 Dec 2011 19:24:41 -0500 |
| parents | ecf0c6bca0c9 |
| children | 72c96de7a403 |
| rev | line source |
|---|---|
| 9946 | 1 #! /bin/sh |
|
11521
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
2 # Print a version string. |
|
13257
e052c36bf14f
update bootstrap to latest gnulib version
John W. Eaton <jwe@octave.org>
parents:
12733
diff
changeset
|
3 scriptversion=2011-08-11.17; # UTC |
| 9946 | 4 |
| 5 # Bootstrap this package from checked-out sources. | |
| 6 | |
|
11521
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
7 # Copyright (C) 2003-2011 Free Software Foundation, Inc. |
| 9946 | 8 |
| 9 # This program is free software: you can redistribute it and/or modify | |
| 10 # it under the terms of the GNU General Public License as published by | |
| 11 # the Free Software Foundation, either version 3 of the License, or | |
| 12 # (at your option) any later version. | |
| 13 | |
| 14 # This program is distributed in the hope that it will be useful, | |
| 15 # but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 16 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 17 # GNU General Public License for more details. | |
| 18 | |
| 19 # You should have received a copy of the GNU General Public License | |
| 20 # along with this program. If not, see <http://www.gnu.org/licenses/>. | |
| 21 | |
|
11521
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
22 # Originally written by Paul Eggert. The canonical version of this |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
23 # script is maintained as build-aux/bootstrap in gnulib, however, to |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
24 # be useful to your project, you should place a copy of it under |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
25 # version control in the top-level directory of your project. The |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
26 # intent is that all customization can be done with a bootstrap.conf |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
27 # file also maintained in your version control; gnulib comes with a |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
28 # template build-aux/bootstrap.conf to get you started. |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
29 |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
30 # Please report bugs or propose patches to bug-gnulib@gnu.org. |
| 9946 | 31 |
| 32 nl=' | |
| 33 ' | |
| 34 | |
| 35 # Ensure file names are sorted consistently across platforms. | |
| 36 LC_ALL=C | |
| 37 export LC_ALL | |
| 38 | |
| 39 local_gl_dir=gl | |
| 40 | |
| 41 # Temporary directory names. | |
| 42 bt='._bootmp' | |
| 43 bt_regex=`echo "$bt"| sed 's/\./[.]/g'` | |
| 44 bt2=${bt}2 | |
|
12170
037f8b7608f3
bootstrap: update from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
11579
diff
changeset
|
45 me=$0 |
| 9946 | 46 |
| 47 usage() { | |
| 48 cat <<EOF | |
|
12170
037f8b7608f3
bootstrap: update from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
11579
diff
changeset
|
49 Usage: $me [OPTION]... |
| 9946 | 50 Bootstrap this package from the checked-out sources. |
| 51 | |
| 52 Options: | |
|
12170
037f8b7608f3
bootstrap: update from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
11579
diff
changeset
|
53 --gnulib-srcdir=DIRNAME specify the local directory where gnulib |
| 9946 | 54 sources reside. Use this if you already |
| 55 have gnulib sources on your machine, and | |
| 56 do not want to waste your bandwidth downloading | |
|
12170
037f8b7608f3
bootstrap: update from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
11579
diff
changeset
|
57 them again. Defaults to \$GNULIB_SRCDIR |
|
037f8b7608f3
bootstrap: update from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
11579
diff
changeset
|
58 --bootstrap-sync if this bootstrap script is not identical to |
|
11521
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
59 the version in the local gnulib sources, |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
60 update this script, and then restart it with |
|
12170
037f8b7608f3
bootstrap: update from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
11579
diff
changeset
|
61 /bin/sh or the shell \$CONFIG_SHELL |
|
037f8b7608f3
bootstrap: update from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
11579
diff
changeset
|
62 --no-bootstrap-sync do not check whether bootstrap is out of sync |
|
037f8b7608f3
bootstrap: update from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
11579
diff
changeset
|
63 --copy copy files instead of creating symbolic links |
|
037f8b7608f3
bootstrap: update from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
11579
diff
changeset
|
64 --force attempt to bootstrap even if the sources seem |
|
037f8b7608f3
bootstrap: update from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
11579
diff
changeset
|
65 not to have been checked out |
|
037f8b7608f3
bootstrap: update from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
11579
diff
changeset
|
66 --no-git do not use git to update gnulib. Requires that |
|
037f8b7608f3
bootstrap: update from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
11579
diff
changeset
|
67 --gnulib-srcdir point to a correct gnulib snapshot |
|
037f8b7608f3
bootstrap: update from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
11579
diff
changeset
|
68 --skip-po do not download po files |
| 9946 | 69 |
|
12170
037f8b7608f3
bootstrap: update from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
11579
diff
changeset
|
70 If the file $me.conf exists in the same directory as this script, its |
| 9946 | 71 contents are read as shell variables to configure the bootstrap. |
| 72 | |
| 73 For build prerequisites, environment variables like \$AUTOCONF and \$AMTAR | |
| 74 are honored. | |
| 75 | |
| 76 Running without arguments will suffice in most cases. | |
| 77 EOF | |
| 78 } | |
| 79 | |
| 80 # Configuration. | |
| 81 | |
| 82 # Name of the Makefile.am | |
| 83 gnulib_mk=gnulib.mk | |
| 84 | |
| 85 # List of gnulib modules needed. | |
| 86 gnulib_modules= | |
| 87 | |
| 88 # Any gnulib files needed that are not in modules. | |
| 89 gnulib_files= | |
| 90 | |
|
11521
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
91 # A function to be called to edit gnulib.mk right after it's created. |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
92 # Override it via your own definition in bootstrap.conf. |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
93 gnulib_mk_hook() { :; } |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
94 |
| 9946 | 95 # A function to be called after everything else in this script. |
| 96 # Override it via your own definition in bootstrap.conf. | |
| 97 bootstrap_epilogue() { :; } | |
| 98 | |
| 99 # The command to download all .po files for a specified domain into | |
| 100 # a specified directory. Fill in the first %s is the domain name, and | |
| 101 # the second with the destination directory. Use rsync's -L and -r | |
| 102 # options because the latest/%s directory and the .po files within are | |
| 103 # all symlinks. | |
| 104 po_download_command_format=\ | |
|
11521
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
105 "rsync --delete --exclude '*.s1' -Lrtvz \ |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
106 'translationproject.org::tp/latest/%s/' '%s'" |
| 9946 | 107 |
| 108 extract_package_name=' | |
| 109 /^AC_INIT(/{ | |
| 110 /.*,.*,.*, */{ | |
| 111 s/// | |
| 112 s/[][]//g | |
| 113 s/)$// | |
| 114 p | |
| 115 q | |
| 116 } | |
| 117 s/AC_INIT(\[*// | |
| 118 s/]*,.*// | |
| 119 s/^GNU // | |
| 120 y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ | |
| 121 s/[^A-Za-z0-9_]/-/g | |
| 122 p | |
| 123 } | |
| 124 ' | |
| 125 package=`sed -n "$extract_package_name" configure.ac` || exit | |
| 126 gnulib_name=lib$package | |
| 127 | |
| 128 build_aux=build-aux | |
| 129 source_base=lib | |
| 130 m4_base=m4 | |
| 131 doc_base=doc | |
| 132 tests_base=tests | |
|
13257
e052c36bf14f
update bootstrap to latest gnulib version
John W. Eaton <jwe@octave.org>
parents:
12733
diff
changeset
|
133 gnulib_extra_files='' |
| 9946 | 134 |
| 135 # Additional gnulib-tool options to use. Use "\newline" to break lines. | |
| 136 gnulib_tool_option_extras= | |
| 137 | |
| 138 # Other locale categories that need message catalogs. | |
| 139 EXTRA_LOCALE_CATEGORIES= | |
| 140 | |
| 141 # Additional xgettext options to use. Use "\\\newline" to break lines. | |
| 142 XGETTEXT_OPTIONS='\\\ | |
| 143 --flag=_:1:pass-c-format\\\ | |
| 144 --flag=N_:1:pass-c-format\\\ | |
| 145 --flag=error:3:c-format --flag=error_at_line:5:c-format\\\ | |
| 146 ' | |
| 147 | |
|
11521
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
148 # Package bug report address and copyright holder for gettext files |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
149 COPYRIGHT_HOLDER='Free Software Foundation, Inc.' |
| 9946 | 150 MSGID_BUGS_ADDRESS=bug-$package@gnu.org |
| 151 | |
| 152 # Files we don't want to import. | |
| 153 excluded_files= | |
| 154 | |
| 155 # File that should exist in the top directory of a checked out hierarchy, | |
| 156 # but not in a distribution tarball. | |
| 157 checkout_only_file=README-hacking | |
| 158 | |
| 159 # Whether to use copies instead of symlinks. | |
| 160 copy=false | |
| 161 | |
| 162 # Set this to '.cvsignore .gitignore' in bootstrap.conf if you want | |
| 163 # those files to be generated in directories like lib/, m4/, and po/. | |
| 164 # Or set it to 'auto' to make this script select which to use based | |
| 165 # on which version control system (if any) is used in the source directory. | |
| 166 vc_ignore=auto | |
| 167 | |
|
11521
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
168 # Set this to true in bootstrap.conf to enable --bootstrap-sync by |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
169 # default. |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
170 bootstrap_sync=false |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
171 |
|
13883
ecf0c6bca0c9
maint: keep gnulib under a subrepo
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
13257
diff
changeset
|
172 # Don't use git to update gnulib sources. We keep gnulib under a |
|
ecf0c6bca0c9
maint: keep gnulib under a subrepo
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
13257
diff
changeset
|
173 # Mercurial subrepository instead |
|
ecf0c6bca0c9
maint: keep gnulib under a subrepo
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
13257
diff
changeset
|
174 use_git=false |
|
ecf0c6bca0c9
maint: keep gnulib under a subrepo
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
13257
diff
changeset
|
175 GNULIB_SRCDIR=gnulib/ |
|
12170
037f8b7608f3
bootstrap: update from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
11579
diff
changeset
|
176 |
| 9946 | 177 # find_tool ENVVAR NAMES... |
| 178 # ------------------------- | |
| 179 # Search for a required program. Use the value of ENVVAR, if set, | |
| 180 # otherwise find the first of the NAMES that can be run (i.e., | |
| 181 # supports --version). If found, set ENVVAR to the program name, | |
| 182 # die otherwise. | |
| 183 find_tool () | |
| 184 { | |
| 185 find_tool_envvar=$1 | |
| 186 shift | |
| 187 find_tool_names=$@ | |
| 188 eval "find_tool_res=\$$find_tool_envvar" | |
| 189 if test x"$find_tool_res" = x; then | |
| 190 for i | |
| 191 do | |
| 192 if ($i --version </dev/null) >/dev/null 2>&1; then | |
| 193 find_tool_res=$i | |
| 194 break | |
| 195 fi | |
| 196 done | |
| 197 else | |
| 198 find_tool_error_prefix="\$$find_tool_envvar: " | |
| 199 fi | |
| 200 if test x"$find_tool_res" = x; then | |
|
12170
037f8b7608f3
bootstrap: update from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
11579
diff
changeset
|
201 echo >&2 "$me: one of these is required: $find_tool_names" |
| 9946 | 202 exit 1 |
| 203 fi | |
| 204 ($find_tool_res --version </dev/null) >/dev/null 2>&1 || { | |
|
12170
037f8b7608f3
bootstrap: update from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
11579
diff
changeset
|
205 echo >&2 "$me: ${find_tool_error_prefix}cannot run $find_tool_res --version" |
| 9946 | 206 exit 1 |
| 207 } | |
| 208 eval "$find_tool_envvar=\$find_tool_res" | |
| 209 eval "export $find_tool_envvar" | |
| 210 } | |
| 211 | |
|
10347
dcee31e49f86
update bootstrap script from gnulib/build-aux/bootstrap
John W. Eaton <jwe@octave.org>
parents:
9946
diff
changeset
|
212 # Find sha1sum, named gsha1sum on MacPorts, and shasum on MacOS 10.6. |
|
dcee31e49f86
update bootstrap script from gnulib/build-aux/bootstrap
John W. Eaton <jwe@octave.org>
parents:
9946
diff
changeset
|
213 find_tool SHA1SUM sha1sum gsha1sum shasum |
| 9946 | 214 |
| 215 # Override the default configuration, if necessary. | |
| 216 # Make sure that bootstrap.conf is sourced from the current directory | |
| 217 # if we were invoked as "sh bootstrap". | |
| 218 case "$0" in | |
| 219 */*) test -r "$0.conf" && . "$0.conf" ;; | |
| 220 *) test -r "$0.conf" && . ./"$0.conf" ;; | |
| 221 esac | |
| 222 | |
|
13257
e052c36bf14f
update bootstrap to latest gnulib version
John W. Eaton <jwe@octave.org>
parents:
12733
diff
changeset
|
223 # Extra files from gnulib, which override files from other sources. |
|
e052c36bf14f
update bootstrap to latest gnulib version
John W. Eaton <jwe@octave.org>
parents:
12733
diff
changeset
|
224 test -z "${gnulib_extra_files}" && \ |
|
e052c36bf14f
update bootstrap to latest gnulib version
John W. Eaton <jwe@octave.org>
parents:
12733
diff
changeset
|
225 gnulib_extra_files=" |
|
e052c36bf14f
update bootstrap to latest gnulib version
John W. Eaton <jwe@octave.org>
parents:
12733
diff
changeset
|
226 $build_aux/install-sh |
|
e052c36bf14f
update bootstrap to latest gnulib version
John W. Eaton <jwe@octave.org>
parents:
12733
diff
changeset
|
227 $build_aux/missing |
|
e052c36bf14f
update bootstrap to latest gnulib version
John W. Eaton <jwe@octave.org>
parents:
12733
diff
changeset
|
228 $build_aux/mdate-sh |
|
e052c36bf14f
update bootstrap to latest gnulib version
John W. Eaton <jwe@octave.org>
parents:
12733
diff
changeset
|
229 $build_aux/texinfo.tex |
|
e052c36bf14f
update bootstrap to latest gnulib version
John W. Eaton <jwe@octave.org>
parents:
12733
diff
changeset
|
230 $build_aux/depcomp |
|
e052c36bf14f
update bootstrap to latest gnulib version
John W. Eaton <jwe@octave.org>
parents:
12733
diff
changeset
|
231 $build_aux/config.guess |
|
e052c36bf14f
update bootstrap to latest gnulib version
John W. Eaton <jwe@octave.org>
parents:
12733
diff
changeset
|
232 $build_aux/config.sub |
|
e052c36bf14f
update bootstrap to latest gnulib version
John W. Eaton <jwe@octave.org>
parents:
12733
diff
changeset
|
233 doc/INSTALL |
|
e052c36bf14f
update bootstrap to latest gnulib version
John W. Eaton <jwe@octave.org>
parents:
12733
diff
changeset
|
234 " |
| 9946 | 235 |
| 236 if test "$vc_ignore" = auto; then | |
| 237 vc_ignore= | |
| 238 test -d .git && vc_ignore=.gitignore | |
| 239 test -d CVS && vc_ignore="$vc_ignore .cvsignore" | |
| 240 fi | |
| 241 | |
| 242 # Translate configuration into internal form. | |
| 243 | |
| 244 # Parse options. | |
| 245 | |
| 246 for option | |
| 247 do | |
| 248 case $option in | |
| 249 --help) | |
| 250 usage | |
| 251 exit;; | |
| 252 --gnulib-srcdir=*) | |
| 253 GNULIB_SRCDIR=`expr "X$option" : 'X--gnulib-srcdir=\(.*\)'`;; | |
| 254 --skip-po) | |
| 255 SKIP_PO=t;; | |
| 256 --force) | |
| 257 checkout_only_file=;; | |
| 258 --copy) | |
| 259 copy=true;; | |
|
11521
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
260 --bootstrap-sync) |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
261 bootstrap_sync=true;; |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
262 --no-bootstrap-sync) |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
263 bootstrap_sync=false;; |
|
12170
037f8b7608f3
bootstrap: update from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
11579
diff
changeset
|
264 --no-git) |
|
037f8b7608f3
bootstrap: update from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
11579
diff
changeset
|
265 use_git=false;; |
| 9946 | 266 *) |
| 267 echo >&2 "$0: $option: unknown option" | |
| 268 exit 1;; | |
| 269 esac | |
| 270 done | |
| 271 | |
|
12170
037f8b7608f3
bootstrap: update from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
11579
diff
changeset
|
272 if $use_git || test -d "$GNULIB_SRCDIR"; then |
|
037f8b7608f3
bootstrap: update from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
11579
diff
changeset
|
273 : |
|
037f8b7608f3
bootstrap: update from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
11579
diff
changeset
|
274 else |
|
037f8b7608f3
bootstrap: update from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
11579
diff
changeset
|
275 echo "$0: Error: --no-git requires --gnulib-srcdir" >&2 |
|
037f8b7608f3
bootstrap: update from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
11579
diff
changeset
|
276 exit 1 |
|
037f8b7608f3
bootstrap: update from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
11579
diff
changeset
|
277 fi |
|
037f8b7608f3
bootstrap: update from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
11579
diff
changeset
|
278 |
| 9946 | 279 if test -n "$checkout_only_file" && test ! -r "$checkout_only_file"; then |
| 280 echo "$0: Bootstrapping from a non-checked-out distribution is risky." >&2 | |
| 281 exit 1 | |
| 282 fi | |
| 283 | |
|
13257
e052c36bf14f
update bootstrap to latest gnulib version
John W. Eaton <jwe@octave.org>
parents:
12733
diff
changeset
|
284 # Ensure that lines starting with ! sort last, per gitignore conventions |
|
e052c36bf14f
update bootstrap to latest gnulib version
John W. Eaton <jwe@octave.org>
parents:
12733
diff
changeset
|
285 # for whitelisting exceptions after a more generic blacklist pattern. |
|
e052c36bf14f
update bootstrap to latest gnulib version
John W. Eaton <jwe@octave.org>
parents:
12733
diff
changeset
|
286 sort_patterns() { |
|
e052c36bf14f
update bootstrap to latest gnulib version
John W. Eaton <jwe@octave.org>
parents:
12733
diff
changeset
|
287 sort -u "$@" | sed '/^!/ { |
|
e052c36bf14f
update bootstrap to latest gnulib version
John W. Eaton <jwe@octave.org>
parents:
12733
diff
changeset
|
288 H |
|
e052c36bf14f
update bootstrap to latest gnulib version
John W. Eaton <jwe@octave.org>
parents:
12733
diff
changeset
|
289 d |
|
e052c36bf14f
update bootstrap to latest gnulib version
John W. Eaton <jwe@octave.org>
parents:
12733
diff
changeset
|
290 } |
|
e052c36bf14f
update bootstrap to latest gnulib version
John W. Eaton <jwe@octave.org>
parents:
12733
diff
changeset
|
291 $ { |
|
e052c36bf14f
update bootstrap to latest gnulib version
John W. Eaton <jwe@octave.org>
parents:
12733
diff
changeset
|
292 P |
|
e052c36bf14f
update bootstrap to latest gnulib version
John W. Eaton <jwe@octave.org>
parents:
12733
diff
changeset
|
293 x |
|
e052c36bf14f
update bootstrap to latest gnulib version
John W. Eaton <jwe@octave.org>
parents:
12733
diff
changeset
|
294 s/^\n// |
|
e052c36bf14f
update bootstrap to latest gnulib version
John W. Eaton <jwe@octave.org>
parents:
12733
diff
changeset
|
295 }' | sed '/^$/d' |
|
e052c36bf14f
update bootstrap to latest gnulib version
John W. Eaton <jwe@octave.org>
parents:
12733
diff
changeset
|
296 } |
|
e052c36bf14f
update bootstrap to latest gnulib version
John W. Eaton <jwe@octave.org>
parents:
12733
diff
changeset
|
297 |
| 9946 | 298 # If $STR is not already on a line by itself in $FILE, insert it, |
| 299 # sorting the new contents of the file and replacing $FILE with the result. | |
| 300 insert_sorted_if_absent() { | |
| 301 file=$1 | |
| 302 str=$2 | |
| 303 test -f $file || touch $file | |
|
13257
e052c36bf14f
update bootstrap to latest gnulib version
John W. Eaton <jwe@octave.org>
parents:
12733
diff
changeset
|
304 echo "$str" | sort_patterns - $file | cmp - $file > /dev/null \ |
|
e052c36bf14f
update bootstrap to latest gnulib version
John W. Eaton <jwe@octave.org>
parents:
12733
diff
changeset
|
305 || { echo "$str" | sort_patterns - $file > $file.bak \ |
|
e052c36bf14f
update bootstrap to latest gnulib version
John W. Eaton <jwe@octave.org>
parents:
12733
diff
changeset
|
306 && mv $file.bak $file; } \ |
| 9946 | 307 || exit 1 |
| 308 } | |
| 309 | |
|
11521
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
310 # Adjust $PATTERN for $VC_IGNORE_FILE and insert it with |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
311 # insert_sorted_if_absent. |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
312 insert_vc_ignore() { |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
313 vc_ignore_file="$1" |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
314 pattern="$2" |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
315 case $vc_ignore_file in |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
316 *.gitignore) |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
317 # A .gitignore entry that does not start with `/' applies |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
318 # recursively to subdirectories, so prepend `/' to every |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
319 # .gitignore entry. |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
320 pattern=`echo "$pattern" | sed s,^,/,`;; |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
321 esac |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
322 insert_sorted_if_absent "$vc_ignore_file" "$pattern" |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
323 } |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
324 |
| 9946 | 325 # Die if there is no AC_CONFIG_AUX_DIR($build_aux) line in configure.ac. |
| 326 found_aux_dir=no | |
| 327 grep '^[ ]*AC_CONFIG_AUX_DIR(\['"$build_aux"'\])' configure.ac \ | |
| 328 >/dev/null && found_aux_dir=yes | |
| 329 grep '^[ ]*AC_CONFIG_AUX_DIR('"$build_aux"')' configure.ac \ | |
| 330 >/dev/null && found_aux_dir=yes | |
| 331 if test $found_aux_dir = no; then | |
| 332 echo "$0: expected line not found in configure.ac. Add the following:" >&2 | |
| 333 echo " AC_CONFIG_AUX_DIR([$build_aux])" >&2 | |
| 334 exit 1 | |
| 335 fi | |
| 336 | |
| 337 # If $build_aux doesn't exist, create it now, otherwise some bits | |
| 338 # below will malfunction. If creating it, also mark it as ignored. | |
| 339 if test ! -d $build_aux; then | |
| 340 mkdir $build_aux | |
| 341 for dot_ig in x $vc_ignore; do | |
| 342 test $dot_ig = x && continue | |
|
11521
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
343 insert_vc_ignore $dot_ig $build_aux |
| 9946 | 344 done |
| 345 fi | |
| 346 | |
| 347 # Note this deviates from the version comparison in automake | |
| 348 # in that it treats 1.5 < 1.5.0, and treats 1.4.4a < 1.4-p3a | |
| 349 # but this should suffice as we won't be specifying old | |
| 350 # version formats or redundant trailing .0 in bootstrap.conf. | |
| 351 # If we did want full compatibility then we should probably | |
| 352 # use m4_version_compare from autoconf. | |
| 353 sort_ver() { # sort -V is not generally available | |
| 354 ver1="$1" | |
| 355 ver2="$2" | |
| 356 | |
| 357 # split on '.' and compare each component | |
| 358 i=1 | |
| 359 while : ; do | |
| 360 p1=$(echo "$ver1" | cut -d. -f$i) | |
| 361 p2=$(echo "$ver2" | cut -d. -f$i) | |
| 362 if [ ! "$p1" ]; then | |
| 363 echo "$1 $2" | |
| 364 break | |
| 365 elif [ ! "$p2" ]; then | |
| 366 echo "$2 $1" | |
| 367 break | |
| 368 elif [ ! "$p1" = "$p2" ]; then | |
| 369 if [ "$p1" -gt "$p2" ] 2>/dev/null; then # numeric comparison | |
| 370 echo "$2 $1" | |
| 371 elif [ "$p2" -gt "$p1" ] 2>/dev/null; then # numeric comparison | |
| 372 echo "$1 $2" | |
| 373 else # numeric, then lexicographic comparison | |
| 374 lp=$(printf "$p1\n$p2\n" | LANG=C sort -n | tail -n1) | |
| 375 if [ "$lp" = "$p2" ]; then | |
| 376 echo "$1 $2" | |
| 377 else | |
| 378 echo "$2 $1" | |
| 379 fi | |
| 380 fi | |
| 381 break | |
| 382 fi | |
| 383 i=$(($i+1)) | |
| 384 done | |
| 385 } | |
| 386 | |
| 387 get_version() { | |
| 388 app=$1 | |
| 389 | |
| 390 $app --version >/dev/null 2>&1 || return 1 | |
| 391 | |
| 392 $app --version 2>&1 | | |
|
11521
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
393 sed -n '# Move version to start of line. |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
394 s/.*[v ]\([0-9]\)/\1/ |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
395 |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
396 # Skip lines that do not start with version. |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
397 /^[0-9]/!d |
|
10347
dcee31e49f86
update bootstrap script from gnulib/build-aux/bootstrap
John W. Eaton <jwe@octave.org>
parents:
9946
diff
changeset
|
398 |
|
11521
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
399 # Remove characters after the version. |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
400 s/[^.a-z0-9-].*// |
|
10347
dcee31e49f86
update bootstrap script from gnulib/build-aux/bootstrap
John W. Eaton <jwe@octave.org>
parents:
9946
diff
changeset
|
401 |
|
11521
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
402 # The first component must be digits only. |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
403 s/^\([0-9]*\)[a-z-].*/\1/ |
|
10347
dcee31e49f86
update bootstrap script from gnulib/build-aux/bootstrap
John W. Eaton <jwe@octave.org>
parents:
9946
diff
changeset
|
404 |
|
dcee31e49f86
update bootstrap script from gnulib/build-aux/bootstrap
John W. Eaton <jwe@octave.org>
parents:
9946
diff
changeset
|
405 #the following essentially does s/5.005/5.5/ |
|
dcee31e49f86
update bootstrap script from gnulib/build-aux/bootstrap
John W. Eaton <jwe@octave.org>
parents:
9946
diff
changeset
|
406 s/\.0*\([1-9]\)/.\1/g |
|
dcee31e49f86
update bootstrap script from gnulib/build-aux/bootstrap
John W. Eaton <jwe@octave.org>
parents:
9946
diff
changeset
|
407 p |
| 9946 | 408 q' |
| 409 } | |
| 410 | |
| 411 check_versions() { | |
| 412 ret=0 | |
| 413 | |
| 414 while read app req_ver; do | |
|
11521
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
415 # We only need libtoolize from the libtool package. |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
416 if test "$app" = libtool; then |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
417 app=libtoolize |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
418 fi |
|
12170
037f8b7608f3
bootstrap: update from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
11579
diff
changeset
|
419 # Exempt git if --no-git is in effect. |
|
037f8b7608f3
bootstrap: update from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
11579
diff
changeset
|
420 if test "$app" = git; then |
|
037f8b7608f3
bootstrap: update from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
11579
diff
changeset
|
421 $use_git || continue |
|
037f8b7608f3
bootstrap: update from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
11579
diff
changeset
|
422 fi |
| 9946 | 423 # Honor $APP variables ($TAR, $AUTOCONF, etc.) |
|
11521
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
424 appvar=`echo $app | tr '[a-z]-' '[A-Z]_'` |
| 9946 | 425 test "$appvar" = TAR && appvar=AMTAR |
|
13257
e052c36bf14f
update bootstrap to latest gnulib version
John W. Eaton <jwe@octave.org>
parents:
12733
diff
changeset
|
426 case $appvar in |
|
e052c36bf14f
update bootstrap to latest gnulib version
John W. Eaton <jwe@octave.org>
parents:
12733
diff
changeset
|
427 GZIP) ;; # Do not use $GZIP: it contains gzip options. |
|
e052c36bf14f
update bootstrap to latest gnulib version
John W. Eaton <jwe@octave.org>
parents:
12733
diff
changeset
|
428 *) eval "app=\${$appvar-$app}" ;; |
|
e052c36bf14f
update bootstrap to latest gnulib version
John W. Eaton <jwe@octave.org>
parents:
12733
diff
changeset
|
429 esac |
|
e052c36bf14f
update bootstrap to latest gnulib version
John W. Eaton <jwe@octave.org>
parents:
12733
diff
changeset
|
430 if [ "$req_ver" = "-" ]; then |
|
e052c36bf14f
update bootstrap to latest gnulib version
John W. Eaton <jwe@octave.org>
parents:
12733
diff
changeset
|
431 # Merely require app to exist; not all prereq apps are well-behaved |
|
e052c36bf14f
update bootstrap to latest gnulib version
John W. Eaton <jwe@octave.org>
parents:
12733
diff
changeset
|
432 # so we have to rely on $? rather than get_version. |
|
e052c36bf14f
update bootstrap to latest gnulib version
John W. Eaton <jwe@octave.org>
parents:
12733
diff
changeset
|
433 $app --version >/dev/null 2>&1 |
|
e052c36bf14f
update bootstrap to latest gnulib version
John W. Eaton <jwe@octave.org>
parents:
12733
diff
changeset
|
434 if [ 126 -le $? ]; then |
|
e052c36bf14f
update bootstrap to latest gnulib version
John W. Eaton <jwe@octave.org>
parents:
12733
diff
changeset
|
435 echo "$me: Error: '$app' not found" >&2 |
| 9946 | 436 ret=1 |
| 437 fi | |
|
13257
e052c36bf14f
update bootstrap to latest gnulib version
John W. Eaton <jwe@octave.org>
parents:
12733
diff
changeset
|
438 else |
|
e052c36bf14f
update bootstrap to latest gnulib version
John W. Eaton <jwe@octave.org>
parents:
12733
diff
changeset
|
439 # Require app to produce a new enough version string. |
|
e052c36bf14f
update bootstrap to latest gnulib version
John W. Eaton <jwe@octave.org>
parents:
12733
diff
changeset
|
440 inst_ver=$(get_version $app) |
|
e052c36bf14f
update bootstrap to latest gnulib version
John W. Eaton <jwe@octave.org>
parents:
12733
diff
changeset
|
441 if [ ! "$inst_ver" ]; then |
|
e052c36bf14f
update bootstrap to latest gnulib version
John W. Eaton <jwe@octave.org>
parents:
12733
diff
changeset
|
442 echo "$me: Error: '$app' not found" >&2 |
|
e052c36bf14f
update bootstrap to latest gnulib version
John W. Eaton <jwe@octave.org>
parents:
12733
diff
changeset
|
443 ret=1 |
|
e052c36bf14f
update bootstrap to latest gnulib version
John W. Eaton <jwe@octave.org>
parents:
12733
diff
changeset
|
444 else |
|
e052c36bf14f
update bootstrap to latest gnulib version
John W. Eaton <jwe@octave.org>
parents:
12733
diff
changeset
|
445 latest_ver=$(sort_ver $req_ver $inst_ver | cut -d' ' -f2) |
|
e052c36bf14f
update bootstrap to latest gnulib version
John W. Eaton <jwe@octave.org>
parents:
12733
diff
changeset
|
446 if [ ! "$latest_ver" = "$inst_ver" ]; then |
|
e052c36bf14f
update bootstrap to latest gnulib version
John W. Eaton <jwe@octave.org>
parents:
12733
diff
changeset
|
447 echo "$me: Error: '$app' version == $inst_ver is too old" >&2 |
|
e052c36bf14f
update bootstrap to latest gnulib version
John W. Eaton <jwe@octave.org>
parents:
12733
diff
changeset
|
448 echo " '$app' version >= $req_ver is required" >&2 |
|
e052c36bf14f
update bootstrap to latest gnulib version
John W. Eaton <jwe@octave.org>
parents:
12733
diff
changeset
|
449 ret=1 |
|
e052c36bf14f
update bootstrap to latest gnulib version
John W. Eaton <jwe@octave.org>
parents:
12733
diff
changeset
|
450 fi |
|
e052c36bf14f
update bootstrap to latest gnulib version
John W. Eaton <jwe@octave.org>
parents:
12733
diff
changeset
|
451 fi |
| 9946 | 452 fi |
| 453 done | |
| 454 | |
| 455 return $ret | |
| 456 } | |
| 457 | |
| 458 print_versions() { | |
| 459 echo "Program Min_version" | |
| 460 echo "----------------------" | |
|
11521
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
461 printf %s "$buildreq" |
| 9946 | 462 echo "----------------------" |
| 463 # can't depend on column -t | |
| 464 } | |
| 465 | |
|
11521
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
466 use_libtool=0 |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
467 # We'd like to use grep -E, to see if any of LT_INIT, |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
468 # AC_PROG_LIBTOOL, AM_PROG_LIBTOOL is used in configure.ac, |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
469 # but that's not portable enough (e.g., for Solaris). |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
470 grep '^[ ]*A[CM]_PROG_LIBTOOL' configure.ac >/dev/null \ |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
471 && use_libtool=1 |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
472 grep '^[ ]*LT_INIT' configure.ac >/dev/null \ |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
473 && use_libtool=1 |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
474 if test $use_libtool = 1; then |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
475 find_tool LIBTOOLIZE glibtoolize libtoolize |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
476 fi |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
477 |
| 9946 | 478 if ! printf "$buildreq" | check_versions; then |
|
11521
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
479 echo >&2 |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
480 if test -f README-prereq; then |
|
12170
037f8b7608f3
bootstrap: update from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
11579
diff
changeset
|
481 echo "$0: See README-prereq for how to get the prerequisite programs" >&2 |
|
11521
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
482 else |
|
12170
037f8b7608f3
bootstrap: update from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
11579
diff
changeset
|
483 echo "$0: Please install the prerequisite programs" >&2 |
|
11521
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
484 fi |
| 9946 | 485 exit 1 |
| 486 fi | |
| 487 | |
| 488 echo "$0: Bootstrapping from checked-out $package sources..." | |
| 489 | |
| 490 # See if we can use gnulib's git-merge-changelog merge driver. | |
| 491 if test -d .git && (git --version) >/dev/null 2>/dev/null ; then | |
| 492 if git config merge.merge-changelog.driver >/dev/null ; then | |
| 493 : | |
| 494 elif (git-merge-changelog --version) >/dev/null 2>/dev/null ; then | |
|
12170
037f8b7608f3
bootstrap: update from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
11579
diff
changeset
|
495 echo "$0: initializing git-merge-changelog driver" |
| 9946 | 496 git config merge.merge-changelog.name 'GNU-style ChangeLog merge driver' |
| 497 git config merge.merge-changelog.driver 'git-merge-changelog %O %A %B' | |
| 498 else | |
|
12170
037f8b7608f3
bootstrap: update from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
11579
diff
changeset
|
499 echo "$0: consider installing git-merge-changelog from gnulib" |
| 9946 | 500 fi |
| 501 fi | |
| 502 | |
| 503 | |
| 504 cleanup_gnulib() { | |
| 505 status=$? | |
|
11521
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
506 rm -fr "$gnulib_path" |
| 9946 | 507 exit $status |
| 508 } | |
| 509 | |
| 510 git_modules_config () { | |
| 511 test -f .gitmodules && git config --file .gitmodules "$@" | |
| 512 } | |
| 513 | |
|
11521
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
514 gnulib_path=`git_modules_config submodule.gnulib.path` |
|
11579
5c680b69b4e2
bootstrap: update from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
11522
diff
changeset
|
515 test -z "$gnulib_path" && gnulib_path=gnulib |
|
11521
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
516 |
| 9946 | 517 # Get gnulib files. |
| 518 | |
| 519 case ${GNULIB_SRCDIR--} in | |
| 520 -) | |
| 521 if git_modules_config submodule.gnulib.url >/dev/null; then | |
| 522 echo "$0: getting gnulib files..." | |
| 523 git submodule init || exit $? | |
| 524 git submodule update || exit $? | |
| 525 | |
|
11521
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
526 elif [ ! -d "$gnulib_path" ]; then |
| 9946 | 527 echo "$0: getting gnulib files..." |
| 528 | |
| 529 trap cleanup_gnulib 1 2 13 15 | |
| 530 | |
|
11521
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
531 shallow= |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
532 git clone -h 2>&1 | grep -- --depth > /dev/null && shallow='--depth 2' |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
533 git clone $shallow git://git.sv.gnu.org/gnulib "$gnulib_path" || |
| 9946 | 534 cleanup_gnulib |
| 535 | |
| 536 trap - 1 2 13 15 | |
| 537 fi | |
|
11521
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
538 GNULIB_SRCDIR=$gnulib_path |
| 9946 | 539 ;; |
| 540 *) | |
|
11521
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
541 # Use GNULIB_SRCDIR as a reference. |
| 9946 | 542 if test -d "$GNULIB_SRCDIR"/.git && \ |
| 543 git_modules_config submodule.gnulib.url >/dev/null; then | |
| 544 echo "$0: getting gnulib files..." | |
|
11521
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
545 if git submodule -h|grep -- --reference > /dev/null; then |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
546 # Prefer the one-liner available in git 1.6.4 or newer. |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
547 git submodule update --init --reference "$GNULIB_SRCDIR" \ |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
548 "$gnulib_path" || exit $? |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
549 else |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
550 # This fallback allows at least git 1.5.5. |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
551 if test -f "$gnulib_path"/gnulib-tool; then |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
552 # Since file already exists, assume submodule init already complete. |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
553 git submodule update || exit $? |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
554 else |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
555 # Older git can't clone into an empty directory. |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
556 rmdir "$gnulib_path" 2>/dev/null |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
557 git clone --reference "$GNULIB_SRCDIR" \ |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
558 "$(git_modules_config submodule.gnulib.url)" "$gnulib_path" \ |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
559 && git submodule init && git submodule update \ |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
560 || exit $? |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
561 fi |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
562 fi |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
563 GNULIB_SRCDIR=$gnulib_path |
| 9946 | 564 fi |
| 565 ;; | |
| 566 esac | |
| 567 | |
|
11521
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
568 if $bootstrap_sync; then |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
569 cmp -s "$0" "$GNULIB_SRCDIR/build-aux/bootstrap" || { |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
570 echo "$0: updating bootstrap and restarting..." |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
571 exec sh -c \ |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
572 'cp "$1" "$2" && shift && exec "${CONFIG_SHELL-/bin/sh}" "$@"' \ |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
573 -- "$GNULIB_SRCDIR/build-aux/bootstrap" \ |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
574 "$0" "$@" --no-bootstrap-sync |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
575 } |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
576 fi |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
577 |
| 9946 | 578 gnulib_tool=$GNULIB_SRCDIR/gnulib-tool |
| 579 <$gnulib_tool || exit | |
| 580 | |
| 581 # Get translations. | |
| 582 | |
| 583 download_po_files() { | |
| 584 subdir=$1 | |
| 585 domain=$2 | |
|
12170
037f8b7608f3
bootstrap: update from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
11579
diff
changeset
|
586 echo "$me: getting translations into $subdir for $domain..." |
| 9946 | 587 cmd=`printf "$po_download_command_format" "$domain" "$subdir"` |
| 588 eval "$cmd" | |
| 589 } | |
| 590 | |
|
11521
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
591 # Mirror .po files to $po_dir/.reference and copy only the new |
| 9946 | 592 # or modified ones into $po_dir. Also update $po_dir/LINGUAS. |
|
11521
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
593 # Note po files that exist locally only are left in $po_dir but will |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
594 # not be included in LINGUAS and hence will not be distributed. |
| 9946 | 595 update_po_files() { |
| 596 # Directory containing primary .po files. | |
| 597 # Overwrite them only when we're sure a .po file is new. | |
| 598 po_dir=$1 | |
| 599 domain=$2 | |
| 600 | |
|
11521
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
601 # Mirror *.po files into this dir. |
| 9946 | 602 # Usually contains *.s1 checksum files. |
| 603 ref_po_dir="$po_dir/.reference" | |
| 604 | |
| 605 test -d $ref_po_dir || mkdir $ref_po_dir || return | |
| 606 download_po_files $ref_po_dir $domain \ | |
| 607 && ls "$ref_po_dir"/*.po 2>/dev/null | | |
|
11521
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
608 sed 's|.*/||; s|\.po$||' > "$po_dir/LINGUAS" || return |
| 9946 | 609 |
| 610 langs=`cd $ref_po_dir && echo *.po|sed 's/\.po//g'` | |
| 611 test "$langs" = '*' && langs=x | |
| 612 for po in $langs; do | |
| 613 case $po in x) continue;; esac | |
| 614 new_po="$ref_po_dir/$po.po" | |
| 615 cksum_file="$ref_po_dir/$po.s1" | |
| 616 if ! test -f "$cksum_file" || | |
| 617 ! test -f "$po_dir/$po.po" || | |
| 618 ! $SHA1SUM -c --status "$cksum_file" \ | |
| 619 < "$new_po" > /dev/null; then | |
|
12170
037f8b7608f3
bootstrap: update from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
11579
diff
changeset
|
620 echo "$me: updated $po_dir/$po.po..." |
| 9946 | 621 cp "$new_po" "$po_dir/$po.po" \ |
| 622 && $SHA1SUM < "$new_po" > "$cksum_file" | |
| 623 fi | |
| 624 done | |
| 625 } | |
| 626 | |
| 627 case $SKIP_PO in | |
| 628 '') | |
| 629 if test -d po; then | |
| 630 update_po_files po $package || exit | |
| 631 fi | |
| 632 | |
| 633 if test -d runtime-po; then | |
| 634 update_po_files runtime-po $package-runtime || exit | |
| 635 fi;; | |
| 636 esac | |
| 637 | |
| 638 symlink_to_dir() | |
| 639 { | |
| 640 src=$1/$2 | |
| 641 dst=${3-$2} | |
| 642 | |
| 643 test -f "$src" && { | |
| 644 | |
| 645 # If the destination directory doesn't exist, create it. | |
| 646 # This is required at least for "lib/uniwidth/cjk.h". | |
| 647 dst_dir=`dirname "$dst"` | |
| 648 if ! test -d "$dst_dir"; then | |
| 649 mkdir -p "$dst_dir" | |
| 650 | |
| 651 # If we've just created a directory like lib/uniwidth, | |
| 652 # tell version control system(s) it's ignorable. | |
| 653 # FIXME: for now, this does only one level | |
| 654 parent=`dirname "$dst_dir"` | |
| 655 for dot_ig in x $vc_ignore; do | |
| 656 test $dot_ig = x && continue | |
| 657 ig=$parent/$dot_ig | |
|
11521
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
658 insert_vc_ignore $ig `echo "$dst_dir"|sed 's,.*/,,'` |
| 9946 | 659 done |
| 660 fi | |
| 661 | |
| 662 if $copy; then | |
| 663 { | |
| 664 test ! -h "$dst" || { | |
|
12170
037f8b7608f3
bootstrap: update from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
11579
diff
changeset
|
665 echo "$me: rm -f $dst" && |
| 9946 | 666 rm -f "$dst" |
| 667 } | |
| 668 } && | |
| 669 test -f "$dst" && | |
| 670 cmp -s "$src" "$dst" || { | |
|
12170
037f8b7608f3
bootstrap: update from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
11579
diff
changeset
|
671 echo "$me: cp -fp $src $dst" && |
| 9946 | 672 cp -fp "$src" "$dst" |
| 673 } | |
| 674 else | |
|
13257
e052c36bf14f
update bootstrap to latest gnulib version
John W. Eaton <jwe@octave.org>
parents:
12733
diff
changeset
|
675 # Leave any existing symlink alone, if it already points to the source, |
|
e052c36bf14f
update bootstrap to latest gnulib version
John W. Eaton <jwe@octave.org>
parents:
12733
diff
changeset
|
676 # so that broken build tools that care about symlink times |
|
e052c36bf14f
update bootstrap to latest gnulib version
John W. Eaton <jwe@octave.org>
parents:
12733
diff
changeset
|
677 # aren't confused into doing unnecessary builds. Conversely, if the |
|
e052c36bf14f
update bootstrap to latest gnulib version
John W. Eaton <jwe@octave.org>
parents:
12733
diff
changeset
|
678 # existing symlink's time stamp is older than the source, make it afresh, |
|
e052c36bf14f
update bootstrap to latest gnulib version
John W. Eaton <jwe@octave.org>
parents:
12733
diff
changeset
|
679 # so that broken tools aren't confused into skipping needed builds. See |
|
e052c36bf14f
update bootstrap to latest gnulib version
John W. Eaton <jwe@octave.org>
parents:
12733
diff
changeset
|
680 # <http://lists.gnu.org/archive/html/bug-gnulib/2011-05/msg00326.html>. |
| 9946 | 681 test -h "$dst" && |
| 682 src_ls=`ls -diL "$src" 2>/dev/null` && set $src_ls && src_i=$1 && | |
| 683 dst_ls=`ls -diL "$dst" 2>/dev/null` && set $dst_ls && dst_i=$1 && | |
|
13257
e052c36bf14f
update bootstrap to latest gnulib version
John W. Eaton <jwe@octave.org>
parents:
12733
diff
changeset
|
684 test "$src_i" = "$dst_i" && |
|
e052c36bf14f
update bootstrap to latest gnulib version
John W. Eaton <jwe@octave.org>
parents:
12733
diff
changeset
|
685 both_ls=`ls -dt "$src" "$dst"` && |
|
e052c36bf14f
update bootstrap to latest gnulib version
John W. Eaton <jwe@octave.org>
parents:
12733
diff
changeset
|
686 test "X$both_ls" = "X$dst$nl$src" || { |
| 9946 | 687 dot_dots= |
| 688 case $src in | |
| 689 /*) ;; | |
| 690 *) | |
| 691 case /$dst/ in | |
| 692 *//* | */../* | */./* | /*/*/*/*/*/) | |
|
12170
037f8b7608f3
bootstrap: update from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
11579
diff
changeset
|
693 echo >&2 "$me: invalid symlink calculation: $src -> $dst" |
| 9946 | 694 exit 1;; |
| 695 /*/*/*/*/) dot_dots=../../../;; | |
| 696 /*/*/*/) dot_dots=../../;; | |
| 697 /*/*/) dot_dots=../;; | |
| 698 esac;; | |
| 699 esac | |
| 700 | |
|
12170
037f8b7608f3
bootstrap: update from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
11579
diff
changeset
|
701 echo "$me: ln -fs $dot_dots$src $dst" && |
| 9946 | 702 ln -fs "$dot_dots$src" "$dst" |
| 703 } | |
| 704 fi | |
| 705 } | |
| 706 } | |
| 707 | |
| 708 cp_mark_as_generated() | |
| 709 { | |
| 710 cp_src=$1 | |
| 711 cp_dst=$2 | |
| 712 | |
| 713 if cmp -s "$cp_src" "$GNULIB_SRCDIR/$cp_dst"; then | |
| 714 symlink_to_dir "$GNULIB_SRCDIR" "$cp_dst" | |
| 715 elif cmp -s "$cp_src" "$local_gl_dir/$cp_dst"; then | |
| 716 symlink_to_dir $local_gl_dir "$cp_dst" | |
| 717 else | |
| 718 case $cp_dst in | |
| 719 *.[ch]) c1='/* '; c2=' */';; | |
| 720 *.texi) c1='@c '; c2= ;; | |
| 721 *.m4|*/Make*|Make*) c1='# ' ; c2= ;; | |
| 722 *) c1= ; c2= ;; | |
| 723 esac | |
| 724 | |
| 725 # If the destination directory doesn't exist, create it. | |
| 726 # This is required at least for "lib/uniwidth/cjk.h". | |
| 727 dst_dir=`dirname "$cp_dst"` | |
| 728 test -d "$dst_dir" || mkdir -p "$dst_dir" | |
| 729 | |
| 730 if test -z "$c1"; then | |
| 731 cmp -s "$cp_src" "$cp_dst" || { | |
| 732 # Copy the file first to get proper permissions if it | |
| 733 # doesn't already exist. Then overwrite the copy. | |
|
12170
037f8b7608f3
bootstrap: update from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
11579
diff
changeset
|
734 echo "$me: cp -f $cp_src $cp_dst" && |
| 9946 | 735 rm -f "$cp_dst" && |
| 736 cp "$cp_src" "$cp_dst-t" && | |
| 737 sed "s!$bt_regex/!!g" "$cp_src" > "$cp_dst-t" && | |
| 738 mv -f "$cp_dst-t" "$cp_dst" | |
| 739 } | |
| 740 else | |
| 741 # Copy the file first to get proper permissions if it | |
| 742 # doesn't already exist. Then overwrite the copy. | |
| 743 cp "$cp_src" "$cp_dst-t" && | |
| 744 ( | |
| 745 echo "$c1-*- buffer-read-only: t -*- vi: set ro:$c2" && | |
| 746 echo "${c1}DO NOT EDIT! GENERATED AUTOMATICALLY!$c2" && | |
| 747 sed "s!$bt_regex/!!g" "$cp_src" | |
| 748 ) > $cp_dst-t && | |
| 749 if cmp -s "$cp_dst-t" "$cp_dst"; then | |
| 750 rm -f "$cp_dst-t" | |
| 751 else | |
|
12170
037f8b7608f3
bootstrap: update from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
11579
diff
changeset
|
752 echo "$me: cp $cp_src $cp_dst # with edits" && |
| 9946 | 753 mv -f "$cp_dst-t" "$cp_dst" |
| 754 fi | |
| 755 fi | |
| 756 fi | |
| 757 } | |
| 758 | |
| 759 version_controlled_file() { | |
| 760 dir=$1 | |
| 761 file=$2 | |
| 762 found=no | |
| 763 if test -d CVS; then | |
| 764 grep -F "/$file/" $dir/CVS/Entries 2>/dev/null | | |
| 765 grep '^/[^/]*/[0-9]' > /dev/null && found=yes | |
| 766 elif test -d .git; then | |
| 767 git rm -n "$dir/$file" > /dev/null 2>&1 && found=yes | |
| 768 elif test -d .svn; then | |
| 769 svn log -r HEAD "$dir/$file" > /dev/null 2>&1 && found=yes | |
| 770 else | |
|
12170
037f8b7608f3
bootstrap: update from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
11579
diff
changeset
|
771 echo "$me: no version control for $dir/$file?" >&2 |
| 9946 | 772 fi |
| 773 test $found = yes | |
| 774 } | |
| 775 | |
| 776 slurp() { | |
| 777 for dir in . `(cd $1 && find * -type d -print)`; do | |
| 778 copied= | |
| 779 sep= | |
| 780 for file in `ls -a $1/$dir`; do | |
| 781 case $file in | |
| 782 .|..) continue;; | |
|
11521
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
783 # FIXME: should all file names starting with "." be ignored? |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
784 .*) continue;; |
| 9946 | 785 esac |
| 786 test -d $1/$dir/$file && continue | |
| 787 for excluded_file in $excluded_files; do | |
| 788 test "$dir/$file" = "$excluded_file" && continue 2 | |
| 789 done | |
|
11521
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
790 if test $file = Makefile.am && test "X$gnulib_mk" != XMakefile.am; then |
| 9946 | 791 copied=$copied${sep}$gnulib_mk; sep=$nl |
| 792 remove_intl='/^[^#].*\/intl/s/^/#/;'"s!$bt_regex/!!g" | |
|
11521
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
793 sed "$remove_intl" $1/$dir/$file | |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
794 cmp - $dir/$gnulib_mk > /dev/null || { |
|
12170
037f8b7608f3
bootstrap: update from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
11579
diff
changeset
|
795 echo "$me: Copying $1/$dir/$file to $dir/$gnulib_mk ..." && |
| 9946 | 796 rm -f $dir/$gnulib_mk && |
|
11521
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
797 sed "$remove_intl" $1/$dir/$file >$dir/$gnulib_mk && |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
798 gnulib_mk_hook $dir/$gnulib_mk |
| 9946 | 799 } |
| 800 elif { test "${2+set}" = set && test -r $2/$dir/$file; } || | |
| 801 version_controlled_file $dir $file; then | |
|
12170
037f8b7608f3
bootstrap: update from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
11579
diff
changeset
|
802 echo "$me: $dir/$file overrides $1/$dir/$file" |
| 9946 | 803 else |
| 804 copied=$copied$sep$file; sep=$nl | |
|
13257
e052c36bf14f
update bootstrap to latest gnulib version
John W. Eaton <jwe@octave.org>
parents:
12733
diff
changeset
|
805 cp_mark_as_generated $1/$dir/$file $dir/$file |
| 9946 | 806 fi || exit |
| 807 done | |
| 808 | |
| 809 for dot_ig in x $vc_ignore; do | |
| 810 test $dot_ig = x && continue | |
| 811 ig=$dir/$dot_ig | |
| 812 if test -n "$copied"; then | |
|
11521
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
813 insert_vc_ignore $ig "$copied" |
| 9946 | 814 # If an ignored file name ends with .in.h, then also add |
| 815 # the name with just ".h". Many gnulib headers are generated, | |
| 816 # e.g., stdint.in.h -> stdint.h, dirent.in.h ->..., etc. | |
| 817 # Likewise for .gperf -> .h, .y -> .c, and .sin -> .sed | |
|
11521
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
818 f=`echo "$copied" | |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
819 sed ' |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
820 s/\.in\.h$/.h/ |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
821 s/\.sin$/.sed/ |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
822 s/\.y$/.c/ |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
823 s/\.gperf$/.h/ |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
824 ' |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
825 ` |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
826 insert_vc_ignore $ig "$f" |
| 9946 | 827 |
| 828 # For files like sys_stat.in.h and sys_time.in.h, record as | |
| 829 # ignorable the directory we might eventually create: sys/. | |
| 830 f=`echo "$copied"|sed 's/sys_.*\.in\.h$/sys/'` | |
|
11521
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
831 insert_vc_ignore $ig "$f" |
| 9946 | 832 fi |
| 833 done | |
| 834 done | |
| 835 } | |
| 836 | |
| 837 | |
| 838 # Create boot temporary directories to import from gnulib and gettext. | |
| 839 rm -fr $bt $bt2 && | |
| 840 mkdir $bt $bt2 || exit | |
| 841 | |
| 842 # Import from gnulib. | |
| 843 | |
| 844 gnulib_tool_options="\ | |
| 845 --import\ | |
| 846 --no-changelog\ | |
| 847 --aux-dir $bt/$build_aux\ | |
| 848 --doc-base $bt/$doc_base\ | |
| 849 --lib $gnulib_name\ | |
| 850 --m4-base $bt/$m4_base/\ | |
| 851 --source-base $bt/$source_base/\ | |
| 852 --tests-base $bt/$tests_base\ | |
| 853 --local-dir $local_gl_dir\ | |
| 854 $gnulib_tool_option_extras\ | |
| 855 " | |
|
11521
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
856 if test $use_libtool = 1; then |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
857 case "$gnulib_tool_options " in |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
858 *' --libtool '*) ;; |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
859 *) gnulib_tool_options="$gnulib_tool_options --libtool" ;; |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
860 esac |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
861 fi |
| 9946 | 862 echo "$0: $gnulib_tool $gnulib_tool_options --import ..." |
| 863 $gnulib_tool $gnulib_tool_options --import $gnulib_modules && | |
| 864 slurp $bt || exit | |
| 865 | |
| 866 for file in $gnulib_files; do | |
| 867 symlink_to_dir "$GNULIB_SRCDIR" $file || exit | |
| 868 done | |
| 869 | |
| 870 | |
| 871 # Import from gettext. | |
| 872 with_gettext=yes | |
| 873 grep '^[ ]*AM_GNU_GETTEXT_VERSION(' configure.ac >/dev/null || \ | |
| 874 with_gettext=no | |
| 875 | |
| 876 if test $with_gettext = yes; then | |
| 877 echo "$0: (cd $bt2; ${AUTOPOINT-autopoint}) ..." | |
| 878 cp configure.ac $bt2 && | |
| 879 (cd $bt2 && ${AUTOPOINT-autopoint} && rm configure.ac) && | |
| 880 slurp $bt2 $bt || exit | |
| 881 fi | |
| 882 rm -fr $bt $bt2 || exit | |
| 883 | |
| 884 # Remove any dangling symlink matching "*.m4" or "*.[ch]" in some | |
| 885 # gnulib-populated directories. Such .m4 files would cause aclocal to fail. | |
| 886 # The following requires GNU find 4.2.3 or newer. Considering the usual | |
| 887 # portability constraints of this script, that may seem a very demanding | |
| 888 # requirement, but it should be ok. Ignore any failure, which is fine, | |
| 889 # since this is only a convenience to help developers avoid the relatively | |
| 890 # unusual case in which a symlinked-to .m4 file is git-removed from gnulib | |
| 891 # between successive runs of this script. | |
| 892 find "$m4_base" "$source_base" \ | |
| 893 -depth \( -name '*.m4' -o -name '*.[ch]' \) \ | |
| 894 -type l -xtype l -delete > /dev/null 2>&1 | |
| 895 | |
| 896 # Reconfigure, getting other files. | |
| 897 | |
| 898 # Skip autoheader if it's not needed. | |
| 899 grep -E '^[ ]*AC_CONFIG_HEADERS?\>' configure.ac >/dev/null || | |
| 900 AUTOHEADER=true | |
| 901 | |
| 902 for command in \ | |
| 903 libtool \ | |
|
13257
e052c36bf14f
update bootstrap to latest gnulib version
John W. Eaton <jwe@octave.org>
parents:
12733
diff
changeset
|
904 "${ACLOCAL-aclocal} --force -I '$m4_base' $ACLOCAL_FLAGS" \ |
| 9946 | 905 "${AUTOCONF-autoconf} --force" \ |
| 906 "${AUTOHEADER-autoheader} --force" \ | |
| 907 "${AUTOMAKE-automake} --add-missing --copy --force-missing" | |
| 908 do | |
| 909 if test "$command" = libtool; then | |
| 910 test $use_libtool = 0 \ | |
| 911 && continue | |
| 912 command="${LIBTOOLIZE-libtoolize} -c -f" | |
| 913 fi | |
| 914 echo "$0: $command ..." | |
|
13257
e052c36bf14f
update bootstrap to latest gnulib version
John W. Eaton <jwe@octave.org>
parents:
12733
diff
changeset
|
915 eval "$command" || exit |
| 9946 | 916 done |
| 917 | |
| 918 | |
| 919 # Get some extra files from gnulib, overriding existing files. | |
| 920 for file in $gnulib_extra_files; do | |
| 921 case $file in | |
| 922 */INSTALL) dst=INSTALL;; | |
| 923 build-aux/*) dst=$build_aux/`expr "$file" : 'build-aux/\(.*\)'`;; | |
| 924 *) dst=$file;; | |
| 925 esac | |
| 926 symlink_to_dir "$GNULIB_SRCDIR" $file $dst || exit | |
| 927 done | |
| 928 | |
| 929 if test $with_gettext = yes; then | |
| 930 # Create gettext configuration. | |
| 931 echo "$0: Creating po/Makevars from po/Makevars.template ..." | |
| 932 rm -f po/Makevars | |
| 933 sed ' | |
| 934 /^EXTRA_LOCALE_CATEGORIES *=/s/=.*/= '"$EXTRA_LOCALE_CATEGORIES"'/ | |
|
11521
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
935 /^COPYRIGHT_HOLDER *=/s/=.*/= '"$COPYRIGHT_HOLDER"'/ |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
936 /^MSGID_BUGS_ADDRESS *=/s|=.*|= '"$MSGID_BUGS_ADDRESS"'| |
| 9946 | 937 /^XGETTEXT_OPTIONS *=/{ |
| 938 s/$/ \\/ | |
| 939 a\ | |
| 940 '"$XGETTEXT_OPTIONS"' $${end_of_xgettext_options+} | |
| 941 } | |
|
11521
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
942 ' po/Makevars.template >po/Makevars || exit 1 |
| 9946 | 943 |
| 944 if test -d runtime-po; then | |
| 945 # Similarly for runtime-po/Makevars, but not quite the same. | |
| 946 rm -f runtime-po/Makevars | |
| 947 sed ' | |
| 948 /^DOMAIN *=.*/s/=.*/= '"$package"'-runtime/ | |
| 949 /^subdir *=.*/s/=.*/= runtime-po/ | |
| 950 /^MSGID_BUGS_ADDRESS *=/s/=.*/= bug-'"$package"'@gnu.org/ | |
| 951 /^XGETTEXT_OPTIONS *=/{ | |
| 952 s/$/ \\/ | |
| 953 a\ | |
| 954 '"$XGETTEXT_OPTIONS_RUNTIME"' $${end_of_xgettext_options+} | |
| 955 } | |
|
11521
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
956 ' po/Makevars.template >runtime-po/Makevars || exit 1 |
| 9946 | 957 |
| 958 # Copy identical files from po to runtime-po. | |
| 959 (cd po && cp -p Makefile.in.in *-quot *.header *.sed *.sin ../runtime-po) | |
| 960 fi | |
| 961 fi | |
| 962 | |
| 963 bootstrap_epilogue | |
| 964 | |
| 965 echo "$0: done. Now you can run './configure'." | |
| 966 | |
|
11521
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
967 # Local variables: |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
968 # eval: (add-hook 'write-file-hooks 'time-stamp) |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
969 # time-stamp-start: "scriptversion=" |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
970 # time-stamp-format: "%:y-%02m-%02d.%02H" |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
971 # time-stamp-time-zone: "UTC" |
|
00fe5069b70e
update bootstrap scripts from gnulib sources
John W. Eaton <jwe@octave.org>
parents:
10347
diff
changeset
|
972 # time-stamp-end: "; # UTC" |
| 9946 | 973 # End: |