First attempt at adding the possibility to set the pointer size for the builds on...

[openssl.git] / apps / makeapps.com

diff --git a/apps/makeapps.com b/apps/makeapps.com
index 2e90443fbc346da31f2544469b2a6846c9aae1f7..ab849e86c7fe48304bf9ceb1409565f4fa879f71 100644 (file)
--- a/apps/makeapps.com
+++ b/apps/makeapps.com
@@ -6,11 +6,12 @@ $!               A-Com Computing, Inc.
 $!               byer@mail.all-net.net
 $!
 $!  Changes by Richard Levitte <richard@levitte.org>
 $!               byer@mail.all-net.net
 $!
 $!  Changes by Richard Levitte <richard@levitte.org>

+$!             Zoltan Arpadffy <zoli@polarhome.com>   

 $!
 $!  This command files compiles and creates all the various different
 $!  "application" programs for the different types of encryption for OpenSSL.
 $!  The EXE's are placed in the directory [.xxx.EXE.APPS] where "xxx" denotes
 $!
 $!  This command files compiles and creates all the various different
 $!  "application" programs for the different types of encryption for OpenSSL.
 $!  The EXE's are placed in the directory [.xxx.EXE.APPS] where "xxx" denotes

-$!  either AXP or VAX depending on your machine architecture.
+$!  ALPHA, IA64 or VAX, depending on your machine architecture.

 $!
 $!  It was written so it would try to determine what "C" compiler to
 $!  use or you can specify which "C" compiler to use.
 $!
 $!  It was written so it would try to determine what "C" compiler to
 $!  use or you can specify which "C" compiler to use.


@@ -38,6 +39,13 @@ $!  P4, if defined, sets a compiler thread NOT needed on OpenVMS 7.1 (and up)
 $!
 $!  P5, if defined, sets a choice of programs to compile.
 $!
 $!
 $!  P5, if defined, sets a choice of programs to compile.
 $!

+$!  For 64 bit architectures (Alpha and IA64), specify the pointer size as P6.
+$!  For 32 bit architectures (VAX), P6 is ignored.
+$!  Currently supported values are:
+$!
+$!     32      To ge a library compiled with /POINTER_SIZE=32
+$!     64      To ge a library compiled with /POINTER_SIZE=64
+$!

 $!
 $! Define A TCP/IP Library That We Will Need To Link To.
 $! (That Is, If We Need To Link To One.)
 $!
 $! Define A TCP/IP Library That We Will Need To Link To.
 $! (That Is, If We Need To Link To One.)


@@ -46,20 +54,21 @@ $ TCPIP_LIB = ""
 $!
 $! Check What Architecture We Are Using.
 $!
 $!
 $! Check What Architecture We Are Using.
 $!

-$ IF (F$GETSYI("CPU").GE.128)
+$ IF (F$GETSYI("CPU").LT.128)

 $ THEN
 $!
 $ THEN
 $!

-$!  The Architecture Is AXP.
+$!  The Architecture Is VAX.

 $!
 $!

-$   ARCH := AXP
+$   ARCH := VAX

 $!
 $! Else...
 $!
 $ ELSE
 $!
 $!
 $! Else...
 $!
 $ ELSE
 $!

-$!  The Architecture Is VAX.
+$!  The Architecture Is Alpha, IA64 or whatever comes in the future.

 $!
 $!

-$   ARCH := VAX
+$   ARCH = F$EDIT( F$GETSYI( "ARCH_NAME"), "UPCASE")
+$   IF (ARCH .EQS. "") THEN ARCH = "UNK"

 $!
 $! End The Architecture Check.
 $!
 $!
 $! End The Architecture Check.
 $!


@@ -69,29 +78,33 @@ $! Define what programs should be compiled
 $!
 $ PROGRAMS := OPENSSL
 $!
 $!
 $ PROGRAMS := OPENSSL
 $!

-$! Check To Make Sure We Have Valid Command Line Parameters.
+$! Define The CRYPTO Library.

 $!
 $!

-$ GOSUB CHECK_OPTIONS
+$ CRYPTO_LIB := SYS$DISK:[-.'ARCH'.EXE.CRYPTO]LIBCRYPTO'LIB32'.OLB

 $!
 $!

