Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitace2b06

Browse files
committed
Fix MSVC build for new ways to pull in keywords.c and kwlookup.c.
1 parent4022f94 commitace2b06

File tree

1 file changed

+23
-17
lines changed

1 file changed

+23
-17
lines changed

‎src/tools/msvc/Mkvcbuild.pm

Lines changed: 23 additions & 17 deletions
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.37 2009/02/25 17:42:19 mha Exp $
6+
# $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.38 2009/03/08 19:13:38 mha Exp $
77
#
88
use Carp;
99
use Win32;
@@ -211,16 +211,22 @@ sub mkvcbuild
211211
$pgdump->AddFile('src\bin\pg_dump\pg_dump.c');
212212
$pgdump->AddFile('src\bin\pg_dump\common.c');
213213
$pgdump->AddFile('src\bin\pg_dump\pg_dump_sort.c');
214+
$pgdump->AddFile('src\bin\pg_dump\keywords.c');
215+
$pgdump->AddFile('src\backend\parser\kwlookup.c');
214216

215217
my$pgdumpall = AddSimpleFrontend('pg_dump', 1);
216218
$pgdumpall->{name} ='pg_dumpall';
217219
$pgdumpall->AddIncludeDir('src\backend');
218220
$pgdumpall->AddFile('src\bin\pg_dump\pg_dumpall.c');
221+
$pgdumpall->AddFile('src\bin\pg_dump\keywords.c');
222+
$pgdumpall->AddFile('src\backend\parser\kwlookup.c');
219223

220224
my$pgrestore = AddSimpleFrontend('pg_dump', 1);
221225
$pgrestore->{name} ='pg_restore';
222226
$pgrestore->AddIncludeDir('src\backend');
223227
$pgrestore->AddFile('src\bin\pg_dump\pg_restore.c');
228+
$pgrestore->AddFile('src\bin\pg_dump\keywords.c');
229+
$pgrestore->AddFile('src\backend\parser\kwlookup.c');
224230

225231
my$zic =$solution->AddProject('zic','exe','utils');
226232
$zic->AddFiles('src\timezone','zic.c','ialloc.c','scheck.c','localtime.c');
@@ -322,26 +328,26 @@ sub mkvcbuild
322328
my@files =split /\s+/,$1;
323329
foreachmy$f (@files)
324330
{
325-
if ($f =~/\/keywords\.o$/)
331+
$f =~s/\.o$/\.c/;
332+
if ($feq'keywords.c')
326333
{
327-
$proj->AddFile('src\backend\parser\keywords.c');
328-
$proj->AddIncludeDir('src\backend');
334+
$proj->AddFile('src\bin\pg_dump\keywords.c');
335+
}
336+
elsif ($feq'kwlookup.c')
337+
{
338+
$proj->AddFile('src\backend\parser\kwlookup.c');
339+
}
340+
elsif ($feq'dumputils.c')
341+
{
342+
$proj->AddFile('src\bin\pg_dump\dumputils.c');
343+
}
344+
elsif ($f =~/print\.c$/)
345+
{# Also catches mbprint.c
346+
$proj->AddFile('src\bin\psql\\' .$f);
329347
}
330348
else
331349
{
332-
$f =~s/\.o$/\.c/;
333-
if ($feq'dumputils.c')
334-
{
335-
$proj->AddFile('src\bin\pg_dump\dumputils.c');
336-
}
337-
elsif ($f =~/print\.c$/)
338-
{# Also catches mbprint.c
339-
$proj->AddFile('src\bin\psql\\' .$f);
340-
}
341-
else
342-
{
343-
$proj->AddFile('src\bin\scripts\\' .$f);
344-
}
350+
$proj->AddFile('src\bin\scripts\\' .$f);
345351
}
346352
}
347353
$proj->AddIncludeDir('src\interfaces\libpq');

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp