Setup Automake as master for XFile.pm and Struct.pm (Was: Re: Update FileUtils)

[Alexandre Duret-Lutz]

>>> "adl" == Alexandre Duret-Lutz <address@hidden> writes:

>>> "Akim" == Akim Demaille <address@hidden> writes:
 >>> Who is the master of this file?  We need to update the `make
 >>> fetch' or similar for the other one.  I think FileUtils belongs
 >>> to Autom4te because this file is less used in Automake.
 >>> Probably we need a general policy for all these files.

 Akim> Honestly, I was considering having all the generic ones in Automake,

 adl> That's fine with me.  Actually it might be better since
 adl> Automake's repository uses branches.  (If the files were in
 adl> Autoconf, it would be more difficult to use `make fetch' on the
 adl> stable branch of Automake.)

We discussed the case of XFile and Struct yesterday, and decided
to move them into Automake like the other files.

I'm installing this on HEAD.

2003-09-13  Alexandre Duret-Lutz  <address@hidden>

        * Makefile.am (FETCHFILES, fetch): Do not fetch lib/Automake/XFile.pm
        and lib/Automake/Struct.pm from Autoconf.
        * lib/Automake/XFile.pm: Update comment, Automake is now
        the master for this file.  Cosmetic changes.

Index: HACKING
===================================================================
RCS file: /cvs/automake/automake/HACKING,v
retrieving revision 1.17
diff -u -r1.17 HACKING
--- HACKING     20 Jul 2003 21:51:41 -0000      1.17
+++ HACKING     13 Sep 2003 21:44:40 -0000
@@ -31,7 +31,6 @@
       INSTALL (address@hidden),
       config.guess, config.sub (address@hidden),
       texinfo.tex (address@hidden),
-      Struct.pm, XFile.pm (address@hidden).
   Most of them are updated before release with `make fetch'.
 
 * Changes other than bug fixes must be mentioned in NEWS
@@ -137,7 +136,8 @@
   If not an alpha, announcement must also go to FSF:
   Put the files on a public ftp site and send a message to
   address@hidden
-  Then send the announcement to address@hidden
+  Then send the announcement at least to address@hidden,
+  address@hidden, and address@hidden
 
 * Update version number in configure.in to next alpha number.
   Re-run autoconf and commit.
Index: Makefile.am
===================================================================
RCS file: /cvs/automake/automake/Makefile.am,v
retrieving revision 1.219
diff -u -r1.219 Makefile.am
--- Makefile.am 7 Aug 2003 11:21:45 -0000       1.219
+++ Makefile.am 13 Sep 2003 21:44:40 -0000
@@ -286,8 +286,6 @@
 ## Files that we fetch and which we compare against.
 ## FIXME should be a lot more here
 FETCHFILES = \
-Automake/Struct.pm \
-Automake/XFile.pm \
 INSTALL \
 config-ml.in \
 config.guess \
@@ -298,14 +296,12 @@
 ## Fetch the latest versions of files we care about.
 fetch:
        rm -rf Fetchdir > /dev/null 2>&1
-       mkdir Fetchdir; mkdir Fetchdir/Automake
+       mkdir Fetchdir
 ## If a get fails then that is a problem.
        (cd Fetchdir && \
        $(WGET) ftp://ftp.gnu.org/gnu/config/config.guess; \
        $(WGET) ftp://ftp.gnu.org/gnu/config/config.sub; \
        $(WGET) ftp://ftp.gnu.org/gnu/texinfo/texinfo.tex; \
-       $(WGET) 
http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~/autoconf/autoconf/lib/Autom4te/Struct.pm?content-type=text/plain
 -O Automake/Struct.pm; \
-       $(WGET) 
http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~/autoconf/autoconf/lib/Autom4te/XFile.pm?content-type=text/plain
 -O Automake/XFile.pm; \
        $(WGET) 
http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~/autoconf/autoconf/INSTALL?content-type=text/plain
 -O INSTALL; \
        $(WGET) 
http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~/gcc/gcc/config-ml.in; \
        $(WGET) 
http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~/gcc/gcc/symlink-tree)
Index: lib/Automake/XFile.pm
===================================================================
RCS file: /cvs/automake/automake/lib/Automake/XFile.pm,v
retrieving revision 1.5
diff -u -r1.5 XFile.pm
--- lib/Automake/XFile.pm       6 Sep 2003 21:10:39 -0000       1.5
+++ lib/Automake/XFile.pm       13 Sep 2003 21:44:45 -0000
@@ -18,8 +18,8 @@
 # Written by Akim Demaille <address@hidden>.
 
 ###############################################################
-# The main copy of this file is in Autoconf's CVS repository. #
-# Updates should be sent to address@hidden         #
+# The main copy of this file is in Automake's CVS repository. #
+# Updates should be sent to address@hidden         #
 ###############################################################
 
 package Automake::XFile;
@@ -33,7 +33,7 @@
     use Automake::XFile;
 
     $fh = new Automake::XFile;
-    $fh->open("< file"))
+    $fh->open ("< file");
     # No need to check $FH: we died if open failed.
     print <$fh>;
     $fh->close;
@@ -50,12 +50,12 @@
     print <$fh>;
     undef $fh;   # automatically closes the file and checks for errors.
 
-    $fh = new Automake::XFile "file", O_WRONLY|O_APPEND;
+    $fh = new Automake::XFile "file", O_WRONLY | O_APPEND;
     # No need to check $FH: we died if new failed.
     print $fh "corge\n";
 
     $pos = $fh->getpos;
-    $fh->setpos($pos);
+    $fh->setpos ($pos);
 
     undef $fh;   # automatically closes the file and checks for errors.
 
@@ -119,7 +119,7 @@
 sub new
 {
   my $type = shift;
-  my $class = ref($type) || $type || "Automake::XFile";
+  my $class = ref $type || $type || "Automake::XFile";
   my $fh = $class->SUPER::new ();
   if (@_)
     {
@@ -134,7 +134,7 @@
 
 sub open
 {
-  my ($fh) = shift;
+  my $fh = shift;
   my ($file) = @_;
 
   # WARNING: Gross hack: $FH is a typeglob: use its hash slot to store
@@ -161,7 +161,7 @@
 
 sub close
 {
-  my ($fh) = shift;
+  my $fh = shift;
   if (!$fh->SUPER::close (@_))
     {
       my $file = $fh->name;
@@ -204,7 +204,7 @@
 
 sub name
 {
-  my ($fh) = shift;
+  my $fh = shift;
   return ${*$fh}{'autom4te_xfile_file'};
 }
 
@@ -229,7 +229,7 @@
 
 sub seek
 {
-  my ($fh) = shift;
+  my $fh = shift;
   # Cannot use @_ here.
   if (!seek ($fh, $_[0], $_[1]))
     {
-- 
Alexandre Duret-Lutz