[rfa/binutils] distclean .cvsignore?

[rfa/binutils] distclean .cvsignore?

[Andrew Cagney]

[-- Attachment #1: Type: text/plain, Size: 389 bytes --]

[reply to set to binutils@]

Hello,

This patch modifies bfd/ and opcodes/ so that the .cvsignore files are 
removed when doing a distclean.  The name is not dos friendly so 
shouldn't be included in GDB's distro.

ok?
Andrew

PS: Note that bfd/Makefile.in most recent re-generate was not with a 
stock 000227 automake.  Someone may want to investigate this - I side 
stepped the problem.

[-- Attachment #2: diffs --]
[-- Type: text/plain, Size: 2897 bytes --]

Index: bfd/ChangeLog
2004-02-28  Andrew Cagney  <cagney@redhat.com>

	* Makefile.am (DISTCLEANFILES): Add po/.cvsignore.
	* Makefile.in: Update.

Index: opcodes/ChangeLog
2004-02-28  Andrew Cagney  <cagney@redhat.com>

	* Makefile.am (DISTCLEANFILES): Set to po/.cvsignore.
	* Makefile.in: Re-generate.

Index: bfd/Makefile.am
===================================================================
RCS file: /cvs/src/src/bfd/Makefile.am,v
retrieving revision 1.127
diff -u -r1.127 Makefile.am
--- bfd/Makefile.am	2 Dec 2003 08:14:33 -0000	1.127
+++ bfd/Makefile.am	28 Feb 2004 17:48:10 -0000
@@ -854,7 +854,7 @@
 CLEANFILES = bfd.h dep.sed stmp-bfd-h DEP DEPA DEP1 DEP2 libbfd.a stamp-lib \
 	stmp-bin2-h stmp-lbfd-h stmp-lcoff-h
 
-DISTCLEANFILES = $(BUILD_CFILES) $(BUILD_HFILES)
+DISTCLEANFILES = $(BUILD_CFILES) $(BUILD_HFILES) po/.cvsignore
 
 # We want to rerun configure if config.bfd, configure.host or version.h change.
 config.status: $(srcdir)/configure $(srcdir)/config.bfd \
Index: bfd/Makefile.in
===================================================================
RCS file: /cvs/src/src/bfd/Makefile.in,v
retrieving revision 1.140
diff -u -r1.140 Makefile.in
--- bfd/Makefile.in	2 Dec 2003 08:14:33 -0000	1.140
+++ bfd/Makefile.in	28 Feb 2004 17:48:11 -0000
@@ -779,7 +779,7 @@
 	stmp-bin2-h stmp-lbfd-h stmp-lcoff-h
 
 
-DISTCLEANFILES = $(BUILD_CFILES) $(BUILD_HFILES)
+DISTCLEANFILES = $(BUILD_CFILES) $(BUILD_HFILES) po/.cvsignore
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
 CONFIG_HEADER = config.h
Index: opcodes/Makefile.am
===================================================================
RCS file: /cvs/src/src/opcodes/Makefile.am,v
retrieving revision 1.73
diff -u -r1.73 Makefile.am
--- opcodes/Makefile.am	7 Jan 2004 18:39:40 -0000	1.73
+++ opcodes/Makefile.am	28 Feb 2004 17:48:34 -0000
@@ -349,6 +349,7 @@
 	stamp-iq2000 stamp-xstormy16 \
 	libopcodes.a stamp-lib dep.sed DEP DEPA DEP1 DEP2
 
+DISTCLEANFILES = po/.cvsignore
 
 CGENDIR = @cgendir@
 CPUDIR = $(CGENDIR)/cpu
Index: opcodes/Makefile.in
===================================================================
RCS file: /cvs/src/src/opcodes/Makefile.in,v
retrieving revision 1.82
diff -u -r1.82 Makefile.in
--- opcodes/Makefile.in	7 Jan 2004 18:39:40 -0000	1.82
+++ opcodes/Makefile.in	28 Feb 2004 17:48:34 -0000
@@ -417,6 +417,8 @@
 	libopcodes.a stamp-lib dep.sed DEP DEPA DEP1 DEP2
 
 
+DISTCLEANFILES = po/.cvsignore
+
 CGENDIR = @cgendir@
 CPUDIR = $(CGENDIR)/cpu
 CGEN = `if test -f ../guile/libguile/guile ; then echo ../guile/libguile/guile; else echo guile ; fi`
@@ -774,6 +776,7 @@
 distclean-generic:
 	-rm -f Makefile $(CONFIG_CLEAN_FILES)
 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
 mostlyclean-am:  mostlyclean-hdr mostlyclean-noinstLIBRARIES \

[patch/rfc] Skip .cvsfiles in src-release; Was: [rfa/binutils] distclean .cvsignore?

[Andrew Cagney]

[-- Attachment #1: Type: text/plain, Size: 161 bytes --]

The attached modifies src-release to prune .cvsignore when building a 
release.  Any problems with this one?  (note, I'm still testing it, 
chug, chug).

Andrew

[-- Attachment #2: diffs --]
[-- Type: text/plain, Size: 1159 bytes --]

2004-02-28  Andrew Cagney  <cagney@redhat.com>

	* src-release (CVS_NAMES): Define.
	(do-tar, do-tar): Prune $(CVS_NAMES).

Index: src-release
===================================================================
RCS file: /cvs/src/src/src-release,v
retrieving revision 1.9
diff -u -r1.9 src-release
--- src-release	15 Jan 2004 23:24:29 -0000	1.9
+++ src-release	28 Feb 2004 19:59:01 -0000
@@ -208,11 +208,14 @@
 	-rm -f $(PACKAGE)-$(VER)
 	ln -s proto-toplev $(PACKAGE)-$(VER)
 
+CVS_NAMES= \( -name CVS -o -name '\.cvsignore' \)
+
 .PHONY: do-tar
 do-tar:
 	echo "==> Making $(PACKAGE)-$(VER).tar"
 	-rm -f $(PACKAGE)-$(VER).tar
-	find $(PACKAGE)-$(VER) -follow -name CVS -prune -o -type f -print \
+	find $(PACKAGE)-$(VER) -follow $(CVS_NAMES) -prune \
+			-o -type f -print \
 		| tar cTfh - $(PACKAGE)-$(VER).tar
 
 .PHONY: do-bz2
@@ -224,7 +227,8 @@
 .PHONY: do-md5sum
 do-md5sum:
 	echo "==> Adding md5 checksum to top-level directory"
-	cd proto-toplev && find * -follow -name CVS -prune -o -type f -print \
+	cd proto-toplev && find * -follow $(CVS_NAMES) -prune \
+			-o -type f -print \
 		| xargs $(MD5PROG) > ../md5.sum
 	mv md5.sum proto-toplev
 

Re: [patch/rfc] Skip .cvsfiles in src-release; Was: [rfa/binutils] distclean .cvsignore?

[Andreas Schwab]

Andrew Cagney <cagney@gnu.org> writes:

> --- src-release	15 Jan 2004 23:24:29 -0000	1.9
> +++ src-release	28 Feb 2004 19:59:01 -0000
> @@ -208,11 +208,14 @@
>  	-rm -f $(PACKAGE)-$(VER)
>  	ln -s proto-toplev $(PACKAGE)-$(VER)
>  
> +CVS_NAMES= \( -name CVS -o -name '\.cvsignore' \)

This won't match .cvsignore (it's a glob pattern, not a regex).

Andreas.

-- 
Andreas Schwab, SuSE Labs, schwab@suse.de
SuSE Linux AG, Maxfeldstraße 5, 90409 Nürnberg, Germany
Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

Re: [patch/rfc] Skip .cvsfiles in src-release; Was: [rfa/binutils] distclean .cvsignore?

[Andrew Cagney]

> Andrew Cagney <cagney@gnu.org> writes:
> 
> 
>>> --- src-release	15 Jan 2004 23:24:29 -0000	1.9
>>> +++ src-release	28 Feb 2004 19:59:01 -0000
>>> @@ -208,11 +208,14 @@
>>>  	-rm -f $(PACKAGE)-$(VER)
>>>  	ln -s proto-toplev $(PACKAGE)-$(VER)
>>>  
>>> +CVS_NAMES= \( -name CVS -o -name '\.cvsignore' \)
> 
> 
> This won't match .cvsignore (it's a glob pattern, not a regex).

Actually, it did (guess its a GNU find feature).  Anyway, committed 
minus that '\'.  In testing this I noticed a few other CVS files that it 
wouldn't hurt to prune (but I'll follow that up after GDB's branched).

Andrew

Re: [patch/rfc] Skip .cvsfiles in src-release; Was: [rfa/binutils] distclean .cvsignore?

[Andreas Schwab]

Andrew Cagney <cagney@gnu.org> writes:

>> Andrew Cagney <cagney@gnu.org> writes:
>> 
>>>> --- src-release	15 Jan 2004 23:24:29 -0000	1.9
>>>> +++ src-release	28 Feb 2004 19:59:01 -0000
>>>> @@ -208,11 +208,14 @@
>>>>  	-rm -f $(PACKAGE)-$(VER)
>>>>  	ln -s proto-toplev $(PACKAGE)-$(VER)
>>>>  +CVS_NAMES= \( -name CVS -o -name '\.cvsignore' \)
>> This won't match .cvsignore (it's a glob pattern, not a regex).
>
> Actually, it did (guess its a GNU find feature).

It's actually standard behaviour.  Sorry for confusion.

Andreas.

-- 
Andreas Schwab, SuSE Labs, schwab@suse.de
SuSE Linux AG, Maxfeldstraße 5, 90409 Nürnberg, Germany
Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

Re: [patch/rfc] Skip .cvsfiles in src-release; Was: [rfa/binutils] distclean .cvsignore?

[Ian Lance Taylor]

Andrew Cagney <cagney@gnu.org> writes:

> The attached modifies src-release to prune .cvsignore when building a
> release.  Any problems with this one?  (note, I'm still testing it,
> chug, chug).

This is fine with me.  Dunno who maintains those top-level files.

Ian

Re: [patch/rfc] Skip .cvsfiles in src-release; Was: [rfa/binutils] distclean .cvsignore?

[Andrew Cagney]

> Andrew Cagney <cagney@gnu.org> writes:
> 
> 
>>> The attached modifies src-release to prune .cvsignore when building a
>>> release.  Any problems with this one?  (note, I'm still testing it,
>>> chug, chug).
> 
> 
> This is fine with me.  Dunno who maintains those top-level files.

We (as in GDB and BINUTILS) get to maintain "src/src-release".

> I personally think that it is time to drop this antiquated
> requirement.  But I won't stop you from trying to adhere to it.

"I wish".  If only people would stop building GDB on 8.3 systems ...

Andrew