Ignore:
Timestamp:
Jan 13, 2014, 4:09:37 PM (10 years ago)
Author:
rybkin
Message:

merge -r 646:663 HEAD

Location:
CMT/v1r25-branch
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • CMT/v1r25-branch

  • CMT/v1r25-branch/src/setup.sh

    r611 r664  
    66#-----------------------------------------------------------
    77
    8 CMTBIN=`uname`-`uname -m | tr -d ' '`; export CMTBIN
     8# Remove spaces, if any
     9_m="`uname -m`"
     10_nm=
     11while [ -n "$_m" ]; do
     12  _t="${_m#?}"
     13  _a="${_m%${_t}}"
     14  if [ "${_a}" != " " ]; then
     15    _nm="${_nm}${_a}"
     16  fi
     17  _m="$_t"
     18done
     19CMTBIN=`uname`-"$_nm"; export CMTBIN
     20unset _m _nm _t _a
    921
    1022if test "${CMTCONFIG}" = "" ; then
    … …  
    2032fi
    2133
     34cmt_clean_path()
     35{
     36# Remove CMT entries, if any
     37  _np=
     38  _p="$1"
     39  while [ -n "$_p" ]; do
     40    __p="${_p#:}"
     41    while [ "$__p" != "$_p" ]; do
     42      _p="${__p}"
     43      __p="${_p#:}"
     44    done
     45    _e="${_p%%:*}"
     46    _p="${_p#${_e}}"
     47    if [ "${_e%/CMT/*}" = "${_e}" ] && [ -n "${_e}" ]; then
     48      if [ -n "${_np}" ]; then
     49        _np="${_np}:${_e}"
     50      else
     51        _np="${_e}"
     52      fi
     53    fi
     54  done
     55  echo "$_np"
     56  unset _np _p __p _e
     57}
     58
    2259if [ "${PATH%/CMT/*}" = "${PATH}" ]; then
    2360  PATH=${PATH}:${CMTROOT}/${CMTBIN}; export PATH
    2461else
    25   newpath=
    26   for p in `echo ${PATH} | tr ':' ' '`; do
    27     if [ "${p%/CMT/*}" = "${p}" ]; then
    28       if [ -n "${newpath}" ]; then
    29         newpath=${newpath}:${p}
    30       else
    31         newpath=${p}
    32       fi
    33     fi
    34   done
    35 
     62  newpath=`cmt_clean_path "${PATH}"`
    3663  PATH=${newpath}:${CMTROOT}/${CMTBIN}; export PATH
    3764  unset newpath
    3865fi
    3966
    40 alias cmt='${CMTROOT}/${CMTBIN}/cmt.exe'; export cmt
     67alias cmt='${CMTROOT}/${CMTBIN}/cmt.exe'
    4168
    4269if [ -z "${CLASSPATH-}" ]; then
    … …  
    4572  CLASSPATH=${CLASSPATH}:${CMTROOT}/java/cmt.jar; export CLASSPATH
    4673else
    47   newpath=
    48   for p in `echo ${CLASSPATH-} | tr ':' ' '`; do
    49     if [ "${p%/CMT/*}" = "${p}" ]; then
    50       if [ -n "${newpath}" ]; then
    51         newpath=${newpath}:${p}
    52       else
    53         newpath=${p}
    54       fi
    55     fi
    56   done
    57 
     74  newpath=`cmt_clean_path "${CLASSPATH}"`
    5875  if [ -n "${newpath}" ]; then
    5976    CLASSPATH=${newpath}:${CMTROOT}/java/cmt.jar; export CLASSPATH
    … …  
    6481fi
    6582
    66 alias jcmt='(java cmt_parser)'; export jcmt
     83alias jcmt='(java cmt_parser)'
     84
     85unset -f cmt_clean_path
    6786
    6887# Set MAKEFLAGS, if unset (similar to NPROC with Plan 9 mk utility)
Note: See TracChangeset for help on using the changeset viewer.