Add multi-line flag to regex that needs it. Backpatch to 8.2. Fix from Andreas Zeugswetter

adunstan · adunstan · commit 2b8a795738ee · 2008-04-15T16:22:36.000Z
diff --git a/src/tools/msvc/Project.pm b/src/tools/msvc/Project.pm
@@ -3,7 +3,7 @@ package Project;
 #
 # Package that encapsulates a Visual C++ project file generation
 #
-# $PostgreSQL: pgsql/src/tools/msvc/Project.pm,v 1.18 2008/02/19 16:15:14 mha Exp $
+# $PostgreSQL: pgsql/src/tools/msvc/Project.pm,v 1.19 2008/04/15 16:22:36 adunstan Exp $
 #
 use Carp;
 use strict;
@@ -259,7 +259,8 @@ sub AddDir
     }
 
     # Match rules that pull in source files from different directories
-    my $replace_re = qr{^([^:\n\$]+\.c)\s*:\s*(?:%\s*: )?\$(\([^\)]+\))\/(.*)\/[^\/]+$};
+    # example: pg_crc.c: $(top_srcdir)/src/backend/utils/hash/pg_crc.c
+    my $replace_re = qr{^([^:\n\$]+\.c)\s*:\s*(?:%\s*: )?\$(\([^\)]+\))\/(.*)\/[^\/]+$}m;
     while ($mf =~ m{$replace_re}m)
     {
         my $match = $1;

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package Project;`
`3`	`3`	`#`
`4`	`4`	`# Package that encapsulates a Visual C++ project file generation`
`5`	`5`	`#`
`6`		`-# $PostgreSQL: pgsql/src/tools/msvc/Project.pm,v 1.18 2008/02/19 16:15:14 mha Exp $`
	`6`	`+# $PostgreSQL: pgsql/src/tools/msvc/Project.pm,v 1.19 2008/04/15 16:22:36 adunstan Exp $`
`7`	`7`	`#`
`8`	`8`	`use Carp;`
`9`	`9`	`use strict;`
`@@ -259,7 +259,8 @@ sub AddDir`
`259`	`259`	`}`
`260`	`260`
`261`	`261`	`# Match rules that pull in source files from different directories`
`262`		`- my $replace_re = qr{^([^:\n\$]+\.c)\s:\s(?:%\s: )?\$(\([^\)]+\))\/(.)\/[^\/]+$};`
	`262`	`+ # example: pg_crc.c: $(top_srcdir)/src/backend/utils/hash/pg_crc.c`
	`263`	`+ my $replace_re = qr{^([^:\n\$]+\.c)\s:\s(?:%\s: )?\$(\([^\)]+\))\/(.)\/[^\/]+$}m;`
`263`	`264`	`while ($mf =~ m{$replace_re}m)`
`264`	`265`	`{`
`265`	`266`	`my $match = $1;`