Clarify the regexp used to detect source files in MSVC builds.

hlinnaka · hlinnaka · commit ce01548d4fdb · 2014-12-17T21:55:26.000+02:00
The old pattern would match files with strange extensions like *.ry or
*.lpp. Refactor it to only include files with known extensions, and to make
it more readable.

Per Andrew Dunstan's suggestion.
diff --git a/src/tools/msvc/MSBuildProject.pm b/src/tools/msvc/MSBuildProject.pm
@@ -127,7 +127,7 @@ EOF
 	foreach my $fileNameWithPath (sort keys %{ $self->{files} })
 	{
 		confess "Bad format filename '$fileNameWithPath'\n"
-		  unless ($fileNameWithPath =~ /^(.*)\\([^\\]+)\.[r]?[cyl]$/);
+		  unless ($fileNameWithPath =~ /^(.*)\\([^\\]+)\.(c|cpp|y|l|rc)$/);
 		my $dir      = $1;
 		my $fileName = $2;
 		if ($fileNameWithPath =~ /\.y$/ or $fileNameWithPath =~ /\.l$/)
diff --git a/src/tools/msvc/VCBuildProject.pm b/src/tools/msvc/VCBuildProject.pm
@@ -71,7 +71,7 @@ EOF
 	foreach my $fileNameWithPath (sort keys %{ $self->{files} })
 	{
 		confess "Bad format filename '$fileNameWithPath'\n"
-		  unless ($fileNameWithPath =~ /^(.*)\\([^\\]+)\.[r]?[cyl]$/);
+		  unless ($fileNameWithPath =~ /^(.*)\\([^\\]+)\.(c|cpp|y|l|rc)$/);
 		my $dir  = $1;
 		my $file = $2;
 

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ EOF`
`127`	`127`	`foreach my $fileNameWithPath (sort keys %{ $self->{files} })`
`128`	`128`	`{`
`129`	`129`	`confess "Bad format filename '$fileNameWithPath'\n"`
`130`		`- unless ($fileNameWithPath =~ /^(.*)\\([^\\]+)\.[r]?[cyl]$/);`
	`130`	`+ unless ($fileNameWithPath =~ /^(.*)\\([^\\]+)\.(c\|cpp\|y\|l\|rc)$/);`
`131`	`131`	`my $dir = $1;`
`132`	`132`	`my $fileName = $2;`
`133`	`133`	`if ($fileNameWithPath =~ /\.y$/ or $fileNameWithPath =~ /\.l$/)`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ EOF`
`71`	`71`	`foreach my $fileNameWithPath (sort keys %{ $self->{files} })`
`72`	`72`	`{`
`73`	`73`	`confess "Bad format filename '$fileNameWithPath'\n"`
`74`		`- unless ($fileNameWithPath =~ /^(.*)\\([^\\]+)\.[r]?[cyl]$/);`
	`74`	`+ unless ($fileNameWithPath =~ /^(.*)\\([^\\]+)\.(c\|cpp\|y\|l\|rc)$/);`
`75`	`75`	`my $dir = $1;`
`76`	`76`	`my $file = $2;`
`77`	`77`