diff options
author | Richard Levitte <levitte@openssl.org> | 2021-01-11 08:31:21 +0100 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2021-02-12 15:57:25 +0100 |
commit | 72ddea9b817e9b787e58d5b7ca8b7b8e6351f06e (patch) | |
tree | c8db798041ac1d1e6a1c1b85f455aba99bf6190d | |
parent | 1695e10e402a2d25e57df2ac709d6265f3a2533f (diff) |
Configurations/descrip.mms.tmpl: avoid enormous PIPE commands
DCL has a total command line limitation that's too easily broken by
them.
We solve them by creating separate message scripts and using them.
Fixes #13789
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13835)
-rw-r--r-- | Configurations/descrip.mms.tmpl | 23 | ||||
-rw-r--r-- | VMS/msg_install.com | 14 | ||||
-rw-r--r-- | VMS/msg_staging.com | 31 |
3 files changed, 50 insertions, 18 deletions
diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl index a2f3293c54..04fa0e0d46 100644 --- a/Configurations/descrip.mms.tmpl +++ b/Configurations/descrip.mms.tmpl @@ -475,25 +475,12 @@ install_final : @ WRITE SYS$OUTPUT "######################################################################" @ WRITE SYS$OUTPUT "" @ IF "$(DESTDIR)" .EQS. "" THEN - - PIPE ( WRITE SYS$OUTPUT "Installation complete" ; - - WRITE SYS$OUTPUT "" ; - - WRITE SYS$OUTPUT "Run @$(SYSTARTUP)openssl_startup{- $osslver -} to set up logical names" ; - - WRITE SYS$OUTPUT "then run @$(SYSTARTUP)openssl_utils{- $osslver -} to define commands" ; - - WRITE SYS$OUTPUT "" ) + @{- sourcefile("VMS", "msg_install.com") -} "$(SYSTARTUP)" "{- $osslver -}" @ IF "$(DESTDIR)" .NES. "" THEN - - PIPE ( WRITE SYS$OUTPUT "Staging installation complete" ; - - WRITE SYS$OUTPUT "" ; - - WRITE SYS$OUTPUT "Finish or package in such a way that the contents of the directory tree" ; - - WRITE SYS$OUTPUT staging_instdir ; - - WRITE SYS$OUTPUT "ends up in $(INSTALLTOP)," ; - - WRITE SYS$OUTPUT "and that the contents of the contents of the directory tree" ; - - WRITE SYS$OUTPUT staging_datadir ; - - WRITE SYS$OUTPUT "ends up in $(OPENSSLDIR)" ; - - WRITE SYS$OUTPUT "" ; - - WRITE SYS$OUTPUT "When in its final destination," ; - - WRITE SYS$OUTPUT "Run @$(SYSTARTUP)openssl_startup{- $osslver -} to set up logical names" ; - - WRITE SYS$OUTPUT "then run @$(SYSTARTUP)openssl_utils{- $osslver -} to define commands" ; - - WRITE SYS$OUTPUT "" ) + @{- sourcefile("VMS", "msg_staging.com") -} - + 'installtop' 'datatop' "$(INSTALLTOP)" "$(OPENSSLDIR)" - + "$(SYSTARTUP)" "{- $osslver -}" - + check_install : spawn/nolog @ossl_installroot:[SYSTEST]openssl_ivp{- $osslver -}.com diff --git a/VMS/msg_install.com b/VMS/msg_install.com new file mode 100644 index 0000000000..ed8444edfe --- /dev/null +++ b/VMS/msg_install.com @@ -0,0 +1,14 @@ +$ ! Used by the main descrip.mms to print the installation complete +$ ! message. +$ ! Arguments: +$ ! P1 startup / setup / shutdown scripts directory +$ ! P2 distinguishing version number ("major version") +$ +$ systartup = p1 +$ osslver = p2 +$ +$ WRITE SYS$OUTPUT "Installation complete" +$ WRITE SYS$OUTPUT "" +$ WRITE SYS$OUTPUT "Run @''systartup'openssl_startup''osslver' to set up logical names" +$ WRITE SYS$OUTPUT "then run @''systartup'openssl_utils''osslver' to define commands" +$ WRITE SYS$OUTPUT "" diff --git a/VMS/msg_staging.com b/VMS/msg_staging.com new file mode 100644 index 0000000000..d1d2a7dc40 --- /dev/null +++ b/VMS/msg_staging.com @@ -0,0 +1,31 @@ +$ ! Used by the main descrip.mms to print the statging installation +$ ! complete +$ ! message. +$ ! Arguments: +$ ! P1 staging software installation directory +$ ! P2 staging data installation directory +$ ! P3 final software installation directory +$ ! P4 final data installation directory +$ ! P5 startup / setup / shutdown scripts directory +$ ! P6 distinguishing version number ("major version") +$ +$ staging_instdir = p1 +$ staging_datadir = p2 +$ final_instdir = p3 +$ final_datadir = p4 +$ systartup = p5 +$ osslver = p6 +$ +$ WRITE SYS$OUTPUT "Staging installation complete" +$ WRITE SYS$OUTPUT "" +$ WRITE SYS$OUTPUT "Finish or package in such a way that the contents of the directory tree" +$ WRITE SYS$OUTPUT staging_instdir +$ WRITE SYS$OUTPUT "ends up in ''final_instdir'," +$ WRITE SYS$OUTPUT "and that the contents of the contents of the directory tree" +$ WRITE SYS$OUTPUT staging_datadir +$ WRITE SYS$OUTPUT "ends up in ''final_datadir" +$ WRITE SYS$OUTPUT "" +$ WRITE SYS$OUTPUT "When in its final destination," +$ WRITE SYS$OUTPUT "Run @''systartup'openssl_startup''osslver' to set up logical names" +$ WRITE SYS$OUTPUT "then run @''systartup'openssl_utils''osslver' to define commands" +$ WRITE SYS$OUTPUT "" |