Pass down correct information to the VMS startup script templates
authorRichard Levitte <levitte@openssl.org>
Sat, 2 Jul 2016 06:31:00 +0000 (08:31 +0200)
committerRichard Levitte <levitte@openssl.org>
Sat, 2 Jul 2016 13:49:45 +0000 (15:49 +0200)
Reviewed-by: Rich Salz <rsalz@openssl.org>
Configurations/descrip.mms.tmpl
VMS/openssl_shutdown.com.in
VMS/openssl_startup.com.in

index 8211d01..8a5da85 100644 (file)
@@ -436,18 +436,14 @@ vmsconfig.pm : configdata.pm
         WRITE CONFIG "our @ISA = qw(Exporter);"
         WRITE CONFIG "our @EXPORT = qw(%config %target %withargs %unified_info %disabled);"
         WRITE CONFIG "our %config = ("
-        WRITE CONFIG "  target => '{- $config{target} -}',"
-        WRITE CONFIG "  version => '$(MAJOR).$(MINOR)',"
+        WRITE CONFIG "  target => '","{- $config{target} -}","',"
+        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 "  INSTALLTOP => '$(INSTALLTOP)',"
         WRITE CONFIG "  OPENSSLDIR => '$(OPENSSLDIR)',"
-        WRITE CONFIG "  pointersize => '","{- $target{pointersize} -}","',"
-        WRITE CONFIG "  shared_libs => ["
-        {- $disabled{shared}
-           ? "\@ !"
-           : join("\n        ", map { "WRITE CONFIG \"    '$_'," } map { $unified_info{sharednames}->{$_} || () } @{$unified_info{libraries}})
-        -}
-        WRITE CONFIG "  ],"
+        WRITE CONFIG "  pointer_size => '","{- $target{pointer_size} -}","',"
         WRITE CONFIG ");"
         WRITE CONFIG "our %target = ();"
         WRITE CONFIG "our %disabled = ();"
index 5385362..73ef380 100644 (file)
@@ -24,14 +24,11 @@ $       arch := F$EDIT(F$GETSYI("ARCH_NAME"),"UPCASE")
 $          IF arch .EQS. "" THEN GOTO unknown_arch
 $      ENDIF
 $
-$      ! Generated information
-$      VERSION := {- $config{version} -}
-$      INSTALLTOP := {- $config{INSTALLTOP} -}
-$      POINTER_SIZE = {- $config{pointersize} -}
-$
 $      ! Abbrevs
 $      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$INCLUDE'v'
index e5043b5..f9350b0 100644 (file)
@@ -51,10 +51,8 @@ $        IF arch .EQS. "" THEN GOTO unknown_arch
 $      ENDIF
 $
 $      ! Generated information
-$      VERSION := {- $config{version} -}
 $      INSTALLTOP := {- $config{INSTALLTOP} -}
 $      OPENSSLDIR := {- $config{OPENSSLDIR} -}
-$      POINTER_SIZE := {- $config{pointersize} -}
 $
 $      ! Make sure that INSTALLTOP and OPENSSLDIR become something one
 $      ! can build concealed logical names on
@@ -82,7 +80,9 @@ $
 $      ! Abbrevs
 $      DEFT := DEFINE /TRANSLATION=CONCEALED /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$INCLUDE'v'    OSSL$INSTROOT:[INCLUDE.]