Commit 8258975c authored by Richard Levitte's avatar Richard Levitte
Browse files

Configuration: Simplify generating list of generated files in build file templates 



Computing the value of the GENERATED variable in the build file
templates is somewhat overcomplicated, and because of possible
duplication errors, changes are potentially error prone.

Looking more closely at how this list is determined, it can be
observed that the exact list of files to check is consistently
available in all the values found in the %unified_info tables
'depends', 'sources' and 'shared_sources', and all that's needed is to
filter those values so only those present as keys in the 'generate'
table are left.

This computation is also common for all build files, so due to its
apparent complexity, we move it to common0.tmpl, with the result left
in a global variable (@generated), to be consumed by all build file
templates.

common0.tmpl is included among the files to process when creating
build files, but unlike common.tmpl, it comes first of all.

Reviewed-by: default avatarAndy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5930)
parent c12a2d27

Configurations/common0.tmpl

0 → 100644
+31 −0
Original line number Diff line number Diff line 
{- # -*- Mode: perl -*-



 # Commonly used list of generated files

 # The reason for the complexity is that the build.info files provide

 # GENERATE rules for *all* platforms without discrimination, while the

 # build files only want those for a particular build.  Therefore, we

 # need to extrapolate exactly what we need to generate.  The way to do

 # that is to extract all possible source files from diverse tables and

 # filter out all that are not generated

 my %generatables =

     map { $_ => 1 }

     ( # The sources of stuff may be generated

         ( map { @{$unified_info{sources}->{$_}} }

               keys %{$unified_info{sources}} ),

         $disabled{shared}

             ? ()

             : ( map { @{$unified_info{shared_sources}->{$_}} }

                 keys %{$unified_info{shared_sources}} ),

         # Things we explicitely depend on are usually generated

         ( map { $_ eq "" ? () : @{$unified_info{depends}->{$_}} }

               keys %{$unified_info{depends}} ));

 our @generated =

     sort ( ( grep { defined $unified_info{generate}->{$_} }

              sort keys %generatables ),

            # Scripts are assumed to be generated, so add thhem too

            ( grep { defined $unified_info{sources}->{$_} }

              @{$unified_info{scripts}} ) );



 # Avoid strange output

 "";

-}

Configurations/descrip.mms.tmpl

+3 −6
Original line number Diff line number Diff line
@@ -55,11 +55,6 @@ 
  our @install_shlibs =

      map { $unified_info{sharednames}->{$_} || () }

      grep(!/\.a$/, @{$unified_info{install}->{libraries}});

  our @generated = ( ( map { (my $x = $_) =~ s|\.[sS]$|\.asm|; $x }

                       grep { defined $unified_info{generate}->{$_} }

                       map { @{$unified_info{sources}->{$_}} }

                       grep { /\.o$/ } keys %{$unified_info{sources}} ),

                     ( grep { /\.(?:h|opt)$/ } keys %{$unified_info{generate}} ) );



  # This is a horrible hack, but is needed because recursive inclusion of files

  # in different directories does not work well with HP C.
@@ -136,7 +131,9 @@ DEPS={- our @deps = map { (my $x = $_) =~ s|\.o$|\$(DEP_EXT)|; $x; } 
        join(", ", map { "-\n\t".$_ } @deps); -}

{- output_on() if $disabled{makedepend}; "" -}

GENERATED_MANDATORY={- join(", ", map { "-\n\t".$_ } @{$unified_info{depends}->{""}} ) -}

GENERATED={- join(", ", map { "-\n\t".$_ } @generated) -}

GENERATED={- # common0.tmpl provides @generated

             join(", ", map { (my $x = $_) =~ s|\.[sS]$|.asm|; "-\n\t".$x }

                        @generated) -}



INSTALL_LIBS={- join(", ", map { "-\n\t".$_.".OLB" } @install_libs) -}

INSTALL_SHLIBS={- join(", ", map { "-\n\t".$_.".EXE" } @install_shlibs) -}

Configurations/unix-Makefile.tmpl

+3 −6
Original line number Diff line number Diff line
@@ -107,11 +107,8 @@ DEPS={- join(" ", map { (my $x = $_) =~ s|\.o$|$depext|; $x; } 
                  keys %{$unified_info{sources}}); -}

{- output_on() if $disabled{makedepend}; "" -}

GENERATED_MANDATORY={- join(" ", @{$unified_info{depends}->{""}}) -}

GENERATED={- join(" ",

                  ( grep { defined $unified_info{generate}->{$_} }

                    map { @{$unified_info{sources}->{$_}} }

                    grep { /\.(?:o|res)$/ } keys %{$unified_info{sources}} ),

                  ( grep { /\.(?:h|map|def)$/ } keys %{$unified_info{generate}} )) -}

GENERATED={- # common0.tmpl provides @generated

             join(" ", @generated ) -}



INSTALL_LIBS={- join(" ", map { lib($_) } @{$unified_info{install}->{libraries}}) -}

INSTALL_SHLIBS={- join(" ", map { shlib($_) } @{$unified_info{install}->{libraries}}) -}

Configurations/windows-makefile.tmpl

+3 −6
Original line number Diff line number Diff line
@@ -88,12 +88,9 @@ DEPS={- join(" ", map { (my $x = $_) =~ s|\.o$|$depext|; $x; } 
                  keys %{$unified_info{sources}}); -}

{- output_on() if $disabled{makedepend}; "" -}

GENERATED_MANDATORY={- join(" ", @{$unified_info{depends}->{""}} ) -}

GENERATED={- join(" ",

                  ( map { (my $x = $_) =~ s|\.[sS]$|\.asm|; $x }

                    grep { defined $unified_info{generate}->{$_} }

                    map { @{$unified_info{sources}->{$_}} }

                    grep { /\.o$/ } keys %{$unified_info{sources}} ),

                  ( grep { /\.(?:h|def)$/ } keys %{$unified_info{generate}} )) -}

GENERATED={- # common0.tmpl provides @generated

             join(" ", map { (my $x = $_) =~ s|\.[sS]$|.asm|; $x }

                       @generated) -}



INSTALL_LIBS={- join(" ", map { lib($_) } @{$unified_info{install}->{libraries}}) -}

INSTALL_SHLIBS={- join(" ", map { shlib($_) } @{$unified_info{install}->{libraries}}) -}

Configure

+3 −1
Original line number Diff line number Diff line
@@ -1630,7 +1630,9 @@ if ($builder eq "unified") { 
	die "*** Couldn't find any of:\n", join("\n", @build_file_templates), "\n";

    }

    $config{build_file_templates}

      = [ $build_file_template,

      = [ cleanfile($srcdir, catfile("Configurations", "common0.tmpl"),

                    $blddir),

          $build_file_template,

          cleanfile($srcdir, catfile("Configurations", "common.tmpl"),

                    $blddir) ];