-$! Initialise logical names and such
+$! Define The SSL Library.

 $!
 $!

-$ GOSUB INITIALISE
+$ SSL_LIB := SYS$DISK:[-.'ARCH'.EXE.SSL]LIBSSL'LIB32'.OLB

 $!
 $!

-$! Tell The User What Kind of Machine We Run On.
+$! Define The OBJ Directory.

 $!
 $!

-$ WRITE SYS$OUTPUT "Compiling On A ",ARCH," Machine."
+$ OBJ_DIR := SYS$DISK:[-.'ARCH'.OBJ.APPS]

 $!
 $!

-$! Define The CRYPTO Library.
+$! Define The EXE Directory.

 $!
 $!

-$ CRYPTO_LIB := SYS$DISK:[-.'ARCH'.EXE.CRYPTO]LIBCRYPTO.OLB
+$ EXE_DIR := SYS$DISK:[-.'ARCH'.EXE.APPS]

 $!
 $!

-$! Define The SSL Library.
+$! Check To Make Sure We Have Valid Command Line Parameters.

 $!
 $!

-$ SSL_LIB := SYS$DISK:[-.'ARCH'.EXE.SSL]LIBSSL.OLB
+$ GOSUB CHECK_OPTIONS

 $!
 $!

-$! Define The OBJ Directory.
+$! Initialise logical names and such

 $!
 $!

-$ OBJ_DIR := SYS$DISK:[-.'ARCH'.OBJ.APPS]
+$ GOSUB INITIALISE
+$!
+$! Tell The User What Kind of Machine We Run On.
+$!
+$ WRITE SYS$OUTPUT "Compiling On A ",ARCH," Machine."

 $!
 $! Check To See If The OBJ Directory Exists.
 $!
 $!
 $! Check To See If The OBJ Directory Exists.
 $!


@@ -106,10 +119,6 @@ $! End The OBJ Directory Check.
 $!
 $ ENDIF
 $!
 $!
 $ ENDIF
 $!

-$! Define The EXE Directory.
-$!
-$ EXE_DIR := SYS$DISK:[-.'ARCH'.EXE.APPS]
-$!

 $! Check To See If The EXE Directory Exists.
 $!
 $ IF (F$PARSE(EXE_DIR).EQS."")
 $! Check To See If The EXE Directory Exists.
 $!
 $ IF (F$PARSE(EXE_DIR).EQS."")


@@ -132,6 +141,9 @@ $!
 $ GOSUB CHECK_OPT_FILE
 $!
 $! Define The Application Files.
 $ GOSUB CHECK_OPT_FILE
 $!
 $! Define The Application Files.

+$! NOTE: Some might think this list ugly.  However, it's made this way to
+$! reflect the E_OBJ variable in Makefile as closely as possible, thereby
+$! making it fairly easy to verify that the lists are the same.

 $!
 $ LIB_OPENSSL = "VERIFY,ASN1PARS,REQ,DGST,DH,DHPARAM,ENC,PASSWD,GENDH,ERRSTR,"+-
                "CA,PKCS7,CRL2P7,CRL,"+-
 $!
 $ LIB_OPENSSL = "VERIFY,ASN1PARS,REQ,DGST,DH,DHPARAM,ENC,PASSWD,GENDH,ERRSTR,"+-
                "CA,PKCS7,CRL2P7,CRL,"+-


@@ -146,7 +158,7 @@ $ IF COMPILER .EQS. "VAXC" THEN -
 $!
 $! Setup exceptional compilations
 $!
 $!
 $! Setup exceptional compilations
 $!

-$ COMPILEWITH_CC2 = ",S_SERVER,S_CLIENT,"
+$ COMPILEWITH_CC2 = ",S_SOCKET,S_SERVER,S_CLIENT,"

 $!
 $ PHASE := LIB
 $!
 $!
 $ PHASE := LIB
 $!


@@ -164,6 +176,10 @@ $!  Make The Application File Name
 $!
 $ CURRENT_APP = F$EDIT(F$ELEMENT(APP_COUNTER,",",PROGRAMS),"TRIM")
 $!
 $!
 $ CURRENT_APP = F$EDIT(F$ELEMENT(APP_COUNTER,",",PROGRAMS),"TRIM")
 $!

