Browse Source

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)
master
Richard Levitte 9 months ago
parent
commit
72ddea9b81
3 changed files with 50 additions and 18 deletions
  1. +5
    -18
      Configurations/descrip.mms.tmpl
  2. +14
    -0
      VMS/msg_install.com
  3. +31
    -0
      VMS/msg_staging.com

+ 5
- 18
Configurations/descrip.mms.tmpl View File

@ -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


+ 14
- 0
VMS/msg_install.com View File

@ -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 ""

+ 31
- 0
VMS/msg_staging.com View File

@ -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 ""

Loading…
Cancel
Save