[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
readme-snapshot.patch
From: |
Matthew R. MacIntyre |
Subject: |
readme-snapshot.patch |
Date: |
Fri, 5 Oct 2001 11:43:17 -0400 |
Hi,
This is my first time submitting a patch for automake, so please go
easy on me if I screwed something up.
I added a new option, 'readme-snapshot', to automake. It is very
similar in scope to the 'readme-alpha' option. If the version
number is an 8 digit number (usually representing the date the
snapshot was built), and there is a 'README-snapshot' file in the
top-level directory, it will be included.
This patch includes:
* changes to automake.in
* a test case
* documentation update
* ChangeLog, NEWS additions
I created the patch with ``cvs diff -uRN'', if it matters.
If accepted, is this change substantial enough for me to have to fill out the
paperwork for inclusion? If so, can someone let me know, so I can get
a jump on this.
Thanks,
-matt
Index: ChangeLog
===================================================================
RCS file: /cvs/automake/automake/ChangeLog,v
retrieving revision 1.1556
diff -u -r1.1556 ChangeLog
--- ChangeLog 2001/10/02 17:17:42 1.1556
+++ ChangeLog 2001/10/05 15:27:00
@@ -1,3 +1,10 @@
+2001-10-03 Matthew R. MacIntyre <address@hidden>
+
+ * automake.in: support for readme-snapshot option
+ * automake.texi: documentation for readme-snapshot option
+ * tests/snapshot.test: tests case for readme-snapshot option
+ * NEWS: new option: 'readme-snapshot'
+
2001-10-02 Akim Demaille <address@hidden>
* lib/Automake/Struct.pm: Update from Autoconf.
Index: NEWS
===================================================================
RCS file: /cvs/automake/automake/NEWS,v
retrieving revision 1.154
diff -u -r1.154 NEWS
--- NEWS 2001/09/27 08:37:54 1.154
+++ NEWS 2001/10/05 15:27:00
@@ -2,6 +2,7 @@
* Autoconf 2.52 is required.
* `dist' generates all the archive flavors, as did `dist-all'.
* `dist-gzip' generates the Gzip tar file only.
+* new option: `readme-snapshot'
New in 1.5:
* Support for `configure.ac'.
Index: THANKS
===================================================================
RCS file: /cvs/automake/automake/THANKS,v
retrieving revision 1.149
diff -u -r1.149 THANKS
--- THANKS 2001/08/28 04:50:14 1.149
+++ THANKS 2001/10/05 15:27:00
@@ -98,6 +98,7 @@
Markus F.X.J. Oberhumer address@hidden
Matt Leach address@hidden
Matthew D. Langston address@hidden
+Matthew R. MacIntyre address@hidden
Matthias Clasen address@hidden
Maxim Sinev address@hidden
Michael Brantley address@hidden
Index: automake.in
===================================================================
RCS file: /cvs/automake/automake/automake.in,v
retrieving revision 1.1176
diff -u -r1.1176 automake.in
--- automake.in 2001/10/02 17:17:43 1.1176
+++ automake.in 2001/10/05 15:27:02
@@ -152,6 +152,11 @@
my $ELSE_PATTERN = '^else(?:\s+(!?)\s*([A-Za-z][A-Za-z0-9_]*))?\s*(?:#.*)?$';
my $ENDIF_PATTERN = '^endif(?:\s+(!?)\s*([A-Za-z][A-Za-z0-9_]*))?\s*(?:#.*)?$';
my $PATH_PATTERN='(\w|[/.-])+';
+
+# This pattern recognizes a snapshot version id and sets $1 if the
+# release is a snapshot release.
+my $SNAPSHOT_VERSION_PATTERN = '[0-9]{8}';
+
# This will pass through anything not of the prescribed form.
my $INCLUDE_PATTERN = ('^include\s+'
. '((\$\(top_srcdir\)/' . $PATH_PATTERN . ')'
@@ -1418,7 +1423,7 @@
|| $_ eq 'dejagnu' || $_ eq 'no-texinfo.tex'
|| $_ eq 'readme-alpha' || $_ eq 'check-news'
|| $_ eq 'subdir-objects' || $_ eq 'nostdinc'
- || $_ eq 'no-exeext')
+ || $_ eq 'no-exeext' || $_ eq 'readme-snapshot')
{
# Explicitly recognize these.
}
@@ -4392,6 +4397,26 @@
&require_file ($FOREIGN, 'README-alpha');
}
}
+ }
+
+ if (defined $options{'readme-snapshot'})
+ {
+ if ($relative_dir eq '.')
+ {
+ if ($package_version !~ /^$SNAPSHOT_VERSION_PATTERN$/)
+ {
+ # FIXME: allow real filename.
+ &am_conf_line_error ($configure_ac,
+ $package_version_line,
+ "version `$package_version' is not in the
correct form for a snapshot");
+ }
+ elsif ( -f 'README-snapshot')
+ {
+ # This means we have a snapshot release. See
+ # SNAPSHOT_VERSION_PATTERN for details.
+ &require_file ($FOREIGN, 'README-snapshot');
+ }
+ }
}
}
Index: automake.texi
===================================================================
RCS file: /cvs/automake/automake/automake.texi,v
retrieving revision 1.242
diff -u -r1.242 automake.texi
--- automake.texi 2001/09/27 08:37:54 1.242
+++ automake.texi 2001/10/05 15:27:03
@@ -3940,6 +3940,14 @@
@address@hidden@address@hidden, where @var{ALPHA} is a
letter; it should be omitted for non-alpha releases.
address@hidden @code{readme-snapshot}
address@hidden Option, readme-snapshot
+If this release is a snapshot release, and the file
address@hidden exists, then it will be added to the
+distribution. If this option is given, version numbers must contain
+only eight digits. These digits usually correspond to the date
+(@samp{MMDDYYYY} or @samp{YYYYDDMM}) the snapshot was built.
+
@item @code{subdir-objects}
If this option is specified, then objects are placed into the
subdirectory of the build directory corresponding to the subdirectory of
Index: tests/Makefile.am
===================================================================
RCS file: /cvs/automake/automake/tests/Makefile.am,v
retrieving revision 1.345
diff -u -r1.345 Makefile.am
--- Makefile.am 2001/08/23 05:00:34 1.345
+++ Makefile.am 2001/10/05 15:27:03
@@ -256,6 +256,7 @@
scripts.test \
seenc.test \
sinclude.test \
+snapshot.test \
sourcesub.test \
sourcesub2.test \
space.test \
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- readme-snapshot.patch,
Matthew R. MacIntyre <=