database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-05 07:21:24 +03:00
Code Activity

Finish adding file version information to installed Windows binaries.

Browse Source 
In support of this, have the MSVC build follow GNU make in preferring
GNUmakefile over Makefile when a directory contains both.

Michael Paquier, reviewed by MauMau.
This commit is contained in:
Noah Misch
2014-08-18 22:59:53 -04:00
parent fb2aece8ae
commit ee9569e4df
8 changed files with 66 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/tools/msvc/Project.pm
View File

@ -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;