@@ -19,6 +19,7 @@ sub _new
19
19
options => $options ,
20
20
numver => ' ' ,
21
21
strver => ' ' ,
22
+ pgprover => ' ' ,
22
23
VisualStudioVersion => undef ,
23
24
MinimumVisualStudioVersion => undef ,
24
25
vcver => undef ,
@@ -138,10 +139,13 @@ sub GenerateFiles
138
139
$self -> {numver } =sprintf (" %d %02d%02d" ,$1 ,$2 ,$3 ?$3 : 0);
139
140
$self -> {majorver } =sprintf (" %d .%d " ,$1 ,$2 );
140
141
}
142
+ if (/ ^PGPRO_VERSION="\$ PACKAGE_VERSION\. (\d +)"/ ) {
143
+ $self -> {pgprover } =$1 ;
144
+ }
141
145
}
142
146
close (C);
143
147
confess" Unable to parse configure.in for all variables!"
144
- if ($self -> {strver }eq ' ' ||$self -> {numver }eq ' ' );
148
+ if ($self -> {strver }eq ' ' ||$self -> {numver }eq ' ' || $self -> { pgprover } eq ' ' );
145
149
146
150
if (IsNewer(" src/include/pg_config_os.h" ," src/include/port/win32.h" ))
147
151
{
@@ -163,6 +167,8 @@ sub GenerateFiles
163
167
s { PG_VERSION "[^"]+"} { PG_VERSION "$self ->{strver}$extraver "} ;
164
168
s { PG_VERSION_NUM\d +} { PG_VERSION_NUM$self ->{numver}} ;
165
169
s { PG_VERSION_STR "[^"]+"} { __STRINGIFY(x) #x\n #define __STRINGIFY2(z) __STRINGIFY(z)\n #define PG_VERSION_STR "PostgreSQL$self ->{strver}$extraver , compiled by Visual C++ build " __STRINGIFY2(_MSC_VER) ",$bits -bit"} ;
170
+ s { PGPRO_PACKAGE_VERSION "[^"]+"} { PGRPO_PACKAGE_VERSION "$self ->{strver}.$self ->{pgprover}"} ;
171
+ s { PGPRO_PACKAGE_STR "[^"]+"} { PGPRO_PACKAGE_STR "PostgresPro$self ->{strver}.$self ->{pgprover}"} ;
166
172
s { #define PGPRO_VERSION_STR "[^"]+"} { #define PGPRO_VERSION_STR PGPRO_PACKAGE_STR " compiled by Visual C++ build" __STRINGIFY2(_MSC_VER) ",$bits -bit"} ;
167
173
print O;
168
174
}