wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Pass down correct information to the VMS startup script templates

Browse source 
Reviewed-by: Rich Salz <rsalz@openssl.org>
This commit is contained in:
Richard Levitte 2016-07-02 08:31:00 +02:00
parent 7878e536d0
commit 34d5490a1d
3 changed files with 11 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Configurations/descrip.mms.tmpl
View file

@ -436,18 +436,14 @@ vmsconfig.pm : configdata.pm
WRITE CONFIG "our @ISA = qw(Exporter);" WRITE CONFIG "our @ISA = qw(Exporter);"
WRITE CONFIG "our @EXPORT = qw(%config %target %withargs %unified_info %disabled);" WRITE CONFIG "our @EXPORT = qw(%config %target %withargs %unified_info %disabled);"
WRITE CONFIG "our %config = (" WRITE CONFIG "our %config = ("
WRITE CONFIG " target => '{- $config{target} -}'," WRITE CONFIG " target => '","{- $config{target} -}","',"
WRITE CONFIG " version => '$(MAJOR).$(MINOR)'," WRITE CONFIG " version => '","{- $config{version} -}","',"
WRITE CONFIG " shlib_major => '","{- $config{shlib_major} -}","',"
WRITE CONFIG " shlib_minor => '","{- $config{shlib_minor} -}","',"
WRITE CONFIG " no_shared => '","{- $disabled{shared} -}","'," WRITE CONFIG " no_shared => '","{- $disabled{shared} -}","',"
WRITE CONFIG " INSTALLTOP => '$(INSTALLTOP)'," WRITE CONFIG " INSTALLTOP => '$(INSTALLTOP)',"
WRITE CONFIG " OPENSSLDIR => '$(OPENSSLDIR)'," WRITE CONFIG " OPENSSLDIR => '$(OPENSSLDIR)',"
WRITE CONFIG " pointersize => '","{- $target{pointersize} -}","'," WRITE CONFIG " pointer_size => '","{- $target{pointer_size} -}","',"
WRITE CONFIG " shared_libs => ["
{- $disabled{shared}
? "\@ !"
: join("\n ", map { "WRITE CONFIG \" '$_'," } map { $unified_info{sharednames}->{$_} || () } @{$unified_info{libraries}})
-}
WRITE CONFIG " ],"
WRITE CONFIG ");" WRITE CONFIG ");"
WRITE CONFIG "our %target = ();" WRITE CONFIG "our %target = ();"
WRITE CONFIG "our %disabled = ();" WRITE CONFIG "our %disabled = ();"

9
VMS/openssl_shutdown.com.in
View file

@ -24,14 +24,11 @@ $ arch := F$EDIT(F$GETSYI("ARCH_NAME"),"UPCASE")
$ IF arch .EQS. "" THEN GOTO unknown_arch $ IF arch .EQS. "" THEN GOTO unknown_arch
$ ENDIF $ ENDIF
$ $
$ ! Generated information
$ VERSION := {- $config{version} -}
$ INSTALLTOP := {- $config{INSTALLTOP} -}
$ POINTER_SIZE = {- $config{pointersize} -}
$
$ ! Abbrevs $ ! Abbrevs
$ DEAS := DEASSIGN /NOLOG 'P1' $ DEAS := DEASSIGN /NOLOG 'P1'
$ v = VERSION - "." - "." $ v := {- sprintf "%02d%02d", split(/\./, $config{version}) -}
$ sv := {- sprintf "%02d%02d", $config{shlib_major}, $config{shlib_minor} -}
$ pz := {- $config{pointer_size} -}
$ $
$ DEAS OSSL$ROOT'v' $ DEAS OSSL$ROOT'v'
$ DEAS OSSL$INCLUDE'v' $ DEAS OSSL$INCLUDE'v'

6
VMS/openssl_startup.com.in
View file

@ -51,10 +51,8 @@ $ IF arch .EQS. "" THEN GOTO unknown_arch
$ ENDIF $ ENDIF
$ $
$ ! Generated information $ ! Generated information
$ VERSION := {- $config{version} -}
$ INSTALLTOP := {- $config{INSTALLTOP} -} $ INSTALLTOP := {- $config{INSTALLTOP} -}
$ OPENSSLDIR := {- $config{OPENSSLDIR} -} $ OPENSSLDIR := {- $config{OPENSSLDIR} -}
$ POINTER_SIZE := {- $config{pointersize} -}
$ $
$ ! Make sure that INSTALLTOP and OPENSSLDIR become something one $ ! Make sure that INSTALLTOP and OPENSSLDIR become something one
$ ! can build concealed logical names on $ ! can build concealed logical names on
@ -82,7 +80,9 @@ $
$ ! Abbrevs $ ! Abbrevs
$ DEFT := DEFINE /TRANSLATION=CONCEALED /NOLOG 'P1' $ DEFT := DEFINE /TRANSLATION=CONCEALED /NOLOG 'P1'
$ DEF := DEFINE /NOLOG 'P1' $ DEF := DEFINE /NOLOG 'P1'
$ v = VERSION - "." - "." $ v := {- sprintf "%02d%02d", split(/\./, $config{version}) -}
$ sv := {- sprintf "%02d%02d", $config{shlib_major}, $config{shlib_minor} -}
$ pz := {- $config{pointer_size} -}
$ $
$ DEFT OSSL$INSTROOT'v' 'INSTALLTOP_' $ DEFT OSSL$INSTROOT'v' 'INSTALLTOP_'
$ DEFT OSSL$INCLUDE'v' OSSL$INSTROOT:[INCLUDE.] $ DEFT OSSL$INCLUDE'v' OSSL$INSTROOT:[INCLUDE.]