diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-07-08 14:52:09 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-07-18 20:49:54 +0200 |
| commit | 0f01b7bc8536c816f7b6e9305437346b68a1fe89 (patch) | |
| tree | 612a3cc6d1a234deb4e1f80d1e4e22302e2b591e /Configurations/descrip.mms.tmpl | |
| parent | 52fef270bf037a2b8caffdb34f6195191c08d9f2 (diff) | |
Adapt the build files to the new "install" hash table
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'Configurations/descrip.mms.tmpl')
| -rw-r--r-- | Configurations/descrip.mms.tmpl | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl index b3cf430860..092af416ab 100644 --- a/Configurations/descrip.mms.tmpl +++ b/Configurations/descrip.mms.tmpl @@ -43,6 +43,7 @@ # Because we need to make two computations of these data, # we store them in arrays for reuse our @shlibs = map { $unified_info{sharednames}->{$_} || () } @{$unified_info{libraries}}; + our @install_shlibs = map { $unified_info{sharednames}->{$_} || () } @{$unified_info{install}->{libraries}}; our @programs = grep { !m|^\[\.test\]| } @{$unified_info{programs}}; our @testprogs = grep { m|^\[\.test\]| } @{$unified_info{programs}}; our @generated = ( ( map { (my $x = $_) =~ s|\.S$|\.s|; $x } @@ -130,6 +131,10 @@ DEPS={- our @deps = map { (my $x = $_) =~ s|\.o$|\$(DEP_EXT)|; $x; } GENERATED_MANDATORY={- join(", ", map { "-\n\t".$_ } @{$unified_info{depends}->{""}} ) -} GENERATED={- join(", ", map { "-\n\t".$_ } @generated) -} +INSTALL_LIBS={- join(", ", map { "-\n\t".$_.".OLB" } @{$unified_info{install}->{libraries}}) -} +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}}) -} {- output_off() if $disabled{apps}; "" -} BIN_SCRIPTS=[.tools]c_rehash.pl MISC_SCRIPTS=[.apps]CA.pl, [.apps]tsget.pl @@ -382,12 +387,11 @@ install_dev : check_INSTALLTOP - CREATE/DIR ossl_installroot:[LIB.'arch'] {- join("\n ", map { "COPY/PROT=W:R $_.OLB ossl_installroot:[LIB.'arch']" } - @{$unified_info{libraries}}) -} + @{$unified_info{install}->{libraries}}) -} @ {- output_off() if $disabled{shared}; "" -} ! {- join("\n ", - map { "COPY/PROT=W:RE $_.EXE ossl_installroot:[LIB.'arch']" } - map { $unified_info{sharednames}->{$_} || () } - @{$unified_info{libraries}}) -} + map { "COPY/PROT=W:R $_.OLB ossl_installroot:[LIB.'arch']" } + @install_shlibs) -} @ {- output_on() if $disabled{shared}; "" -} ! install_runtime : check_INSTALLTOP @@ -407,7 +411,7 @@ install_engines : check_INSTALLTOP - CREATE/DIR ossl_installroot:[ENGINES{- $sover.$target{pointer_size} -}.'arch'] {- join("\n ", map { "COPY/PROT=W:RE $_.EXE ossl_installroot:[ENGINES$sover$target{pointer_size}.'arch']" } - grep(!m|ossltest$|i, @{$unified_info{engines}})) -} + @{$unified_info{install}->{engines}}) -} @ {- output_on() unless scalar @{$unified_info{engines}}; "" -} ! install_startup : [.VMS]openssl_startup.com [.VMS]openssl_shutdown.com - |