Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 1933a5b

Browse files
committed
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.
1 parent 30a5ce8 commit 1933a5b

File tree

2 files changed

+3
-13
lines changed

2 files changed

+3
-13
lines changed

src/tools/msvc/Mkvcbuild.pm

+3-8
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ use Project;
1313
use Solution;
1414
use Cwd;
1515
use File::Copy;
16-
use File::Basename;
1716
use Config;
1817
use VSObjectFactory;
1918
use List::Util qw(first);
@@ -628,15 +627,11 @@ sub mkvcbuild
628627
(grep { $_->{name} eq 'pg_xlogdump' }
629628
@{ $solution->{projects}->{contrib} })[0];
630629
$pg_xlogdump->AddDefine('FRONTEND');
631-
foreach my $xf (glob('src/backend/access/rmgrdesc/*desc.c'))
630+
foreach my $xf (glob('src\\backend\\access\\rmgrdesc\\*desc.c'))
632631
{
633-
my $bf = basename $xf;
634-
copy($xf, "contrib/pg_xlogdump/$bf");
635-
$pg_xlogdump->AddFile("contrib\\pg_xlogdump\\$bf");
632+
$pg_xlogdump->AddFile($xf)
636633
}
637-
copy(
638-
'src/backend/access/transam/xlogreader.c',
639-
'contrib/pg_xlogdump/xlogreader.c');
634+
$pg_xlogdump->AddFile('src\backend\access\transam\xlogreader.c');
640635

641636
$solution->Save();
642637
return $solution->{vcver};

src/tools/msvc/clean.bat

-5
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,6 @@ REM Clean up datafiles built with contrib
9292
REM cd contrib
9393
REM for /r %%f in (*.sql) do if exist %%f.in del %%f
9494

95-
REM clean up files copied into contrib\pg_xlogdump
96-
if exist contrib\pg_xlogdump\xlogreader.c del /q contrib\pg_xlogdump\xlogreader.c
97-
for %%f in (contrib\pg_xlogdump\*desc.c) do if not %%f==contrib\pg_xlogdump\rmgrdesc.c del /q %%f
98-
99-
10095
cd %D%
10196

10297
REM Clean up ecpg regression test files

0 commit comments

Comments
 (0)