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

Commitc8792c8

Browse files
committed
Build DEF file for libecpg instead of generating a default one.
1 parent6ddbc11 commitc8792c8

File tree

2 files changed

+27
-17
lines changed

2 files changed

+27
-17
lines changed

‎src/tools/msvc/Mkvcbuild.pm

Lines changed: 2 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.18 2007/09/29 07:15:33 mha Exp $
6+
# $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.19 2007/10/03 12:11:00 mha Exp $
77
#
88
use Carp;
99
use Win32;
@@ -144,6 +144,7 @@ sub mkvcbuild
144144
$libecpg->AddIncludeDir('src\interfaces\ecpg\include');
145145
$libecpg->AddIncludeDir('src\interfaces\libpq');
146146
$libecpg->AddIncludeDir('src\port');
147+
$libecpg->UseDef('src\interfaces\ecpg\ecpglib\ecpglib.def');
147148
$libecpg->AddLibrary('wsock32.lib');
148149
$libecpg->AddReference($libpq,$pgtypes,$libpgport);
149150

‎src/tools/msvc/Solution.pm

Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package Solution;
33
#
44
# Package that encapsulates a Visual C++ solution file generation
55
#
6-
# $PostgreSQL: pgsql/src/tools/msvc/Solution.pm,v 1.32 2007/09/0302:51:47 tgl Exp $
6+
# $PostgreSQL: pgsql/src/tools/msvc/Solution.pm,v 1.33 2007/10/0312:11:00 mha Exp $
77
#
88
use Carp;
99
use strict;
@@ -139,21 +139,8 @@ s{PG_VERSION_STR "[^"]+"}{__STRINGIFY(x) #x\n#define __STRINGIFY2(z) __STRINGIFY
139139
close(I);
140140
}
141141

142-
if (IsNewer("src\\interfaces\\libpq\\libpqdll.def","src\\interfaces\\libpq\\exports.txt"))
143-
{
144-
print"Generating libpqdll.def...\n";
145-
open(I,"src\\interfaces\\libpq\\exports.txt") || confess("Could not open exports.txt\n");
146-
open(O,">src\\interfaces\\libpq\\libpqdll.def") || confess("Could not open libpqdll.def\n");
147-
print O"LIBRARY LIBPQ\nEXPORTS\n";
148-
while (<I>)
149-
{
150-
nextif (/^#/);
151-
my ($f,$o) =split;
152-
print O"$f @$o\n";
153-
}
154-
close(O);
155-
close(I);
156-
}
142+
$self->GenerateDefFile("src\\interfaces\\libpq\\libpqdll.def","src\\interfaces\\libpq\\exports.txt","LIBPQ");
143+
$self->GenerateDefFile("src\\interfaces\\ecpg\\ecpglib\\ecpglib.def","src\\interfaces\\ecpg\\ecpglib\\exports.txt","LIBECPG");
157144

158145
if (IsNewer("src\\backend\\utils\\fmgrtab.c","src\\include\\catalog\\pg_proc.h"))
159146
{
@@ -304,6 +291,28 @@ EOF
304291
close(O);
305292
}
306293

294+
subGenerateDefFile
295+
{
296+
my ($self,$deffile,$txtfile,$libname) =@_;
297+
298+
if (IsNewer($deffile,$txtfile))
299+
{
300+
print"Generating$deffile...\n";
301+
open(I,$txtfile) || confess("Could not open$txtfile\n");
302+
open(O,">$deffile") || confess("Could not open$deffile\n");
303+
print O"LIBRARY$libname\nEXPORTS\n";
304+
while (<I>)
305+
{
306+
nextif (/^#/);
307+
nextif (/^\s*$/);
308+
my ($f,$o) =split;
309+
print O"$f @$o\n";
310+
}
311+
close(O);
312+
close(I);
313+
}
314+
}
315+
307316
subAddProject
308317
{
309318
my ($self,$name,$type,$folder,$initialdir) =@_;

0 commit comments

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