From a92aef5432edda3f00d7d334a51c90de3a7f79a7 Mon Sep 17 00:00:00 2001 From: Michael Paquier Date: Mon, 15 Dec 2014 22:16:36 -0800 Subject: [PATCH] Add MSVC support for new modules in src/bin --- src/bin/pg_upgrade/.gitignore | 6 +++-- src/tools/msvc/Mkvcbuild.pm | 61 +++++++++++++++++++++---------------------- src/tools/msvc/clean.bat | 4 +-- src/tools/msvc/vcregress.pl | 6 ++--- 4 files changed, 39 insertions(+), 38 deletions(-) diff --git a/src/bin/pg_upgrade/.gitignore b/src/bin/pg_upgrade/.gitignore index 9555f54..d24ec60 100644 --- a/src/bin/pg_upgrade/.gitignore +++ b/src/bin/pg_upgrade/.gitignore @@ -1,6 +1,8 @@ /pg_upgrade # Generated by test suite -analyze_new_cluster.sh -delete_old_cluster.sh +/analyze_new_cluster.sh +/delete_old_cluster.sh +/analyze_new_cluster.bat +/delete_old_cluster.bat /log/ /tmp_check/ diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm index 004942c..083c6d2 100644 --- a/src/tools/msvc/Mkvcbuild.pm +++ b/src/tools/msvc/Mkvcbuild.pm @@ -30,21 +30,10 @@ my $postgres; my $libpq; my $contrib_defines = { 'refint' => 'REFINT_VERBOSE' }; -my @contrib_uselibpq = - ('dblink', 'oid2name', 'pgbench', 'pg_upgrade', 'postgres_fdw', 'vacuumlo'); -my @contrib_uselibpgport = ( - 'oid2name', 'pgbench', - 'pg_standby', 'pg_archivecleanup', - 'pg_test_fsync', 'pg_test_timing', - 'pg_upgrade', 'pg_xlogdump', - 'vacuumlo'); -my @contrib_uselibpgcommon = ( - 'oid2name', 'pgbench', - 'pg_standby', 'pg_archivecleanup', - 'pg_test_fsync', 'pg_test_timing', - 'pg_upgrade', 'pg_xlogdump', - 'vacuumlo'); -my $contrib_extralibs = { 'pgbench' => ['ws2_32.lib'] }; +my @contrib_uselibpq = ('dblink', 'oid2name', 'postgres_fdw', 'vacuumlo'); +my @contrib_uselibpgport = ('oid2name', 'vacuumlo'); +my @contrib_uselibpgcommon = ('oid2name', 'vacuumlo'); +my $contrib_extralibs; my $contrib_extraincludes = { 'tsearch2' => ['contrib/tsearch2'], 'dblink' => ['src/backend'] }; my $contrib_extrasource = { @@ -444,6 +433,8 @@ sub mkvcbuild $pgdumpall->AddFile('src\backend\parser\kwlookup.c'); $pgdumpall->AddLibrary('ws2_32.lib'); + my $pgarchivecleanup = AddSimpleFrontend('pg_archivecleanup'); + my $pgrestore = AddSimpleFrontend('pg_dump', 1); $pgrestore->{name} = 'pg_restore'; $pgrestore->AddIncludeDir('src\backend'); @@ -452,6 +443,30 @@ sub mkvcbuild $pgrestore->AddFile('src\backend\parser\kwlookup.c'); $pgrestore->AddLibrary('ws2_32.lib'); + my $pgstandby = AddSimpleFrontend('pg_standby'); + + my $pgtestfsync = AddSimpleFrontend('pg_test_fsync'); + + my $pgtesttiming = AddSimpleFrontend('pg_test_timing'); + + my $pgbench = AddSimpleFrontend('pgbench', 1); + $pgbench->AddLibrary('ws2_32.lib'); + + my $pgupgrade = AddSimpleFrontend('pg_upgrade', 1); + + # Get necessary files for pg_xlogdump as files symlinked + # on Linux are copied on Windows. + my $pgxlogdump = AddSimpleFrontend('pg_xlogdump'); + $pgxlogdump->AddDefine('FRONTEND'); + foreach my $xf (glob('src/backend/access/rmgrdesc/*desc.c')) + { + my $bf = basename $xf; + copy($xf, "src/bin/pg_xlogdump/$bf"); + $pgxlogdump->AddFile("src\\bin\\pg_xlogdump\\$bf"); + } + copy('src/backend/access/transam/xlogreader.c', + 'src/bin/pg_xlogdump/xlogreader.c'); + my $zic = $solution->AddProject('zic', 'exe', 'utils'); $zic->AddFiles('src\timezone', 'zic.c', 'ialloc.c', 'scheck.c', 'localtime.c'); @@ -608,22 +623,6 @@ sub mkvcbuild $pgregress->AddDirResourceFile('src\test\regress'); $pgregress->AddReference($libpgcommon, $libpgport); - # fix up pg_xlogdump once it's been set up - # files symlinked on Unix are copied on windows - my $pg_xlogdump = - (grep { $_->{name} eq 'pg_xlogdump' } - @{ $solution->{projects}->{contrib} })[0]; - $pg_xlogdump->AddDefine('FRONTEND'); - foreach my $xf (glob('src/backend/access/rmgrdesc/*desc.c')) - { - my $bf = basename $xf; - copy($xf, "contrib/pg_xlogdump/$bf"); - $pg_xlogdump->AddFile("contrib\\pg_xlogdump\\$bf"); - } - copy( - 'src/backend/access/transam/xlogreader.c', - 'contrib/pg_xlogdump/xlogreader.c'); - $solution->Save(); return $solution->{vcver}; } diff --git a/src/tools/msvc/clean.bat b/src/tools/msvc/clean.bat index 9c7ea42..c48fb25 100755 --- a/src/tools/msvc/clean.bat +++ b/src/tools/msvc/clean.bat @@ -93,8 +93,8 @@ REM cd contrib REM for /r %%f in (*.sql) do if exist %%f.in del %%f REM clean up files copied into contrib\pg_xlogdump -if exist contrib\pg_xlogdump\xlogreader.c del /q contrib\pg_xlogdump\xlogreader.c -for %%f in (contrib\pg_xlogdump\*desc.c) do if not %%f==contrib\pg_xlogdump\rmgrdesc.c del /q %%f +if exist src\bin\pg_xlogdump\xlogreader.c del /q src\bin\pg_xlogdump\xlogreader.c +for %%f in (src\bin\pg_xlogdump\*desc.c) do if not %%f==src\bin\pg_xlogdump\rmgrdesc.c del /q %%f cd %D% diff --git a/src/tools/msvc/vcregress.pl b/src/tools/msvc/vcregress.pl index b84f70d..bd12362 100644 --- a/src/tools/msvc/vcregress.pl +++ b/src/tools/msvc/vcregress.pl @@ -259,7 +259,7 @@ sub upgradecheck # what pg_upgrade's "make check" does. $ENV{PGPORT} ||= 50432; - my $tmp_root = "$topdir/contrib/pg_upgrade/tmp_check"; + my $tmp_root = "$topdir/src/bin/pg_upgrade/tmp_check"; (mkdir $tmp_root || die $!) unless -d $tmp_root; my $tmp_install = "$tmp_root/install"; print "Setting up temp install\n\n"; @@ -272,7 +272,7 @@ sub upgradecheck $ENV{PATH} = "$bindir;$ENV{PATH}"; my $data = "$tmp_root/data"; $ENV{PGDATA} = "$data.old"; - my $logdir = "$topdir/contrib/pg_upgrade/log"; + my $logdir = "$topdir/src/bin/pg_upgrade/log"; (mkdir $logdir || die $!) unless -d $logdir; print "\nRunning initdb on old cluster\n\n"; system("initdb") == 0 or exit 1; @@ -282,7 +282,7 @@ sub upgradecheck installcheck(); # now we can chdir into the source dir - chdir "$topdir/contrib/pg_upgrade"; + chdir "$topdir/src/bin/pg_upgrade"; print "\nDumping old cluster\n\n"; system("pg_dumpall -f $tmp_root/dump1.sql") == 0 or exit 1; print "\nStopping old cluster\n\n"; -- 1.9.2.msysgit.0