Use the same directory for architecture dependent header files as in

the branches OpenSSL-1_0_0-stable and OpenSSL-1_0_1-stable.
This commit is contained in:
Richard Levitte 2010-11-23 02:43:20 +00:00
parent c5ef4bb49a
commit 88868c0786
2 changed files with 29 additions and 34 deletions

View File

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

View File

@ -18,8 +18,8 @@ $!
$! Specify one of the following build options for P1. $! Specify one of the following build options for P1.
$! $!
$! ALL Just build "everything". $! ALL Just build "everything".
$! CONFIG Just build the "[.xxx.CRYPTO]OPENSSLCONF.H" file. $! CONFIG Just build the "[.CRYPTO._xxx]OPENSSLCONF.H" file.
$! BUILDINF Just build the "[.xxx.CRYPTO]BUILDINF.H" file. $! BUILDINF Just build the "[.CRYPTO._xxx]BUILDINF.H" file.
$! SOFTLINKS Just fix the Unix soft links. $! SOFTLINKS Just fix the Unix soft links.
$! BUILDALL Same as ALL, except CONFIG, BUILDINF and SOFTILNKS aren't done. $! BUILDALL Same as ALL, except CONFIG, BUILDINF and SOFTILNKS aren't done.
$! CRYPTO Just build the "[.xxx.EXE.CRYPTO]LIBCRYPTO.OLB" library. $! CRYPTO Just build the "[.xxx.EXE.CRYPTO]LIBCRYPTO.OLB" library.
@ -163,32 +163,32 @@ $! Time To EXIT.
$! $!
$ GOTO TIDY $ GOTO TIDY
$! $!
$! Rebuild The [.xxx.CRYPTO]OPENSSLCONF.H" file. $! Rebuild The [.CRYPTO._xxx]OPENSSLCONF.H" file.
$! $!
$ CONFIG: $ CONFIG:
$! $!
$! Tell The User We Are Creating The [.xxx.CRYPTO]OPENSSLCONF.H File. $! Tell The User We Are Creating The [.CRYPTO._xxx]OPENSSLCONF.H File.
$! $!
$ WRITE SYS$OUTPUT "Creating [.''ARCH'.CRYPTO]OPENSSLCONF.H Include File." $ WRITE SYS$OUTPUT "Creating [.CRYPTO._''ARCH']OPENSSLCONF.H Include File."
$! $!
$! First, make sure the directory exists. $! First, make sure the directory exists.
$! $!
$ IF F$PARSE("SYS$DISK:[.''ARCH'.CRYPTO]") .EQS. "" THEN - $ IF F$PARSE("SYS$DISK:[.CRYPTO._''ARCH']") .EQS. "" THEN -
CREATE/DIRECTORY SYS$DISK:[.'ARCH'.CRYPTO] CREATE/DIRECTORY SYS$DISK:[.CRYPTO._'ARCH']
$! $!
$! Create The [.xxx.CRYPTO]OPENSSLCONF.H File. $! Create The [.CRYPTO._xxx]OPENSSLCONF.H File.
$! Make sure it has the right format. $! Make sure it has the right format.
$! $!
$ OSCH_NAME = "SYS$DISK:[.''ARCH'.CRYPTO]OPENSSLCONF.H" $ OSCH_NAME = "SYS$DISK:[.CRYPTO._''ARCH']OPENSSLCONF.H"
$ CREATE /FDL=SYS$INPUT: 'OSCH_NAME' $ CREATE /FDL=SYS$INPUT: 'OSCH_NAME'
RECORD RECORD
FORMAT stream_lf FORMAT stream_lf
$ OPEN /APPEND H_FILE 'OSCH_NAME' $ OPEN /APPEND H_FILE 'OSCH_NAME'
$! $!
$! Write The [.xxx.CRYPTO]OPENSSLCONF.H File. $! Write The [.CRYPTO._xxx]OPENSSLCONF.H File.
$! $!
$ WRITE H_FILE "/* This file was automatically built using makevms.com */" $ WRITE H_FILE "/* This file was automatically built using makevms.com */"
$ WRITE H_FILE "/* and [.''ARCH'.CRYPTO]OPENSSLCONF.H_IN */" $ WRITE H_FILE "/* and [.CRYPTO._''ARCH']OPENSSLCONF.H_IN */"
$! $!
$! Write a few macros that indicate how this system was built. $! Write a few macros that indicate how this system was built.
$! $!
@ -347,29 +347,29 @@ $! End
$! $!
$ ENDIF $ ENDIF
$! $!
$! Close the [.xxx.CRYPTO]OPENSSLCONF.H file $! Close the [.CRYPTO._xxx]OPENSSLCONF.H file
$! $!
$ CLOSE H_FILE $ CLOSE H_FILE
$! $!
$! Purge The [.xxx.CRYPTO]OPENSSLCONF.H file $! Purge The [.CRYPTO._xxx]OPENSSLCONF.H file
$! $!
$ PURGE SYS$DISK:[.'ARCH'.CRYPTO]OPENSSLCONF.H $ PURGE SYS$DISK:[.CRYPTO._'ARCH']OPENSSLCONF.H
$! $!
$! That's All, Time To RETURN. $! That's All, Time To RETURN.
$! $!
$ RETURN $ RETURN
$! $!
$! Rebuild The "[.xxx.CRYPTO]BUILDINF.H" file. $! Rebuild The "[.CRYPTO._xxx]BUILDINF.H" file.
$! $!
$ BUILDINF: $ BUILDINF:
$! $!
$! Tell The User We Are Creating The [.xxx.CRYPTO]BUILDINF.H File. $! Tell The User We Are Creating The [.CRYPTO._xxx]BUILDINF.H File.
$! $!
$ WRITE SYS$OUTPUT "Creating [.''ARCH'.CRYPTO]BUILDINF.H Include File." $ WRITE SYS$OUTPUT "Creating [.CRYPTO._''ARCH']BUILDINF.H Include File."
$! $!
$! Create The [.xxx.CRYPTO]BUILDINF.H File. $! Create The [.CRYPTO._xxx]BUILDINF.H File.
$! $!
$ BIH_NAME = "SYS$DISK:[.''ARCH'.CRYPTO]BUILDINF.H" $ BIH_NAME = "SYS$DISK:[.CRYPTO._''ARCH']BUILDINF.H"
$ CREATE /FDL=SYS$INPUT: 'BIH_NAME' $ CREATE /FDL=SYS$INPUT: 'BIH_NAME'
RECORD RECORD
FORMAT stream_lf FORMAT stream_lf
@ -380,19 +380,19 @@ $! Get The Current Date & Time.
$! $!
$ TIME = F$TIME() $ TIME = F$TIME()
$! $!
$! Write The [.xxx.CRYPTO]BUILDINF.H File. $! Write The [.CRYPTO._xxx]BUILDINF.H File.
$! $!
$! WRITE H_FILE "#define CFLAGS """" /* Not filled in for now */" $! WRITE H_FILE "#define CFLAGS """" /* Not filled in for now */"
$ WRITE H_FILE "#define PLATFORM ""VMS ''ARCH' ''VMS_VER'""" $ WRITE H_FILE "#define PLATFORM ""VMS ''ARCH' ''VMS_VER'"""
$ WRITE H_FILE "#define DATE ""''TIME'"" " $ WRITE H_FILE "#define DATE ""''TIME'"" "
$! $!
$! Close The [.xxx.CRYPTO]BUILDINF.H File. $! Close The [.CRYPTO._xxx]BUILDINF.H File.
$! $!
$ CLOSE H_FILE $ CLOSE H_FILE
$! $!
$! Purge The [.xxx.CRYPTO]BUILDINF.H File. $! Purge The [.CRYPTO._xxx]BUILDINF.H File.
$! $!
$ PURGE SYS$DISK:[.'ARCH'.CRYPTO]BUILDINF.H $ PURGE SYS$DISK:[.CRYPTO._'ARCH']BUILDINF.H
$! $!
$! Delete [.CRYPTO]BUILDINF.H File, as there might be some residue from Unix. $! Delete [.CRYPTO]BUILDINF.H File, as there might be some residue from Unix.
$! $!
@ -538,12 +538,7 @@ $ IF D .EQS. ""
$ THEN $ THEN
$ COPY [.CRYPTO]'tmp' SYS$DISK:[.INCLUDE.OPENSSL] !/LOG $ COPY [.CRYPTO]'tmp' SYS$DISK:[.INCLUDE.OPENSSL] !/LOG
$ ELSE $ ELSE
$ IF D .EQS. "_''ARCH'" $ COPY [.CRYPTO.'D']'tmp' SYS$DISK:[.INCLUDE.OPENSSL] !/LOG
$ THEN
$ COPY [.'ARCH'.CRYPTO]'tmp' SYS$DISK:[.INCLUDE.OPENSSL] !/LOG
$ ELSE
$ COPY [.CRYPTO.'D']'tmp' SYS$DISK:[.INCLUDE.OPENSSL] !/LOG
$ ENDIF
$ ENDIF $ ENDIF
$ GOTO LOOP_SDIRS $ GOTO LOOP_SDIRS
$ LOOP_SDIRS_END: $ LOOP_SDIRS_END:
@ -769,8 +764,8 @@ $ WRITE SYS$OUTPUT ""
$ WRITE SYS$OUTPUT "The Target ",P1," Is Invalid. The Valid Target Options Are:" $ WRITE SYS$OUTPUT "The Target ",P1," Is Invalid. The Valid Target Options Are:"
$ WRITE SYS$OUTPUT "" $ WRITE SYS$OUTPUT ""
$ WRITE SYS$OUTPUT " ALL : Just Build Everything." $ WRITE SYS$OUTPUT " ALL : Just Build Everything."
$ WRITE SYS$OUTPUT " CONFIG : Just build the [.xxx.CRYPTO]OPENSSLCONF.H file." $ WRITE SYS$OUTPUT " CONFIG : Just build the [.CRYPTO._xxx]OPENSSLCONF.H file."
$ WRITE SYS$OUTPUT " BUILDINF : Just build the [.xxx.CRYPTO]BUILDINF.H file." $ WRITE SYS$OUTPUT " BUILDINF : Just build the [.CRYPTO._xxx]BUILDINF.H file."
$ WRITE SYS$OUTPUT " SOFTLINKS: Just Fix The Unix soft links." $ 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 " 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." $ WRITE SYS$OUTPUT " CRYPTO : To Build Just The [.xxx.EXE.CRYPTO]LIBCRYPTO.OLB Library."