mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-03-31 20:10:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

util/postprocess-makedepend.pl: make an effort to collect dependencies

Browse Source 
Instead of just working line by line, we collect all dependencies for
every target and print everything out at the end, with each target
getting a potentially long list of dependencies.

Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5591)
This commit is contained in:
Richard Levitte 2018-03-14 13:24:12 +01:00
parent 27c4490521
commit 23be743286
1 changed files with 38 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
util/postprocess-makedepend.pl
View File

@ -48,9 +48,10 @@ my $procedure = {
# Finally, discard all empty lines or comment lines
return undef if $line =~ /:\s*$/ || $line =~ /^(#.*|\s*)$/;
$line.="\n" unless $line =~ /\R$/g;
return $line;
my ($target, $deps) = $line =~ /^((?:\\.|[^:])*):(.*)/;
$deps =~ s/^\s+//;
$deps =~ s/\s+$//;
return ($target, $deps);
},
'VMS C' =>
sub {
@ -79,7 +80,10 @@ my $procedure = {
# .TLB.
return undef if /\.TLB\s*$/;
return $line;
my ($target, $deps) = $line =~ /^(.*)\s:\s(.*)/;
$deps =~ s/^\s+//;
$deps =~ s/\s+$//;
return ($target, $deps);
},
'VC' =>
sub {
@ -112,7 +116,7 @@ my $procedure = {
$tail = canonpath($tail);
if ($tail =~ m|^\Q$abs_srcdir\E|i
|| $tail =~ m|^\Q$abs_blddir\E|i) {
return "${object}: \"$tail\"\n";
return ($object, "\"$tail\"");
}
}
@ -122,8 +126,35 @@ my $procedure = {
die "Producer unrecognised: $producer\n" unless defined $procedure;
my %collect = ();
while (<STDIN>) {
if ($_ = $procedure->($_, @ARGV)) {
print or die "$!\n";
s|\R$||; # The better chomp
my ($target, $deps) = $procedure->($_, @ARGV);
$collect{$target}->{$deps} = 1
if defined $target;
}
my $continuation = {
'makedepend' => "\\",
'VMS C' => "-",
'VC' => "\\",
} -> {$producer};
die "Producer unrecognised: $producer\n" unless defined $continuation;
foreach my $target (sort keys %collect) {
my $prefix = $target . ' :';
my @deps = sort keys %{$collect{$target}};
while (@deps) {
my $buf = $prefix;
$prefix = '';
while (@deps && ($buf eq '' || length($buf) + length($deps[0]) <= 77)) {
$buf .= ' ' . shift @deps;
}
$buf .= ' '.$continuation if @deps;
print $buf,"\n";
}
}