Create libpgcommon, and move pg_malloc et al to it

[postgresql] / src / tools / msvc / Mkvcbuild.pm

diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
index d587365437ce3e161718f766b971b8299c3add8f..75e7e4173f88ebd70585310d7d7f7bcd6c0cca58 100644 (file)
--- a/src/tools/msvc/Mkvcbuild.pm
+++ b/src/tools/msvc/Mkvcbuild.pm
@@ -24,6 +24,7 @@ our (@ISA, @EXPORT_OK);
 
 my $solution;
 my $libpgport;
+my $libpgcommon;
 my $postgres;
 my $libpq;
 
@@ -35,6 +36,11 @@ my @contrib_uselibpgport = (
        'pg_standby',    'pg_archivecleanup',
        'pg_test_fsync', 'pg_test_timing',
        'pg_upgrade',    'vacuumlo');
+my @contrib_uselibpgcommon = (
+       'oid2name',      'pgbench',
+       'pg_standby',    'pg_archivecleanup',
+       'pg_test_fsync', 'pg_test_timing',
+       'pg_upgrade',    'vacuumlo');
 my $contrib_extralibs = { 'pgbench' => ['wsock32.lib'] };
 my $contrib_extraincludes =
   { 'tsearch2' => ['contrib/tsearch2'], 'dblink' => ['src/backend'] };
@@ -63,10 +69,19 @@ sub mkvcbuild
          sprompt.c tar.c thread.c getopt.c getopt_long.c dirent.c rint.c win32env.c
          win32error.c win32setlocale.c);
 
+       our @pgcommonfiles = qw(
+               fe_memutils.c);
+
+       our @pgcommonbkndfiles = qw();
+
        $libpgport = $solution->AddProject('libpgport', 'lib', 'misc');
        $libpgport->AddDefine('FRONTEND');
        $libpgport->AddFiles('src\port', @pgportfiles);
 
+       $libpgcommon = $solution->AddProject('libpgcommon', 'lib', 'misc');
+       $libpgcommon->AddDefine('FRONTEND');
+       $libpgcommon->AddFiles('src\common', @pgcommonfiles);
+
        $postgres = $solution->AddProject('postgres', 'exe', '', 'src\backend');
        $postgres->AddIncludeDir('src\backend');
        $postgres->AddDir('src\backend\port\win32');
@@ -81,6 +96,7 @@ sub mkvcbuild
        $postgres->ReplaceFile('src\backend\port\pg_latch.c',
                'src\backend\port\win32_latch.c');
        $postgres->AddFiles('src\port', @pgportfiles);
+       $postgres->AddFiles('src\common', @pgcommonbkndfiles);
        $postgres->AddDir('src\timezone');
        $postgres->AddFiles('src\backend\parser', 'scan.l', 'gram.y');
        $postgres->AddFiles('src\backend\bootstrap', 'bootscanner.l',
@@ -297,7 +313,7 @@ sub mkvcbuild
        $ecpg->AddDefine('MINOR_VERSION=9');
        $ecpg->AddDefine('PATCHLEVEL=0');
        $ecpg->AddDefine('ECPG_COMPILE');
-       $ecpg->AddReference($libpgport);
+       $ecpg->AddReference($libpgport, $libpgcommon);
 
        my $pgregress_ecpg =
          $solution->AddProject('pg_regress_ecpg', 'exe', 'misc');
@@ -307,7 +323,7 @@ sub mkvcbuild
        $pgregress_ecpg->AddIncludeDir('src\test\regress');
        $pgregress_ecpg->AddDefine('HOST_TUPLE="i686-pc-win32vc"');
        $pgregress_ecpg->AddDefine('FRONTEND');
-       $pgregress_ecpg->AddReference($libpgport);
+       $pgregress_ecpg->AddReference($libpgport, $libpgcommon);
 
        my $isolation_tester =
          $solution->AddProject('isolationtester', 'exe', 'misc');
@@ -332,7 +348,7 @@ sub mkvcbuild
        $pgregress_isolation->AddIncludeDir('src\test\regress');
        $pgregress_isolation->AddDefine('HOST_TUPLE="i686-pc-win32vc"');
        $pgregress_isolation->AddDefine('FRONTEND');
-       $pgregress_isolation->AddReference($libpgport);
+       $pgregress_isolation->AddReference($libpgport, $libpgcommon);
 
        # src/bin
        my $initdb = AddSimpleFrontend('initdb');
@@ -393,7 +409,6 @@ sub mkvcbuild
        $pgdumpall->AddIncludeDir('src\backend');
        $pgdumpall->AddFile('src\bin\pg_dump\pg_dumpall.c');
        $pgdumpall->AddFile('src\bin\pg_dump\dumputils.c');
-       $pgdumpall->AddFile('src\bin\pg_dump\dumpmem.c');
        $pgdumpall->AddFile('src\bin\pg_dump\keywords.c');
        $pgdumpall->AddFile('src\backend\parser\kwlookup.c');
 
@@ -407,7 +422,7 @@ sub mkvcbuild
        my $zic = $solution->AddProject('zic', 'exe', 'utils');
        $zic->AddFiles('src\timezone', 'zic.c', 'ialloc.c', 'scheck.c',
                'localtime.c');
-       $zic->AddReference($libpgport);
+       $zic->AddReference($libpgport, $libpgcommon);
 
        if ($solution->{options}->{xml})
        {
@@ -547,7 +562,7 @@ sub mkvcbuild
                $proj->AddIncludeDir('src\interfaces\libpq');
                $proj->AddIncludeDir('src\bin\pg_dump');
                $proj->AddIncludeDir('src\bin\psql');
-               $proj->AddReference($libpq, $libpgport);
+               $proj->AddReference($libpq, $libpgport, $libpgcommon);
                $proj->AddResourceFile('src\bin\scripts', 'PostgreSQL Utility');
        }
 
@@ -561,7 +576,7 @@ sub mkvcbuild
        $pgregress->AddFile('src\test\regress\pg_regress_main.c');
        $pgregress->AddIncludeDir('src\port');
        $pgregress->AddDefine('HOST_TUPLE="i686-pc-win32vc"');
-       $pgregress->AddReference($libpgport);
+       $pgregress->AddReference($libpgport, $libpgcommon);
 
        $solution->Save();
        return $solution->{vcver};
@@ -579,7 +594,7 @@ sub AddSimpleFrontend
 
        my $p = $solution->AddProject($n, 'exe', 'bin');
        $p->AddDir('src\bin\\' . $n);
-       $p->AddReference($libpgport);
+       $p->AddReference($libpgport, $libpgcommon);
        if ($uselibpq)
        {
                $p->AddIncludeDir('src\interfaces\libpq');
@@ -730,6 +745,10 @@ sub AdjustContribProj
        {
                $proj->AddReference($libpgport);
        }
+       if (grep { /^$n$/ } @contrib_uselibpgcommon)
+       {
+               $proj->AddReference($libpgcommon);
+       }
        if ($contrib_extralibs->{$n})
        {
                foreach my $l (@{ $contrib_extralibs->{$n} })