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

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
index e1c8d81549b6973b9f97265109fea4dc000f624b..37958f95b558f7b8ac803b3873b76db18e1ddf66 100644 (file)
--- 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
index 335a1f016d592cf593c30bc5425ea06174ec9649..513cfb5796671dbd78536c5c852473ffb5b79ff5 100644 (file)
--- 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;