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

tglsfdc · tglsfdc · commit 07c23731f211 · 2007-11-13T22:49:47.000Z
diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
@@ -3,7 +3,7 @@ package Mkvcbuild;
 #
 # Package that generates build files for msvc build
 #
-# $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.23 2007/10/13 23:22:46 tgl Exp $
+# $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.24 2007/11/13 22:49:47 tgl Exp $
 #
 use Carp;
 use Win32;
@@ -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
@@ -1,5 +1,5 @@
 @echo off
-REM $PostgreSQL: pgsql/src/tools/msvc/clean.bat,v 1.7 2007/10/03 13:43:24 mha Exp $
+REM $PostgreSQL: pgsql/src/tools/msvc/clean.bat,v 1.8 2007/11/13 22:49:47 tgl Exp $
 
 set D=%CD%
 if exist ..\msvc if exist ..\..\..\src cd ..\..\..
@@ -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
@@ -1,7 +1,7 @@
 
 # -*-perl-*- hey - emacs - this is a perl file
 
-# $PostgreSQL: pgsql/src/tools/msvc/vcregress.pl,v 1.5 2007/10/03 11:34:11 mha Exp $
+# $PostgreSQL: pgsql/src/tools/msvc/vcregress.pl,v 1.6 2007/11/13 22:49:47 tgl Exp $
 
 use strict;
 
@@ -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");

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package Mkvcbuild;`
`3`	`3`	`#`
`4`	`4`	`# Package that generates build files for msvc build`
`5`	`5`	`#`
`6`		`-# $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.23 2007/10/13 23:22:46 tgl Exp $`
	`6`	`+# $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.24 2007/11/13 22:49:47 tgl Exp $`
`7`	`7`	`#`
`8`	`8`	`use Carp;`
`9`	`9`	`use Win32;`
`@@ -468,9 +468,6 @@ sub GenerateContribSqlFiles`
`468`	`468`	`my $in = "$d.in";`
`469`	`469`	`my $out = "$d";`
`470`	`470`
`471`		`- # tsearch2 uses inconsistent naming`
`472`		`- $in = "tsearch.sql.in" if ($in eq "tsearch2.sql.in");`
`473`		`- $in = "untsearch.sql.in" if ($in eq "uninstall_tsearch2.sql.in");`
`474`	`471`	`if (Solution::IsNewer("contrib/$n/$out", "contrib/$n/$in"))`
`475`	`472`	`{`
`476`	`473`	`print "Building $out from $in (contrib/$n)...\n";`