QuasarApp/openssl
4
0
Fork 0
mirror of https://github.com/QuasarApp/openssl.git synced 2025-05-06 22:49:40 +00:00
Code Issues Projects Releases Wiki Activity

Add a "config" for verbosity and use it with Travis

Browse Source 
Modify VMS config.com to match

Reviewed-by: Emilia Käsper <emilia@openssl.org>
This commit is contained in:
Richard Levitte 2016-08-15 18:46:39 +02:00
parent a4ffbbeef6
commit ffb261ff19
3 changed files with 38 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -95,7 +95,7 @@ before_script:
if which ccache >/dev/null && [ "$CC" != clang-3.6 ]; then if which ccache >/dev/null && [ "$CC" != clang-3.6 ]; then
CC="ccache $CC"; CC="ccache $CC";
fi; fi;
$srcdir/config $CONFIG_OPTS; $srcdir/config -v $CONFIG_OPTS;
fi fi
- cd $top - cd $top

40
config
View File

@ -11,7 +11,8 @@
# #
# Do "config -h" for usage information. # Do "config -h" for usage information.
SUFFIX="" SUFFIX=""
TEST="false" DRYRUN="false"
VERBOSE="false"
EXE="" EXE=""
THERE=`dirname $0` THERE=`dirname $0`
@ -20,11 +21,13 @@ for i
do do
case "$i" in case "$i" in
-d*) options=$options" --debug";; -d*) options=$options" --debug";;
-t*) TEST="true";; -t*) DRYRUN="true" VERBOSE="true";;
-h*) TEST="true"; cat <<EOF -v*) VERBOSE="true";;
-h*) DRYRUN="true"; cat <<EOF
Usage: config [options] Usage: config [options]
-d Build with debugging when possible. -d Build with debugging when possible.
-t Test mode, do not run the Configure perl script. -t Test mode, do not run the Configure perl script.
-v Verbose mode, show the exact Configure call that is being made.
-h This help. -h This help.
Any other text will be passed to the Configure perl script. Any other text will be passed to the Configure perl script.
@ -450,7 +453,7 @@ case "$GUESSOS" in
mips4-sgi-irix64) mips4-sgi-irix64)
echo "WARNING! If you wish to build 64-bit library, then you have to" echo "WARNING! If you wish to build 64-bit library, then you have to"
echo " invoke '$THERE/Configure irix64-mips4-$CC' *manually*." echo " invoke '$THERE/Configure irix64-mips4-$CC' *manually*."
if [ "$TEST" = "false" -a -t 1 ]; then if [ "$DRYRUN" = "false" -a -t 1 ]; then
echo " You have about 5 seconds to press Ctrl-C to abort." echo " You have about 5 seconds to press Ctrl-C to abort."
(trap "stty `stty -g`; exit 0" 2 0; stty -icanon min 0 time 50; read waste) <&1 (trap "stty `stty -g`; exit 0" 2 0; stty -icanon min 0 time 50; read waste) <&1
fi fi
@ -469,7 +472,7 @@ case "$GUESSOS" in
if [ "$ISA64" = "1" -a -z "$KERNEL_BITS" ]; then if [ "$ISA64" = "1" -a -z "$KERNEL_BITS" ]; then
echo "WARNING! If you wish to build 64-bit library, then you have to" echo "WARNING! If you wish to build 64-bit library, then you have to"
echo " invoke '$THERE/Configure darwin64-ppc-cc' *manually*." echo " invoke '$THERE/Configure darwin64-ppc-cc' *manually*."
if [ "$TEST" = "false" -a -t 1 ]; then if [ "$DRYRUN" = "false" -a -t 1 ]; then
echo " You have about 5 seconds to press Ctrl-C to abort." echo " You have about 5 seconds to press Ctrl-C to abort."
(trap "stty `stty -g`; exit 0" 2 0; stty -icanon min 0 time 50; read waste) <&1 (trap "stty `stty -g`; exit 0" 2 0; stty -icanon min 0 time 50; read waste) <&1
fi fi
@ -484,7 +487,7 @@ case "$GUESSOS" in
if [ "$ISA64" = "1" -a -z "$KERNEL_BITS" ]; then if [ "$ISA64" = "1" -a -z "$KERNEL_BITS" ]; then
echo "WARNING! If you wish to build 64-bit library, then you have to" echo "WARNING! If you wish to build 64-bit library, then you have to"
echo " invoke 'KERNEL_BITS=64 $THERE/config $options'." echo " invoke 'KERNEL_BITS=64 $THERE/config $options'."
if [ "$TEST" = "false" -a -t 1 ]; then if [ "$DRYRUN" = "false" -a -t 1 ]; then
echo " You have about 5 seconds to press Ctrl-C to abort." echo " You have about 5 seconds to press Ctrl-C to abort."
# The stty technique used elsewhere doesn't work on # The stty technique used elsewhere doesn't work on
# MacOS. At least, right now on this Mac. # MacOS. At least, right now on this Mac.
@ -500,7 +503,7 @@ case "$GUESSOS" in
if [ -z "$KERNEL_BITS" ]; then if [ -z "$KERNEL_BITS" ]; then
echo "WARNING! If you wish to build 32-bit library, then you have to" echo "WARNING! If you wish to build 32-bit library, then you have to"
echo " invoke 'KERNEL_BITS=32 $THERE/config $options'." echo " invoke 'KERNEL_BITS=32 $THERE/config $options'."
if [ "$TEST" = "false" -a -t 1 ]; then if [ "$DRYRUN" = "false" -a -t 1 ]; then
echo " You have about 5 seconds to press Ctrl-C to abort." echo " You have about 5 seconds to press Ctrl-C to abort."
# The stty technique used elsewhere doesn't work on # The stty technique used elsewhere doesn't work on
# MacOS. At least, right now on this Mac. # MacOS. At least, right now on this Mac.
@ -538,7 +541,7 @@ case "$GUESSOS" in
if [ -z "$KERNEL_BITS" ]; then if [ -z "$KERNEL_BITS" ]; then
echo "WARNING! If you wish to build 64-bit library, then you have to" echo "WARNING! If you wish to build 64-bit library, then you have to"
echo " invoke '$THERE/Configure linux-ppc64' *manually*." echo " invoke '$THERE/Configure linux-ppc64' *manually*."
if [ "$TEST" = "false" -a -t 1 ]; then if [ "$DRYRUN" = "false" -a -t 1 ]; then
echo " You have about 5 seconds to press Ctrl-C to abort." echo " You have about 5 seconds to press Ctrl-C to abort."
(trap "stty `stty -g`; exit 0" 2 0; stty -icanon min 0 time 50; read waste) <&1 (trap "stty `stty -g`; exit 0" 2 0; stty -icanon min 0 time 50; read waste) <&1
fi fi
@ -555,7 +558,7 @@ case "$GUESSOS" in
mips64*-*-linux2) mips64*-*-linux2)
echo "WARNING! If you wish to build 64-bit library, then you have to" echo "WARNING! If you wish to build 64-bit library, then you have to"
echo " invoke '$THERE/Configure linux64-mips64' *manually*." echo " invoke '$THERE/Configure linux64-mips64' *manually*."
if [ "$TEST" = "false" -a -t 1 ]; then if [ "$DRYRUN" = "false" -a -t 1 ]; then
echo " You have about 5 seconds to press Ctrl-C to abort." echo " You have about 5 seconds to press Ctrl-C to abort."
(trap "stty `stty -g`; exit 0" 2 0; stty -icanon min 0 time 50; read waste) <&1 (trap "stty `stty -g`; exit 0" 2 0; stty -icanon min 0 time 50; read waste) <&1
fi fi
@ -572,7 +575,7 @@ case "$GUESSOS" in
echo "WARNING! If you *know* that your GNU C supports 64-bit/V9 ABI" echo "WARNING! If you *know* that your GNU C supports 64-bit/V9 ABI"
echo " and wish to build 64-bit library, then you have to" echo " and wish to build 64-bit library, then you have to"
echo " invoke '$THERE/Configure linux64-sparcv9' *manually*." echo " invoke '$THERE/Configure linux64-sparcv9' *manually*."
if [ "$TEST" = "false" -a -t 1 ]; then if [ "$DRYRUN" = "false" -a -t 1 ]; then
echo " You have about 5 seconds to press Ctrl-C to abort." echo " You have about 5 seconds to press Ctrl-C to abort."
(trap "stty `stty -g`; exit 0" 2 0; stty -icanon min 0 time 50; read waste) <&1 (trap "stty `stty -g`; exit 0" 2 0; stty -icanon min 0 time 50; read waste) <&1
fi fi
@ -620,7 +623,7 @@ case "$GUESSOS" in
#if egrep -e '^features.* highgprs' /proc/cpuinfo >/dev/null ; then #if egrep -e '^features.* highgprs' /proc/cpuinfo >/dev/null ; then
# echo "WARNING! If you wish to build \"highgprs\" 32-bit library, then you" # echo "WARNING! If you wish to build \"highgprs\" 32-bit library, then you"
# echo " have to invoke './Configure linux32-s390x' *manually*." # echo " have to invoke './Configure linux32-s390x' *manually*."
# if [ "$TEST" = "false" -a -t -1 ]; then # if [ "$DRYRUN" = "false" -a -t -1 ]; then
# echo " You have about 5 seconds to press Ctrl-C to abort." # echo " You have about 5 seconds to press Ctrl-C to abort."
# (trap "stty `stty -g`; exit 0" 2 0; stty -icanon min 0 time 50; read waste) <&1 # (trap "stty `stty -g`; exit 0" 2 0; stty -icanon min 0 time 50; read waste) <&1
# fi # fi
@ -643,7 +646,7 @@ case "$GUESSOS" in
if [ "$CC" = "cc" -a $CCVER -ge 50 ]; then if [ "$CC" = "cc" -a $CCVER -ge 50 ]; then
echo "WARNING! If you wish to build 64-bit library, then you have to" echo "WARNING! If you wish to build 64-bit library, then you have to"
echo " invoke '$THERE/Configure solaris64-sparcv9-cc' *manually*." echo " invoke '$THERE/Configure solaris64-sparcv9-cc' *manually*."
if [ "$TEST" = "false" -a -t 1 ]; then if [ "$DRYRUN" = "false" -a -t 1 ]; then
echo " You have about 5 seconds to press Ctrl-C to abort." echo " You have about 5 seconds to press Ctrl-C to abort."
(trap "stty `stty -g`; exit 0" 2 0; stty -icanon min 0 time 50; read waste) <&1 (trap "stty `stty -g`; exit 0" 2 0; stty -icanon min 0 time 50; read waste) <&1
fi fi
@ -655,7 +658,7 @@ case "$GUESSOS" in
OUT="solaris64-sparcv9-gcc" OUT="solaris64-sparcv9-gcc"
echo "WARNING! If you wish to build 32-bit library, then you have to" echo "WARNING! If you wish to build 32-bit library, then you have to"
echo " invoke '$THERE/Configure solaris-sparcv9-gcc' *manually*." echo " invoke '$THERE/Configure solaris-sparcv9-gcc' *manually*."
if [ "$TEST" = "false" -a -t 1 ]; then if [ "$DRYRUN" = "false" -a -t 1 ]; then
echo " You have about 5 seconds to press Ctrl-C to abort." echo " You have about 5 seconds to press Ctrl-C to abort."
(trap "stty `stty -g`; exit 0" 2 0; stty -icanon min 0 time 50; read waste) <&1 (trap "stty `stty -g`; exit 0" 2 0; stty -icanon min 0 time 50; read waste) <&1
fi fi
@ -663,7 +666,7 @@ case "$GUESSOS" in
echo "NOTICE! If you *know* that your GNU C supports 64-bit/V9 ABI" echo "NOTICE! If you *know* that your GNU C supports 64-bit/V9 ABI"
echo " and wish to build 64-bit library, then you have to" echo " and wish to build 64-bit library, then you have to"
echo " invoke '$THERE/Configure solaris64-sparcv9-gcc' *manually*." echo " invoke '$THERE/Configure solaris64-sparcv9-gcc' *manually*."
if [ "$TEST" = "false" -a -t 1 ]; then if [ "$DRYRUN" = "false" -a -t 1 ]; then
echo " You have about 5 seconds to press Ctrl-C to abort." echo " You have about 5 seconds to press Ctrl-C to abort."
(trap "stty `stty -g`; exit 0" 2 0; stty -icanon min 0 time 50; read waste) <&1 (trap "stty `stty -g`; exit 0" 2 0; stty -icanon min 0 time 50; read waste) <&1
fi fi
@ -747,7 +750,7 @@ case "$GUESSOS" in
if [ $KERNEL_BITS -eq 64 -a "$CC" = "cc" ]; then if [ $KERNEL_BITS -eq 64 -a "$CC" = "cc" ]; then
echo "WARNING! If you wish to build 64-bit library then you have to" echo "WARNING! If you wish to build 64-bit library then you have to"
echo " invoke '$THERE/Configure hpux64-parisc2-cc' *manually*." echo " invoke '$THERE/Configure hpux64-parisc2-cc' *manually*."
if [ "$TEST" = "false" -a -t 1 ]; then if [ "$DRYRUN" = "false" -a -t 1 ]; then
echo " You have about 5 seconds to press Ctrl-C to abort." echo " You have about 5 seconds to press Ctrl-C to abort."
(trap "stty `stty -g`; exit 0" 2 0; stty -icanon min 0 time 50; read waste) <&1 (trap "stty `stty -g`; exit 0" 2 0; stty -icanon min 0 time 50; read waste) <&1
fi fi
@ -784,7 +787,7 @@ case "$GUESSOS" in
if [ $KERNEL_BITS -eq 64 ]; then if [ $KERNEL_BITS -eq 64 ]; then
echo "WARNING! If you wish to build 64-bit kit, then you have to" echo "WARNING! If you wish to build 64-bit kit, then you have to"
echo " invoke '$THERE/Configure aix64-cc' *manually*." echo " invoke '$THERE/Configure aix64-cc' *manually*."
if [ "$TEST" = "false" -a -t 1 ]; then if [ "$DRYRUN" = "false" -a -t 1 ]; then
echo " You have ~5 seconds to press Ctrl-C to abort." echo " You have ~5 seconds to press Ctrl-C to abort."
(trap "stty `stty -g`; exit 0" 2 0; stty -icanon min 0 time 50; read waste) <&1 (trap "stty `stty -g`; exit 0" 2 0; stty -icanon min 0 time 50; read waste) <&1
fi fi
@ -902,9 +905,10 @@ $PERL $THERE/Configure LIST | grep "$OUT" > /dev/null
if [ $? = "0" ]; then if [ $? = "0" ]; then
echo Configuring for $OUT echo Configuring for $OUT
if [ "$TEST" = "true" ]; then if [ "$VERBOSE" = "true" ]; then
echo $PERL $THERE/Configure $OUT $options echo $PERL $THERE/Configure $OUT $options
else fi
if [ "$DRYRUN" = "false" ]; then
$PERL $THERE/Configure $OUT $options $PERL $THERE/Configure $OUT $options
fi fi
else else

