index 8002f2348775d4456c97e59b93a8cf68769e930b..71450f47739c405106686d54f974a0b0c57b8d50 100644 (file)
push @contrib_excludes, 'uuid-ossp';
}
- # Pgcrypto makefile too complex to parse....
- my $pgcrypto = $solution->AddProject('pgcrypto', 'dll', 'crypto');
+ # AddProject() does not recognize the constructs used to populate OBJS in
+ # the pgcrypto Makefile, so it will discover no files.
+ my $pgcrypto =
+ $solution->AddProject('pgcrypto', 'dll', 'crypto', 'contrib\\pgcrypto');
$pgcrypto->AddFiles(
'contrib\pgcrypto', 'pgcrypto.c',
'px.c', 'px-hmac.c',
|| die 'Could not match in conversion makefile' . "\n";
foreach my $sub (split /\s+/, 1ドル)
{
- my $mf = Project::read_file(
- 'src\backend\utils\mb\conversion_procs\\' . $sub . '\Makefile');
- my $p = $solution->AddProject($sub, 'dll', 'conversion procs');
- $p->AddFile('src\backend\utils\mb\conversion_procs\\'
- . $sub . '\\'
- . $sub
- . '.c');
- if ($mf =~ m{^SRCS\s*\+=\s*(.*)$}m)
- {
- $p->AddFile(
- 'src\backend\utils\mb\conversion_procs\\' . $sub . '\\' . 1ドル);
- }
+ my $dir = 'src\backend\utils\mb\conversion_procs\\' . $sub;
+ my $p = $solution->AddProject($sub, 'dll', 'conversion procs', $dir);
+ $p->AddFile("$dir\\$sub.c"); # implicit source file
$p->AddReference($postgres);
}
if ($mf =~ /^MODULE_big\s*=\s*(.*)$/mg)
{
my $dn = 1ドル;
- $mf =~ s{\\\s*[\r\n]+}{}mg;
- my $proj = $solution->AddProject($dn, 'dll', 'contrib');
- $mf =~ /^OBJS\s*=\s*(.*)$/gm
- || croak "Could not find objects in MODULE_big for $n\n";
- my $objs = 1ドル;
- while ($objs =~ /\b([\w-]+\.o)\b/g)
- {
- my $o = 1ドル;
- $o =~ s/\.o$/.c/;
- $proj->AddFile('contrib\\' . $n . '\\' . $o);
- }
+ my $proj =
+ $solution->AddProject($dn, 'dll', 'contrib', 'contrib\\' . $n);
$proj->AddReference($postgres);
- if ($mf =~ /^SUBDIRS\s*:?=\s*(.*)$/mg)
- {
- foreach my $d (split /\s+/, 1ドル)
- {
- my $mf2 = Project::read_file(
- 'contrib\\' . $n . '\\' . $d . '\Makefile');
- $mf2 =~ s{\\\s*[\r\n]+}{}mg;
- $mf2 =~ /^SUBOBJS\s*=\s*(.*)$/gm
- || croak
- "Could not find objects in MODULE_big for $n, subdir $d\n";
- $objs = 1ドル;
- while ($objs =~ /\b([\w-]+\.o)\b/g)
- {
- my $o = 1ドル;
- $o =~ s/\.o$/.c/;
- $proj->AddFile('contrib\\' . $n . '\\' . $d . '\\' . $o);
- }
- }
- }
AdjustContribProj($proj);
}
elsif ($mf =~ /^MODULES\s*=\s*(.*)$/mg)
{
foreach my $mod (split /\s+/, 1ドル)
{
- my $proj = $solution->AddProject($mod, 'dll', 'contrib');
+ my $proj =
+ $solution->AddProject($mod, 'dll', 'contrib', 'contrib\\' . $n);
$proj->AddFile('contrib\\' . $n . '\\' . $mod . '.c');
$proj->AddReference($postgres);
AdjustContribProj($proj);
}
elsif ($mf =~ /^PROGRAM\s*=\s*(.*)$/mg)
{
- my $proj = $solution->AddProject(1,ドル 'exe', 'contrib');
- $mf =~ s{\\\s*[\r\n]+}{}mg;
- $mf =~ /^OBJS\s*=\s*(.*)$/gm
- || croak "Could not find objects in PROGRAM for $n\n";
- my $objs = 1ドル;
- while ($objs =~ /\b([\w-]+\.o)\b/g)
- {
- my $o = 1ドル;
- $o =~ s/\.o$/.c/;
- $proj->AddFile('contrib\\' . $n . '\\' . $o);
- }
+ my $proj =
+ $solution->AddProject(1,ドル 'exe', 'contrib', 'contrib\\' . $n);
AdjustContribProj($proj);
}
else
{
my $n = shift;
my $mf = shift;
+ $mf =~ s{\\\s*[\r\n]+}{}mg;
if ($mf =~ /^DATA_built\s*=\s*(.*)$/mg)
{
my $l = 1ドル;