aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org.ua>2009-02-06 12:08:20 +0200
committerSergey Poznyakoff <gray@gnu.org.ua>2009-02-06 12:08:20 +0200
commit2777861e30fd2dab6bd5d8745b08091052f90677 (patch)
treee70e2cf5f8e4bb164ed401659b58929cacd315e4
parente1d207da22a7f94ce1c4af17ffa326b0dc40b154 (diff)
downloadcflow-2777861e30fd2dab6bd5d8745b08091052f90677.tar.gz
cflow-2777861e30fd2dab6bd5d8745b08091052f90677.tar.bz2
Switch to git
-rw-r--r--.gitignore (renamed from .cvsignore)10
-rw-r--r--ChangeLog.2007 (renamed from ChangeLog)0
-rw-r--r--Makefile.am36
-rwxr-xr-xbootstrap (renamed from build-aux/bootstrap)254
-rw-r--r--bootstrap.conf2
-rw-r--r--build-aux/.cvsignore10
-rw-r--r--doc/.gitignore (renamed from doc/.cvsignore)0
-rw-r--r--doc/rendition.texi20
-rw-r--r--elisp/.cvsignore2
-rw-r--r--gnulib.modules (renamed from build-aux/gnulib.modules)3
-rw-r--r--lib/.cvsignore90
-rw-r--r--po/.gitignore (renamed from po/.cvsignore)1
-rw-r--r--src/.cvsignore6
-rw-r--r--src/.gitignore2
-rw-r--r--tests/.gitignore (renamed from tests/.cvsignore)2
15 files changed, 215 insertions, 223 deletions
diff --git a/.cvsignore b/.gitignore
index e603953..196d4d9 100644
--- a/.cvsignore
+++ b/.gitignore
@@ -1,12 +1,22 @@
1*.a
2*.la
3*.lo
4*.o
5*.so
1*.tar.bz2 6*.tar.bz2
2*.tar.gz 7*.tar.gz
8*~
3.bootstrap 9.bootstrap
10.deps
11.emacs.desktop
4ABOUT-NLS 12ABOUT-NLS
5INSTALL 13INSTALL
14ChangeLog
6Makefile 15Makefile
7Makefile.in 16Makefile.in
8aclocal.m4 17aclocal.m4
9autom4te.cache 18autom4te.cache
19build-aux
10config 20config
11config.h 21config.h
12config.h.in 22config.h.in
diff --git a/ChangeLog b/ChangeLog.2007
index 397e8e6..397e8e6 100644
--- a/ChangeLog
+++ b/ChangeLog.2007
diff --git a/Makefile.am b/Makefile.am
index 2c2a512..b491182 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
1# This file is part of GNU cflow 1# This file is part of GNU cflow
2# Copyright (C) 2005, 2007 Free Software Foundation, Inc. 2# Copyright (C) 2005, 2007, 2009 Free Software Foundation, Inc.
3# 3#
4# Written by Sergey Poznyakoff 4# Written by Sergey Poznyakoff
5# 5#
@@ -23,4 +23,38 @@ ACLOCAL_AMFLAGS = -I m4
23 23
24SUBDIRS = lib src elisp po doc tests 24SUBDIRS = lib src elisp po doc tests
25 25
26EXTRA_DIST = ChangeLog.2007
27
28gen_start_date = 2007-06-29
29.PHONY: make-ChangeLog
30make-ChangeLog:
31 if test -d .git; then \
32 $(top_srcdir)/build-aux/gitlog-to-changelog \
33 --since=$(gen_start_date) | \
34 sed '/<unknown>$$/d' | fmt -s > $(distdir)/cl-t; \
35 echo " " >> $(distdir)/cl-t; \
36 echo "Local Variables:" >> $(distdir)/cl-t; \
37 echo "mode: change-log" >> $(distdir)/cl-t; \
38 echo "version-control: never" >> $(distdir)/cl-t; \
39 echo "buffer-read-only: t" >> $(distdir)/cl-t; \
40 echo "End:" >> $(distdir)/cl-t; \
41 rm -f $(distdir)/ChangeLog; \
42 mv $(distdir)/cl-t $(distdir)/ChangeLog; \
43 fi
44
45dist-hook: make-ChangeLog
46
47.PHONY: ChangeLog
48ChangeLog:
49 if test -d .git; then \
50 $(top_srcdir)/build-aux/gitlog-to-changelog \
51 --since=$(gen_start_date) | \
52 sed '/<unknown>$$/d' | fmt -s > ChangeLog; \
53 echo " " >> ChangeLog; \
54 echo "Local Variables:" >> ChangeLog; \
55 echo "mode: change-log" >> ChangeLog; \
56 echo "version-control: never" >> ChangeLog; \
57 echo "buffer-read-only: t" >> ChangeLog; \
58 echo "End:" >> ChangeLog; \
59 fi
26 60
diff --git a/build-aux/bootstrap b/bootstrap
index b9c11f1..bc9373c 100755
--- a/build-aux/bootstrap
+++ b/bootstrap
@@ -4,10 +4,10 @@
4 4
5# Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. 5# Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
6 6
7# This program is free software; you can redistribute it and/or modify 7# 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 8# it under the terms of the GNU General Public License as published by
9# the Free Software Foundation; either version 3, or (at your option) 9# the Free Software Foundation, either version 3 of the License, or
10# any later version. 10# (at your option) any later version.
11 11
12# This program is distributed in the hope that it will be useful, 12# This program is distributed in the hope that it will be useful,
13# but WITHOUT ANY WARRANTY; without even the implied warranty of 13# but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,9 +15,7 @@
15# GNU General Public License for more details. 15# GNU General Public License for more details.
16 16
17# You should have received a copy of the GNU General Public License 17# You should have received a copy of the GNU General Public License
18# along with this program; if not, write to the Free Software 18# along with this program. If not, see <http://www.gnu.org/licenses/>.
19# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
20# 02110-1301, USA.
21 19
22# Written by Paul Eggert. 20# Written by Paul Eggert.
23 21
@@ -25,10 +23,11 @@ nl='
25' 23'
26 24
27# Ensure file names are sorted consistently across platforms. 25# Ensure file names are sorted consistently across platforms.
28# Also, ensure diagnostics are in English, e.g., "wget --help" below.
29LC_ALL=C 26LC_ALL=C
30export LC_ALL 27export LC_ALL
31 28
29local_gl_dir=gl
30
32# Temporary directory names. 31# Temporary directory names.
33bt='._bootmp' 32bt='._bootmp'
34bt_regex=`echo "$bt"| sed 's/\./[.]/g'` 33bt_regex=`echo "$bt"| sed 's/\./[.]/g'`
@@ -49,10 +48,8 @@ Options:
49 --force Attempt to bootstrap even if the sources seem 48 --force Attempt to bootstrap even if the sources seem
50 not to have been checked out. 49 not to have been checked out.
51 --skip-po Do not download po files. 50 --skip-po Do not download po files.
52 --cvs-user=USERNAME Set the username to use when checking out
53 sources from the gnulib repository.
54 51
55If the file .bootstrap.conf exists in the current working directory, its 52If the file bootstrap.conf exists in the current working directory, its
56contents are read as shell variables to configure the bootstrap. 53contents are read as shell variables to configure the bootstrap.
57 54
58Running without arguments will suffice in most cases. 55Running without arguments will suffice in most cases.
@@ -61,23 +58,29 @@ Running without arguments will suffice in most cases.
61 58
62# Configuration. 59# Configuration.
63 60
61# Name of the Makefile.am
62gnulib_mk=gnulib.mk
63
64# List of gnulib modules needed. 64# List of gnulib modules needed.
65gnulib_modules= 65gnulib_modules=
66 66
67# Any gnulib files needed that are not in modules. 67# Any gnulib files needed that are not in modules.
68gnulib_files= 68gnulib_files=
69 69
70# Translation Project URL, for the registry of all projects 70# The command to download all .po files for a specified domain into
71# and for the translation-team master directory. 71# a specified directory. Fill in the first %s is the domain name, and
72tp_url() { 72# the second with the destination directory. Use rsync's -L and -r
73 echo "http://translationproject.org/domain/$1.html" 73# options because the latest/%s directory and the .po files within are
74} 74# all symlinks.
75po_download_command_format=\
76"rsync -Lrtvz 'translationproject.org::tp/latest/%s/' '%s'"
75 77
76extract_package_name=' 78extract_package_name='
77 /^AC_INIT(/{ 79 /^AC_INIT(/{
78 /.*,.*,.*,/{ 80 /.*,.*,.*, */{
79 s/// 81 s///
80 s/[][]//g 82 s/[][]//g
83 s/)$//
81 p 84 p
82 q 85 q
83 } 86 }
@@ -104,6 +107,7 @@ gnulib_extra_files="
104 $build_aux/config.sub 107 $build_aux/config.sub
105 doc/INSTALL 108 doc/INSTALL
106" 109"
110
107# Additional gnulib-tool options to use. Use "\newline" to break lines. 111# Additional gnulib-tool options to use. Use "\newline" to break lines.
108gnulib_tool_option_extras= 112gnulib_tool_option_extras=
109 113
@@ -127,9 +131,21 @@ checkout_only_file=README-hacking
127# Whether to use copies instead of symlinks. 131# Whether to use copies instead of symlinks.
128copy=false 132copy=false
129 133
134# Set this to '.cvsignore .gitignore' in bootstrap.conf if you want
135# those files to be generated in directories like lib/, m4/, and po/.
136# Or set it to 'auto' to make this script select which to use based
137# on which version control system (if any) is used in the source directory.
138vc_ignore=auto
139
130# Override the default configuration, if necessary. 140# Override the default configuration, if necessary.
131test -r bootstrap.conf && . ./bootstrap.conf 141test -r bootstrap.conf && . ./bootstrap.conf
132 142
143if test "$vc_ignore" = auto; then
144 vc_ignore=
145 test -d .git && vc_ignore=.gitignore
146 test -d CVS && vc_ignore="$vc_ignore .cvsignore"
147fi
148
133# Translate configuration into internal form. 149# Translate configuration into internal form.
134 150
135# Parse options. 151# Parse options.
@@ -142,8 +158,6 @@ do