+$!  Create The Executable File Name.
+$!
+$   EXE_FILE = EXE_DIR + CURRENT_APP + ".EXE"
+$!

 $!  Check To See If We Are At The End Of The File List.
 $!
 $ IF (CURRENT_APP.EQS.",")
 $!  Check To See If We Are At The End Of The File List.
 $!
 $ IF (CURRENT_APP.EQS.",")


@@ -227,10 +243,6 @@ $!
 $!  Create The Object File Name.
 $!
 $   OBJECT_FILE = OBJ_DIR + FILE_NAME + ".OBJ"
 $!  Create The Object File Name.
 $!
 $   OBJECT_FILE = OBJ_DIR + FILE_NAME + ".OBJ"

-$!
-$!  Create The Executable File Name.
-$!
-$   EXE_FILE = EXE_DIR + FILE_NAME + ".EXE"

 $   ON WARNING THEN GOTO NEXT_LIB
 $!
 $!  Check To See If The File We Want To Compile Actually Exists.
 $   ON WARNING THEN GOTO NEXT_LIB
 $!
 $!  Check To See If The File We Want To Compile Actually Exists.


@@ -420,19 +432,19 @@ $!    Else...
 $!
 $     ELSE
 $!
 $!
 $     ELSE
 $!

-$!      Create The AXP Linker Option File.
+$!      Create The non-VAX Linker Option File.

 $!
 $       CREATE 'OPT_FILE'
 $DECK
 !
 $!
 $       CREATE 'OPT_FILE'
 $DECK
 !

-! Default System Options File For AXP To Link Agianst 
+! Default System Options File For non-VAX To Link Agianst 

 ! The Sharable C Runtime Library.
 !
 SYS$SHARE:CMA$OPEN_LIB_SHR/SHARE
 SYS$SHARE:CMA$OPEN_RTL/SHARE
 $EOD
 $!
 ! The Sharable C Runtime Library.
 !
 SYS$SHARE:CMA$OPEN_LIB_SHR/SHARE
 SYS$SHARE:CMA$OPEN_RTL/SHARE
 $EOD
 $!

-$!    End The VAX/AXP DEC C Option File Check.
+$!    End The DEC C Option File Check.

 $!
 $     ENDIF
 $!
 $!
 $     ENDIF
 $!


@@ -558,6 +570,51 @@ $! End The P1 Check.
 $!
 $ ENDIF
 $!
 $!
 $ ENDIF
 $!

+$!  Check is P6 Is Valid
+$!
+$   IF (P6.EQS."32")
+$   THEN
+$     POINTER_SIZE = "/POINTER_SIZE=32"
+$     IF ARCH .EQS. "VAX"
+$     THEN
+$       LIB32 = ""
+$     ELSE
+$       LIB32 = "32"
+$     ENDIF
+$   ELSE
+$     IF (P6.EQS."64")
+$     THEN
+$       LIB32 = ""
+$       IF ARCH .EQS. "VAX"
+$       THEN
+$         POINTER_SIZE = "/POINTER_SIZE=32"
+$       ELSE
+$         POINTER_SIZE = "/POINTER_SIZE=64"
+$       ENDIF
+$     ELSE
+$!
+$!      Tell The User Entered An Invalid Option..
+$!
+$       WRITE SYS$OUTPUT ""
+$       WRITE SYS$OUTPUT "The Option ",P6," Is Invalid.  The Valid Options Are:"
+$       WRITE SYS$OUTPUT ""
+$       WRITE SYS$OUTPUT "    32  :  Compile with 32 bit pointer size"
+$       WRITE SYS$OUTPUT "    64  :  Compile with 64 bit pointer size"
+$       WRITE SYS$OUTPUT ""
+$!
+$!      Time To EXIT.
+$!
+$       GOTO TIDY
+$!
+$!      End The Valid Arguement Check.
+$!
+$     ENDIF
+$   ENDIF
+$!
+$! End The P6 Check.
+$!
+$ ENDIF
+$!

 $! Check To See If P2 Is Blank.
 $!
 $ IF (P2.EQS."")
 $! Check To See If P2 Is Blank.
 $!
 $ IF (P2.EQS."")


