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

Commitb13635c

Browse files
committed
Support for building contrib/uuid-ossp with MSVC.
Original patch from Hiroshi Saito, modified by me.
1 parentb8eef28 commitb13635c

File tree

5 files changed

+31
-6
lines changed

5 files changed

+31
-6
lines changed

‎doc/src/sgml/install-win32.sgml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/install-win32.sgml,v 1.45 2008/02/06 15:13:25 mha Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/install-win32.sgml,v 1.46 2008/02/28 12:17:59 mha Exp $ -->
22

33
<chapter id="install-win32">
44
<title>Installation on <productname>Windows</productname></title>
@@ -160,6 +160,15 @@
160160
</para></listitem>
161161
</varlistentry>
162162

163+
<varlistentry>
164+
<term><productname>ossp-uuid</productname></term>
165+
<listitem><para>
166+
Required for UUID-OSSP support (contrib only). Source can be
167+
downloaded from
168+
<ulink url="http://www.ossp.org/pkg/lib/uuid/"></>.
169+
</para></listitem>
170+
</varlistentry>
171+
163172
<varlistentry>
164173
<term><productname>Python</productname></term>
165174
<listitem><para>

‎src/tools/msvc/Install.pm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package Install;
33
#
44
# Package that provides 'make install' functionality for msvc builds
55
#
6-
# $PostgreSQL: pgsql/src/tools/msvc/Install.pm,v 1.28 2008/02/0717:58:16 mha Exp $
6+
# $PostgreSQL: pgsql/src/tools/msvc/Install.pm,v 1.29 2008/02/28 12:17:59 mha Exp $
77
#
88
use strict;
99
use warnings;
@@ -291,7 +291,7 @@ sub CopyContribFiles
291291
{
292292
nextif ($d =~/^\./);
293293
nextunless (-f"contrib/$d/Makefile");
294-
nextif ($deq"uuid-ossp");
294+
nextif ($deq"uuid-ossp"&& !defined($config->{uuid}));
295295
nextif ($deq"sslinfo" && !defined($config->{openssl}));
296296
nextif ($deq"xml2" && !defined($config->{xml}));
297297

‎src/tools/msvc/Mkvcbuild.pm

Lines changed: 12 additions & 2 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.25 2008/02/05 14:17:23 mha Exp $
6+
# $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.26 2008/02/28 12:17:59 mha Exp $
77
#
88
use Carp;
99
use Win32;
@@ -31,7 +31,7 @@ my $contrib_extrasource = {
3131
'cube'=> ['cubescan.l','cubeparse.y'],
3232
'seg'=> ['segscan.l','segparse.y']
3333
};
34-
my@contrib_excludes = ('pgcrypto','uuid-ossp');
34+
my@contrib_excludes = ('pgcrypto');
3535

3636
submkvcbuild
3737
{
@@ -247,6 +247,16 @@ sub mkvcbuild
247247
push@contrib_excludes,'sslinfo';
248248
}
249249

250+
if ($solution->{options}->{uuid})
251+
{
252+
$contrib_extraincludes->{'uuid-ossp'} = [$solution->{options}->{uuid} .'\include' ];
253+
$contrib_extralibs->{'uuid-ossp'} = [$solution->{options}->{uuid} .'\lib\uuid.lib' ];
254+
}
255+
else
256+
{
257+
push@contrib_excludes,'uuid-ossp';
258+
}
259+
250260
# Pgcrypto makefile too complex to parse....
251261
my$pgcrypto =$solution->AddProject('pgcrypto','dll','crypto');
252262
$pgcrypto->AddFiles(

‎src/tools/msvc/Solution.pm

Lines changed: 6 additions & 1 deletion
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.35 2008/02/19 12:00:03 mha Exp $
6+
# $PostgreSQL: pgsql/src/tools/msvc/Solution.pm,v 1.36 2008/02/28 12:17:59 mha Exp $
77
#
88
use Carp;
99
use strict;
@@ -113,6 +113,10 @@ s{PG_VERSION_STR "[^"]+"}{__STRINGIFY(x) #x\n#define __STRINGIFY2(z) __STRINGIFY
113113
print O"#define USE_SSL 1\n"if ($self->{options}->{openssl});
114114
print O"#define ENABLE_NLS 1\n"if ($self->{options}->{nls});
115115

116+
if ($self->{options}->{uuid})
117+
{
118+
print O"#define HAVE_UUID_H\n";
119+
}
116120
if ($self->{options}->{xml})
117121
{
118122
print O"#define HAVE_LIBXML2\n";
@@ -451,6 +455,7 @@ sub GetFakeConfigure
451455
$cfg .=' --with-ldap'if ($self->{options}->{ldap});
452456
$cfg .=' --without-zlib'unless ($self->{options}->{zlib});
453457
$cfg .=' --with-openssl'if ($self->{options}->{ssl});
458+
$cfg .=' --with-ossp-uuid'if ($self->{options}->{uuid});
454459
$cfg .=' --with-libxml'if ($self->{options}->{xml});
455460
$cfg .=' --with-libxslt'if ($self->{options}->{xslt});
456461
$cfg .=' --with-krb5'if ($self->{options}->{krb5});

‎src/tools/msvc/config.pl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
krb5=>'c:\prog\pgsql\depend\krb5',# --with-krb5=<path>
1313
ldap=>1,# --with-ldap
1414
openssl=>'c:\openssl',# --with-ssl=<path>
15+
uuid=>'c:\prog\pgsql\depend\ossp-uuid',#--with-ossp-uuid
1516
xml=>'c:\prog\pgsql\depend\libxml2',
1617
xslt=>'c:\prog\pgsql\depend\libxslt',
1718
iconv=>'c:\prog\pgsql\depend\iconv',

0 commit comments

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