Install the openssl app with version number on VMS

This makes it possible for script writers to lock on to a specific
version if they need to.  Note that only the major version number is
used.

Reviewed-by: Rich Salz <rsalz@openssl.org>

diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl
index 2e0ff5924e21445f21a098aa31ef8a98f6471831..0ff434e6d1b442b99ff0760d0611efb245c7c822 100644 (file)
--- a/Configurations/descrip.mms.tmpl
+++ b/Configurations/descrip.mms.tmpl
@@ -388,7 +388,8 @@ install_runtime : check_INSTALLTOP
         @ WRITE SYS$OUTPUT "*** Installing runtime files"
         @ ! Install the main program
         - CREATE/DIR ossl_installroot:[EXE.'arch']
-        COPY/PROT=W:RE [.APPS]openssl.EXE ossl_installroot:[EXE.'arch']
+        COPY/PROT=W:RE [.APPS]openssl.EXE -
+                ossl_installroot:[EXE.'arch']openssl{- sprintf "%02d%02d", split(/\./, $config{version}) -}.EXE
         @ ! Install scripts
         - CREATE/DIR ossl_installroot:[EXE]
         COPY/PROT=W:RE $(BIN_SCRIPTS) ossl_installroot:[EXE]
@@ -404,7 +405,7 @@ install_engines : check_INSTALLTOP
         @ {- output_on() unless scalar @{$unified_info{engines}}; "" -} !
 
 install_startup : [.VMS]openssl_startup.com [.VMS]openssl_shutdown.com -
-                 check_INSTALLTOP
+                 [.VMS]openssl_utils.com, check_INSTALLTOP
         - CREATE/DIR ossl_installroot:[SYS$STARTUP]
         COPY/PROT=W:RE -
                 [.VMS]openssl_startup.com,openssl_startup.com -
@@ -412,9 +413,7 @@ install_startup : [.VMS]openssl_startup.com [.VMS]openssl_shutdown.com -
         COPY/PROT=W:RE -
                 [.VMS]openssl_startup.com,openssl_shutdown.com -
                 ossl_installroot:[SYS$STARTUP]
-        COPY/PROT=W:RE -
-                {- sourcefile("VMS", "openssl_utils.com") -} -
-                ossl_installroot:[SYS$STARTUP]
+        COPY/PROT=W:RE [.VMS]openssl_utils.com ossl_installroot:[SYS$STARTUP]
 
 [.VMS]openssl_startup.com : vmsconfig.pm {- sourcefile("VMS", "openssl_startup.com.in") -}
         - CREATE/DIR [.VMS]
@@ -422,6 +421,12 @@ install_startup : [.VMS]openssl_startup.com [.VMS]openssl_shutdown.com -
                 {- sourcefile("VMS", "openssl_startup.com.in") -} -
                 > [.VMS]openssl_startup.com
 
+[.VMS]openssl_utils.com : vmsconfig.pm {- sourcefile("VMS", "openssl_utils.com.in") -}
+        - CREATE/DIR [.VMS]
+        $(PERL) "-I." "-Mvmsconfig" {- sourcefile("util", "dofile.pl") -} -
+                {- sourcefile("VMS", "openssl_utils.com.in") -} -
+                > [.VMS]openssl_utils.com
+
 [.VMS]openssl_shutdown.com : vmsconfig.pm {- sourcefile("VMS", "openssl_shutdown.com.in") -}
         - CREATE/DIR [.VMS]
         $(PERL) "-I." "-Mvmsconfig" {- sourcefile("util", "dofile.pl") -} -

diff --git a/VMS/openssl_utils.com b/VMS/openssl_utils.com
deleted file mode 100644 (file)
index 09c75d9..0000000
--- a/VMS/openssl_utils.com
+++ /dev/null
@@ -1,11 +0,0 @@
-$      ! OpenSSL utilities
-$      !
-$
-$      OPENSSL         :== $OSSL$EXE:OPENSSL
-$
-$      IF F$SYMBOL(PERL) .EQS. "STRING"
-$      THEN
-$          C_REHASH    :== 'PERL' OSSL$EXE:c_rehash.pl
-$      ELSE
-$          WRITE SYS$ERROR "NOTE: no perl => no C_REHASH"
-$      ENDIF

diff --git a/VMS/openssl_utils.com.in b/VMS/openssl_utils.com.in
new file mode 100644 (file)
index 0000000..edd733d
--- /dev/null
+++ b/VMS/openssl_utils.com.in
@@ -0,0 +1,14 @@
+$      ! OpenSSL utilities
+$      !
+$
+$      v    := {- sprintf "%02d%02d", split(/\./, $config{version}) -}
+$
+$      OPENSSL'v'      :== $OSSL$EXE:OPENSSL'v'
+$      OPENSSL         :== $OSSL$EXE:OPENSSL'v'
+$
+$      IF F$TYPE(PERL) .EQS. "STRING"
+$      THEN
+$          C_REHASH    :== 'PERL' OSSL$EXE:c_rehash.pl
+$      ELSE
+$          WRITE SYS$ERROR "NOTE: no perl => no C_REHASH"
+$      ENDIF