1
0
mirror of https://github.com/postgres/postgres.git synced 2025-04-24 10:47:04 +03:00

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

This commit is contained in:
Tom Lane 2007-11-13 22:49:47 +00:00
parent 4394c1b09c
commit 07c23731f2
3 changed files with 3 additions and 10 deletions

View File

@ -3,7 +3,7 @@ package Mkvcbuild;
# #
# Package that generates build files for msvc build # 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 Carp;
use Win32; use Win32;
@ -468,9 +468,6 @@ sub GenerateContribSqlFiles
my $in = "$d.in"; my $in = "$d.in";
my $out = "$d"; 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")) if (Solution::IsNewer("contrib/$n/$out", "contrib/$n/$in"))
{ {
print "Building $out from $in (contrib/$n)...\n"; print "Building $out from $in (contrib/$n)...\n";

View File

@ -1,5 +1,5 @@
@echo off @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% set D=%CD%
if exist ..\msvc if exist ..\..\..\src 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 REM Clean up datafiles built with contrib
cd contrib cd contrib
for /r %%f in (*.sql) do if exist %%f.in del %%f 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% cd %D%

View File

@ -1,7 +1,7 @@
# -*-perl-*- hey - emacs - this is a perl file # -*-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; use strict;
@ -188,7 +188,6 @@ sub contribcheck
my $mstat = 0; my $mstat = 0;
foreach my $module (glob("*")) foreach my $module (glob("*"))
{ {
next if $module eq 'tsearch2';
next unless -d "$module/sql" && next unless -d "$module/sql" &&
-d "$module/expected" && -d "$module/expected" &&
(-f "$module/Makefile" || -f "$module/GNUmakefile"); (-f "$module/Makefile" || -f "$module/GNUmakefile");