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