@@ -581,7 +638,7 @@ $   ELSE
 $!
 $!  Check To See If We Have VAXC Or DECC.
 $!
 $!
 $!  Check To See If We Have VAXC Or DECC.
 $!

-$     IF (ARCH.EQS."AXP").OR.(F$TRNLNM("DECC$CC_DEFAULT").NES."")
+$     IF (ARCH.NES."VAX").OR.(F$TRNLNM("DECC$CC_DEFAULT").NES."")

 $     THEN 
 $!
 $!      Looks Like DECC, Set To Use DECC.
 $     THEN 
 $!
 $!      Looks Like DECC, Set To Use DECC.


@@ -685,13 +742,13 @@ $!
 $     CC = "CC"
 $     IF ARCH.EQS."VAX" .AND. F$TRNLNM("DECC$CC_DEFAULT").NES."/DECC" -
         THEN CC = "CC/DECC"
 $     CC = "CC"
 $     IF ARCH.EQS."VAX" .AND. F$TRNLNM("DECC$CC_DEFAULT").NES."/DECC" -
         THEN CC = "CC/DECC"

-$     CC = CC + "/''CC_OPTIMIZE'/''DEBUGGER'/STANDARD=ANSI89" + -
+$     CC = CC + "/''CC_OPTIMIZE'/''DEBUGGER'/STANDARD=ANSI89''POINTER_SIZE'" + -

            "/NOLIST/PREFIX=ALL" + -
           "/INCLUDE=(SYS$DISK:[-],SYS$DISK:[-.CRYPTO])" + CCEXTRAFLAGS
 $!
 $!    Define The Linker Options File Name.
 $!
            "/NOLIST/PREFIX=ALL" + -
           "/INCLUDE=(SYS$DISK:[-],SYS$DISK:[-.CRYPTO])" + CCEXTRAFLAGS
 $!
 $!    Define The Linker Options File Name.
 $!

-$     OPT_FILE = "SYS$DISK:[]VAX_DECC_OPTIONS.OPT"
+$     OPT_FILE = "''EXE_DIR'VAX_DECC_OPTIONS.OPT"

 $!
 $!  End DECC Check.
 $!
 $!
 $!  End DECC Check.
 $!


@@ -712,9 +769,9 @@ $!
 $!    Compile Using VAXC.
 $!
 $     CC = "CC"
 $!    Compile Using VAXC.
 $!
 $     CC = "CC"

-$     IF ARCH.EQS."AXP"
+$     IF ARCH.NES."VAX"

 $     THEN
 $     THEN

-$      WRITE SYS$OUTPUT "There is no VAX C on Alpha!"
+$      WRITE SYS$OUTPUT "There is no VAX C on ''ARCH'!"

 $      EXIT
 $     ENDIF
 $     IF F$TRNLNM("DECC$CC_DEFAULT").EQS."/DECC" THEN CC = "CC/VAXC"
 $      EXIT
 $     ENDIF
 $     IF F$TRNLNM("DECC$CC_DEFAULT").EQS."/DECC" THEN CC = "CC/VAXC"


@@ -728,7 +785,7 @@ $     DEFINE/NOLOG SYS SYS$COMMON:[SYSLIB]
 $!
 $!    Define The Linker Options File Name.
 $!
 $!
 $!    Define The Linker Options File Name.
 $!

-$     OPT_FILE = "SYS$DISK:[]VAX_VAXC_OPTIONS.OPT"
+$     OPT_FILE = "''EXE_DIR'VAX_VAXC_OPTIONS.OPT"

 $!
 $!  End VAXC Check
 $!
 $!
 $!  End VAXC Check
 $!


@@ -755,7 +812,7 @@ $     CC = GCC+"/NOCASE_HACK/''GCC_OPTIMIZE'/''DEBUGGER'/NOLIST" + -
 $!
 $!    Define The Linker Options File Name.
 $!
 $!
 $!    Define The Linker Options File Name.
 $!

-$     OPT_FILE = "SYS$DISK:[]VAX_GNUC_OPTIONS.OPT"
+$     OPT_FILE = "''EXE_DIR'VAX_GNUC_OPTIONS.OPT"

 $!
 $!  End The GNU C Check.
 $!
 $!
 $!  End The GNU C Check.
 $!