Make win32 build extract PGPRO_VERSION from configure.in as well as upstream version

vbwagner · vbwagner · commit 4c01292bd606 · 2016-05-23T18:10:24.000+03:00
diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
@@ -19,6 +19,7 @@ sub _new
 		options                    => $options,
 		numver                     => '',
 		strver                     => '',
+		pgprover                   => '',
 		VisualStudioVersion        => undef,
 		MinimumVisualStudioVersion => undef,
 		vcver                      => undef,
@@ -138,10 +139,13 @@ sub GenerateFiles
 			$self->{numver} = sprintf("%d%02d%02d", $1, $2, $3 ? $3 : 0);
 			$self->{majorver} = sprintf("%d.%d", $1, $2);
 		}
+		if ( /^PGPRO_VERSION="\$PACKAGE_VERSION\.(\d+)"/) {
+			$self->{pgprover} = $1;
+		}
 	}
 	close(C);
 	confess "Unable to parse configure.in for all variables!"
-	  if ($self->{strver} eq '' || $self->{numver} eq '');
+	  if ($self->{strver} eq '' || $self->{numver} eq '' || $self->{pgprover} eq '');
 
 	if (IsNewer("src/include/pg_config_os.h", "src/include/port/win32.h"))
 	{
@@ -163,6 +167,8 @@ sub GenerateFiles
 			s{PG_VERSION "[^"]+"}{PG_VERSION "$self->{strver}$extraver"};
 			s{PG_VERSION_NUM \d+}{PG_VERSION_NUM $self->{numver}};
 			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"};
+			s{PGPRO_PACKAGE_VERSION "[^"]+"}{PGRPO_PACKAGE_VERSION "$self->{strver}.$self->{pgprover}"};
+			s{PGPRO_PACKAGE_STR "[^"]+"}{PGPRO_PACKAGE_STR "PostgresPro $self->{strver}.$self->{pgprover}"};
 			s{#define PGPRO_VERSION_STR "[^"]+"}{#define PGPRO_VERSION_STR PGPRO_PACKAGE_STR " compiled by Visual C++ build" __STRINGIFY2(_MSC_VER) ", $bits-bit"};
 			print O;
 		}
