diff options
author | Richard Levitte <levitte@openssl.org> | 2018-11-07 11:02:06 +0100 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2019-01-22 12:35:39 +0100 |
commit | ac6bba6f6ea328ba22425d6f3f95847452193293 (patch) | |
tree | 0c5492016a3bf05da02596c735a82730828e0bc4 /Configurations | |
parent | c91f24d4cca5862f11876457e0ffb6dd54814814 (diff) | |
download | openssl-ac6bba6f6ea328ba22425d6f3f95847452193293.zip openssl-ac6bba6f6ea328ba22425d6f3f95847452193293.tar.gz openssl-ac6bba6f6ea328ba22425d6f3f95847452193293.tar.bz2 |
Build: Change all _NO_INST to use attributes instead.
This means that all PROGRAMS_NO_INST, LIBS_NO_INST, ENGINES_NO_INST
and SCRIPTS_NO_INST are changed to be PROGRAM, LIBS, ENGINES and
SCRIPTS with the associated attribute 'noinst'.
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7581)
Diffstat (limited to 'Configurations')
-rw-r--r-- | Configurations/descrip.mms.tmpl | 18 | ||||
-rw-r--r-- | Configurations/unix-Makefile.tmpl | 35 | ||||
-rw-r--r-- | Configurations/windows-makefile.tmpl | 47 |
3 files changed, 78 insertions, 22 deletions
diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl index ebafcc7..f87de15 100644 --- a/Configurations/descrip.mms.tmpl +++ b/Configurations/descrip.mms.tmpl @@ -48,10 +48,18 @@ @{$unified_info{libraries}}; our @install_libs = map { platform->staticname($_) } - @{$unified_info{install}->{libraries}}; + grep { !$unified_info{attributes}->{$_}->{noinst} } + @{$unified_info{libraries}}; our @install_shlibs = map { platform->sharedname($_) // () } - @{$unified_info{install}->{libraries}}; + grep { !$unified_info{attributes}->{$_}->{noinst} } + @{$unified_info{libraries}}; + our @install_engines = + grep { !$unified_info{attributes}->{$_}->{noinst} } + @{$unified_info{engines}}; + our @install_programs = + grep { !$unified_info{attributes}->{$_}->{noinst} } + @{$unified_info{programs}}; # This is a horrible hack, but is needed because recursive inclusion of files # in different directories does not work well with HP C. @@ -124,8 +132,8 @@ GENERATED={- # common0.tmpl provides @generated INSTALL_LIBS={- join(", ", map { "-\n\t".$_.".OLB" } @install_libs) -} INSTALL_SHLIBS={- join(", ", map { "-\n\t".$_.".EXE" } @install_shlibs) -} -INSTALL_ENGINES={- join(", ", map { "-\n\t".$_.".EXE" } @{$unified_info{install}->{engines}}) -} -INSTALL_PROGRAMS={- join(", ", map { "-\n\t".$_.".EXE" } @{$unified_info{install}->{programs}}) -} +INSTALL_ENGINES={- join(", ", map { "-\n\t".$_.".EXE" } @install_engines) -} +INSTALL_PROGRAMS={- join(", ", map { "-\n\t".$_.".EXE" } @install_programs) -} {- output_off() if $disabled{apps}; "" -} BIN_SCRIPTS=[.tools]c_rehash.pl MISC_SCRIPTS=[.apps]CA.pl, [.apps]tsget.pl @@ -552,7 +560,7 @@ install_engines : check_INSTALLTOP install_runtime_libs build_engines - CREATE/DIR ossl_installroot:[ENGINES{- $sover_dirname.$target{pointer_size} -}.'arch'] {- join("\n ", map { "COPY/PROT=W:RE $_.EXE ossl_installroot:[ENGINES$sover_dirname$target{pointer_size}.'arch']" } - @{$unified_info{install}->{engines}}) -} + @install_engines) -} @ {- output_on() unless scalar @{$unified_info{engines}}; "" -} ! install_runtime : install_programs diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index 4c76b8d..e197e1a 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -52,14 +52,33 @@ GENERATED_MANDATORY={- join(" ", @{$unified_info{depends}->{""}}) -} GENERATED={- # common0.tmpl provides @generated join(" ", map { platform->convertext($_) } @generated ) -} -INSTALL_LIBS={- join(" ", map { platform->staticlib($_) // () } @{$unified_info{install}->{libraries}}) -} -INSTALL_SHLIBS={- join(" ", map { platform->sharedlib($_) // () } @{$unified_info{install}->{libraries}}) -} -INSTALL_SHLIB_INFO={- join(" ", map { my $x = platform->sharedlib($_); - my $y = platform->sharedlib_simple($_); - $x ? "\"$x;$y\"" : () } - @{$unified_info{install}->{libraries}}) -} -INSTALL_ENGINES={- join(" ", map { platform->dso($_) } @{$unified_info{install}->{engines}}) -} -INSTALL_PROGRAMS={- join(" ", map { platform->bin($_) } @{$unified_info{install}->{programs}}) -} +INSTALL_LIBS={- + join(" ", map { platform->staticlib($_) // () } + grep { !$unified_info{attributes}->{$_}->{noinst} } + @{$unified_info{libraries}}) +-} +INSTALL_SHLIBS={- + join(" ", map { platform->sharedlib($_) // () } + grep { !$unified_info{attributes}->{$_}->{noinst} } + @{$unified_info{libraries}}) +-} +INSTALL_SHLIB_INFO={- + join(" ", map { my $x = platform->sharedlib($_); + my $y = platform->sharedlib_simple($_); + $x ? "\"$x;$y\"" : () } + grep { !$unified_info{attributes}->{$_}->{noinst} } + @{$unified_info{libraries}}) +-} +INSTALL_ENGINES={- + join(" ", map { platform->dso($_) } + grep { !$unified_info{attributes}->{$_}->{noinst} } + @{$unified_info{engines}}) +-} +INSTALL_PROGRAMS={- + join(" ", map { platform->bin($_) } + grep { !$unified_info{attributes}->{$_}->{noinst} } + @{$unified_info{programs}}) +-} {- output_off() if $disabled{apps}; "" -} BIN_SCRIPTS=$(BLDDIR)/tools/c_rehash MISC_SCRIPTS=$(BLDDIR)/apps/CA.pl $(BLDDIR)/apps/tsget.pl:tsget diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index 97e59c3..e114d6b 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -59,15 +59,44 @@ GENERATED_MANDATORY={- join(" ", @{$unified_info{depends}->{""}} ) -} GENERATED={- # common0.tmpl provides @generated join(" ", map { platform->convertext($_) } @generated) -} -INSTALL_LIBS={- join(" ", map { quotify1(platform->sharedlib_import($_) // platform->staticlib($_)) } @{$unified_info{install}->{libraries}}) -} -INSTALL_SHLIBS={- join(" ", map { my $x = platform->sharedlib($_); - $x ? quotify_l($x) : () } @{$unified_info{install}->{libraries}}) -} -INSTALL_SHLIBPDBS={- join(" ", map { my $x = platform->sharedlibpdb($_); - $x ? quotify_l($x) : () } @{$unified_info{install}->{libraries}}) -} -INSTALL_ENGINES={- join(" ", map { quotify1(platform->dso($_)) } @{$unified_info{install}->{engines}}) -} -INSTALL_ENGINEPDBS={- join(" ", map { quotify1(platform->dsopdb($_)) } @{$unified_info{install}->{engines}}) -} -INSTALL_PROGRAMS={- join(" ", map { quotify1(platform->bin($_)) } grep { !m|^test\\| } @{$unified_info{install}->{programs}}) -} -INSTALL_PROGRAMPDBS={- join(" ", map { quotify1(platform->binpdb($_)) } grep { !m|^test\\| } @{$unified_info{install}->{programs}}) -} +INSTALL_LIBS={- + join(" ", map { quotify1(platform->sharedlib_import($_) + // platform->staticlib($_)) } + grep { !$unified_info{attributes}->{$_}->{noinst} } + @{$unified_info{libraries}}) +-} +INSTALL_SHLIBS={- + join(" ", map { my $x = platform->sharedlib($_); + $x ? quotify_l($x) : () } + grep { !$unified_info{attributes}->{$_}->{noinst} } + @{$unified_info{libraries}}) +-} +INSTALL_SHLIBPDBS={- + join(" ", map { my $x = platform->sharedlibpdb($_); + $x ? quotify_l($x) : () } + grep { !$unified_info{attributes}->{$_}->{noinst} } + @{$unified_info{libraries}}) +-} +INSTALL_ENGINES={- + join(" ", map { quotify1(platform->dso($_)) } + grep { !$unified_info{attributes}->{$_}->{noinst} } + @{$unified_info{engines}}) +-} +INSTALL_ENGINEPDBS={- + join(" ", map { quotify1(platform->dsopdb($_)) } + grep { !$unified_info{attributes}->{$_}->{noinst} } + @{$unified_info{engines}}) +-} +INSTALL_PROGRAMS={- + join(" ", map { quotify1(platform->bin($_)) } + grep { !$unified_info{attributes}->{$_}->{noinst} } + @{$unified_info{programs}}) +-} +INSTALL_PROGRAMPDBS={- + join(" ", map { quotify1(platform->binpdb($_)) } + grep { !$unified_info{attributes}->{$_}->{noinst} } + @{$unified_info{programs}}) +-} {- output_off() if $disabled{apps}; "" -} BIN_SCRIPTS="$(BLDDIR)\tools\c_rehash.pl" MISC_SCRIPTS="$(BLDDIR)\apps\CA.pl" "$(BLDDIR)\apps\tsget.pl" |