Have an underscore before <ARCH> to make sure any future architecture

name won't be mixed up with any crypto name.
This commit is contained in:
Richard Levitte 2010-03-25 14:45:22 +00:00
parent cf6a1dea19
commit ab9c0ec9fc
2 changed files with 28 additions and 28 deletions

View File

@ -1026,7 +1026,7 @@ $ IF ARCH.EQS."VAX" .AND. F$TRNLNM("DECC$CC_DEFAULT").NES."/DECC" -
THEN CC = "CC/DECC"
$ CC = CC + "/''CC_OPTIMIZE'/''DEBUGGER'/STANDARD=ANSI89" + -
"/NOLIST/PREFIX=ALL" + -
"/INCLUDE=(SYS$DISK:[],SYS$DISK:[.''ARCH'],SYS$DISK:[-],SYS$DISK:[.ENGINE.VENDOR_DEFNS],SYS$DISK:[.EVP])" + -
"/INCLUDE=(SYS$DISK:[],SYS$DISK:[._''ARCH'],SYS$DISK:[-],SYS$DISK:[.ENGINE.VENDOR_DEFNS],SYS$DISK:[.EVP])" + -
CCEXTRAFLAGS
$!
$! Define The Linker Options File Name.
@ -1060,7 +1060,7 @@ $ EXIT
$ ENDIF
$ IF F$TRNLNM("DECC$CC_DEFAULT").EQS."/DECC" THEN CC = "CC/VAXC"
$ CC = CC + "/''CC_OPTIMIZE'/''DEBUGGER'/NOLIST" + -
"/INCLUDE=(SYS$DISK:[],SYS$DISK:[.''ARCH'],SYS$DISK:[-],SYS$DISK:[.ENGINE.VENDOR_DEFNS])" + -
"/INCLUDE=(SYS$DISK:[],SYS$DISK:[._''ARCH'],SYS$DISK:[-],SYS$DISK:[.ENGINE.VENDOR_DEFNS])" + -
CCEXTRAFLAGS
$ CCDEFS = """VAXC""," + CCDEFS
$!
@ -1092,7 +1092,7 @@ $!
$! Use GNU C...
$!
$ CC = "GCC/NOCASE_HACK/''GCC_OPTIMIZE'/''DEBUGGER'/NOLIST" + -
"/INCLUDE=(SYS$DISK:[],SYS$DISK:[.''ARCH'],SYS$DISK:[-],SYS$DISK:[.ENGINE.VENDOR_DEFNS])" + -
"/INCLUDE=(SYS$DISK:[],SYS$DISK:[._''ARCH'],SYS$DISK:[-],SYS$DISK:[.ENGINE.VENDOR_DEFNS])" + -
CCEXTRAFLAGS
$!
$! Define The Linker Options File Name.

View File

@ -18,8 +18,8 @@ $!
$! Specify one of the following build options for P1.
$!
$! ALL Just build "everything".
$! CONFIG Just build the "[.CRYPTO.<ARCH>]OPENSSLCONF.H" file.
$! BUILDINF Just build the "[.CRYPTO.<ARCH>]BUILDINF.H" file.
$! CONFIG Just build the "[.CRYPTO._<ARCH>]OPENSSLCONF.H" file.
$! BUILDINF Just build the "[.CRYPTO._<ARCH>]BUILDINF.H" file.
$! SOFTLINKS Just fix the Unix soft links.
$! BUILDALL Same as ALL, except CONFIG, BUILDINF and SOFTILNKS aren't done.
$! CRYPTO Just build the "[.xxx.EXE.CRYPTO]LIBCRYPTO.OLB" library.
@ -163,32 +163,32 @@ $! Time To EXIT.
$!
$ GOTO TIDY
$!
$! Rebuild The "[.CRYPTO.''ARCH']OPENSSLCONF.H" file.
$! Rebuild The "[.CRYPTO._''ARCH']OPENSSLCONF.H" file.
$!
$ CONFIG:
$!
$! Tell The User We Are Creating The [.CRYPTO.<ARCH>]OPENSSLCONF.H File.
$! Tell The User We Are Creating The [.CRYPTO._<ARCH>]OPENSSLCONF.H File.
$!
$ WRITE SYS$OUTPUT "Creating [.CRYPTO.''ARCH']OPENSSLCONF.H Include File."
$ WRITE SYS$OUTPUT "Creating [.CRYPTO._''ARCH']OPENSSLCONF.H Include File."
$!
$! First, make sure the directory exists.
$!
$ IF F$PARSE("SYS$DISK:[.CRYPTO.''ARCH']") .EQS. "" THEN -
CREATE/DIRECTORY SYS$DISK:[.CRYPTO.'ARCH']
$ IF F$PARSE("SYS$DISK:[.CRYPTO._''ARCH']") .EQS. "" THEN -
CREATE/DIRECTORY SYS$DISK:[.CRYPTO._'ARCH']
$!
$! Create The [.CRYPTO.<ARCH>]OPENSSLCONF.H File.
$! Create The [.CRYPTO._<ARCH>]OPENSSLCONF.H File.
$! Make sure it has the right format.
$!
$ OSCH_NAME = "SYS$DISK:[.CRYPTO.''ARCH']OPENSSLCONF.H"
$ OSCH_NAME = "SYS$DISK:[.CRYPTO._''ARCH']OPENSSLCONF.H"
$ CREATE /FDL=SYS$INPUT: 'OSCH_NAME'
RECORD
FORMAT stream_lf
$ OPEN /APPEND H_FILE 'OSCH_NAME'
$!
$! Write The [.CRYPTO.<ARCH>]OPENSSLCONF.H File.
$! Write The [.CRYPTO._<ARCH>]OPENSSLCONF.H File.
$!
$ WRITE H_FILE "/* This file was automatically built using makevms.com */"
$ WRITE H_FILE "/* and [.CRYPTO.''ARCH']OPENSSLCONF.H_IN */"
$ WRITE H_FILE "/* and [.CRYPTO._''ARCH']OPENSSLCONF.H_IN */"
$!
$! Write a few macros that indicate how this system was built.
$!
@ -351,29 +351,29 @@ $! There are many places where this is needed.
$!
$!!! WRITE H_FILE "#define _XOPEN_SOURCE_EXTENDED"
$!
$! Close the [.CRYPTO.<ARCH>]OPENSSLCONF.H file
$! Close the [.CRYPTO._<ARCH>]OPENSSLCONF.H file
$!
$ CLOSE H_FILE
$!
$! Purge The [.CRYPTO.<ARCH>]OPENSSLCONF.H file
$! Purge The [.CRYPTO._<ARCH>]OPENSSLCONF.H file
$!
$ PURGE SYS$DISK:[.CRYPTO.'ARCH']OPENSSLCONF.H
$ PURGE SYS$DISK:[.CRYPTO._'ARCH']OPENSSLCONF.H
$!
$! That's All, Time To RETURN.
$!
$ RETURN
$!
$! Rebuild The "[.CRYPTO.<ARCH>]BUILDINF.H" file.
$! Rebuild The "[.CRYPTO._<ARCH>]BUILDINF.H" file.
$!
$ BUILDINF:
$!
$! Tell The User We Are Creating The [.CRYPTO.<ARCH>]BUILDINF.H File.
$! Tell The User We Are Creating The [.CRYPTO._<ARCH>]BUILDINF.H File.
$!
$ WRITE SYS$OUTPUT "Creating [.CRYPTO.''ARCH']BUILDINF.H Include File."
$ WRITE SYS$OUTPUT "Creating [.CRYPTO._''ARCH']BUILDINF.H Include File."
$!
$! Create The [.CRYPTO.<ARCH>]BUILDINF.H File.
$! Create The [.CRYPTO._<ARCH>]BUILDINF.H File.
$!
$ BIH_NAME = "SYS$DISK:[.CRYPTO.''ARCH']BUILDINF.H"
$ BIH_NAME = "SYS$DISK:[.CRYPTO._''ARCH']BUILDINF.H"
$ CREATE /FDL=SYS$INPUT: 'BIH_NAME'
RECORD
FORMAT stream_lf
@ -384,19 +384,19 @@ $! Get The Current Date & Time.
$!
$ TIME = F$TIME()
$!
$! Write The [.CRYPTO.<ARCH>]BUILDINF.H File.
$! Write The [.CRYPTO._<ARCH>]BUILDINF.H File.
$!
$ WRITE H_FILE "#define CFLAGS """" /* Not filled in for now */"
$ WRITE H_FILE "#define PLATFORM ""VMS ''ARCH' ''VMS_VER'"""
$ WRITE H_FILE "#define DATE ""''TIME'"" "
$!
$! Close The [.CRYPTO.<ARCH>]BUILDINF.H File.
$! Close The [.CRYPTO._<ARCH>]BUILDINF.H File.
$!
$ CLOSE H_FILE
$!
$! Purge The [.CRYPTO.<ARCH>]BUILDINF.H File.
$! Purge The [.CRYPTO._<ARCH>]BUILDINF.H File.
$!
$ PURGE SYS$DISK:[.CRYPTO.'ARCH']BUILDINF.H
$ PURGE SYS$DISK:[.CRYPTO._'ARCH']BUILDINF.H
$!
$! That's All, Time To RETURN.
$!
@ -732,8 +732,8 @@ $ WRITE SYS$OUTPUT ""
$ WRITE SYS$OUTPUT "The Target ",P1," Is Invalid. The Valid Target Options Are:"
$ WRITE SYS$OUTPUT ""
$ WRITE SYS$OUTPUT " ALL : Just Build Everything."
$ WRITE SYS$OUTPUT " CONFIG : Just build the [.CRYPTO.''ARCH']OPENSSLCONF.H file."
$ WRITE SYS$OUTPUT " BUILDINF : Just build the [.CRYPTO.''ARCH']BUILDINF.H file."
$ WRITE SYS$OUTPUT " CONFIG : Just build the [.CRYPTO._''ARCH']OPENSSLCONF.H file."
$ WRITE SYS$OUTPUT " BUILDINF : Just build the [.CRYPTO._''ARCH']BUILDINF.H file."
$ WRITE SYS$OUTPUT " SOFTLINKS: Just Fix The Unix soft links."
$ WRITE SYS$OUTPUT " BUILDALL : Same as ALL, except CONFIG, BUILDINF and SOFTILNKS aren't done."
$ WRITE SYS$OUTPUT " CRYPTO : To Build Just The [.xxx.EXE.CRYPTO]LIBCRYPTO.OLB Library."