summaryrefslogtreecommitdiff
path: root/src/tools/msvc
diff options
context:
space:
mode:
authorPeter Eisentraut <peter_e@gmx.net>2015-03-10 22:33:23 -0400
committerPeter Eisentraut <peter_e@gmx.net>2015-04-11 23:29:18 -0400
commit83aca89f7c3f913d960e2ea2d4d93b7d8e7a691d (patch)
treeed5acc5bd8a2a1e3f00e2da4026fb91b959f3d6d /src/tools/msvc
parent27846f02c176eebe7e08ce51ed4d52140454e196 (diff)
downloadpostgresql-83aca89f7c3f913d960e2ea2d4d93b7d8e7a691d.tar.gz
Move pg_archivecleanup from contrib/ to src/bin/
Reviewed-by: Michael Paquier <michael.paquier@gmail.com>
Diffstat (limited to 'src/tools/msvc')
-rw-r--r--src/tools/msvc/Mkvcbuild.pm11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
index a647cc719c..ef08334973 100644
--- a/src/tools/msvc/Mkvcbuild.pm
+++ b/src/tools/msvc/Mkvcbuild.pm
@@ -34,13 +34,13 @@ my @contrib_uselibpq =
('dblink', 'oid2name', 'pgbench', 'pg_upgrade', 'postgres_fdw', 'vacuumlo');
my @contrib_uselibpgport = (
'oid2name', 'pgbench',
- 'pg_standby', 'pg_archivecleanup',
+ 'pg_standby',
'pg_test_fsync', 'pg_test_timing',
'pg_upgrade', 'pg_xlogdump',
'vacuumlo');
my @contrib_uselibpgcommon = (
'oid2name', 'pgbench',
- 'pg_standby', 'pg_archivecleanup',
+ 'pg_standby',
'pg_test_fsync', 'pg_test_timing',
'pg_upgrade', 'pg_xlogdump',
'vacuumlo');
@@ -57,6 +57,8 @@ my @contrib_excludes = ('pgcrypto', 'intagg', 'sepgsql');
# Set of variables for frontend modules
my $frontend_defines = { 'initdb' => 'FRONTEND' };
my @frontend_uselibpq = ('pg_ctl', 'psql');
+my @frontend_uselibpgport = ( 'pg_archivecleanup' );
+my @frontend_uselibpgcommon = ( 'pg_archivecleanup' );
my $frontend_extralibs = {
'initdb' => ['ws2_32.lib'],
'pg_restore' => ['ws2_32.lib'],
@@ -769,8 +771,9 @@ sub AdjustContribProj
sub AdjustFrontendProj
{
my $proj = shift;
- AdjustModule($proj, $frontend_defines, \@frontend_uselibpq, undef,
- undef, $frontend_extralibs,
+ AdjustModule($proj, $frontend_defines, \@frontend_uselibpq,
+ \@frontend_uselibpgport, \@frontend_uselibpgcommon,
+ $frontend_extralibs,
$frontend_extrasource, $frontend_extraincludes);
}