25
config.com
View File

@ -16,7 +16,8 @@ $ ! -t test mode, doesn't run Configure
$ $
$ arch = f$edit( f$getsyi( "arch_name"), "lowercase") $ arch = f$edit( f$getsyi( "arch_name"), "lowercase")
$ pointer_size = "" $ pointer_size = ""
$ test = 0 $ dryrun = 0
$ verbose = 0
$ here = F$PARSE("A.;",F$ENVIRONMENT("PROCEDURE"),,,"SYNTAX_ONLY") - "A.;" $ here = F$PARSE("A.;",F$ENVIRONMENT("PROCEDURE"),,,"SYNTAX_ONLY") - "A.;"
$ $
$ collected_args = "" $ collected_args = ""
@ -27,7 +28,7 @@ $ IF P_index .GT. 8 THEN GOTO ENDLOOP1
$ P = F$EDIT(P1,"TRIM,LOWERCASE") $ P = F$EDIT(P1,"TRIM,LOWERCASE")
$ IF P .EQS. "-h" $ IF P .EQS. "-h"
$ THEN $ THEN
$ TEST = 1 $ dryrun = 1
$ P = "" $ P = ""
$ TYPE SYS$INPUT $ TYPE SYS$INPUT
$ DECK $ DECK
@ -37,6 +38,7 @@ Usage: @config [options]
-64 or 64 Build with 64-bit pointer size. -64 or 64 Build with 64-bit pointer size.
-d Build with debugging. -d Build with debugging.
-t Test mode, do not run the Configure perl script. -t Test mode, do not run the Configure perl script.
-v Verbose mode, show the exact Configure call that is being made.
-h This help. -h This help.
Any other text will be passed to the Configure perl script. Any other text will be passed to the Configure perl script.
@ -46,7 +48,13 @@ $ EOD
$ ENDIF $ ENDIF
$ IF P .EQS. "-t" $ IF P .EQS. "-t"
$ THEN $ THEN
$ test = 1 $ dryrun = 1
$ verbose = 1
$ P = ""
$ ENDIF
$ IF P .EQS. "-v"
$ THEN
$ verbose = 1
$ P = "" $ P = ""
$ ENDIF $ ENDIF
$ IF P .EQS. "-32" .OR. P .EQS. "32" $ IF P .EQS. "-32" .OR. P .EQS. "32"
@ -78,12 +86,9 @@ $ GOTO LOOP1
$ ENDLOOP1: $ ENDLOOP1:
$ $
$ target = "vms-''arch'''pointer_size'" $ target = "vms-''arch'''pointer_size'"
$ IF test $ IF verbose THEN -
$ THEN WRITE SYS$OUTPUT "PERL ''here'Configure ""''target'""''collected_args'"
$ WRITE SYS$OUTPUT "PERL ''here'Configure ""''target'""''collected_args'" $ IF .not. dryrun THEN -
$ ELSE PERL 'here'Configure "''target'" 'debug' 'collected_args'
$ PERL 'here'Configure "''target'" 'debug' 'collected_args'
$ ENDIF $ ENDIF
$ EXIT $STATUS $ EXIT $STATUS
$
$ USAGE: