diff options
| author | Pauli <pauli@openssl.org> | 2021-05-21 15:16:39 +1000 |
|---|---|---|
| committer | Pauli <pauli@openssl.org> | 2021-05-22 15:33:53 +1000 |
| commit | d594d2e121d85aa0d57fa7d833a2cb6a8ae9a515 (patch) | |
| tree | 38dcf0fc7ebc609ef8fc5574f16e79809f035004 /Configure | |
| parent | f90040f80512cb5905214f1a420e8aab31deb706 (diff) | |
| download | openssl-new-d594d2e121d85aa0d57fa7d833a2cb6a8ae9a515.tar.gz | |
configure: build list of image files
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15399)
Diffstat (limited to 'Configure')
| -rwxr-xr-x | Configure | 19 |
1 files changed, 17 insertions, 2 deletions
@@ -1956,6 +1956,7 @@ if ($builder eq "unified") { my %defines = (); my %depends = (); my %generate = (); + my %imagedocs = (); my %htmldocs = (); my %mandocs = (); @@ -2169,6 +2170,11 @@ if ($builder eq "unified") { \$attributes{scripts}, $+{ATTRIBS}, tokenize($expand_variables->($+{VALUE}))) if !@skip || $skip[$#skip] > 0; }, + qr/^\s* IMAGEDOCS ${index_re} = ${value_re} $/x + => sub { $push_to->(\%imagedocs, $expand_variables->($+{INDEX}), + undef, undef, + tokenize($expand_variables->($+{VALUE}))) + if !@skip || $skip[$#skip] > 0; }, qr/^\s* HTMLDOCS ${index_re} = ${value_re} $/x => sub { $push_to->(\%htmldocs, $expand_variables->($+{INDEX}), undef, undef, @@ -2463,6 +2469,13 @@ EOF } } + foreach my $section (keys %imagedocs) { + foreach (@{$imagedocs{$section}}) { + my $imagedocs = cleanfile($buildd, $_, $blddir); + $unified_info{imagedocs}->{$section}->{$imagedocs} = 1; + } + } + foreach my $section (keys %htmldocs) { foreach (@{$htmldocs{$section}}) { my $htmldocs = cleanfile($buildd, $_, $blddir); @@ -2704,7 +2717,7 @@ EOF } # Two level structures foreach my $l1 (("sources", "shared_sources", "ldadd", "depends", - "htmldocs", "mandocs")) { + "imagedocs", "htmldocs", "mandocs")) { foreach my $l2 (sort keys %{$unified_info{$l1}}) { my @items = sort @@ -2751,7 +2764,9 @@ EOF "dso" => [ @{$unified_info{modules}} ], "bin" => [ @{$unified_info{programs}} ], "script" => [ @{$unified_info{scripts}} ], - "docs" => [ (map { @{$unified_info{htmldocs}->{$_} // []} } + "docs" => [ (map { @{$unified_info{imagedocs}->{$_} // []} } + keys %{$unified_info{imagedocs} // {}}), + (map { @{$unified_info{htmldocs}->{$_} // []} } keys %{$unified_info{htmldocs} // {}}), (map { @{$unified_info{mandocs}->{$_} // []} } keys %{$unified_info{mandocs} // {}}) ] ); |