Addapt VMS scripts to the newer disk layout system ODS-5, which allows more than...

diff --git a/apps/makeapps.com b/apps/makeapps.com
index d6651433ddf5019e71198c2e810069e2b00723e5..219f571d57ad7ce07d9cd017af109ffd76bb1c8b 100644 (file)
--- a/apps/makeapps.com
+++ b/apps/makeapps.com
@@ -1113,6 +1113,7 @@ $!
 $! Save directory information
 $!
 $ __HERE = F$PARSE(F$PARSE("A.;",F$ENVIRONMENT("PROCEDURE"))-"A.;","[]A.;") - "A.;"
 $! Save directory information
 $!
 $ __HERE = F$PARSE(F$PARSE("A.;",F$ENVIRONMENT("PROCEDURE"))-"A.;","[]A.;") - "A.;"

+$ __HERE = F$EDIT(__HERE,"UPCASE")

 $ __TOP = __HERE - "APPS]"
 $ __INCLUDE = __TOP + "INCLUDE.OPENSSL]"
 $!
 $ __TOP = __HERE - "APPS]"
 $ __INCLUDE = __TOP + "INCLUDE.OPENSSL]"
 $!

diff --git a/crypto/crypto-lib.com b/crypto/crypto-lib.com
index b4d80f77fda0e1102073ce4930232c4414349109..2fdf623fe33243a6a537f259f8691cbe98c9c972 100644 (file)
--- a/crypto/crypto-lib.com
+++ b/crypto/crypto-lib.com
@@ -1453,6 +1453,7 @@ $!
 $! Save directory information
 $!
 $ __HERE = F$PARSE(F$PARSE("A.;",F$ENVIRONMENT("PROCEDURE"))-"A.;","[]A.;") - "A.;"
 $! Save directory information
 $!
 $ __HERE = F$PARSE(F$PARSE("A.;",F$ENVIRONMENT("PROCEDURE"))-"A.;","[]A.;") - "A.;"

+$ __HERE = F$EDIT(__HERE,"UPCASE")

 $ __TOP = __HERE - "CRYPTO]"
 $ __INCLUDE = __TOP + "INCLUDE.OPENSSL]"
 $!
 $ __TOP = __HERE - "CRYPTO]"
 $ __INCLUDE = __TOP + "INCLUDE.OPENSSL]"
 $!

diff --git a/makevms.com b/makevms.com
index 638d61b4703c9659424011aadc977d562b22fa48..49b98b54dbc7e09f798512a74c919c83a6e78558 100755 (executable)
--- a/makevms.com
+++ b/makevms.com
@@ -249,8 +249,14 @@ $   IF F$SEARCH("[.CRYPTO]OPENSSLCONF_H.IN") .NES. ""
 $   THEN
 $     TYPE [.CRYPTO]OPENSSLCONF_H.IN /OUTPUT=H_FILE:
 $   ELSE
 $   THEN
 $     TYPE [.CRYPTO]OPENSSLCONF_H.IN /OUTPUT=H_FILE:
 $   ELSE

-$     WRITE SYS$ERROR "Couldn't find a [.CRYPTO]OPENSSLCONF.H_IN.  Exiting!"
-$     EXIT 0
+$     ! For ODS-5
+$     IF F$SEARCH("[.CRYPTO]OPENSSLCONF.H.IN") .NES. ""
+$     THEN
+$       TYPE [.CRYPTO]OPENSSLCONF.H.IN /OUTPUT=H_FILE:
+$     ELSE
+$       WRITE SYS$ERROR "Couldn't find a [.CRYPTO]OPENSSLCONF.H_IN.  Exiting!"
+$       EXIT 0
+$     ENDIF

 $   ENDIF
 $ ENDIF
 $ IF ARCH .EQS. "AXP"
 $   ENDIF
 $ ENDIF
 $ IF ARCH .EQS. "AXP"

diff --git a/ssl/ssl-lib.com b/ssl/ssl-lib.com
index cc64544d28a99836c99b7accb3edbd92b86a7a5f..313ff2565e6deae211c17b856a7813c60c2e3872 100644 (file)
--- a/ssl/ssl-lib.com
+++ b/ssl/ssl-lib.com
@@ -1174,6 +1174,7 @@ $!
 $! Save directory information
 $!
 $ __HERE = F$PARSE(F$PARSE("A.;",F$ENVIRONMENT("PROCEDURE"))-"A.;","[]A.;") - "A.;"
 $! Save directory information
 $!
 $ __HERE = F$PARSE(F$PARSE("A.;",F$ENVIRONMENT("PROCEDURE"))-"A.;","[]A.;") - "A.;"

+$ __HERE = F$EDIT(__HERE,"UPCASE")

 $ __TOP = __HERE - "SSL]"
 $ __INCLUDE = __TOP + "INCLUDE.OPENSSL]"
 $!
 $ __TOP = __HERE - "SSL]"
 $ __INCLUDE = __TOP + "INCLUDE.OPENSSL]"
 $!

diff --git a/test/maketests.com b/test/maketests.com
index 3ef3ba8fa5b18b5624335f08d5491cd17626812d..e0be3dd43bb383a3ffe04f190abbe9b5c5a2ecac 100644 (file)
--- a/test/maketests.com
+++ b/test/maketests.com
@@ -1031,6 +1031,7 @@ $!
 $! Save directory information
 $!
 $ __HERE = F$PARSE(F$PARSE("A.;",F$ENVIRONMENT("PROCEDURE"))-"A.;","[]A.;") - "A.;"
 $! Save directory information
 $!
 $ __HERE = F$PARSE(F$PARSE("A.;",F$ENVIRONMENT("PROCEDURE"))-"A.;","[]A.;") - "A.;"

+$ __HERE = F$EDIT(__HERE,"UPCASE")

 $ __TOP = __HERE - "TEST]"
 $ __INCLUDE = __TOP + "INCLUDE.OPENSSL]"
 $!
 $ __TOP = __HERE - "TEST]"
 $ __INCLUDE = __TOP + "INCLUDE.OPENSSL]"
 $!