diff options
author | Richard Levitte <levitte@openssl.org> | 2016-08-15 18:46:39 +0200 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2016-08-16 10:38:45 +0200 |
commit | ffb261ff192b1af83726305aee17d025ff8fe352 (patch) | |
tree | 5642a1ac545cd2e528c5cebaf4fce68aa729eec7 | |
parent | a4ffbbeef6ccf2f273ecaae3883ae7644ab5b417 (diff) |
Add a "config" for verbosity and use it with Travis
Modify VMS config.com to match
Reviewed-by: Emilia Käsper <emilia@openssl.org>
-rw-r--r-- | .travis.yml | 2 | ||||
-rwxr-xr-x | config | 40 | ||||
-rw-r--r-- | config.com | 25 |
3 files changed, 38 insertions, 29 deletions
diff --git a/.travis.yml b/.travis.yml index e73a4a050f..ad56a5f3e9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -95,7 +95,7 @@ before_script: if which ccache >/dev/null && [ "$CC" != clang-3.6 ]; then CC="ccache $CC"; fi; - $srcdir/config $CONFIG_OPTS; + $srcdir/config -v $CONFIG_OPTS; fi - cd $top @@ -11,7 +11,8 @@ # # Do "config -h" for usage information. SUFFIX="" -TEST="false" +DRYRUN="false" +VERBOSE="false" EXE="" THERE=`dirname $0` @@ -20,11 +21,13 @@ for i do case "$i" in -d*) options=$options" --debug";; --t*) TEST="true";; --h*) TEST="true"; cat <<EOF +-t*) DRYRUN="true" VERBOSE="true";; +-v*) VERBOSE="true";; +-h*) DRYRUN="true"; cat <<EOF Usage: config [options] -d Build with debugging when possible. -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. Any other text will be passed to the Configure perl script. @@ -450,7 +453,7 @@ case "$GUESSOS" in mips4-sgi-irix64) echo "WARNING! If you wish to build 64-bit library, then you have to" 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." (trap "stty `stty -g`; exit 0" 2 0; stty -icanon min 0 time 50; read waste) <&1 fi @@ -469,7 +472,7 @@ case "$GUESSOS" in if [ "$ISA64" = "1" -a -z "$KERNEL_BITS" ]; then echo "WARNING! If you wish to build 64-bit library, then you have to" 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." (trap "stty `stty -g`; exit 0" 2 0; stty -icanon min 0 time 50; read waste) <&1 fi @@ -484,7 +487,7 @@ case "$GUESSOS" in if [ "$ISA64" = "1" -a -z "$KERNEL_BITS" ]; then echo "WARNING! If you wish to build 64-bit library, then you have to" 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." # The stty technique used elsewhere doesn't work on # MacOS. At least, right now on this Mac. @@ -500,7 +503,7 @@ case "$GUESSOS" in if [ -z "$KERNEL_BITS" ]; then echo "WARNING! If you wish to build 32-bit library, then you have to" 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." # The stty technique used elsewhere doesn't work on # MacOS. At least, right now on this Mac. @@ -538,7 +541,7 @@ case "$GUESSOS" in if [ -z "$KERNEL_BITS" ]; then echo "WARNING! If you wish to build 64-bit library, then you have to" 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." (trap "stty `stty -g`; exit 0" 2 0; stty -icanon min 0 time 50; read waste) <&1 fi @@ -555,7 +558,7 @@ case "$GUESSOS" in mips64*-*-linux2) echo "WARNING! If you wish to build 64-bit library, then you have to" 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." (trap "stty `stty -g`; exit 0" 2 0; stty -icanon min 0 time 50; read waste) <&1 fi @@ -572,7 +575,7 @@ case "$GUESSOS" in 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 " 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." (trap "stty `stty -g`; exit 0" 2 0; stty -icanon min 0 time 50; read waste) <&1 fi @@ -620,7 +623,7 @@ case "$GUESSOS" in #if egrep -e '^features.* highgprs' /proc/cpuinfo >/dev/null ; then # echo "WARNING! If you wish to build \"highgprs\" 32-bit library, then you" # 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." # (trap "stty `stty -g`; exit 0" 2 0; stty -icanon min 0 time 50; read waste) <&1 # fi @@ -643,7 +646,7 @@ case "$GUESSOS" in if [ "$CC" = "cc" -a $CCVER -ge 50 ]; then echo "WARNING! If you wish to build 64-bit library, then you have to" 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." (trap "stty `stty -g`; exit 0" 2 0; stty -icanon min 0 time 50; read waste) <&1 fi @@ -655,7 +658,7 @@ case "$GUESSOS" in OUT="solaris64-sparcv9-gcc" echo "WARNING! If you wish to build 32-bit library, then you have to" 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." (trap "stty `stty -g`; exit 0" 2 0; stty -icanon min 0 time 50; read waste) <&1 fi @@ -663,7 +666,7 @@ case "$GUESSOS" in 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 " 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." (trap "stty `stty -g`; exit 0" 2 0; stty -icanon min 0 time 50; read waste) <&1 fi @@ -747,7 +750,7 @@ case "$GUESSOS" in if [ $KERNEL_BITS -eq 64 -a "$CC" = "cc" ]; then echo "WARNING! If you wish to build 64-bit library then you have to" 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." (trap "stty `stty -g`; exit 0" 2 0; stty -icanon min 0 time 50; read waste) <&1 fi @@ -784,7 +787,7 @@ case "$GUESSOS" in if [ $KERNEL_BITS -eq 64 ]; then echo "WARNING! If you wish to build 64-bit kit, then you have to" 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." (trap "stty `stty -g`; exit 0" 2 0; stty -icanon min 0 time 50; read waste) <&1 fi @@ -902,9 +905,10 @@ $PERL $THERE/Configure LIST | grep "$OUT" > /dev/null if [ $? = "0" ]; then echo Configuring for $OUT - if [ "$TEST" = "true" ]; then + if [ "$VERBOSE" = "true" ]; then echo $PERL $THERE/Configure $OUT $options - else + fi + if [ "$DRYRUN" = "false" ]; then $PERL $THERE/Configure $OUT $options fi else diff --git a/config.com b/config.com index ed4df15e0b..7a1b351b46 100644 --- a/config.com +++ b/config.com @@ -16,7 +16,8 @@ $ ! -t test mode, doesn't run Configure $ $ arch = f$edit( f$getsyi( "arch_name"), "lowercase") $ pointer_size = "" -$ test = 0 +$ dryrun = 0 +$ verbose = 0 $ here = F$PARSE("A.;",F$ENVIRONMENT("PROCEDURE"),,,"SYNTAX_ONLY") - "A.;" $ $ collected_args = "" @@ -27,7 +28,7 @@ $ IF P_index .GT. 8 THEN GOTO ENDLOOP1 $ P = F$EDIT(P1,"TRIM,LOWERCASE") $ IF P .EQS. "-h" $ THEN -$ TEST = 1 +$ dryrun = 1 $ P = "" $ TYPE SYS$INPUT $ DECK @@ -37,6 +38,7 @@ Usage: @config [options] -64 or 64 Build with 64-bit pointer size. -d Build with debugging. -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. Any other text will be passed to the Configure perl script. @@ -46,7 +48,13 @@ $ EOD $ ENDIF $ IF P .EQS. "-t" $ THEN -$ test = 1 +$ dryrun = 1 +$ verbose = 1 +$ P = "" +$ ENDIF +$ IF P .EQS. "-v" +$ THEN +$ verbose = 1 $ P = "" $ ENDIF $ IF P .EQS. "-32" .OR. P .EQS. "32" @@ -78,12 +86,9 @@ $ GOTO LOOP1 $ ENDLOOP1: $ $ target = "vms-''arch'''pointer_size'" -$ IF test -$ THEN -$ WRITE SYS$OUTPUT "PERL ''here'Configure ""''target'""''collected_args'" -$ ELSE -$ PERL 'here'Configure "''target'" 'debug' 'collected_args' +$ IF verbose THEN - + WRITE SYS$OUTPUT "PERL ''here'Configure ""''target'""''collected_args'" +$ IF .not. dryrun THEN - + PERL 'here'Configure "''target'" 'debug' 'collected_args' $ ENDIF $ EXIT $STATUS -$ -$ USAGE: |