diff options
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/msvc/Mkvcbuild.pm | 15 | ||||
| -rw-r--r-- | src/tools/msvc/Project.pm | 38 | ||||
| -rwxr-xr-x | src/tools/msvc/clean.bat | 6 |
3 files changed, 45 insertions, 14 deletions
diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm index e6fb3ecdecf..004942ca07a 100644 --- a/src/tools/msvc/Mkvcbuild.pm +++ b/src/tools/msvc/Mkvcbuild.pm @@ -106,6 +106,9 @@ sub mkvcbuild $postgres->AddFiles('src\port', @pgportfiles); $postgres->AddFiles('src\common', @pgcommonbkndfiles); $postgres->AddDir('src\timezone'); + # We need source files from src\timezone, but that directory's resource + # file pertains to "zic", not to the backend. + $postgres->RemoveFile('src\timezone\win32ver.rc'); $postgres->AddFiles('src\backend\parser', 'scan.l', 'gram.y'); $postgres->AddFiles('src\backend\bootstrap', 'bootscanner.l', 'bootparse.y'); @@ -126,10 +129,11 @@ sub mkvcbuild my $snowball = $solution->AddProject('dict_snowball', 'dll', '', 'src\backend\snowball'); + # This Makefile uses VPATH to find most source files in a subdirectory. $snowball->RelocateFiles( 'src\backend\snowball\libstemmer', sub { - return shift !~ /dict_snowball.c$/; + return shift !~ /(dict_snowball.c|win32ver.rc)$/; }); $snowball->AddIncludeDir('src\include\snowball'); $snowball->AddReference($postgres); @@ -341,6 +345,7 @@ sub mkvcbuild $pgregress_ecpg->AddIncludeDir('src\test\regress'); $pgregress_ecpg->AddDefine('HOST_TUPLE="i686-pc-win32vc"'); $pgregress_ecpg->AddDefine('FRONTEND'); + $pgregress_ecpg->AddDirResourceFile('src\interfaces\ecpg\test'); $pgregress_ecpg->AddReference($libpgcommon, $libpgport); my $isolation_tester = @@ -356,6 +361,7 @@ sub mkvcbuild $isolation_tester->AddDefine('HOST_TUPLE="i686-pc-win32vc"'); $isolation_tester->AddDefine('FRONTEND'); $isolation_tester->AddLibrary('ws2_32.lib'); + $isolation_tester->AddDirResourceFile('src\test\isolation'); $isolation_tester->AddReference($libpq, $libpgcommon, $libpgport); my $pgregress_isolation = @@ -366,6 +372,7 @@ sub mkvcbuild $pgregress_isolation->AddIncludeDir('src\test\regress'); $pgregress_isolation->AddDefine('HOST_TUPLE="i686-pc-win32vc"'); $pgregress_isolation->AddDefine('FRONTEND'); + $pgregress_isolation->AddDirResourceFile('src\test\isolation'); $pgregress_isolation->AddReference($libpgcommon, $libpgport); # src/bin @@ -448,6 +455,7 @@ sub mkvcbuild my $zic = $solution->AddProject('zic', 'exe', 'utils'); $zic->AddFiles('src\timezone', 'zic.c', 'ialloc.c', 'scheck.c', 'localtime.c'); + $zic->AddDirResourceFile('src\timezone'); $zic->AddReference($libpgcommon, $libpgport); if ($solution->{options}->{xml}) @@ -582,14 +590,14 @@ sub mkvcbuild $proj->AddIncludeDir('src\bin\pg_dump'); $proj->AddIncludeDir('src\bin\psql'); $proj->AddReference($libpq, $libpgcommon, $libpgport); - $proj->AddResourceFile('src\bin\scripts', 'PostgreSQL Utility', - 'win32'); + $proj->AddDirResourceFile('src\bin\scripts'); $proj->AddLibrary('ws2_32.lib'); } # Regression DLL and EXE my $regress = $solution->AddProject('regress', 'dll', 'misc'); $regress->AddFile('src\test\regress\regress.c'); + $regress->AddDirResourceFile('src\test\regress'); $regress->AddReference($postgres); my $pgregress = $solution->AddProject('pg_regress', 'exe', 'misc'); @@ -597,6 +605,7 @@ sub mkvcbuild $pgregress->AddFile('src\test\regress\pg_regress_main.c'); $pgregress->AddIncludeDir('src\port'); $pgregress->AddDefine('HOST_TUPLE="i686-pc-win32vc"'); + $pgregress->AddDirResourceFile('src\test\regress'); $pgregress->AddReference($libpgcommon, $libpgport); # fix up pg_xlogdump once it's been set up diff --git a/src/tools/msvc/Project.pm b/src/tools/msvc/Project.pm index f343b2b9b8c..b9b5a239d8a 100644 --- a/src/tools/msvc/Project.pm +++ b/src/tools/msvc/Project.pm @@ -183,15 +183,7 @@ sub UseDef sub AddDir { my ($self, $reldir) = @_; - my $MF; - - my $t = $/; - undef $/; - open($MF, "$reldir\\Makefile") - || open($MF, "$reldir\\GNUMakefile") - || croak "Could not open $reldir\\Makefile\n"; - my $mf = <$MF>; - close($MF); + my $mf = read_makefile($reldir); $mf =~ s{\\\r?\n}{}g; if ($mf =~ m{^(?:SUB)?DIRS[^=]*=\s*(.*)$}mg) @@ -292,7 +284,15 @@ sub AddDir $mf =~ s{$replace_re}{}m; } - # See if this Makefile contains a description, and should have a RC file + $self->AddDirResourceFile($reldir); +} + +# If the directory's Makefile bears a description string, add a resource file. +sub AddDirResourceFile +{ + my ($self, $reldir) = @_; + my $mf = read_makefile($reldir); + if ($mf =~ /^PGFILEDESC\s*=\s*\"([^\"]+)\"/m) { my $desc = $1; @@ -300,7 +300,6 @@ sub AddDir if ($mf =~ /^PGAPPICON\s*=\s*(.*)$/m) { $ico = $1; } $self->AddResourceFile($reldir, $desc, $ico); } - $/ = $t; } sub AddResourceFile @@ -409,4 +408,21 @@ sub read_file return $txt; } +sub read_makefile +{ + my $reldir = shift; + my $F; + my $t = $/; + + undef $/; + open($F, "$reldir\\GNUmakefile") + || open($F, "$reldir\\Makefile") + || croak "Could not open $reldir\\Makefile\n"; + my $txt = <$F>; + close($F); + $/ = $t; + + return $txt; +} + 1; diff --git a/src/tools/msvc/clean.bat b/src/tools/msvc/clean.bat index b76eea99eda..9c7ea4292bf 100755 --- a/src/tools/msvc/clean.bat +++ b/src/tools/msvc/clean.bat @@ -20,10 +20,16 @@ del /s /q src\bin\win32ver.rc 2> NUL del /s /q src\interfaces\win32ver.rc 2> NUL if exist src\backend\win32ver.rc del /q src\backend\win32ver.rc if exist src\backend\replication\libpqwalreceiver\win32ver.rc del /q src\backend\replication\libpqwalreceiver\win32ver.rc +if exist src\backend\snowball\win32ver.rc del /q src\backend\snowball\win32ver.rc +if exist src\interfaces\ecpg\test\win32ver.rc del /q src\interfaces\ecpg\test\win32ver.rc if exist src\pl\plperl\win32ver.rc del /q src\pl\plperl\win32ver.rc if exist src\pl\plpgsql\src\win32ver.rc del /q src\pl\plpgsql\src\win32ver.rc if exist src\pl\plpython\win32ver.rc del /q src\pl\plpython\win32ver.rc if exist src\pl\tcl\win32ver.rc del /q src\pl\tcl\win32ver.rc +if exist src\test\isolation\win32ver.rc del /q src\test\isolation\win32ver.rc +if exist src\test\regress\win32ver.rc del /q src\test\regress\win32ver.rc +if exist src\timezone\win32ver.rc del /q src\timezone\win32ver.rc + for /d %%f in (src\interfaces\ecpg\*) do if exist %%f\win32ver.rc del /q %%f\win32ver.rc for /d %%f in (contrib\*) do if exist %%f\win32ver.rc del /q %%f\win32ver.rc for /d %%f in (src\backend\utils\mb\conversion_procs\*) do if exist %%f\win32ver.rc del /q %%f\win32ver.rc |