aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitmodules3
-rwxr-xr-xbootstrap923
m---------gint0
m---------gnulib0
-rw-r--r--scheme/idest/batch/setlyrics.scm2
-rw-r--r--src/Makefile.am13
-rw-r--r--tests/atlocal.in3
-rw-r--r--tests/delcomm.at6
-rw-r--r--tests/fmt-shortlist.at7
-rw-r--r--tests/framelist00.at6
-rw-r--r--tests/framelist01.at6
-rw-r--r--tests/framelist02.at6
-rw-r--r--tests/list1.at7
-rw-r--r--tests/list2.at7
-rw-r--r--tests/lyrics00.at6
-rw-r--r--tests/pic00.at5
-rw-r--r--tests/pic01.at6
-rw-r--r--tests/script00.at6
-rw-r--r--tests/script01.at6
-rw-r--r--tests/script02.at6
-rw-r--r--tests/script03.at6
-rw-r--r--tests/script04.at6
-rw-r--r--tests/script05.at6
-rw-r--r--tests/script06.at6
-rw-r--r--tests/script07.at6
-rw-r--r--tests/script08.at6
-rw-r--r--tests/setlyrics.at6
-rw-r--r--tests/setpic.at6
-rw-r--r--tests/settitle.at7
-rw-r--r--tests/shortlist.at7
-rw-r--r--tests/testsuite.at7
31 files changed, 755 insertions, 338 deletions
diff --git a/.gitmodules b/.gitmodules
index 7c369d4..adb8e67 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -3 +3,4 @@
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
diff --git a/bootstrap b/bootstrap
index 4cb82b2..e72894c 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,2 +1,4 @@
1#! /bin/sh 1#! /bin/sh
2# Print a version string.
3scriptversion=2014-12-08.12; # UTC
2 4
@@ -4,5 +6,5 @@
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
@@ -11,3 +13,3 @@
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
@@ -17,5 +19,13 @@
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
@@ -28,12 +38,16 @@ 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
29local_gl_dir=gl 43local_gl_dir=gl
30 44
31# Temporary directory names. 45# Honour $PERL, but work even if there is none
32bt='._bootmp' 46PERL="${PERL-perl}"
33bt_regex=`echo "$bt"| sed 's/\./[.]/g'` 47
34bt2=${bt}2 48me=$0
35 49
36usage() { 50usage() {
37 echo >&2 "\ 51 cat <<EOF
38Usage: $0 [OPTION]... 52Usage: $me [OPTION]...
39Bootstrap this package from the checked-out sources. 53Bootstrap this package from the checked-out sources.
@@ -41,3 +55,3 @@ Bootstrap this package from the checked-out sources.
41Options: 55Options:
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
@@ -45,15 +59,52 @@ Options:
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
52If 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
73If the file $me.conf exists in the same directory as this script, its
53contents are read as shell variables to configure the bootstrap. 74contents are read as shell variables to configure the bootstrap.
54 75
76For build prerequisites, environment variables like \$AUTOCONF and \$AMTAR
77are honored.
78
55Running without arguments will suffice in most cases. 79Running without arguments will suffice in most cases.
56" 80EOF
81}
82
83# warnf_ FORMAT-STRING ARG1...
84warnf_ ()
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...
98warn_ ()
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...
108die() { warn_ "$@"; exit 1; }
109
59# Configuration. 110# Configuration.
@@ -69,2 +120,13 @@ 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.
126bootstrap_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.
130bootstrap_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
@@ -75,10 +137,18 @@ gnulib_files=
75po_download_command_format=\ 137po_download_command_format=\
76"rsync -Lrtvz 'translationproject.org::tp/latest/%s/' '%s'" 138"rsync --delete --exclude '*.s1' -Lrtvz \
139 'translationproject.org::tp/latest/%s/' '%s'"
140
141# Fallback for downloading .po files (if rsync fails).
142po_download_command_format2=\
143"wget --mirror -nd -q -np -A.po -P '%s' \
144 http://translationproject.org/latest/%s/"
77 145
146# Prefer a non-empty tarname (4th argument of AC_INIT if given), else
147# fall back to the package name (1st argument with munging)
78extract_package_name=' 148extract_package_name='
79 /^AC_INIT(/{ 149 /^AC_INIT(\[*/{
80 /.*,.*,.*, */{
81 s/// 150 s///
82 s/[][]//g 151 /^[^,]*,[^,]*,[^,]*,[ []*\([^][ ,)]\)/{
83 s/)$// 152 s//\1/
153 s/[],)].*//
84 p 154 p
@@ -86,7 +156,6 @@ extract_package_name='
86 } 156 }
87 s/AC_INIT(\[*// 157 s/[],)].*//
88 s/]*,.*//
89 s/^GNU // 158 s/^GNU //
90 y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ 159 y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
91 s/[^A-Za-z0-9_]/-/g 160 s/[^abcdefghijklmnopqrstuvwxyz0123456789_]/-/g
92 p 161 p
@@ -94,3 +163,4 @@ extract_package_name='
94' 163'
95package=`sed -n "$extract_package_name" configure.ac` || exit 164package=$(sed -n "$extract_package_name" configure.ac) \
165 || die 'cannot find package name in configure.ac'
96gnulib_name=lib$package 166gnulib_name=lib$package
@@ -102,14 +172,3 @@ doc_base=doc
102tests_base=tests 172tests_base=tests
103 173gnulib_extra_files=''
104# Extra files from gnulib, which override files from other sources.
105gnulib_extra_files="
106 $build_aux/install-sh
107 $build_aux/missing
108 $build_aux/mdate-sh
109