The previous take went wrong, try again.

This commit is contained in:
Richard Levitte 2010-01-29 12:02:54 +00:00
parent fa79cc9c23
commit d023b4e2dd
2 changed files with 16 additions and 17 deletions

View File

@ -41,6 +41,7 @@ $ IF F$PARSE("WRK_SSLINCLUDE:") .EQS. "" THEN -
CREATE/DIR/LOG WRK_SSLINCLUDE: CREATE/DIR/LOG WRK_SSLINCLUDE:
$ $
$ SDIRS := ,- $ SDIRS := ,-
_'ARCH',-
OBJECTS,- OBJECTS,-
MD2,MD4,MD5,SHA,MDC2,HMAC,RIPEMD,WHRLPOOL,- MD2,MD4,MD5,SHA,MDC2,HMAC,RIPEMD,WHRLPOOL,-
DES,AES,RC2,RC4,RC5,IDEA,BF,CAST,CAMELLIA,SEED,- DES,AES,RC2,RC4,RC5,IDEA,BF,CAST,CAMELLIA,SEED,-
@ -49,8 +50,8 @@ $ SDIRS := ,-
EVP,ASN1,PEM,X509,X509V3,CONF,TXT_DB,PKCS7,PKCS12,COMP,OCSP,- EVP,ASN1,PEM,X509,X509V3,CONF,TXT_DB,PKCS7,PKCS12,COMP,OCSP,-
UI,KRB5,- UI,KRB5,-
STORE,CMS,PQUEUE,TS,JPAKE STORE,CMS,PQUEUE,TS,JPAKE
$ EXHEADER_ := crypto.h,opensslv.h,opensslconf.h,ebcdic.h,symhacks.h,- $ EXHEADER_ := crypto.h,opensslv.h,ebcdic.h,symhacks.h,ossl_typ.h
ossl_typ.h $ EXHEADER__'ARCH' := opensslconf.h
$ EXHEADER_OBJECTS := objects.h,obj_mac.h $ EXHEADER_OBJECTS := objects.h,obj_mac.h
$ EXHEADER_MD2 := md2.h $ EXHEADER_MD2 := md2.h
$ EXHEADER_MD4 := md4.h $ EXHEADER_MD4 := md4.h
@ -117,13 +118,14 @@ $ IF D .EQS. "," THEN GOTO LOOP_SDIRS_END
$ tmp = EXHEADER_'D' $ tmp = EXHEADER_'D'
$ IF D .EQS. "" $ IF D .EQS. ""
$ THEN $ THEN
$ ! If we don't find a file in the source directory, it's most
$ ! probably generated for each architecture
$ ! (opensslconf.h, for example)
$ IF F$SEARCH("''tmp'") .EQS. "" THEN tmp = "[-.''ARCH'.CRYPTO]''tmp'"
$ COPY 'tmp' WRK_SSLINCLUDE: /LOG $ COPY 'tmp' WRK_SSLINCLUDE: /LOG
$ ELSE $ ELSE
$ COPY [.'D']'tmp' WRK_SSLINCLUDE: /LOG $ IF D .EQS. "_''ARCH'"
$ THEN
$ COPY [-.'ARCH'.CRYPTO]'tmp' WRK_SSLINCLUDE: /LOG
$ ELSE
$ COPY [.'D']'tmp' WRK_SSLINCLUDE: /LOG
$ ENDIF
$ ENDIF $ ENDIF
$ SET FILE/PROT=WORLD:RE WRK_SSLINCLUDE:'tmp' $ SET FILE/PROT=WORLD:RE WRK_SSLINCLUDE:'tmp'
$ GOTO LOOP_SDIRS $ GOTO LOOP_SDIRS

View File

@ -457,7 +457,7 @@ $!
$! Copy All The ".H" Files From The [.CRYPTO] Directory Tree. $! Copy All The ".H" Files From The [.CRYPTO] Directory Tree.
$! $!
$ SDIRS := ,- $ SDIRS := ,-
'ARCH',- _'ARCH',-
OBJECTS,- OBJECTS,-
MD2,MD4,MD5,SHA,MDC2,HMAC,RIPEMD,WHRLPOOL,- MD2,MD4,MD5,SHA,MDC2,HMAC,RIPEMD,WHRLPOOL,-
DES,AES,RC2,RC4,RC5,IDEA,BF,CAST,CAMELLIA,SEED,MODES,- DES,AES,RC2,RC4,RC5,IDEA,BF,CAST,CAMELLIA,SEED,MODES,-
@ -465,7 +465,8 @@ $ SDIRS := ,-
BUFFER,BIO,STACK,LHASH,RAND,ERR,- BUFFER,BIO,STACK,LHASH,RAND,ERR,-
EVP,ASN1,PEM,X509,X509V3,CONF,TXT_DB,PKCS7,PKCS12,COMP,OCSP,UI,KRB5,- EVP,ASN1,PEM,X509,X509V3,CONF,TXT_DB,PKCS7,PKCS12,COMP,OCSP,UI,KRB5,-
STORE,CMS,PQUEUE,TS,JPAKE STORE,CMS,PQUEUE,TS,JPAKE
$ EXHEADER_ := crypto.h,opensslv.h,opensslconf.h,ebcdic.h,symhacks.h,ossl_typ.h $ EXHEADER_ := crypto.h,opensslv.h,ebcdic.h,symhacks.h,ossl_typ.h
$ EXHEADER__'ARCH' := opensslconf.h
$ EXHEADER_OBJECTS := objects.h,obj_mac.h $ EXHEADER_OBJECTS := objects.h,obj_mac.h
$ EXHEADER_MD2 := md2.h $ EXHEADER_MD2 := md2.h
$ EXHEADER_MD4 := md4.h $ EXHEADER_MD4 := md4.h
@ -529,17 +530,13 @@ $ IF D .EQS. "," THEN GOTO LOOP_SDIRS_END
$ tmp = EXHEADER_'D' $ tmp = EXHEADER_'D'
$ IF D .EQS. "" $ IF D .EQS. ""
$ THEN $ THEN
$ ! If we don't find a file in the source directory, it's most $ COPY [.CRYPTO]'tmp' SYS$DISK:[.INCLUDE.OPENSSL] !/LOG
$ ! probably generated for each architecture $ ELSE
$ ! (opensslconf.h, for example) $ IF D .EQS. "_''ARCH'" THEN
$ IF F$SEARCH("[.CRYPTO]''tmp'") .EQS. ""
$ THEN
$ COPY [.'ARCH'.CRYPTO]'tmp' SYS$DISK:[.INCLUDE.OPENSSL] !/LOG $ COPY [.'ARCH'.CRYPTO]'tmp' SYS$DISK:[.INCLUDE.OPENSSL] !/LOG
$ ELSE $ ELSE
$ COPY [.CRYPTO]'tmp' SYS$DISK:[.INCLUDE.OPENSSL] !/LOG $ COPY [.CRYPTO.'D']'tmp' SYS$DISK:[.INCLUDE.OPENSSL] !/LOG
$ ENDIF $ ENDIF
$ ELSE
$ COPY [.CRYPTO.'D']'tmp' SYS$DISK:[.INCLUDE.OPENSSL] !/LOG
$ ENDIF $ ENDIF
$ GOTO LOOP_SDIRS $ GOTO LOOP_SDIRS
$ LOOP_SDIRS_END: $ LOOP_SDIRS_END: