libfunutil-cvs

[<sg...@us...>]

Update of /cvsroot/libfunutil/libfunutil/toc/sbin
In directory sc8-pr-cvs1:/tmp/cvs-serv13657

Modified Files:
	toc_core.sh 
Log Message:
added emoticons to toc.make. Other minor fixes.

Index: toc_core.sh
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/sbin/toc_core.sh,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- toc_core.sh	28 Aug 2003 10:40:39 -0000	1.20
+++ toc_core.sh	29 Aug 2003 10:45:07 -0000	1.21
@@ -19,6 +19,7 @@
 TOC_INCLUDESDIR=${TOC_TOPDIR}/include
 
 TOC_TOCDIR=${TOC_TOPDIR}/toc
+PATH=${TOC_TOCDIR}/bin:${PATH}
 TOC_TESTSDIR=${TOC_TOCDIR}/tests
 TOC_MAKEFILES_DIR=$TOC_TOCDIR/make
 
@@ -221,6 +222,9 @@
 TOC_RELATIVE_DIR=${shortform##./}
 TOC_TOP_SRCDIR=${relpath##./}
 TOC_SHARED_MAKEFILE=${TOC_SHARED_MAKEFILE}
+TOC_EMOTICON_OKAY=${TOC_EMOTICON_OKAY}
+TOC_EMOTICON_WARNING= ${TOC_EMOTICON_WARNING}
+TOC_EMOTICON_ERROR=${TOC_EMOTICON_ERROR}
 EOF
         toc_atfilter_file $tocmakeprops ${TOC_TOCDIR}/make/toc.make.at $cmake || {
             err=$?
@@ -285,8 +289,8 @@
 
 function toc_create_config_h
 {  # writes out config.h using the options set via toc_add_make
-    local configh=$TOC_INCLUDESDIR/config.h
-    local configh=${configh##./}
+    local configh=${TOC_INCLUDESDIR}/config.h
+    configh=${configh##${TOC_TOPDIR}/}
     local tmpl=$configh.at
     test -f $tmpl || {
 	echo "Note: no $tmpl found, so $configh will not be created."
@@ -296,13 +300,14 @@
     local propsfile=.config.h.properties
     local tmpfile=.config.h.tmp
     i=0
-    test -f $propsfile && rm $propsfile # see not in toc_create_make as to why we skip ${TOC_DELETE_TEMP}
+    test -f $propsfile && rm $propsfile
     while test $i -lt ${#CONFIG_DOT_H_ARRAY[@]}; do
         echo ${CONFIG_DOT_H_ARRAY[$i]}
         i=$((i + 1))
     done >> $propsfile
     toc_atfilter_file $propsfile $tmpl $configh
     ${TOC_DELETE_TEMP} && test -f $propsfile && rm $propsfile
+    return 0
 }
 
 
@@ -388,7 +393,9 @@
 function toc_find_test
 { # internal helper function.
   # return value is in TOC_FIND_RESULT
-    toc_find_in_path ${TOC_TESTSDIR}/$1.sh
+    toc_find_in_path ${TOC_TESTSDIR}/$1.sh || \
+        toc_find_in_path $1 ".:${PATH}" || \
+        toc_find_in_path $1.sh ".:${PATH}"
 }
 
 
@@ -428,7 +435,10 @@
 #        else
                 echo -n "==${TOC_RUN_DEPTH}=="
 #        fi
-        echo -e " ${TOC_BOLD_}test: [$testname $@]${_TOC_BOLD} $desc"
+        local args=""
+        test "x${TOC_LOUD-0}" != "x0" && args=" $@"
+        test "$args" = " " && args=
+        echo -e " ${TOC_BOLD_}test: [$testname$args]${_TOC_BOLD} $desc"
         local err=0
         toc_source_test $testname $@
         err=$?