diff options
| author | Heikki Linnakangas <heikki.linnakangas@iki.fi> | 2015-03-21 11:53:47 +0200 |
|---|---|---|
| committer | Heikki Linnakangas <heikki.linnakangas@iki.fi> | 2015-03-21 11:56:48 +0200 |
| commit | 1933a5bbc883fd2697c42d82ae12f2d585559b23 (patch) | |
| tree | 21a5828fff1891b85e2f157e4dd95eb699920674 /src | |
| parent | 30a5ce8f5da15174f85619963ca0a07e6343f821 (diff) | |
| download | postgresql-1933a5bbc883fd2697c42d82ae12f2d585559b23.tar.gz postgresql-1933a5bbc883fd2697c42d82ae12f2d585559b23.zip | |
Make pg_xlogdump MSVC build work more like others.
Instead of copying xlogreader.c and *desc.c files into the source directory,
build them where they are. That's what we do for other binaries that need to
compile and link in files from elsewhere in the source tree.
The commit history suggests that it was done this way because of issues with
older versions of MSVC. I think this should work, but we'll see if the
buildfarm complains.
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/msvc/Mkvcbuild.pm | 11 | ||||
| -rwxr-xr-x | src/tools/msvc/clean.bat | 5 |
2 files changed, 3 insertions, 13 deletions
diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm index 989a2ec9487..473a3106247 100644 --- a/src/tools/msvc/Mkvcbuild.pm +++ b/src/tools/msvc/Mkvcbuild.pm @@ -13,7 +13,6 @@ use Project; use Solution; use Cwd; use File::Copy; -use File::Basename; use Config; use VSObjectFactory; use List::Util qw(first); @@ -628,15 +627,11 @@ sub mkvcbuild (grep { $_->{name} eq 'pg_xlogdump' } @{ $solution->{projects}->{contrib} })[0]; $pg_xlogdump->AddDefine('FRONTEND'); - foreach my $xf (glob('src/backend/access/rmgrdesc/*desc.c')) + 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"); + $pg_xlogdump->AddFile($xf) } - copy( - 'src/backend/access/transam/xlogreader.c', - 'contrib/pg_xlogdump/xlogreader.c'); + $pg_xlogdump->AddFile('src\backend\access\transam\xlogreader.c'); $solution->Save(); return $solution->{vcver}; diff --git a/src/tools/msvc/clean.bat b/src/tools/msvc/clean.bat index 9c7ea4292bf..fbe3cc6744a 100755 --- a/src/tools/msvc/clean.bat +++ b/src/tools/msvc/clean.bat @@ -92,11 +92,6 @@ REM Clean up datafiles built with contrib 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 - - cd %D% REM Clean up ecpg regression test files |