Commit 82c78ee4 authored by Richard Levitte's avatar Richard Levitte
Browse files

VMS: Rearrange installation targets for shared libraries 



The way it was implemented before this change, the shared libraries
were installed twice.  On a file system that supports file
generations, that's a waste.  Slightly rearranging the install targets
solves the problem.

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent 11279b13

Configurations/descrip.mms.tmpl

+22 −18
Original line number Diff line number Diff line
@@ -353,9 +353,13 @@ descrip.mms : FORCE 


# Install helper targets #############################################



install_sw : all install_dev install_engines install_runtime install_startup install_ivp

install_sw : all install_shared _install_dev_ns -

             install_engines _install_runtime_ns -

             install_startup install_ivp



uninstall_sw : uninstall_dev uninstall_engines uninstall_runtime uninstall_startup uninstall_ivp

uninstall_sw : uninstall_shared _uninstall_dev_ns -

               uninstall_engines _uninstall_runtime_ns -

               uninstall_startup uninstall_ivp



install_docs : install_html_docs
@@ -374,7 +378,17 @@ install_ssldirs : check_INSTALLTOP 
        COPY/PROT=W:RE {- sourcefile("apps", "openssl-vms.cnf") -} -

                ossl_dataroot:[000000]openssl.cnf



install_dev : check_INSTALLTOP

install_shared : check_INSTALLTOP

        @ {- output_off() if $disabled{shared}; "" -} !

        @ WRITE SYS$OUTPUT "*** Installing shareable images"

        @ ! Install shared (runtime) libraries

        - CREATE/DIR ossl_installroot:[LIB.'arch']

        {- join("\n        ",

                map { "COPY/PROT=W:R $_.EXE ossl_installroot:[LIB.'arch']" }

                @install_shlibs) -}

        @ {- output_on() if $disabled{shared}; "" -} !



_install_dev_ns : check_INSTALLTOP

        @ WRITE SYS$OUTPUT "*** Installing development files"

        @ ! Install header files

        - CREATE/DIR ossl_installroot:[include.openssl]
@@ -384,22 +398,10 @@ install_dev : check_INSTALLTOP 
        {- join("\n        ",

                map { "COPY/PROT=W:R $_.OLB ossl_installroot:[LIB.'arch']" }

                @{$unified_info{install}->{libraries}}) -}

        @ {- output_off() if $disabled{shared}; "" -} !

        @ ! Install shared (runtime) libraries

        {- join("\n        ",

                map { "COPY/PROT=W:R $_.EXE ossl_installroot:[LIB.'arch']" }

                @install_shlibs) -}

        @ {- output_on() if $disabled{shared}; "" -} !



install_runtime : check_INSTALLTOP

        @ ! {- output_off() if $disabled{apps}; "" -}

        @ WRITE SYS$OUTPUT "*** Installing runtime files"

        @ {- output_off() if $disabled{shared}; "" -} !

        @ ! Install shared (runtime) libraries

        {- join("\n        ",

                map { "COPY/PROT=W:R $_.OLB ossl_installroot:[LIB.'arch']" }

                @install_shlibs) -}

        @ {- output_on() if $disabled{shared}; "" -} !

install_dev : install_shared _install_dev_ns



_install_runtime_ns : check_INSTALLTOP

        @ ! Install the main program

        - CREATE/DIR ossl_installroot:[EXE.'arch']

        COPY/PROT=W:RE [.APPS]openssl.EXE -
@@ -408,6 +410,8 @@ install_runtime : check_INSTALLTOP 
        COPY/PROT=W:RE $(BIN_SCRIPTS) ossl_installroot:[EXE]

        @ ! {- output_on() if $disabled{apps}; "" -}



install_runtime : install_shared _install_runtime_ns



install_engines : check_INSTALLTOP

        @ {- output_off() unless scalar @{$unified_info{engines}}; "" -} !

        @ WRITE SYS$OUTPUT "*** Installing engines"