Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit b913a94

Browse files
committed
Build snowball DLL for tsearch-in-core.
(Still needs to build the .sql output files, but this handles the C part of the build)
1 parent a3bc467 commit b913a94

File tree

2 files changed

+22
-2
lines changed

2 files changed

+22
-2
lines changed

src/tools/msvc/Mkvcbuild.pm

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package Mkvcbuild;
33
#
44
# Package that generates build files for msvc build
55
#
6-
# $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.15 2007/07/23 10:16:54 mha Exp $
6+
# $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.16 2007/08/21 15:10:41 mha Exp $
77
#
88
use Carp;
99
use Win32;
@@ -70,6 +70,13 @@ sub mkvcbuild
7070
$postgres->AddLibrary('wldap32.lib') if ($solution->{options}->{ldap});
7171
$postgres->FullExportDLL('postgres.lib');
7272

73+
my $snowball = $solution->AddProject('dict_snowball','dll','','src\backend\snowball');
74+
$snowball->RelocateFiles('src\backend\snowball\libstemmer', sub {
75+
return shift !~ /dict_snowball.c$/;
76+
});
77+
$snowball->AddIncludeDir('src\include\snowball');
78+
$snowball->AddReference($postgres);
79+
7380
my $plpgsql = $solution->AddProject('plpgsql','dll','PLs','src\pl\plpgsql\src');
7481
$plpgsql->AddFiles('src\pl\plpgsql\src','scan.l','gram.y');
7582
$plpgsql->AddReference($postgres);

src/tools/msvc/Project.pm

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@ package Project;
33
#
44
# Package that encapsulates a Visual C++ project file generation
55
#
6-
# $PostgreSQL: pgsql/src/tools/msvc/Project.pm,v 1.13 2007/07/25 10:51:03 mha Exp $
6+
# $PostgreSQL: pgsql/src/tools/msvc/Project.pm,v 1.14 2007/08/21 15:10:41 mha Exp $
77
#
88
use Carp;
99
use strict;
1010
use warnings;
11+
use File::Basename;
1112

1213
sub new
1314
{
@@ -96,6 +97,18 @@ sub RemoveFile
9697
confess("Could not find file $filename to remove\n");
9798
}
9899

100+
sub RelocateFiles
101+
{
102+
my ($self, $targetdir, $proc) = @_;
103+
foreach my $f (keys %{$self->{files}}) {
104+
my $r = &$proc($f);
105+
if ($r) {
106+
$self->RemoveFile($f);
107+
$self->AddFile($targetdir . '\\' . basename($f));
108+
}
109+
}
110+
}
111+
99112
sub AddReference
100113
{
101114
my $self = shift;

0 commit comments

Comments
 (0)