diff options
author | Sergey Poznyakoff <gray@gnu.org> | 2015-11-07 17:34:53 +0200 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org> | 2015-11-07 17:34:53 +0200 |
commit | 6cecc808e5552f3220b97033306e42ce152908bb (patch) | |
tree | 778eb3e631cc6e556f1ec31ab584446951da8885 | |
parent | 638c48ec020909e52a2081b4b9dc6908592e1bab (diff) | |
download | idest-6cecc808e5552f3220b97033306e42ce152908bb.tar.gz idest-6cecc808e5552f3220b97033306e42ce152908bb.tar.bz2 |
Include gnulib as a submodule. Fix testsuite.
Guile 2.x outputs spurious diagnostics to stderr when compiling input files.
The only way to disable it is to disable compilation by setting environment
variable GUILE_AUTO_COMPILE to 0. However, even if compilation is disabled,
Guile still checks whether the compiled file exists and complains on stderr
if it is older than the input file. This diagnostics begins with ;;;. Delete
this using sed prior to comparing stderr with the expected text.
* .gitmodules: Add gnulib
* gnulib: New module.
* bootstrap: Update from gnulib
* gint: Upgrade.
* scheme/idest/batch/setlyrics.scm: Fix typo.
* src/Makefile.am: Use AM_CPPFLAGS instead of obsolete includes.
* tests/atlocal.in: Set GUILE_AUTO_COMPILE=0
* tests/testsuite.at (WITH_GUILE): New macro.
* tests/delcomm.at: Use WITH_GUILE.
* tests/fmt-shortlist.at: Likewise.
* tests/framelist00.at: Likewise.
* tests/framelist01.at: Likewise.
* tests/framelist02.at: Likewise.
* tests/list1.at: Likewise.
* tests/list2.at: Likewise.
* tests/lyrics00.at: Likewise.
* tests/pic00.at: Likewise.
* tests/pic01.at: Likewise.
* tests/script00.at: Likewise.
* tests/script01.at: Likewise.
* tests/script02.at: Likewise.
* tests/script03.at: Likewise.
* tests/script04.at: Likewise.
* tests/script05.at: Likewise.
* tests/script06.at: Likewise.
* tests/script07.at: Likewise.
* tests/script08.at: Likewise.
* tests/setlyrics.at: Likewise.
* tests/setpic.at: Likewise.
* tests/settitle.at: Likewise.
* tests/shortlist.at: Likewise.
-rw-r--r-- | .gitmodules | 3 | ||||
-rwxr-xr-x | bootstrap | 983 | ||||
m--------- | gint | 0 | ||||
m--------- | gnulib | 0 | ||||
-rw-r--r-- | scheme/idest/batch/setlyrics.scm | 2 | ||||
-rw-r--r-- | src/Makefile.am | 13 | ||||
-rw-r--r-- | tests/atlocal.in | 3 | ||||
-rw-r--r-- | tests/delcomm.at | 6 | ||||
-rw-r--r-- | tests/fmt-shortlist.at | 7 | ||||
-rw-r--r-- | tests/framelist00.at | 6 | ||||
-rw-r--r-- | tests/framelist01.at | 6 | ||||
-rw-r--r-- | tests/framelist02.at | 6 | ||||
-rw-r--r-- | tests/list1.at | 7 | ||||
-rw-r--r-- | tests/list2.at | 7 | ||||
-rw-r--r-- | tests/lyrics00.at | 6 | ||||
-rw-r--r-- | tests/pic00.at | 5 | ||||
-rw-r--r-- | tests/pic01.at | 6 | ||||
-rw-r--r-- | tests/script00.at | 6 | ||||
-rw-r--r-- | tests/script01.at | 6 | ||||
-rw-r--r-- | tests/script02.at | 6 | ||||
-rw-r--r-- | tests/script03.at | 6 | ||||
-rw-r--r-- | tests/script04.at | 6 | ||||
-rw-r--r-- | tests/script05.at | 6 | ||||
-rw-r--r-- | tests/script06.at | 6 | ||||
-rw-r--r-- | tests/script07.at | 6 | ||||
-rw-r--r-- | tests/script08.at | 6 | ||||
-rw-r--r-- | tests/setlyrics.at | 6 | ||||
-rw-r--r-- | tests/setpic.at | 6 | ||||
-rw-r--r-- | tests/settitle.at | 7 | ||||
-rw-r--r-- | tests/shortlist.at | 7 | ||||
-rw-r--r-- | tests/testsuite.at | 7 |
31 files changed, 785 insertions, 368 deletions
diff --git a/.gitmodules b/.gitmodules index 7c369d4..adb8e67 100644 --- a/.gitmodules +++ b/.gitmodules | |||
@@ -1,3 +1,6 @@ | |||
1 | [submodule "gint"] | 1 | [submodule "gint"] |
2 | path = gint | 2 | path = gint |
3 | url = git://git.gnu.org.ua/gint.git | 3 | url = git://git.gnu.org.ua/gint.git |
4 | [submodule "gnulib"] | ||
5 | path = gnulib | ||
6 | url = git://git.sv.gnu.org/gnulib.git | ||
@@ -1,120 +1,179 @@ | |||
1 | #! /bin/sh | 1 | #! /bin/sh |
2 | # Print a version string. | ||
3 | scriptversion=2014-12-08.12; # UTC | ||
2 | 4 | ||
3 | # Bootstrap this package from checked-out sources. | 5 | # Bootstrap this package from checked-out sources. |
4 | 6 | ||
5 | # Copyright (C) 2003-2008 Free Software Foundation, Inc. | 7 | # Copyright (C) 2003-2015 Free Software Foundation, Inc. |
6 | 8 | ||
7 | # Dico is free software: you can redistribute it and/or modify | 9 | # This program is free software: you can redistribute it and/or modify |
8 | # it under the terms of the GNU General Public License as published by | 10 | # it under the terms of the GNU General Public License as published by |
9 | # the Free Software Foundation, either version 3 of the License, or | 11 | # the Free Software Foundation, either version 3 of the License, or |
10 | # (at your option) any later version. | 12 | # (at your option) any later version. |
11 | 13 | ||
12 | # Dico is distributed in the hope that it will be useful, | 14 | # This program is distributed in the hope that it will be useful, |
13 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | 15 | # but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 16 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
15 | # GNU General Public License for more details. | 17 | # GNU General Public License for more details. |
16 | 18 | ||
17 | # You should have received a copy of the GNU General Public License | 19 | # You should have received a copy of the GNU General Public License |
18 | # along with Dico. If not, see <http://www.gnu.org/licenses/>. | 20 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
19 | 21 | ||
20 | # Written by Paul Eggert. | 22 | # Originally written by Paul Eggert. The canonical version of this |
23 | # script is maintained as build-aux/bootstrap in gnulib, however, to | ||
24 | # be useful to your project, you should place a copy of it under | ||
25 | # version control in the top-level directory of your project. The | ||
26 | # intent is that all customization can be done with a bootstrap.conf | ||
27 | # file also maintained in your version control; gnulib comes with a | ||
28 | # template build-aux/bootstrap.conf to get you started. | ||
29 | |||
30 | # Please report bugs or propose patches to bug-gnulib@gnu.org. | ||
21 | 31 | ||
22 | nl=' | 32 | nl=' |
23 | ' | 33 | ' |
24 | 34 | ||
25 | # Ensure file names are sorted consistently across platforms. | 35 | # Ensure file names are sorted consistently across platforms. |
26 | LC_ALL=C | 36 | LC_ALL=C |
27 | export LC_ALL | 37 | export LC_ALL |
28 | 38 | ||
39 | # Ensure that CDPATH is not set. Otherwise, the output from cd | ||
40 | # would cause trouble in at least one use below. | ||
41 | (unset CDPATH) >/dev/null 2>&1 && unset CDPATH | ||
42 | |||
29 | local_gl_dir=gl | 43 | local_gl_dir=gl |
30 | 44 | ||
31 | # Temporary directory names. | 45 | # Honour $PERL, but work even if there is none |
32 | bt='._bootmp' | 46 | PERL="${PERL-perl}" |
33 | bt_regex=`echo "$bt"| sed 's/\./[.]/g'` | 47 | |
34 | bt2=${bt}2 | 48 | me=$0 |
35 | 49 | ||
36 | usage() { | 50 | usage() { |
37 | echo >&2 "\ | 51 | cat <<EOF |
38 | Usage: $0 [OPTION]... | 52 | Usage: $me [OPTION]... |
39 | Bootstrap this package from the checked-out sources. | 53 | Bootstrap this package from the checked-out sources. |
40 | 54 | ||
41 | Options: | 55 | Options: |
42 | --gnulib-srcdir=DIRNAME Specify the local directory where gnulib | 56 | --gnulib-srcdir=DIRNAME specify the local directory where gnulib |
43 | sources reside. Use this if you already | 57 | sources reside. Use this if you already |
44 | have gnulib sources on your machine, and | 58 | have gnulib sources on your machine, and |
45 | do not want to waste your bandwidth downloading | 59 | do not want to waste your bandwidth downloading |
46 | them again. | 60 | them again. Defaults to \$GNULIB_SRCDIR |
47 | --copy Copy files instead of creating symbolic links. | 61 | --bootstrap-sync if this bootstrap script is not identical to |
48 | --force Attempt to bootstrap even if the sources seem | 62 | the version in the local gnulib sources, |
49 | not to have been checked out. | 63 | update this script, and then restart it with |
50 | --skip-po Do not download po files. | 64 | /bin/sh or the shell \$CONFIG_SHELL |
51 | 65 | --no-bootstrap-sync do not check whether bootstrap is out of sync | |
52 | If the file bootstrap.conf exists in the current working directory, its | 66 | --copy copy files instead of creating symbolic links |
67 | --force attempt to bootstrap even if the sources seem | ||
68 | not to have been checked out | ||
69 | --no-git do not use git to update gnulib. Requires that | ||
70 | --gnulib-srcdir point to a correct gnulib snapshot | ||
71 | --skip-po do not download po files | ||
72 | |||
73 | If the file $me.conf exists in the same directory as this script, its | ||
53 | contents are read as shell variables to configure the bootstrap. | 74 | contents are read as shell variables to configure the bootstrap. |
54 | 75 | ||
76 | For build prerequisites, environment variables like \$AUTOCONF and \$AMTAR | ||
77 | are honored. | ||
78 | |||
55 | Running without arguments will suffice in most cases. | 79 | Running without arguments will suffice in most cases. |
56 | " | 80 | EOF |
81 | } | ||
82 | |||
83 | # warnf_ FORMAT-STRING ARG1... | ||
84 | warnf_ () | ||
85 | { | ||
86 | warnf_format_=$1 | ||
87 | shift | ||
88 | nl=' | ||
89 | ' | ||
90 | case $* in | ||
91 | *$nl*) me_=$(printf "$me"|tr "$nl|" '??') | ||
92 | printf "$warnf_format_" "$@" | sed "s|^|$me_: |" ;; | ||
93 | *) printf "$me: $warnf_format_" "$@" ;; | ||
94 | esac >&2 | ||
95 | } | ||
96 | |||
97 | # warn_ WORD1... | ||
98 | warn_ () | ||
99 | { | ||
100 | # If IFS does not start with ' ', set it and emit the warning in a subshell. | ||
101 | case $IFS in | ||
102 | ' '*) warnf_ '%s\n' "$*";; | ||
103 | *) (IFS=' '; warn_ "$@");; | ||
104 | esac | ||
57 | } | 105 | } |
58 | 106 | ||
107 | # die WORD1... | ||
108 | die() { warn_ "$@"; exit 1; } | ||
109 | |||
59 | # Configuration. | 110 | # Configuration. |
60 | 111 | ||
61 | # Name of the Makefile.am | 112 | # Name of the Makefile.am |
62 | gnulib_mk=gnulib.mk | 113 | gnulib_mk=gnulib.mk |
63 | 114 | ||
64 | # List of gnulib modules needed. | 115 | # List of gnulib modules needed. |
65 | gnulib_modules= | 116 | gnulib_modules= |
66 | 117 | ||
67 | # Any gnulib files needed that are not in modules. | 118 | # Any gnulib files needed that are not in modules. |
68 | gnulib_files= | 119 | gnulib_files= |
69 | 120 | ||
121 | : ${AUTOPOINT=autopoint} | ||
122 | : ${AUTORECONF=autoreconf} | ||
123 | |||
124 | # A function to be called right after gnulib-tool is run. | ||
125 | # Override it via your own definition in bootstrap.conf. | ||
126 | bootstrap_post_import_hook() { :; } | ||
127 | |||
128 | # A function to be called after everything else in this script. | ||
129 | # Override it via your own definition in bootstrap.conf. | ||
130 | bootstrap_epilogue() { :; } | ||
131 | |||
70 | # The command to download all .po files for a specified domain into | 132 | # The command to download all .po files for a specified domain into |
71 | # a specified directory. Fill in the first %s is the domain name, and | 133 | # a specified directory. Fill in the first %s is the domain name, and |
72 | # the second with the destination directory. Use rsync's -L and -r | 134 | # the second with the destination directory. Use rsync's -L and -r |
73 | # options because the latest/%s directory and the .po fil |