Fixed build under Win32 with new version defines. Disabled build of pg_arman for Win32.

vbwagner · vbwagner · commit 38251d0e337f · 2016-03-29T19:18:03.000+03:00
Man page for pg_arman is generated during make dist now.
diff --git a/GNUmakefile.in b/GNUmakefile.in
@@ -107,6 +107,7 @@ distdir:
 	done
 	$(MAKE) -C $(distdir) distprep
 	$(MAKE) -C $(distdir)/doc/src/sgml/ INSTALL
+	$(MAKE) -C $(distdir)/contrib/pg_arman/doc pg_arman.1 XMLTO=/usr/bin/xmlto ASCIIDOC=/usr/bin/asciidoc
 	cp $(distdir)/doc/src/sgml/INSTALL $(distdir)/
 	$(MAKE) -C $(distdir) distclean
 	rm -f $(distdir)/README.git
diff --git a/src/include/pg_config.h.win32 b/src/include/pg_config.h.win32
@@ -596,6 +596,9 @@
 /* A string containing the version number, platform, and C compiler */
 #define PG_VERSION_STR "Uninitialized version string (win32)"
 
+/* A string containing the PostgresPro  version number, platform, and C compiler */
+#define PGPRO_VERSION_STR "Uninitialized version string (win32)"
+
 /* The size of `long', as computed by sizeof. */
 #define SIZEOF_LONG 4
 
diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm
@@ -464,6 +464,7 @@ sub CopyContribFiles
 			next if ($d eq "hstore_plpython" && !defined($config->{python}));
 			next if ($d eq "ltree_plpython"  && !defined($config->{python}));
 			next if ($d eq "sepgsql");
+			next if ($d eq 'pg_arman');
 
 			CopySubdirFiles($subdir, $d, $config, $target);
 		}
diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
@@ -46,7 +46,8 @@ my $contrib_extrasource = {
 
 my @contrib_excludes = (
 	'commit_ts',      'hstore_plperl', 'hstore_plpython', 'intagg',
-	'ltree_plpython', 'pgcrypto',      'sepgsql',         'brin');
+	'ltree_plpython', 'pgcrypto',      'sepgsql',         'brin',
+	'pg_arman');
 
 # Set of variables for frontend modules
 my $frontend_defines = { 'initdb' => 'FRONTEND' };
diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
@@ -162,7 +162,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{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{#define PGPRO_VERSION_STR "[^"]+"}{#define PGPRO_VERSION_STR PGPRO_PACKAGE_STR " compiled by Visual C++ build" __STRINGIFY2(_MSC_VER) ", $bits-bit"};
 			print O;
 		}
 		print O "#define PG_MAJORVERSION \"$self->{majorver}\"\n";
diff --git a/src/tools/msvc/vcregress.pl b/src/tools/msvc/vcregress.pl
@@ -371,6 +371,7 @@ sub contribcheck
 		next if ($module eq "hstore_plpython" && !defined($config->{python}));
 		next if ($module eq "ltree_plpython"  && !defined($config->{python}));
 		next if ($module eq "sepgsql");
+		next if ($module eq "pg_arman");
 		# Need database with UTF8 encoding, not SQL_ASCII
 		next if ($module eq "hunspell_ru_ru");
 

Original file line number	Diff line number	Diff line change
`@@ -464,6 +464,7 @@ sub CopyContribFiles`
`464`	`464`	`next if ($d eq "hstore_plpython" && !defined($config->{python}));`
`465`	`465`	`next if ($d eq "ltree_plpython" && !defined($config->{python}));`
`466`	`466`	`next if ($d eq "sepgsql");`
	`467`	`+ next if ($d eq 'pg_arman');`
`467`	`468`
`468`	`469`	`CopySubdirFiles($subdir, $d, $config, $target);`
`469`	`470`	`}`
Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,8 @@ sub GenerateFiles`
`162`	`162`	`{`
`163`	`163`	`s{PG_VERSION "[^"]+"}{PG_VERSION "$self->{strver}$extraver"};`
`164`	`164`	`s{PG_VERSION_NUM \d+}{PG_VERSION_NUM $self->{numver}};`
`165`		`-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"};`
	`165`	`+ 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"};`
	`166`	`+ s{#define PGPRO_VERSION_STR "[^"]+"}{#define PGPRO_VERSION_STR PGPRO_PACKAGE_STR " compiled by Visual C++ build" __STRINGIFY2(_MSC_VER) ", $bits-bit"};`
`166`	`167`	`print O;`
`167`	`168`	`}`
`168`	`169`	`print O "#define PG_MAJORVERSION \"$self->{majorver}\"\n";`