1.1 --- a/bin/caam	Sun Dec 17 12:42:41 2017 +0900
     1.2 +++ b/bin/caam	Tue Feb 20 08:33:24 2018 +0900
     1.3 @@ -1,6 +1,6 @@
     1.4  #!/bin/sh
     1.5  # caam - Configure And And Make
     1.6 -# (C)2008-2015 by HIROSE, Yuuji [yuuji/at/gentei.org]
     1.7 +# (C)2008-2018 by HIROSE, Yuuji [yuuji/at/gentei.org]
     1.8  # $HGid$
     1.9  # http://www.gentei.org/~yuuji/software/caam/
    1.10  
    1.11 @@ -54,6 +54,7 @@
    1.12  WRAPDIR=$mytop/wrap
    1.13  [ "$CAAM_DEBUG" ] && echo wrapdir=$WRAPDIR
    1.14  SUSPEND=:
    1.15 +CAAM_LOG=true
    1.16  
    1.17  # Parse my own arguments
    1.18  while [ x"" != x"$1" ]; do
    1.19 @@ -63,6 +64,7 @@
    1.20      -maic)	TGT2="install clean";;
    1.21      -gmai)	TGT2="install"; CAAM_MAKE=gmake;;
    1.22      -mai)	TGT2="install";;
    1.23 +    -nolog)	CAAM_LOG=false ;;
    1.24      -m)		CAAM_CFG="echo configure done";;
    1.25      -t)		shift; MKTGT=${MKTGT:+"all "}"$1" ;;
    1.26      -j[0-9]*)	CAAM_MKOPT="$CAAM_MKOPT${CAAM_MKOPT:+ }$1";;
    1.27 @@ -188,15 +190,16 @@
    1.28    fi
    1.29  }
    1.30  
    1.31 -successlog() {
    1.32 +successlog() (
    1.33   status=$?
    1.34 - (PWD=`pwd`				  # for compatibility
    1.35 -  uname=`uname -sm 2>/dev/null`
    1.36 -  logfile=../`basename $PWD`.caam
    1.37 -  [ -s $logfile ] || echo "### $logfile started at `date`" > $logfile
    1.38 -  (echo 1i
    1.39 -   echo "# ** $uname ** - $myname succeeded at `date`"
    1.40 -   cat <<EOF
    1.41 + if $CAAM_LOG; then
    1.42 +   PWD=`pwd`				# for compatibility
    1.43 +   uname=`uname -sm 2>/dev/null`
    1.44 +   logfile=../`basename $PWD`.caam
    1.45 +   [ -s $logfile ] || echo "### $logfile started at `date`" > $logfile
    1.46 +   (echo 1i
    1.47 +    echo "# ** $uname ** - $myname succeeded at `date`"
    1.48 +    cat <<EOF
    1.49  if [ x"\`uname -sm\`" = x"$uname" ]; then
    1.50    if [ x"\$1" = x"-n" ]; then
    1.51      sed -n -e '1,/#[:]BEGIN/d' -e '/^  exit\$/q' -e p \$0 \\
    1.52 @@ -206,22 +209,22 @@
    1.53    fi
    1.54    #:BEGIN
    1.55  EOF
    1.56 -   for e in $kept_env; do
    1.57 -     eval v="\$old_$e"
    1.58 -     echo "  "$e=\"$v\" \\
    1.59 -   done
    1.60 -   echo "  $myname" $myargs '"$@"'
    1.61 -   echo "  exit"
    1.62 -   echo "fi"
    1.63 -   echo "#### ** $uname Success log ends here."
    1.64 -   echo .; echo w; echo q) | ed $logfile 2> /dev/null
    1.65 +    for e in $kept_env; do
    1.66 +      eval v="\$old_$e"
    1.67 +      echo "  "$e=\"$v\" \\
    1.68 +    done
    1.69 +    echo "  $myname" $myargs '"$@"'
    1.70 +    echo "  exit"
    1.71 +    echo "fi"
    1.72 +    echo "#### ** $uname Success log ends here."
    1.73 +    echo .; echo w; echo q) | ed $logfile 2> /dev/null
    1.74  
    1.75     echo "Saved caam log in $logfile."
    1.76     echo "To build again with same parameters:    sh $logfile"
    1.77     echo "To see successfull caam arguments:      sh $logfile -n"
    1.78 -  )
    1.79 -  exit $status
    1.80 -}
    1.81 + fi
    1.82 + exit $status
    1.83 +)
    1.84  
    1.85  # if [ $setcc ]; then
    1.86  #   # CC="$CAAM_GCC $CFLAGS $LDFLAGS"; export CC