[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
FYI: 1.4 and 1.5: obsolete_rx
From: |
Akim Demaille |
Subject: |
FYI: 1.4 and 1.5: obsolete_rx |
Date: |
14 Jul 2001 19:13:00 +0200 |
User-agent: |
Gnus/5.0808 (Gnus v5.8.8) XEmacs/21.4 (Academic Rigor) |
I needed this to update Bison.
On 1.4p:
Index: ChangeLog
from Akim Demaille <address@hidden>
* automake.in ($obsolete_rx): Stop at word boundaries.
(&scan_one_configure_file): Skip VERSION=$2.
Index: automake.in
===================================================================
RCS file: /cvs/automake/automake/automake.in,v
retrieving revision 1.644.4.13
diff -u -u -r1.644.4.13 automake.in
--- automake.in 2001/07/01 23:21:04 1.644.4.13
+++ automake.in 2001/07/14 17:08:09
@@ -297,7 +297,7 @@
);
# Regexp to match the above macros.
-$obsolete_rx = '(' . join ('|', keys %obsolete_macros) . ')';
+$obsolete_rx = '\b(' . join ('|', keys %obsolete_macros) . ')\b';
# This maps extensions onto language names.
%extension_map = ();
@@ -4317,7 +4317,7 @@
$seen_package = 1 if /PACKAGE=/;
# Skip VERSION of [$2]; that is from AM_INIT_AUTOMAKE.
- if (/\bVERSION=(\S+)/ && $1 ne '[$2]')
+ if (/\bVERSION=(\S+)/ && $1 ne '$2' && $1 ne '[$2]')
{
$seen_version = 1;
$package_version = $1;
And on pre-1.5:
Index: ChangeLog
from Akim Demaille <address@hidden>
* automake.in ($obsolete_rx): No need for `(\bfoo\b|\bbar\b)',
`\b(foo|bar)\b' is what we want.
Index: automake.in
===================================================================
RCS file: /cvs/automake/automake/automake.in,v
retrieving revision 1.1149
diff -u -u -r1.1149 automake.in
--- automake.in 2001/07/14 17:12:26 1.1149
+++ automake.in 2001/07/14 17:13:21
@@ -300,7 +300,7 @@
);
# Regexp to match the above macros.
-my $obsolete_rx = '(\b' . join ('\b|\b', keys %obsolete_macros) . '\b)';
+my $obsolete_rx = '\b(' . join ('|', keys %obsolete_macros) . ')\b';
- FYI: 1.4 and 1.5: obsolete_rx,
Akim Demaille <=