Changeset 611 for CMT


Ignore:
Timestamp:
Apr 24, 2012, 10:15:51 AM (12 years ago)
Author:
rybkin
Message:

See C.L. 486

Location:
CMT/HEAD
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • CMT/HEAD/ChangeLog

    r610 r611  
     12012-04-24    <rybkin@lal.in2p3.fr> 486
     2
     3        * source/cmt_symbol.cxx: In class Symbol function filter_path_value, test
     4        existence of directory added to path to issue warning only if warning is
     5        active (for optimisation)
     6        * mgr/cmt_system.sh: Optimise by reducing the number of processes (invoke
     7        awk instead of sed and awk)
     8        * src/setup.sh: Optimise by reducing the number of processes making use of
     9        POSIX shell features
     10        * src/setup.csh: Optimise by reducing the number of processes making use of
     11        C shell features
     12       
    1132012-04-16    <rybkin@lal.in2p3.fr> 485
    214

  • CMT/HEAD/mgr/cmt_system.sh

    r465 r611  
    2121  esac
    2222
    23   if test "${may_use_afs}" = 1; then
     23  if test ${may_use_afs} -eq 1; then
    2424    a=`fs sysname 2>/dev/null`
    25     if test $? = 0 ; then
    26       echo $a | \
    27         sed -e "s#[ :]##g" \
    28             -e "s#'# #g" \
    29             -e "s#Currentsysnameis##" \
    30             -e "s#Currentsysnamelistis##" | awk '{print $1}'
     25    if test $? -eq 0 ; then
     26      echo $a | awk "{
     27            gsub(/[ :]/, \"\")
     28            gsub(/'/, \" \")
     29            sub(/Currentsysnameis/, \"\")
     30            sub(/Currentsysnamelistis/, \"\")
     31            print \$1
     32      }"
    3133         
    3234      return 0

  • CMT/HEAD/source/cmt_symbol.cxx

    r610 r611  
    895895      cmt_string& t = paths[j];
    896896
    897       if (!CmtSystem::test_directory (t))
    898           {
    899             if (CmtMessage::active (Verbose))
    900               CmtMessage::warning ("Non-existent directory " + t + " in " + name);
    901897            /*
     898        if (!CmtSystem::test_directory (t))
    902899              if (Cmt::get_warnings ())
    903900              {
    … …  
    905902              }
    906903            */
    907           }
    908904           
    909905      int exist = 0; 
    … …  
    912908          cmt_string& u = paths[i];
    913909          if (u == t)
    914              exist = 1;
     910            {
     911              exist = 1;
     912              break;
     913            }
    915914      }           
    916915      if (exist==0)
    … …  
    918917          cmt_string& s = normalyzed_paths.add ();
    919918          s = t;
    920       }             
     919          if (CmtMessage::active (Verbose))
     920            if (!CmtSystem::test_directory (t))
     921              {
     922                CmtMessage::warning ("Non-existent directory " + t + " in " + name);
     923              }
     924      }
    921925    }
    922926   

  • CMT/HEAD/src/setup.csh

    r588 r611  
    22# Copyright Christian Arnault LAL-Orsay CNRS
    33# arnault@lal.in2p3.fr
     4# Modified by Grigory Rybkin
    45# See the complete license in cmt_license.txt "http://www.cecill.info".
    56#-----------------------------------------------------------
    67
    7 setenv CMTBIN `uname`-`uname -m | sed -e 's# ##g'`
     8setenv CMTBIN `uname`-`uname -m | tr -d ' '`
    89
    910if ( $?CMTCONFIG == 0 ) then
    … …  
    1718endif
    1819
    19 set newpath=
    20 
    21 foreach p ( `echo ${PATH} | sed 's#:# #g'` )
    22   echo ${p} | egrep '/CMT/' >& /dev/null
    23   set s=${status}
    24   if ( "${s}" != 0 ) then
    25     if ( ${newpath} == "" ) then
    26       set newpath=${p}
     20set newpath=()
     21foreach p (${path})
     22  if ( "${p}" !~ "*/CMT/*" ) then
     23    if ( ${#newpath} != 0 ) then
     24      set newpath=(${newpath} ${p})
    2725    else
    28       set newpath=${newpath}:${p}
     26      set newpath=(${p})
    2927    endif
    3028  endif
    3129end
    3230
    33 setenv PATH ${newpath}:"${CMTROOT}/${CMTBIN}"
     31set path=(${newpath} "${CMTROOT}/${CMTBIN}")
    3432alias cmt '${CMTROOT}/${CMTBIN}/cmt.exe'
     33unset newpath
    3534
    36 if ( $?CLASSPATH == 0) then
    37   setenv CLASSPATH ${CMTROOT}/java
     35if ( $?CLASSPATH == 0 || "${CLASSPATH}" == "" ) then
     36  setenv CLASSPATH ${CMTROOT}/java/cmt.jar
     37else if ( "${CLASSPATH}" !~ "*/CMT/*" ) then
     38  setenv CLASSPATH ${CLASSPATH}:${CMTROOT}/java/cmt.jar
    3839else
    3940  set newpath=
    40   foreach p ( `echo ${CLASSPATH} | sed 's#:# #g'` )
    41     echo ${p} | egrep '/CMT/' >& /dev/null
    42     set s=${status}
    43     if ( "${s}" != 0 ) then
    44       if ( ${newpath} == "" ) then
     41  foreach p ( `echo ${CLASSPATH} | tr ':' ' '` )
     42    if ( "${p}" !~ "*/CMT/*" ) then
     43      if ( "${newpath}" != "" ) then
     44        set newpath=${newpath}:${p}
     45      else
    4546        set newpath=${p}
    46       else
    47         set newpath=${newpath}:${p}
    4847      endif
    4948    endif
    5049  end
    5150
    52   setenv CLASSPATH ${newpath}:${CMTROOT}/java/cmt.jar
     51  if ( "${newpath}" != "" ) then
     52    setenv CLASSPATH ${newpath}:${CMTROOT}/java/cmt.jar
     53  else
     54    setenv CLASSPATH ${CMTROOT}/java/cmt.jar
     55  endif
     56  unset newpath
    5357endif
    5458

  • CMT/HEAD/src/setup.sh

    r588 r611  
    22# Copyright Christian Arnault LAL-Orsay CNRS
    33# arnault@lal.in2p3.fr
     4# Modified by Grigory Rybkin
    45# See the complete license in cmt_license.txt "http://www.cecill.info".
    56#-----------------------------------------------------------
    67
    7 CMTBIN=`uname`-`uname -m | sed -e 's# ##g'`; export CMTBIN
     8CMTBIN=`uname`-`uname -m | tr -d ' '`; export CMTBIN
    89
    910if test "${CMTCONFIG}" = "" ; then
    … …  
    1920fi
    2021
    21 newpath=""
    22 for p in `echo ${PATH} | sed 's/:/ /g'`; do
    23   if ! echo ${p} | egrep /CMT/ >/dev/null ; then
    24     if test "${newpath}" = "" ; then
    25       newpath=${p}
    26     else
    27       newpath=${newpath}:${p}
     22if [ "${PATH%/CMT/*}" = "${PATH}" ]; then
     23  PATH=${PATH}:${CMTROOT}/${CMTBIN}; export PATH
     24else
     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
    2833    fi
    29   fi
    30 done
     34  done
    3135
    32 PATH=${newpath}:${CMTROOT}/${CMTBIN}; export PATH
     36  PATH=${newpath}:${CMTROOT}/${CMTBIN}; export PATH
     37  unset newpath
     38fi
     39
    3340alias cmt='${CMTROOT}/${CMTBIN}/cmt.exe'; export cmt
    3441
    35 newpath=""
    36 for p in `echo ${CLASSPATH} | sed 's/:/ /g'`; do
    37   if ! echo ${p} | egrep /CMT/ >/dev/null ; then
    38     if test "${newpath}" = "" ; then
    39       newpath=${p}
    40     else
    41       newpath=${newpath}:${p}
     42if [ -z "${CLASSPATH-}" ]; then
     43  CLASSPATH=${CMTROOT}/java/cmt.jar; export CLASSPATH
     44elif [ "${CLASSPATH%/CMT/*}" = "${CLASSPATH}" ]; then
     45  CLASSPATH=${CLASSPATH}:${CMTROOT}/java/cmt.jar; export CLASSPATH
     46else
     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
    4255    fi
     56  done
     57
     58  if [ -n "${newpath}" ]; then
     59    CLASSPATH=${newpath}:${CMTROOT}/java/cmt.jar; export CLASSPATH
     60  else
     61    CLASSPATH=${CMTROOT}/java/cmt.jar; export CLASSPATH
    4362  fi
    44 done
    45 
    46 CLASSPATH=${newpath}:${CMTROOT}/java/cmt.jar; export CLASSPATH
     63  unset newpath
     64fi
    4765
    4866alias jcmt='(java cmt_parser)'; export jcmt
Note: See TracChangeset for help on using the changeset viewer.