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

Commit8d9a0e8

Browse files
committed
Support --with-extra-version equivalent functionality in MSVC build
Adds a configuration parameter, extraver, that is appended to theversion number when built.Michael Paquier, reviewed by Muhammad Asif Naeem
1 parentbd40951 commit8d9a0e8

File tree

2 files changed

+23
-21
lines changed

2 files changed

+23
-21
lines changed

‎src/tools/msvc/Solution.pm

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -164,9 +164,9 @@ sub GenerateFiles
164164
|| confess"Could not write to pg_config.h\n";
165165
while (<I>)
166166
{
167-
s{PG_VERSION "[^"]+"}{PG_VERSION "$self->{strver}"};
167+
s{PG_VERSION "[^"]+"}{PG_VERSION "$self->{strver}$self->{options}->{extraver}"};
168168
s{PG_VERSION_NUM\d+}{PG_VERSION_NUM$self->{numver}};
169-
s{PG_VERSION_STR "[^"]+"}{__STRINGIFY(x) #x\n#define __STRINGIFY2(z) __STRINGIFY(z)\n#define PG_VERSION_STR "PostgreSQL$self->{strver}, compiled by Visual C++ build " __STRINGIFY2(_MSC_VER) ",$bits-bit"};
169+
s{PG_VERSION_STR "[^"]+"}{__STRINGIFY(x) #x\n#define __STRINGIFY2(z) __STRINGIFY(z)\n#define PG_VERSION_STR "PostgreSQL$self->{strver}$self->{options}->{extraver}, compiled by Visual C++ build " __STRINGIFY2(_MSC_VER) ",$bits-bit"};
170170
print O;
171171
}
172172
print O"#define PG_MAJORVERSION\"$self->{majorver}\"\n";
@@ -625,14 +625,15 @@ sub GetFakeConfigure
625625
$cfg .=' --enable-nls'if ($self->{options}->{nls});
626626
$cfg .=' --with-ldap'if ($self->{options}->{ldap});
627627
$cfg .=' --without-zlib'unless ($self->{options}->{zlib});
628-
$cfg .=' --with-openssl'if ($self->{options}->{ssl});
629-
$cfg .=' --with-ossp-uuid'if ($self->{options}->{uuid});
630-
$cfg .=' --with-libxml'if ($self->{options}->{xml});
631-
$cfg .=' --with-libxslt'if ($self->{options}->{xslt});
632-
$cfg .=' --with-gssapi'if ($self->{options}->{gss});
633-
$cfg .=' --with-tcl'if ($self->{options}->{tcl});
634-
$cfg .=' --with-perl'if ($self->{options}->{perl});
635-
$cfg .=' --with-python'if ($self->{options}->{python});
628+
$cfg .=' --with-extra-version'if ($self->{options}->{extraver});
629+
$cfg .=' --with-openssl'if ($self->{options}->{ssl});
630+
$cfg .=' --with-ossp-uuid'if ($self->{options}->{uuid});
631+
$cfg .=' --with-libxml'if ($self->{options}->{xml});
632+
$cfg .=' --with-libxslt'if ($self->{options}->{xslt});
633+
$cfg .=' --with-gssapi'if ($self->{options}->{gss});
634+
$cfg .=' --with-tcl'if ($self->{options}->{tcl});
635+
$cfg .=' --with-perl'if ($self->{options}->{perl});
636+
$cfg .=' --with-python'if ($self->{options}->{python});
636637

637638
return$cfg;
638639
}

‎src/tools/msvc/config_default.pl

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,18 @@
1010
# blocksize => 8, # --with-blocksize, 8kB by default
1111
# wal_blocksize => 8, # --with-wal-blocksize, 8kB by default
1212
# wal_segsize => 16, # --with-wal-segsize, 16MB by default
13-
ldap=> 1,# --with-ldap
14-
nls=>undef,# --enable-nls=<path>
15-
tcl=>undef,# --with-tls=<path>
16-
perl=>undef,# --with-perl
17-
python=>undef,# --with-python=<path>
18-
openssl=>undef,# --with-ssl=<path>
19-
uuid=>undef,# --with-ossp-uuid
20-
xml=>undef,# --with-libxml=<path>
21-
xslt=>undef,# --with-libxslt=<path>
22-
iconv=>undef,# (not in configure, path to iconv)
23-
zlib=>undef# --with-zlib=<path>
13+
ldap=> 1,# --with-ldap
14+
extraver=>undef,# --with-extra-version=<string>
15+
nls=>undef,# --enable-nls=<path>
16+
tcl=>undef,# --with-tls=<path>
17+
perl=>undef,# --with-perl
18+
python=>undef,# --with-python=<path>
19+
openssl=>undef,# --with-ssl=<path>
20+
uuid=>undef,# --with-ossp-uuid
21+
xml=>undef,# --with-libxml=<path>
22+
xslt=>undef,# --with-libxslt=<path>
23+
iconv=>undef,# (not in configure, path to iconv)
24+
zlib=>undef# --with-zlib=<path>
2425
};
2526

2627
1;

0 commit comments

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