contrib/tsearch2 need not be special-cased any longer.

diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
index 9a70f9f57e59ed688087b5c41264458e2bbc0783..5c47b66cb2aba0cfbb9c6812e49837ce02a3659d 100644 (file)
--- a/src/tools/msvc/Mkvcbuild.pm
+++ b/src/tools/msvc/Mkvcbuild.pm
@@ -468,9 +468,6 @@ sub GenerateContribSqlFiles
             my $in = "$d.in";
             my $out = "$d";
 
-            # tsearch2 uses inconsistent naming
-            $in = "tsearch.sql.in" if ($in eq "tsearch2.sql.in");
-            $in = "untsearch.sql.in" if ($in eq "uninstall_tsearch2.sql.in");
             if (Solution::IsNewer("contrib/$n/$out", "contrib/$n/$in"))
             {
                 print "Building $out from $in (contrib/$n)...\n";

diff --git a/src/tools/msvc/clean.bat b/src/tools/msvc/clean.bat
index 56c7e0b44f3b865fe5e59dd439af162119b0e2dd..d251ecd808f783b5c8b0347bcf36856deb0b3ffa 100755 (executable)
--- a/src/tools/msvc/clean.bat
+++ b/src/tools/msvc/clean.bat
@@ -57,9 +57,6 @@ call :del src\test\regress\regress.dll
 REM Clean up datafiles built with contrib
 cd contrib
 for /r %%f in (*.sql) do if exist %%f.in del %%f
-REM Clean up tsearch2 which uses inconsistent names
-call :del tsearch2\tsearch2.sql
-call :del tsearch2\uninstall_tsearch2.sql
 
 cd %D%
 

diff --git a/src/tools/msvc/vcregress.pl b/src/tools/msvc/vcregress.pl
index 61b680c4ab01dbe29fb55a31044151ee82fe6a60..c80b0816befb7186ffe74830e42c2928ef9f9ee0 100644 (file)
--- a/src/tools/msvc/vcregress.pl
+++ b/src/tools/msvc/vcregress.pl
@@ -188,7 +188,6 @@ sub contribcheck
     my $mstat = 0;
     foreach my $module (glob("*"))
     {
-               next if $module eq 'tsearch2';
         next unless -d "$module/sql" && 
                        -d "$module/expected" && 
                        (-f "$module/Makefile" || -f "$module/GNUmakefile");