- Timestamp:
- Apr 24, 2012, 10:15:51 AM (12 years ago)
- Location:
- CMT/HEAD
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
CMT/HEAD/ChangeLog
r610 r611 1 2012-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 1 13 2012-04-16 <rybkin@lal.in2p3.fr> 485 2 14 -
CMT/HEAD/mgr/cmt_system.sh
r465 r611 21 21 esac 22 22 23 if test "${may_use_afs}" =1; then23 if test ${may_use_afs} -eq 1; then 24 24 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 }" 31 33 32 34 return 0 -
CMT/HEAD/source/cmt_symbol.cxx
r610 r611 895 895 cmt_string& t = paths[j]; 896 896 897 if (!CmtSystem::test_directory (t))898 {899 if (CmtMessage::active (Verbose))900 CmtMessage::warning ("Non-existent directory " + t + " in " + name);901 897 /* 898 if (!CmtSystem::test_directory (t)) 902 899 if (Cmt::get_warnings ()) 903 900 { … … 905 902 } 906 903 */ 907 }908 904 909 905 int exist = 0; … … 912 908 cmt_string& u = paths[i]; 913 909 if (u == t) 914 exist = 1; 910 { 911 exist = 1; 912 break; 913 } 915 914 } 916 915 if (exist==0) … … 918 917 cmt_string& s = normalyzed_paths.add (); 919 918 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 } 921 925 } 922 926 -
CMT/HEAD/src/setup.csh
r588 r611 2 2 # Copyright Christian Arnault LAL-Orsay CNRS 3 3 # arnault@lal.in2p3.fr 4 # Modified by Grigory Rybkin 4 5 # See the complete license in cmt_license.txt "http://www.cecill.info". 5 6 #----------------------------------------------------------- 6 7 7 setenv CMTBIN `uname`-`uname -m | sed -e 's# ##g'`8 setenv CMTBIN `uname`-`uname -m | tr -d ' '` 8 9 9 10 if ( $?CMTCONFIG == 0 ) then … … 17 18 endif 18 19 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} 20 set newpath=() 21 foreach p (${path}) 22 if ( "${p}" !~ "*/CMT/*" ) then 23 if ( ${#newpath} != 0 ) then 24 set newpath=(${newpath} ${p}) 27 25 else 28 set newpath= ${newpath}:${p}26 set newpath=(${p}) 29 27 endif 30 28 endif 31 29 end 32 30 33 set env PATH ${newpath}:"${CMTROOT}/${CMTBIN}"31 set path=(${newpath} "${CMTROOT}/${CMTBIN}") 34 32 alias cmt '${CMTROOT}/${CMTBIN}/cmt.exe' 33 unset newpath 35 34 36 if ( $?CLASSPATH == 0) then 37 setenv CLASSPATH ${CMTROOT}/java 35 if ( $?CLASSPATH == 0 || "${CLASSPATH}" == "" ) then 36 setenv CLASSPATH ${CMTROOT}/java/cmt.jar 37 else if ( "${CLASSPATH}" !~ "*/CMT/*" ) then 38 setenv CLASSPATH ${CLASSPATH}:${CMTROOT}/java/cmt.jar 38 39 else 39 40 set newpath= 40 foreach p ( `echo ${CLASSPATH} | sed 's#:# #g'` )41 echo ${p} | egrep '/CMT/' >& /dev/null42 set s=${status}43 if ( "${s}" != 0 ) then44 if ( ${newpath} == "" ) then41 foreach p ( `echo ${CLASSPATH} | tr ':' ' '` ) 42 if ( "${p}" !~ "*/CMT/*" ) then 43 if ( "${newpath}" != "" ) then 44 set newpath=${newpath}:${p} 45 else 45 46 set newpath=${p} 46 else47 set newpath=${newpath}:${p}48 47 endif 49 48 endif 50 49 end 51 50 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 53 57 endif 54 58 -
CMT/HEAD/src/setup.sh
r588 r611 2 2 # Copyright Christian Arnault LAL-Orsay CNRS 3 3 # arnault@lal.in2p3.fr 4 # Modified by Grigory Rybkin 4 5 # See the complete license in cmt_license.txt "http://www.cecill.info". 5 6 #----------------------------------------------------------- 6 7 7 CMTBIN=`uname`-`uname -m | sed -e 's# ##g'`; export CMTBIN8 CMTBIN=`uname`-`uname -m | tr -d ' '`; export CMTBIN 8 9 9 10 if test "${CMTCONFIG}" = "" ; then … … 19 20 fi 20 21 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} 22 if [ "${PATH%/CMT/*}" = "${PATH}" ]; then 23 PATH=${PATH}:${CMTROOT}/${CMTBIN}; export PATH 24 else 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 28 33 fi 29 fi 30 done 34 done 31 35 32 PATH=${newpath}:${CMTROOT}/${CMTBIN}; export PATH 36 PATH=${newpath}:${CMTROOT}/${CMTBIN}; export PATH 37 unset newpath 38 fi 39 33 40 alias cmt='${CMTROOT}/${CMTBIN}/cmt.exe'; export cmt 34 41 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} 42 if [ -z "${CLASSPATH-}" ]; then 43 CLASSPATH=${CMTROOT}/java/cmt.jar; export CLASSPATH 44 elif [ "${CLASSPATH%/CMT/*}" = "${CLASSPATH}" ]; then 45 CLASSPATH=${CLASSPATH}:${CMTROOT}/java/cmt.jar; export CLASSPATH 46 else 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 42 55 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 43 62 fi 44 done 45 46 CLASSPATH=${newpath}:${CMTROOT}/java/cmt.jar; export CLASSPATH 63 unset newpath 64 fi 47 65 48 66 alias jcmt='(java cmt_parser)'; export jcmt
Note: See TracChangeset
for help on using the changeset viewer.