diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/msvc/Install.pm | 1 | ||||
| -rw-r--r-- | src/tools/msvc/vcregress.pl | 8 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm index 55de9e55e6b..ce17f72ec5a 100644 --- a/src/tools/msvc/Install.pm +++ b/src/tools/msvc/Install.pm @@ -408,6 +408,7 @@ sub CopyContribFiles next if ($insttype eq "client" && !grep { $_ eq $d } @client_contribs); + # these configuration-based exclusions must match vcregress.pl next if ($d eq "uuid-ossp" && !defined($config->{uuid})); next if ($d eq "sslinfo" && !defined($config->{openssl})); next if ($d eq "xml2" && !defined($config->{xml})); diff --git a/src/tools/msvc/vcregress.pl b/src/tools/msvc/vcregress.pl index 1b0c9d4c0f7..2c8cd50a2f7 100644 --- a/src/tools/msvc/vcregress.pl +++ b/src/tools/msvc/vcregress.pl @@ -219,8 +219,12 @@ sub contribcheck my $mstat = 0; foreach my $module (glob("*")) { - next if ($module eq 'sepgsql'); - next if ($module eq 'xml2' && !$config->{xml}); + # these configuration-based exclusions must match Install.pm + next if ($module eq "uuid-ossp" && !defined($config->{uuid})); + next if ($module eq "sslinfo" && !defined($config->{openssl})); + next if ($module eq "xml2" && !defined($config->{xml})); + next if ($module eq "sepgsql"); + next unless -d "$module/sql" && -d "$module/expected" |