[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
various maintainer cleanups
From: |
Paul Eggert |
Subject: |
various maintainer cleanups |
Date: |
Sun, 22 May 2005 17:49:14 -0000 |
I installed this change to modernize Bison's maintainer procedures a bit.
You may need to check out fresh sources and run 'bootstrap' after this.
2005-05-22 Paul Eggert <address@hidden>
Various maintainer cleanups.
* .cvsignore: Add a.exe, a.out, b.out,, conf[0-9]*, confdefs*,
conftest*, for benefit of CVS commands run at the same time as
"configure". Add build-aux, since "bootstrap" now creates it and
its subfiles.
* Makefile.cfg (move_if_change): Remove.
* Makefile.maint: Remove the update stuff; we now use "bootstrap".
(ftp-gnu, www-gnu, move_if_change, local_updates, update):
(po_repo, do-po-update, po-update, wget_files, get-targets):
(config.guess-url_prefix, config.sub-url_prefix):
(ansi2knr.c-url_prefix, texinfo.tex-url_prefix):
(standards.texi-url_prefix, make-stds.texi-url_prefix, taget, url):
($(get-targets), cvs-files, automake_repo, wget-update, cvs-update):
Remove.
* configure.ac (AC_CONFIG_AUX_DIR): Change from config to build-aux;
this is now the recommended name.
* config/.cvsignore: Remove config.guess, config.rpath, config.sub,
depcomp, install-sh, mdate-sh, missing, mkinstalldirs, texinfo.tex,
ylwrap. These files now go into build-aux.
* config/move-if-change: Remove.
* config/prev-version.txt: Bump from 1.75 to 2.0.
Index: .cvsignore
===================================================================
RCS file: /cvsroot/bison/bison/.cvsignore,v
retrieving revision 1.22
diff -p -u -r1.22 .cvsignore
--- .cvsignore 9 Oct 2004 17:57:06 -0000 1.22
+++ .cvsignore 22 May 2005 17:43:40 -0000
@@ -7,9 +7,15 @@ INSTALL
Makefile
Makefile.in
_*
+a.exe
+a.out
aclocal.m4
autom4te.cache
+b.out
bison-*
+build-aux
+conf[0-9]*
+confdefs*
config.cache
config.h
config.hin
@@ -17,6 +23,7 @@ config.log
config.status
configure
configure.lineno
+conftest*
intl
patches
releases
Index: Makefile.cfg
===================================================================
RCS file: /cvsroot/bison/bison/Makefile.cfg,v
retrieving revision 1.2
diff -p -u -r1.2 Makefile.cfg
--- Makefile.cfg 14 May 2005 06:49:46 -0000 1.2
+++ Makefile.cfg 22 May 2005 17:43:41 -0000
@@ -17,7 +17,6 @@
# 02110-1301, USA.
prev_version_file = $(srcdir)/config/prev-version.txt
-move_if_change = $(srcdir)/config/move-if-change
announce_gen = $(srcdir)/config/announce-gen
release_archive_dir = releases
Index: Makefile.maint
===================================================================
RCS file: /cvsroot/bison/bison/Makefile.maint,v
retrieving revision 1.17
diff -p -u -r1.17 Makefile.maint
--- Makefile.maint 14 May 2005 06:49:46 -0000 1.17
+++ Makefile.maint 22 May 2005 17:43:41 -0000
@@ -395,103 +395,6 @@ announcement: NEWS ChangeLog $(rel-files
$(addprefix --url-dir=, $(url_dir_list)) \
-## ---------------- ##
-## Updating files. ##
-## ---------------- ##
-
-ftp-gnu = ftp://ftp.gnu.org/gnu
-www-gnu = http://www.gnu.org
-
-# Use mv, if you don't have/want move-if-change.
-move_if_change ?= move-if-change
-
-
-# --------------------- #
-# Updating everything. #
-# --------------------- #
-
-.PHONY: update
-local_updates ?= wget-update cvs-update po-update
-update: $(local_updates)
-
-
-# ------------------- #
-# Updating PO files. #
-# ------------------- #
-
-po_repo = http://www.iro.umontreal.ca/contrib/po/maint/$(PACKAGE)
-.PHONY: do-po-update po-update
-do-po-update:
- tmppo=/tmp/$(PACKAGE)-$(VERSION)-po &&\
- rm -rf $$tmppo && \
- mkdir $$tmppo && \
- (cd $$tmppo && \
- $(WGET) $(WGETFLAGS) -r -l1 -nd --no-parent -A '*.po' $(po_repo)) &&\
- cp $$tmppo/*.po po
- cd po && $(MAKE) update-po
- $(MAKE) po-check
-
-po-update:
- if test -d "po"; then \
- $(MAKE) do-po-update; \
- fi
-
-# -------------------------- #
-# Updating GNU build tools. #
-# -------------------------- #
-
-# The following pseudo table associates a local directory and a URL
-# with each of the files that belongs to some other package and is
-# regularly updated from the specified URL.
-wget_files ?= $(srcdir)/config/config.guess \
- $(srcdir)/config/config.sub \
- $(srcdir)/src/ansi2knr.c \
- $(srcdir)/config/texinfo.tex
-get-targets = $(patsubst %, get-%, $(wget_files))
-
-config.guess-url_prefix = $(ftp-gnu)/config/
-config.sub-url_prefix = $(ftp-gnu)/config/
-
-ansi2knr.c-url_prefix = ftp://ftp.cs.wisc.edu/ghost/
-
-texinfo.tex-url_prefix = $(ftp-gnu)/texinfo/
-
-standards.texi-url_prefix = $(www-gnu)/prep/
-make-stds.texi-url_prefix = $(standards.texi-url_prefix)
-
-target = $(patsubst get-%, %, $@)
-url = $($(notdir $(target))-url_prefix)$(notdir $(target))
-
-.PHONY: $(get-targets)
-$(get-targets):
- $(WGET) $(WGETFLAGS) $(url) -O $(target).t \
- && $(move_if_change) $(target).t $(target)
-
-cvs_files ?= \
- $(srcdir)/src/ansi2knr.c \
- $(srcdir)/config/depcomp \
- $(srcdir)/config/install-sh \
- $(srcdir)/config/missing \
- $(srcdir)/config/mkinstalldirs
-automake_repo=:pserver:anoncvs:address@hidden:/cvs/automake
-.PHONY: wget-update
-wget-update: $(get-targets)
-
-.PHONY: cvs-update
-cvs-update:
- fail=; \
- for f in $(cvs_files); do \
- test -f $$f || { echo "*** skipping $$f" 1>&2; continue; }; \
- cvs diff $$f > /dev/null \
- || { echo "*** $$f is locally modified; skipping it" 1>&2; \
- fail=yes; continue; }; \
- file=$$(basename $$f); \
- echo checking out $$file...; \
- $(CVS) -d $(automake_repo) co -p automake/lib/$$file> $$f.t \
- && $(move_if_change) $$f.t $$f; \
- done; \
- test "$$fail" && exit 1
-
define emit-upload-commands
echo =====================================
echo =====================================
Index: configure.ac
===================================================================
RCS file: /cvsroot/bison/bison/configure.ac,v
retrieving revision 1.53
diff -p -u -r1.53 configure.ac
--- configure.ac 14 May 2005 06:49:46 -0000 1.53
+++ configure.ac 22 May 2005 17:43:41 -0000
@@ -24,7 +24,7 @@
AC_PREREQ(2.59)
AC_INIT([GNU Bison], [2.0a], address@hidden)
-AC_CONFIG_AUX_DIR([config])
+AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4])
# We don't have a file m4/Makefile.am, so we need Automake 1.8 or later.
Index: config/.cvsignore
===================================================================
RCS file: /cvsroot/bison/bison/config/.cvsignore,v
retrieving revision 1.8
diff -p -u -r1.8 .cvsignore
--- config/.cvsignore 28 Apr 2004 20:00:53 -0000 1.8
+++ config/.cvsignore 22 May 2005 17:43:41 -0000
@@ -1,13 +1,3 @@
*.t
Makefile
Makefile.in
-config.guess
-config.rpath
-config.sub
-depcomp
-install-sh
-mdate-sh
-missing
-mkinstalldirs
-texinfo.tex
-ylwrap
Index: config/Makefile.am
===================================================================
RCS file: /cvsroot/bison/bison/config/Makefile.am,v
retrieving revision 1.3
diff -p -u -r1.3 Makefile.am
--- config/Makefile.am 3 May 2002 16:10:29 -0000 1.3
+++ config/Makefile.am 22 May 2005 17:43:41 -0000
@@ -1,2 +1,2 @@
## Process this file with automake to produce Makefile.in -*-Makefile-*-
-EXTRA_DIST = move-if-change prev-version.txt config.rpath
+EXTRA_DIST = prev-version.txt
Index: config/prev-version.txt
===================================================================
RCS file: /cvsroot/bison/bison/config/prev-version.txt,v
retrieving revision 1.6
diff -p -u -r1.6 prev-version.txt
--- config/prev-version.txt 14 Oct 2002 18:15:05 -0000 1.6
+++ config/prev-version.txt 22 May 2005 17:43:41 -0000
@@ -1 +1 @@
-1.75
+2.0
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- various maintainer cleanups,
Paul Eggert <=