Menu
▾
▴
libfunutil-cvs — CVS commit messages for libfunUtil
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(58) |
Sep
(79) |
Oct
(41) |
Nov
(80) |
Dec
(23) |
|---|
|
From: <sg...@us...> - 2003-08-31 00:44:31
|
Update of /cvsroot/libfunutil/libfunutil/toc/make
In directory sc8-pr-cvs1:/tmp/cvs-serv12944
Modified Files:
subdirs_traverser.make
Log Message:
subdirs runs now use --no-print-directory
Index: subdirs_traverser.make
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/make/subdirs_traverser.make,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- subdirs_traverser.make 28 Aug 2003 23:11:54 -0000 1.8
+++ subdirs_traverser.make 31 Aug 2003 00:44:26 -0000 1.9
@@ -18,7 +18,10 @@
toc_make_subdirs = \
test -z "$(1)" && exit 0; \
for b in $(1) ""; do test -z "$$b" && continue; \
- ${MAKE} -C $$b $(2) || exit; \
+ pwd=$$(pwd); \
+ tgt="$(2)"; test -z "$$tgt" && tgt="all"; \
+ echo "Making $$tgt in directory $$pwd/$$b..."; \
+ ${MAKE} --no-print-directory -C $$b $(2) || exit; \
done
SUBDIRS_CLEANERS = $(patsubst %,clean-%,$(SUBDIRS))
@@ -29,9 +32,6 @@
.PHONY: subdirs $(SUBDIRS) $(SUBDIRS_CLEANERS) $(SUBDIRS_DISTCLEANERS) \
distclean-subdirs clean-subdirs
-
-
-# $(patsubst %,%: subdir-%,$(SUBDIRS))
$(SUBDIRS):
${MAKE} -C $@
|
|
From: <sg...@us...> - 2003-08-31 00:44:16
|
Update of /cvsroot/libfunutil/libfunutil/toc/make In directory sc8-pr-cvs1:/tmp/cvs-serv12902 Modified Files: install.make Log Message: fixed cygwin-related PWD bug which broke symlinks under cygwin Index: install.make =================================================================== RCS file: /cvsroot/libfunutil/libfunutil/toc/make/install.make,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- install.make 30 Aug 2003 19:20:30 -0000 1.20 +++ install.make 31 Aug 2003 00:44:12 -0000 1.21 @@ -84,13 +84,13 @@ # Note that symlinks must be linked to absolute paths here, because we cannot # easily/reliably make a relative path from the target directory back to # the install source: -# KNOWN TO NOT WORK PROPERLY UNDER CYGWIN: the symlinks point to the wrong place. toc_make_install_symlink = $(call TOC_MAKE_INSTALL_GREP_KLUDGE,$(1)); \ test -d $(2) || mkdir -p $(2) || exit; \ for b in $(1) ""; do test -z "$$b" && continue; \ target=$(2)/$$b; \ + pwd=$$(pwd); \ test $$target -ef $$b && continue; \ - echo "Symlinking $$target"; ln -s -f $$PWD/$$b $$target || exit $$?; \ + echo "Symlinking $$target"; ln -s -f $$pwd/$$b $$target || exit $$?; \ done # toc_make_install_so: installs foo.so.X.Y.Z and symlinks foo.so, foo.so.X and foo.so.X.Y to it, |
|
From: <sg...@us...> - 2003-08-31 00:43:30
|
Update of /cvsroot/libfunutil/libfunutil/toc/tests In directory sc8-pr-cvs1:/tmp/cvs-serv12756 Added Files: buildtool.sh Log Message: egg --- NEW FILE: buildtool.sh --- # toc_run_description = looking for buildtool... # toc_begin_help = # Looks for buildtool and exports: # configure_with_buildtool to 1 or # BUILDTOOL_BIN: path to build tool # # buildtool can be found at http://buildtool.sourceforge.net/ # = toc_end_help varname=configure_with_buildtool bin=${configure_with_buildtool} val=0 ret=1 if toc_find_failok buildtool "$bin:$PATH"; then bin=${TOC_FIND_RESULT} val=1 ret=0 fi toc_add_make BUILDTOOL_BIN=${bin} toc_add_make $varname=${val} return $ret |
|
From: <sg...@us...> - 2003-08-31 00:43:10
|
Update of /cvsroot/libfunutil/libfunutil/toc/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv12689
Modified Files:
toc_core_tests.sh
Log Message:
handled the way some tests are run, for asthetic reasons :).
Index: toc_core_tests.sh
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/tests/toc_core_tests.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- toc_core_tests.sh 30 Aug 2003 19:20:31 -0000 1.7
+++ toc_core_tests.sh 31 Aug 2003 00:43:05 -0000 1.8
@@ -6,7 +6,6 @@
toc_quietly "Required components:"
for x in \
- awk=AWK \
bash=SHELL \
cat=CAT \
cut=CUT \
@@ -33,16 +32,19 @@
toc_add_make TOC_MAKEDIST_BIN="\$(top_srcdir)/${TOC_FIND_RESULT##${PWD}/}"
for x in \
+ awk \
gnu_make \
gnu_find \
gnu_tar \
; do
- toc_run_failok $x || {
+ toc_source_test $x || {
echo "required test $x failed."
return 1
}
done
+toc_run running_under_cygwin
+
#toc_run_failok gnu_install || {
# boldecho "Didn't find GNU install. You won't be able to do a 'make install'."
#}
@@ -57,8 +59,6 @@
toc_find_failok $f
toc_add_make $v=${TOC_FIND_RESULT}
done
-
-toc_run running_under_cygwin
toc_boldecho -n "Core configure checks completed. "
echo ${TOC_EMOTICON_OKAY}
|
|
From: <sg...@us...> - 2003-08-31 00:42:55
|
Update of /cvsroot/libfunutil/libfunutil/toc/tests In directory sc8-pr-cvs1:/tmp/cvs-serv12638 Modified Files: awk.sh Log Message: added check for nawk Index: awk.sh =================================================================== RCS file: /cvsroot/libfunutil/libfunutil/toc/tests/awk.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- awk.sh 26 Aug 2003 08:31:28 -0000 1.2 +++ awk.sh 31 Aug 2003 00:42:50 -0000 1.3 @@ -1,4 +1,6 @@ # awk? -toc_find_failok awk || toc_find_failok gawk || return +err=0 +toc_find_failok awk || toc_find_failok gawk || toc_find_failok nawk || err=1 toc_add_make AWK=$TOC_FIND_RESULT +return $err |
|
From: <sg...@us...> - 2003-08-31 00:40:53
|
Update of /cvsroot/libfunutil/libfunutil/toc/sbin
In directory sc8-pr-cvs1:/tmp/cvs-serv12328
Modified Files:
toc_core.sh
Log Message:
removed a large amount of comment code. Made a lot of vars explicitely local.
Index: toc_core.sh
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/sbin/toc_core.sh,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- toc_core.sh 30 Aug 2003 19:20:31 -0000 1.22
+++ toc_core.sh 31 Aug 2003 00:40:48 -0000 1.23
@@ -431,30 +431,28 @@
local showname="$testname"
test "x${TOC_LOUD-0}" != "x0" -a "x$1" != "x" && showname="$showname $@"
- toc_loudly -n "[$depth] "
-# test "x${TOC_LOUD-0}" toc_boldecho -n "[$depth] ===="
+ toc_loudly -n "[$depth]"
i=1;
while test $i -le $depth; do
- echo -n "${TOC_BOLD_}==${_TOC_BOLD_}"
+ echo -n "${TOC_BOLD_}===${_TOC_BOLD_}"
i=$((i + 1))
done
-# else
- toc_boldecho -n " [$showname] "
- test -n "$desc" && echo -n $desc
-# echo -n "[$testname]====== "
-# fi
+ toc_boldecho -n " [$showname] "
+ test -n "$desc" && echo -n $desc
echo
local err=0
toc_source_test $testname $@
err=$?
- test ${TOC_FAIL_FAST-0} = 1 -a $err != 0 && toc_die $err "toc_run: TOC_FAIL_FAST is set, and test $testname returned an error."
+ if test ${TOC_FAIL_FAST-0} = 1 -a $err != 0; then
+ toc_die $err "toc_run: TOC_FAIL_FAST is set, and test $testname returned a non-zero error code."
+ fi
TOC_RUN_DEPTH=$((TOC_RUN_DEPTH - 1))
return $err
}
function toc_run_failok
{ # runs toc_run and warns if there was an error.
- # It does not exit - it returns 1 on error, however.
+ # It does not exit - it passed back the error code from the test.
toc_debug toc_run_failok $@
local testname=$1
local depth=$((TOC_RUN_DEPTH + 1))
@@ -463,19 +461,16 @@
toc_loudly -n "[${depth}] "
toc_boldecho -n "^^^^^^^^^^ "
echo -n ${TOC_EMOTICON_WARNING} " "
- toc_boldecho -n "$testname: $ret"
+ toc_boldecho -n "$testname"
echo -n " " ${TOC_EMOTICON_WARNING} " "
toc_boldecho "^^^^^^^^^^ "
return $ret
}
- #&& echo ${TOC_EMOTICON_OKAY}
- #toc_show_posttest_feedback
return 0
}
- # function toc_run_fail calls toc_run and fails if it returns !0
function toc_run_fail
- {
+ { # calls toc_run and fails if it returns !0
toc_debug toc_run_fail $@
local testname=$1
local depth=$((TOC_RUN_DEPTH + 1))
@@ -484,7 +479,7 @@
toc_loudly -n "[${depth}] "
toc_boldecho -n "^^^^^^^^^^ "
echo -n ${TOC_EMOTICON_ERROR} " "
- toc_boldecho -n "$testname: $ret"
+ toc_boldecho -n "$testname"
echo -n " " ${TOC_EMOTICON_ERROR} " "
toc_boldecho "^^^^^^^^^^ "
exit $ret
@@ -495,10 +490,8 @@
function toc_find_failok
{
# toc_find_failok works like toc_run, but searches for the passed-in app ($1)
- # in ${2-${PATH}}, using the same conventions output/return conventions set by toc_run().
- # It returns 1 if it finds no file.
- # It "returns" the found file in the ${TOC_FIND_RESULT}.
- # This function generates output.
+ # in ${2-${PATH}. It returns 1 if it finds no file, else zero.
+ # It "returns" the found file in ${TOC_FIND_RESULT}.
local bin=$1
path=${2-${PATH}}
toc_quietly -n "? find $bin ..."
@@ -522,45 +515,38 @@
function toc_source_test
{ # sources the given test script and returns it's error code.
# it accepts a filename or X, where X resolves to is toc/tests/X.sh.
- #
- local test
- test=$1
+ local test=$1
shift
- local tmpfile
- tmpfile=.toc.${test##*/}.output
- local sh
- sh=${TOC_TESTSDIR}/$test.sh
+ local tmpfile=.toc.${test##*/}.output
+ local sh=${TOC_TESTSDIR}/$test.sh
test -f $test && sh=$test
test -f "$sh" || toc_die 1 "toc_source_test $test: $sh not found!"
- local err
- err=0
+ local err=0
toc_debug "toc_source_test sourcing [$sh $@]"
source $sh $@
err=$?
return $err
}
-
-
} # end toc_run functions
-{ # function toc_replace_file: helper to check if a file is changed, and replace it if it is
- # usage: toc_replace_file target tmpfile
- # tmpfile is deleted if target is the same as tmpfile, else it replaces target.
- # The fact that it echos text is a side-effect of other parts of this code,
- # so don't rely 100% on that "feature". i.e., it echos to fit in with common usage
- # of this function, not because it's a logical part of the interface :/.
- #
- # It returns 0 if it replaces $1 with $2. It returns 1 if $1 does
- # not need replacing ($1 and $2 are not different).
- #
- #
- # It exits if it cannot mv or rm a file: that is considered a filesystem/rights-level
- # problem which needs to be addressed immediately.
- #
- #
+{
function toc_replace_file
- {
+ { # toc_replace_file: helper to check if a file is changed, and replace it if it is
+ # usage: toc_replace_file target tmpfile
+ # tmpfile is deleted if target is the same as tmpfile, else it replaces target.
+ # The fact that it echos text is a side-effect of other parts of this code,
+ # so don't rely 100% on that "feature". i.e., it echos to fit in with common usage
+ # of this function, not because it's a logical part of the interface :/.
+ #
+ # It returns 0 if it replaces $1 with $2. It returns 1 if $1 does
+ # not need replacing ($1 and $2 are not different).
+ #
+ #
+ # It exits if it cannot mv or rm a file: that is considered a filesystem/rights-level
+ # problem which needs to be addressed immediately.
+ #
+ #
local tgt=$1
local tmp=$2
#toc_boldecho toc_replace_file $tgt $tmp
@@ -587,22 +573,26 @@
}
} # end toc_replace_file
-{ # toc_atfilter_file(): uses the @-parser to filter a template file.
- # It returns !0 only if $TOC_ATSIGN_PARSER throws an error.
+{
function toc_atfilter_file
- { # $1 = file containing properties to @-filter.
+ {
+ # uses the @-parser to filter a template file.
+ # It returns !0 only if $TOC_ATSIGN_PARSER throws an error.
+ # $1 = file containing properties to @-filter.
# $2 = input template (e.g. toc_shared.make.at)
# $3 = output file (e.g. toc_shared.make). It only changed if
# needed, so it is dependency-safe.
- pfile=$1
- tmpl=$2
- ofile=$3
- local tmpfile=$ofile.toc_atfilter_file
+ local pfile=$1
+ local tmpl=$2
+ local ofile=$3
+ test -f "$pfile" || toc_die $? "toc_atfilter_file: \$1: file not found: $pfile"
+ test -f "$tmpl" || toc_die $? "toc_atfilter_file: \$2: file not found: $tmpl"
+ local tmpfile=$ofile.tmp.toc_atfilter_file
${TOC_ATSIGN_PARSER} -f $pfile < $tmpl > $tmpfile || {
- err=$?
+ local err=$?
echo "toc_atfilter_file(): @-parsing failed: error $err "
echo ${TOC_EMOTICON_ERROR}
- return 1
+ return $err
}
echo -n "$ofile ... "
@@ -610,23 +600,19 @@
test -f $ofile && fstate="updated"
toc_replace_file $ofile $tmpfile || fstate="up to date"
echo "$fstate"
- #echo " ${TOC_EMOTICON_OKAY}"
return 0
}
} # end toc_atfilter_file
function toc_endconfigure
-{ # ends the configuration process
+{ # ends the configuration process, processing the files
+ # which need to be @-parsed
toc_boldecho "==== Creating configuration-dependent files..."
{
toc_create_config_h
-# | perl -ne '$|=1; print " $_";'
-# nonportable: | sed -ue 's/^/ /'
toc_create_make
}
-# | perl -ne '$|=1; print " $_";'
-# | sed -ue 's/^/ /'
- clean=$(ls .toc.* 2> /dev/null)
+ local clean="$(ls .toc.* 2> /dev/null)"
test -n "$clean" && rm $clean
}
@@ -635,9 +621,9 @@
toc_debug "toc_parseargs: Handling command-line arguments: $@"
# mostly stolen from the qt 3.1.0 configure script :)
while [ "$#" -gt 0 ]; do
- VAR=
- VAL=
- arg=$1
+ local VAR=
+ local VAL=
+ local arg=$1
shift
case $arg in
--help|-?)
@@ -733,10 +719,9 @@
esac
toc_debug toc_parseargs: $arg "VAR=$VAR VAL=$VAL"
test -n "$VAR" -a -n "$VAL" && {
- export $VAR="$VAL"
toc_debug "toc_parseargs: exporting [$VAR]=$VAL"
- toc_add_make "$VAR=$VAL"
- toc_add_config_h "$VAR=$VAL"
+ export $VAR="$VAL"
+ toc_add_config "$VAR=$VAL"
}
done
return 0
@@ -747,27 +732,17 @@
{ # usage: toc_makerelative /foo/bar/one/two /foo/bar
# sets global var TOC_MAKERELATIVE to the "return value".
# In the above example, it should = ./../..
- startat=${1-$PWD}
- relto=${2-${TOC_TOPDIR}}
+ local startat=${1-$PWD}
+ local relto=${2-${TOC_TOPDIR}}
test -n "$relto" || $relto=$PWD
-
-# export TOC_MAKERELATIVE=${startat##$relto}
-# return 0
-
test -f $startat && startat=$(dirname $startat)
- dn=$startat/bogus
- dn=${dn%*/*}
- #echo "dn=$dn, relto=$relto"
- rel="."
-# rel=""
+ local dn=$startat/bogus
+ local dn=${dn%*/*}
+ local rel="."
while test -n "$dn" -a "$dn" != "$relto" -a "$dn" != "/"; do
rel="$rel/.."
-# rel="../$rel"
dn=${dn%*/*}
- #echo "dn=$dn"
done
- #echo "rel=$rel"
-# TOC_MAKERELATIVE=$rel
TOC_MAKERELATIVE=${rel##./}
}
@@ -777,11 +752,6 @@
echo "Configuring build environment."
toc_parseargs --prefix=${prefix} "$@"
-# ^^^ --prefix=... will be overridden by any user-supplied value.
-# note that any args with spaces in them are hosed at this point:
-# --with-INCLUDES="-I. -I/some/path"
-# will turn into:
-# --with-INCLUDES=-I
toc_loudly 'Loud mode enabled.'
toc_quietly <<-EOF
@@ -792,11 +762,8 @@
do not yet know if it is fatal. A warning might actually
be an error: this is build tree dependent.
- Note that not all config test failures are fatal, so do not be
- alarmed if you see a warning/error below and the process keeps going.
- It will stop if it fails a test which it /needs/ to pass.
- Also, generally speaking, No News is Good News.
-
+ Note that not all config test failures are fatal: it will stop if
+ it fails a test which it /needs/ to pass.
EOF
# source ${TOC_TOCDIR}/tests/toc_core_tests.sh || {
|
|
From: <sg...@us...> - 2003-08-30 19:44:23
|
Update of /cvsroot/libfunutil/libfunutil/include In directory sc8-pr-cvs1:/tmp/cvs-serv1672 Modified Files: config.h.at Log Message: added CONFIG_HAVE_CYGWIN Index: config.h.at =================================================================== RCS file: /cvsroot/libfunutil/libfunutil/include/config.h.at,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- config.h.at 28 Aug 2003 09:34:13 -0000 1.4 +++ config.h.at 30 Aug 2003 19:44:19 -0000 1.5 @@ -22,4 +22,6 @@ #define CONFIG_HAVE_QT @HAVE_QT@ +#define CONFIG_HAVE_CYGWIN @CYGWIN@ // toc test: running_under_cygwin. 0 or 1 + #endif // CONFIG_H_INCLUDED |
|
From: <sg...@us...> - 2003-08-30 19:42:20
|
Update of /cvsroot/libfunutil/libfunutil/toc/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv1424
Added Files:
running_under_cygwin.sh
Log Message:
egg
--- NEW FILE: running_under_cygwin.sh ---
# toc_run_description = building under cygwin?
test -d /cygdrive/c
err=$?
if test $err = 0 ; then
toc_add_config CYGWIN=1
echo "Detected cygwin."
else
toc_add_config CYGWIN=0
fi
return $err
|
|
From: <sg...@us...> - 2003-08-30 19:21:15
|
Update of /cvsroot/libfunutil/libfunutil
In directory sc8-pr-cvs1:/tmp/cvs-serv30906
Modified Files:
configure.libfunutil
Log Message:
changed to accomodate new behaviour from qt.sh
Index: configure.libfunutil
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/configure.libfunutil,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- configure.libfunutil 29 Aug 2003 11:37:56 -0000 1.16
+++ configure.libfunutil 30 Aug 2003 19:21:11 -0000 1.17
@@ -35,7 +35,7 @@
configure_with_qt=${configure_with_qt-1}
qt_required_version='3.x'
qt_required_version_glob='3.*'
-toc_run_fail qt_if_enabled "Enable Qt checks?"
+toc_run_fail qt_if_enabled
# If we're building with Qt, see whether we're also building std::string API's
if test "${configure_with_qt}" = "1"; then
|
Update of /cvsroot/libfunutil/libfunutil/toc/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv30672/tests
Modified Files:
accept_license.sh gnu_find.sh lyxport.sh qt_if_enabled.sh
testtemplate.sh toc_core_tests.sh
Log Message:
a number of changes from the toc tree.
Index: accept_license.sh
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/tests/accept_license.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- accept_license.sh 29 Aug 2003 11:37:28 -0000 1.3
+++ accept_license.sh 30 Aug 2003 19:20:31 -0000 1.4
@@ -27,7 +27,7 @@
echo "accept_license: could not find license file $lc."
return 1
}
-toc_boldecho -e "\tPLEASE READ THE LICENSE! PLEASE READ THE LICENSE! PLEASE READ THE LICENSE!"
+toc_boldecho -e "\tPLEASE READ THE LICENSE!"
test "x${accept_license-0}" = "x0" && {
echo "You are going to be shown a license (file: $lc), after which you will be asked whether you accept the license or not."
echo "Tap ENTER to continue."; read
Index: gnu_find.sh
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/tests/gnu_find.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gnu_find.sh 26 Aug 2003 08:31:28 -0000 1.2
+++ gnu_find.sh 30 Aug 2003 19:20:31 -0000 1.3
@@ -1,4 +1,4 @@
-# tests for GNU find
+# toc_run_description = search for GNU find
toc_find_failok find || return 1
Index: lyxport.sh
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/tests/lyxport.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- lyxport.sh 26 Aug 2003 08:31:28 -0000 1.3
+++ lyxport.sh 30 Aug 2003 19:20:31 -0000 1.4
@@ -20,8 +20,7 @@
configure_with_lyxport=${configure_with_lyxport-0}
path=${PATH}:${TOC_TOCDIR}/bin
toc_find_failok lyxport $path || {
- echo "lyxport not found $path"
- echo "You can possibly find lyxport at http://www-hep.colorado.edu/~fperez/lyxport"
+ echo "lyxport not found. You can possibly find lyxport at http://www-hep.colorado.edu/~fperez/lyxport"
return 1
}
lyxport=${TOC_FIND_RESULT}
Index: qt_if_enabled.sh
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/tests/qt_if_enabled.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- qt_if_enabled.sh 26 Aug 2003 08:31:28 -0000 1.3
+++ qt_if_enabled.sh 30 Aug 2003 19:20:31 -0000 1.4
@@ -27,7 +27,7 @@
qt_required_version=${qt_required_version-'3.x'}
qt_required_version_glob=${qt_required_version_glob-'3.*'}
-toc_source_test qt || {
+toc_source_test qt $@ || {
err=$?
echo "Qt $qt_required_version not found."
return $err
Index: testtemplate.sh
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/tests/testtemplate.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- testtemplate.sh 28 Aug 2003 09:29:43 -0000 1.2
+++ testtemplate.sh 30 Aug 2003 19:20:31 -0000 1.3
@@ -43,4 +43,11 @@
toc_find_fail ls
toc_add_make MY_OPTION='my value'
+#echo 'echo nested test "$@"' > footest.sh
+#echo 'toc_run_failok footest.sh boogle bar' > bartest.sh
+#toc_run_failok bartest.sh
+#rm bartest.sh footest.sh
+
+
echo "this test will fail now."; return 1
+
Index: toc_core_tests.sh
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/tests/toc_core_tests.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- toc_core_tests.sh 29 Aug 2003 08:47:26 -0000 1.6
+++ toc_core_tests.sh 30 Aug 2003 19:20:31 -0000 1.7
@@ -1,3 +1,4 @@
+# toc_run_description = core sanity checks
# to be sourced from toc_core.sh
# This is the core sanity checker for toc. Any test which MUST
# pass for a tree to be considered toc-capable may be placed
@@ -56,6 +57,8 @@
toc_find_failok $f
toc_add_make $v=${TOC_FIND_RESULT}
done
+
+toc_run running_under_cygwin
toc_boldecho -n "Core configure checks completed. "
echo ${TOC_EMOTICON_OKAY}
|
|
From: <sg...@us...> - 2003-08-30 19:20:35
|
Update of /cvsroot/libfunutil/libfunutil/toc/make
In directory sc8-pr-cvs1:/tmp/cvs-serv30672/make
Modified Files:
cpp_bins.make deps.make dist.make install.make
Log Message:
a number of changes from the toc tree.
Index: cpp_bins.make
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/make/cpp_bins.make,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- cpp_bins.make 26 Aug 2003 00:58:54 -0000 1.4
+++ cpp_bins.make 30 Aug 2003 19:20:30 -0000 1.5
@@ -28,7 +28,11 @@
ifneq (,$(BIN_PROGRAMS))
+ifeq (1,$(configure_with_CYGWIN))
+CLEAN_FILES += $(wildcard $(addsuffix .exe,$(BIN_PROGRAMS)))
+else
CLEAN_FILES += $(wildcard $(BIN_PROGRAMS))
+endif
BIN_PROGRAMS_DEPSFILE = .toc.BIN_PROGRAMS.deps
@@ -51,7 +55,6 @@
bins-run: $(BIN_PROGRAMS_TARGETS)
@LD_LIBRARY_PATH=$${LD_LIBRARY_PATH}:$${PWD}; for i in $(BIN_PROGRAMS); do echo "Running $$i"; ./$$i || exit $$?; done
-
endif
# ^^^ got $(BIN_PROGRAMS) ???
Index: deps.make
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/make/deps.make,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- deps.make 26 Aug 2003 08:29:27 -0000 1.7
+++ deps.make 30 Aug 2003 19:20:30 -0000 1.8
@@ -11,9 +11,11 @@
DEPS_C_SOURCES_GLOB = *.cpp *.c *.c++ *.C *.cc *.moc
SOURCE_FILES_TO_DEP = $(sort $(wildcard $(DEPS_C_SOURCES_GLOB)))
+TOC_C_DEPS_MAKEFILE = $(toc_makesdir)/deps.make
+
DEPSGEN_BIN = $(toc_tocdir)/bin/mkdep
-$(DEPSGEN_BIN):
- cd $(toc_tocdir)/bin; \
+$(DEPSGEN_BIN): $(TOC_C_DEPS_MAKEFILE)
+ @echo "Building $@"; cd $(toc_tocdir)/bin; \
$(CC) -o mkdep mkdep.c
# toc_made_c_deps call()able function:
@@ -28,7 +30,6 @@
ifneq (,$(SOURCE_FILES_TO_DEP))
TOC_C_DEPSFILE = .toc.deps.c.make
-TOC_C_DEPS_MAKEFILE = $(toc_makesdir)/deps.make
$(TOC_C_DEPSFILE): $(DEPSGEN_BIN) $(SOURCE_FILES_TO_DEP) Makefile $(TOC_C_DEPS_MAKEFILE)
@test -n "$(SOURCE_FILES_TO_DEP)" || exit 0; \
echo "Generating source file dependencies for $(DEPS_C_SOURCES_GLOB)"; \
Index: dist.make
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/make/dist.make,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- dist.make 28 Aug 2003 23:23:19 -0000 1.7
+++ dist.make 30 Aug 2003 19:20:30 -0000 1.8
@@ -5,7 +5,7 @@
# This snippet requires a filesystem-valid $(PACKAGE_NAME)-$(PACKAGE_VERSION)
# combination
DIST_FILES_FILE = .toc.distfiles.list
-CLEAN_FILES += $(DIST_FILES_FILE)
+CLEAN_FILES += $(wildcard $(DIST_FILES_FILE))
FORCE:
@@ -29,14 +29,14 @@
DIST_NAME = $(PACKAGE_NAME)-$(PACKAGE_VERSION)
DIST_FILES_TARBALL = $(DIST_NAME).tar
-CLEAN_FILES += $(DIST_FILES_TARBALL)
+CLEAN_FILES += $(wildcard $(DIST_FILES_TARBALL))
dist-tar: $(DIST_FILES_TARBALL)
$(DIST_FILES_TARBALL): $(DIST_FILES_FILE)
@echo "Making dist tarball..."; \
tmpfile=.toc.dist.tmp; \
echo '' > $$tmpfile; \
find . -name $(DIST_FILES_FILE) | xargs cat >> $$tmpfile; \
- perl -pe "s|$${PWD}/||" $$tmpfile > foo; sort < foo > $$tmpfile; rm foo; \
+ perl -pe "s|$${PWD}/||" $$tmpfile > foo.bar; sort < foo.bar > $$tmpfile; rm foo.bar; \
$(TOC_MAKEDIST_BIN) $$tmpfile $@ || exit; \
rm $$tmpfile
@@ -48,7 +48,7 @@
configure_dist_use_zip ?= 0
ifeq (1,$(configure_dist_use_gzip))
-CLEAN_FILES += $(DIST_FILES_TARBALL).gz
+CLEAN_FILES += $(wildcard $(DIST_FILES_TARBALL).gz)
dist-compress: dist-tarball-gzip
dist-gzip: dist dist-tarball-gzip
dist-tarball-gzip: $(DIST_FILES_TARBALL).gz
@@ -58,7 +58,7 @@
# ^^^ end gzip
ifeq (1,$(configure_dist_use_bzip))
-CLEAN_FILES += $(DIST_FILES_TARBALL).bz2
+CLEAN_FILES += $(wildcard $(DIST_FILES_TARBALL).bz2)
dist-compress: dist-tarball-bzip
dist-bzip: dist dist-tarball-bzip
dist-tarball-bzip: $(DIST_FILES_TARBALL).bz2
@@ -69,7 +69,7 @@
ifeq (1,$(configure_dist_use_zip))
DIST_TARBALL_ZIP = $(DIST_NAME).zip
-CLEAN_FILES += $(DIST_TARBALL_ZIP)
+CLEAN_FILES += $(wildcard $(DIST_TARBALL_ZIP))
dist-compress: dist-tarball-zip
dist-zip: dist dist-tarball-zip
dist-tarball-zip: $(DIST_TARBALL_ZIP)
Index: install.make
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/make/install.make,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- install.make 29 Aug 2003 10:45:23 -0000 1.19
+++ install.make 30 Aug 2003 19:20:30 -0000 1.20
@@ -79,11 +79,12 @@
done
# toc_make_install_symlink call()able:
-# works similarly to toc_make_install, but symlinks back to the install source,
+# Works similarly to toc_make_install, but symlinks back to the install source,
# instead of copying. Arg $3 is ignored.
# Note that symlinks must be linked to absolute paths here, because we cannot
# easily/reliably make a relative path from the target directory back to
# the install source:
+# KNOWN TO NOT WORK PROPERLY UNDER CYGWIN: the symlinks point to the wrong place.
toc_make_install_symlink = $(call TOC_MAKE_INSTALL_GREP_KLUDGE,$(1)); \
test -d $(2) || mkdir -p $(2) || exit; \
for b in $(1) ""; do test -z "$$b" && continue; \
@@ -174,5 +175,6 @@
uninstall: uninstall-. uninstall-subdirs
+# implement these to hook in to the start of the install:
install-.:
uninstall-.:
|
|
From: <sg...@us...> - 2003-08-30 19:20:35
|
Update of /cvsroot/libfunutil/libfunutil/toc/sbin
In directory sc8-pr-cvs1:/tmp/cvs-serv30672/sbin
Modified Files:
toc_core.sh toconfigure
Log Message:
a number of changes from the toc tree.
Index: toc_core.sh
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/sbin/toc_core.sh,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- toc_core.sh 29 Aug 2003 10:45:07 -0000 1.21
+++ toc_core.sh 30 Aug 2003 19:20:31 -0000 1.22
@@ -93,7 +93,7 @@
function toc_debug
{
test "$TOC_DEBUG" -ne 0 || return 0;
- echo "toc_debug: " $@
+ echo "toc_debug: " $@ 1>&2
return 0
}
@@ -184,7 +184,7 @@
toc_dump_make_properties $tmpfile
toc_atfilter_file $tmpfile $tmpl $target
local err=$?
- test -f $tmpfile && rm $tmpfile
+ rm $tmpfile
return $err
}
@@ -391,8 +391,8 @@
} # end config manipulator
function toc_find_test
-{ # internal helper function.
- # return value is in TOC_FIND_RESULT
+{ # Sets TOC_FIND_RESULT to the absolute path of the toc test named $1
+ # Returns 0 if it finds a file, else 1.
toc_find_in_path ${TOC_TESTSDIR}/$1.sh || \
toc_find_in_path $1 ".:${PATH}" || \
toc_find_in_path $1.sh ".:${PATH}"
@@ -414,31 +414,36 @@
function toc_run
{
TOC_RUN_DEPTH=$((TOC_RUN_DEPTH + 1))
+ local depth=${TOC_RUN_DEPTH}
toc_debug "toc_run " $@
local testname=$1 #${TOC_FIND_RESULT}
#TOC_DIR=${TOC_TESTSDIR}
local path=
local desc=
- toc_find_test $1 && {
+ toc_find_test $testname && {
path=${TOC_FIND_RESULT}
desc=$(sed -ne 's|\#.*toc_run_description.*= *\(.*\)|\1|p;q' ${TOC_FIND_RESULT});
} || {
- toc_die 127 toc_run cannot find script for test $1.
+ toc_die 127 toc_run cannot find script for test $testname.
}
shift
# if test ${TOC_LOUD} = 1; then
-# i=1;
-# while test $i -le ${TOC_RUN_DEPTH}; do
-# echo -n "${TOC_BOLD_}===>${_TOC_BOLD_} "
-# i=$((i + 1))
-# done
+
+ local showname="$testname"
+ test "x${TOC_LOUD-0}" != "x0" -a "x$1" != "x" && showname="$showname $@"
+ toc_loudly -n "[$depth] "
+# test "x${TOC_LOUD-0}" toc_boldecho -n "[$depth] ===="
+ i=1;
+ while test $i -le $depth; do
+ echo -n "${TOC_BOLD_}==${_TOC_BOLD_}"
+ i=$((i + 1))
+ done
# else
- echo -n "==${TOC_RUN_DEPTH}=="
+ toc_boldecho -n " [$showname] "
+ test -n "$desc" && echo -n $desc
+# echo -n "[$testname]====== "
# fi
- local args=""
- test "x${TOC_LOUD-0}" != "x0" && args=" $@"
- test "$args" = " " && args=
- echo -e " ${TOC_BOLD_}test: [$testname$args]${_TOC_BOLD} $desc"
+ echo
local err=0
toc_source_test $testname $@
err=$?
@@ -451,17 +456,16 @@
{ # runs toc_run and warns if there was an error.
# It does not exit - it returns 1 on error, however.
toc_debug toc_run_failok $@
- local testname
- testname=$1
- depth=$((TOC_RUN_DEPTH + 1))
+ local testname=$1
+ local depth=$((TOC_RUN_DEPTH + 1))
toc_run $@ || {
local ret=$?
- local ret
- echo -n "==${depth}== "
- for i in 0 0 0; do
- echo -en "!!!! ${TOC_EMOTICON_WARNING} ${TOC_BOLD}${testname}${_TOC_BOLD}";
- done
- echo ${TOC_EMOTICON_WARNING} $ret
+ toc_loudly -n "[${depth}] "
+ toc_boldecho -n "^^^^^^^^^^ "
+ echo -n ${TOC_EMOTICON_WARNING} " "
+ toc_boldecho -n "$testname: $ret"
+ echo -n " " ${TOC_EMOTICON_WARNING} " "
+ toc_boldecho "^^^^^^^^^^ "
return $ret
}
#&& echo ${TOC_EMOTICON_OKAY}
@@ -473,22 +477,18 @@
function toc_run_fail
{
toc_debug toc_run_fail $@
- testname=$1
- depth=$((TOC_RUN_DEPTH + 1))
-# depth=${TOC_RUN_DEPTH}
+ local testname=$1
+ local depth=$((TOC_RUN_DEPTH + 1))
toc_run $@ || {
- local ret
- ret=$?
- echo -n "==${depth}== "
- for i in 0 0 0; do
- echo -en "!!!! ${TOC_EMOTICON_ERROR} ${TOC_BOLD}${testname}${_TOC_BOLD} ";
- done
- echo ${TOC_EMOTICON_ERROR}
- # toc_run_showerr $ret ${TOC_CONFIG_LOG} $testname
+ local ret=$?
+ toc_loudly -n "[${depth}] "
+ toc_boldecho -n "^^^^^^^^^^ "
+ echo -n ${TOC_EMOTICON_ERROR} " "
+ toc_boldecho -n "$testname: $ret"
+ echo -n " " ${TOC_EMOTICON_ERROR} " "
+ toc_boldecho "^^^^^^^^^^ "
exit $ret
}
- # && echo ${TOC_EMOTICON_OKAY}
- #toc_show_posttest_feedback
return 0
}
@@ -572,6 +572,7 @@
# test -f $tgt && fstate=updated
if test -f "$tgt"; then
if cmp -s "$tgt" "$tmp"; then
+ toc_debug "toc_replace_file: $tgt is up to date. Deleting $tmp."
#echo "toc_replace_file: $tgt fstate=up to date"
rm -f $tmp
return 1
@@ -596,7 +597,7 @@
pfile=$1
tmpl=$2
ofile=$3
- tmpfile=$ofile.tmp
+ local tmpfile=$ofile.toc_atfilter_file
${TOC_ATSIGN_PARSER} -f $pfile < $tmpl > $tmpfile || {
err=$?
echo "toc_atfilter_file(): @-parsing failed: error $err "
@@ -606,7 +607,7 @@
echo -n "$ofile ... "
fstate="created"
- test -f $ofile && fstate="recreated"
+ test -f $ofile && fstate="updated"
toc_replace_file $ofile $tmpfile || fstate="up to date"
echo "$fstate"
#echo " ${TOC_EMOTICON_OKAY}"
@@ -630,7 +631,7 @@
}
function toc_parseargs
-{ # an experiment in cl args handling
+{ # parses $@ for arguments toc can work with.
toc_debug "toc_parseargs: Handling command-line arguments: $@"
# mostly stolen from the qt 3.1.0 configure script :)
while [ "$#" -gt 0 ]; do
@@ -642,26 +643,27 @@
--help|-?)
cat<<-EOF
Usage:
- configure [--prefix=/path] [--argument=value] [--arg2=val2] ...
+ $0 [--prefix=/path] [--argument=value] [--arg2=val2] ...
See the README file for this package to find out which arguments are supported.
Standard arguments include:
- --help or -? Show this help.
- --prefix=/path Top-most path for installation. Default: ${prefix}
- --enable-FOO=... Sets the global variable configure_enable_FOO to the given value.
- --enable-FOO Equivalent to --enable-FOO=1.
- --disable-FOO Equivalent to --enable-FOO=0.
- --with-FOO=... Sets the global variable configure_with_FOO to the given value.
- --with-FOO Equivalent to --with-FOO=1.
- --without-FOO Equivalent to --with-FOO=0.
- --FOO=BAR Sets global variable FOO=BAR.
- --FOO Equivalent to --FOO=1.
- --toc-quiet Disables some text which may be of arguable utility.
- --toc-loud Disables "quietness", and turns up the volume a bit.
- Note that all generated variables are set in the shell environment, the shared makefile and config.h.
- This means you can do things like override the PATH with --PATH=...
-
+EOF
+# ^^^^ note usage of hard tabs in the cat command!
+cat <<EOF | perl -ne 'm/\t*(.*)\s*\|\s*(.*)/; print " $1\n\t\t$2\n";'
+ --help or -? | Show this help.
+ --prefix=/path | Top-most path for installation. Default: ${prefix}
+ --enable-FEATURE=... | Exports config variable configure_enable_FEATURE.
+ --enable-FEATURE | Equivalent to --enable-FEATURE=1.
+ --disable-FEATURE | Equivalent to --enable-FEATURE=0.
+ --with-FEATURE=... | Sets the global variable configure_with_FEATURE.
+ --with-FEATURE | Equivalent to --with-FEATURE=1.
+ --without-FEATURE | Equivalent to --with-FEATURE=0.
+ --XXX=YYY | Exports config variable XXX=YYY.
+ --XXX | Equivalent to --XXX=1.
+ --toc-quiet,--quiet | Disables some text which may be of arguable utility.
+ --toc-loud, --verbose, --loud | Enables some otherwise superfluous information.
+ --toc-fail-fast | Causes configure to abort if toc_run_failok returns non-zero.
EOF
# ^^^^ note usage of hard tabs in the cat command!
exit 0
@@ -671,13 +673,21 @@
VAR=$(echo $arg | sed "s,^--\(.*\)=.*,\1,;")
VAL=$(echo $arg | sed "s,^--.*=\(.*\),\1,")
;;
+ --loud|--verbose|--toc-loud)
+ VAR=TOC_LOUD
+ VAL=1
+ ;;
+ --quiet)
+ VAR=TOC_QUIET
+ VAL=1
+ ;;
--TOC-[-_]*|--toc[-_]*)
# reserved.
VAR=$(echo $arg | sed "s,^--\(.*\)=.*,\1,;s,-,_,g;s/^__//;" | tr '[a-z\-]' '[A-Z_]')
VAL=$(echo $arg | sed "s,^--.*=\(.*\),\1,;/^--/d;")
test -n "$VAL" || VAL=1
;;
- --enable-*=*|--with-*=*)
+ --enable-*=*|--with-*=*)
# sets configure_with_XXX or configure_enable_XXX
VAR=$(echo "$arg" | sed "s,^--\(.*\)=.*,\1,;s,-,_,g")
VAL=$(echo "$arg" | sed "s,^--.*=\(.*\),\1,")
@@ -790,7 +800,7 @@
EOF
# source ${TOC_TOCDIR}/tests/toc_core_tests.sh || {
-toc_run_fail toc_core_tests "Build environment sanity checks..." || {
+toc_run_fail toc_core_tests || {
# Don't do "toc_run toc_core" because then we don't see the output :/
err=$?
echo "Core toc sanity test failed (err=$err). This tree is not toc-capable. ${TOC_EMOTICON_ERROR}"
Index: toconfigure
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/sbin/toconfigure,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
|
|
From: <sg...@us...> - 2003-08-30 19:20:34
|
Update of /cvsroot/libfunutil/libfunutil/toc/bin
In directory sc8-pr-cvs1:/tmp/cvs-serv30672/bin
Modified Files:
atsign_parse mkdep.c
Log Message:
a number of changes from the toc tree.
Index: atsign_parse
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/bin/atsign_parse,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Index: mkdep.c
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/bin/mkdep.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- mkdep.c 9 Aug 2003 10:45:21 -0000 1.3
+++ mkdep.c 30 Aug 2003 19:20:30 -0000 1.4
@@ -603,13 +603,12 @@
while (++argv, --argc > 0) {
if (strncmp(*argv, "-I", 2) == 0) {
- if (*((*argv)+2)) {
+ if (*((*argv)+2) ) {
add_path((*argv)+2);
}
else {
++argv;
--argc;
- add_path(*argv);
}
}
else if (strcmp(*argv, "--") == 0) {
|
|
From: <sg...@us...> - 2003-08-30 19:19:39
|
Update of /cvsroot/libfunutil/libfunutil/toc/tests In directory sc8-pr-cvs1:/tmp/cvs-serv30507 Modified Files: qt.sh Log Message: added toc_run_description Index: qt.sh =================================================================== RCS file: /cvsroot/libfunutil/libfunutil/toc/tests/qt.sh,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- qt.sh 29 Aug 2003 11:47:07 -0000 1.5 +++ qt.sh 30 Aug 2003 19:19:35 -0000 1.6 @@ -1,3 +1,4 @@ +# toc_run_description = looking for Qt libraries and headers # toc_begin_help = # Calls toc_add_make for the following: # - QTINCDIR directory containing Qt headers |
|
From: <sg...@us...> - 2003-08-29 11:47:11
|
Update of /cvsroot/libfunutil/libfunutil/toc/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv24307
Modified Files:
qt.sh readline.sh
Log Message:
added some help text
Index: qt.sh
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/tests/qt.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- qt.sh 26 Aug 2003 08:31:28 -0000 1.4
+++ qt.sh 29 Aug 2003 11:47:07 -0000 1.5
@@ -1,3 +1,4 @@
+# toc_begin_help =
# Calls toc_add_make for the following:
# - QTINCDIR directory containing Qt headers
# - QTLIBDIR directory containing Qt libraries
@@ -17,6 +18,12 @@
# before running this test:
# qt_required_version - human-readable version number like "3.1.x"
# qt_required_version_glob - version glob like "3.1.*"
+# Optionally, pass the version as $1 and glob as $2 (be sure to quote the
+# glob!).
+# = toc_end_help
+
+qt_required_version_version=${1-${qt_required_version_version-'3.x'}}
+qt_required_version_glob=${2-${qt_required_version_glob-'3.*'}}
function qt_check_dir
{
Index: readline.sh
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/tests/readline.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- readline.sh 28 Aug 2003 09:29:43 -0000 1.6
+++ readline.sh 29 Aug 2003 11:47:07 -0000 1.7
@@ -1,4 +1,8 @@
# a basic toc test for libreadline.
+# toc_begin_help =
+# Searches for GNU libreadline.
+# Use --with-libreadline to enable it.
+# Sets the LIBREADLINE_LDADD make var and the HAVE_READLINE config.h var.
#
# Sample snippet for your shared makefile:
#
@@ -15,7 +19,7 @@
# In your config.h.at put something like:
#
# #define HAVE_READLINE @HAVE_READLINE@
-#
+# = toc_end_help
toc_add_config_h HAVE_READLINE=0
toc_add_make configure_with_libreadline=0
|
|
From: <sg...@us...> - 2003-08-29 11:39:33
|
Update of /cvsroot/libfunutil/libfunutil
In directory sc8-pr-cvs1:/tmp/cvs-serv22838
Modified Files:
configure
Log Message:
doc corrections
Index: configure
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/configure,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- configure 29 Aug 2003 05:41:49 -0000 1.6
+++ configure 29 Aug 2003 11:39:27 -0000 1.7
@@ -1,28 +1,20 @@
#!/bin/bash
-
+# toc-style boostrap configure script
+#
# PACKAGE_* vars: you should change these vars to match your
-# project. They are not strictly required by toc, but they are are
-# conventional, and necessary if you are going to do a 'make dist' or
-# 'make install'.
-# No spaces in the PACKAGE_NAME and _VERSION, please - this should be as filesystem-friendly as possible.
-# export PACKAGE_NAME=${PACKAGE_NAME?You must set PACKAGE_NAME in $0}
+# project.
+#
+# No spaces in the PACKAGE_NAME and _VERSION, please - this should be
+# as filesystem-friendly as possible. export
PACKAGE_NAME=libfunutil
PACKAGE_VERSION=0.7.999
-# These initial values have to be here, not configure.libfunutil, because
-# args will already have been parsed at that point.
-#
-# Use Qt by default.
-# configure_with_qt=1
-# Warn (and croak) by default.
-configure_enable_warn="-Wall -Werror"
-
# toconfigure kicks off the configure process, which will eventually
# call configure.${PACKAGE_NAME}, writes out any output and returns 0
-# or 1 (most likely 0). It may also exit. Note that after it returns
-# there is no way to add/change config options unless you're willing
-# to re-generate them again (by calling toc_endconfigure). This is
+# or 1. It may also exit. Note that after it returns there is no way
+# to add/change config options unless you're willing to re-generate
+# them again (by calling toc_endconfigure). This is
# unsupported/untested, but should work.
source toc/sbin/toconfigure $@
|
|
From: <sg...@us...> - 2003-08-29 11:37:59
|
Update of /cvsroot/libfunutil/libfunutil
In directory sc8-pr-cvs1:/tmp/cvs-serv22604
Modified Files:
configure.libfunutil
Log Message:
added toc_tests_help test
Index: configure.libfunutil
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/configure.libfunutil,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- configure.libfunutil 29 Aug 2003 05:41:12 -0000 1.15
+++ configure.libfunutil 29 Aug 2003 11:37:56 -0000 1.16
@@ -1,4 +1,6 @@
-# sample package-specific configure script for use with toc.
+# package-specific configure script for libfunutil
+
+toc_run_fail toc_tests_help
# very funny.
#accept_license_LICENSES="GPL" # enabled bypassing license with --accept-license=GPL
@@ -60,6 +62,7 @@
toc_boldecho "Running $USER's tests..."
source ${configure_developer_script} || toc_die $? "${configure_developer_script} failed"
}
+
echo ==============================================================
echo "${PACKAGE_NAME} configuration checks completed."
|
|
From: <sg...@us...> - 2003-08-29 11:37:31
|
Update of /cvsroot/libfunutil/libfunutil/toc/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv22568
Modified Files:
accept_license.sh
Log Message:
corrected some utter bogosity in the help text
Index: accept_license.sh
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/tests/accept_license.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- accept_license.sh 29 Aug 2003 11:35:15 -0000 1.2
+++ accept_license.sh 29 Aug 2003 11:37:28 -0000 1.3
@@ -1,21 +1,24 @@
# toc_run_description = encourage the user to read the LICENSE file
# toc_begin_help =
-
# Accepts a license filename as $1 and returns 1 if the license could
# not be read or if the user does not answer yes to the question of
# accepting the license.
-# After returning, if ${accept_license_LICENSES} is not empty then the
+# If ${accept_license_LICENSES} is not empty then the
# user is prompted to select one of the licenses, and this test
-# returns 1 if they do not.
+# returns 1 if the user do not choose one of them.
+
+# It accepts the following "quick bypass":
+# --accept-license=license
+# where license is one of ${accept_license_LICENSES}
+
+# Upon returning, if successful then ${accept_license_LICENSE} is set
+# to the selected license.
# = toc_end_help
-# It accepts the following "quick bypass":
-# --accept-license=license
-# where license is one of ${accept_license_LICENSES}
#
lc=${1-LICENSE}
|
|
From: <sg...@us...> - 2003-08-29 11:35:25
|
Update of /cvsroot/libfunutil/libfunutil/toc/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv22238
Modified Files:
gnu_cpp_tools.sh accept_license.sh
Log Message:
added some help text using the new help support
Index: gnu_cpp_tools.sh
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/tests/gnu_cpp_tools.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- gnu_cpp_tools.sh 29 Aug 2003 10:40:40 -0000 1.7
+++ gnu_cpp_tools.sh 29 Aug 2003 11:35:15 -0000 1.8
@@ -1,5 +1,5 @@
# toc_run_description = looking for gcc, ld, and maybe other compilation-related tools
-#
+# toc_begin_help =
# It takes the following configure arguments:
# --enable-debug causes stuff to be built -g instead of -02. This is a
# little weird, but you can control the optimization level
@@ -16,6 +16,7 @@
# - CFLAGS probably empty (or maybe -pipe)
# - CXXFLAGS probably empty (or maybe -pipe)
# - LDFLAGS probably empty
+# = toc_end_help
CC=
Index: accept_license.sh
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/tests/accept_license.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- accept_license.sh 28 Aug 2003 09:30:07 -0000 1.1
+++ accept_license.sh 29 Aug 2003 11:35:15 -0000 1.2
@@ -1,10 +1,16 @@
# toc_run_description = encourage the user to read the LICENSE file
-# toc_return_description = 1 if the license could not be read or if the user does not answer yes to the question of accepting the license.
-#
+# toc_begin_help =
+
+# Accepts a license filename as $1 and returns 1 if the license could
+# not be read or if the user does not answer yes to the question of
+# accepting the license.
+
+# After returning, if ${accept_license_LICENSES} is not empty then the
+# user is prompted to select one of the licenses, and this test
+# returns 1 if they do not.
+
+# = toc_end_help
-# If ${accept_license_LICENSES} is not empty then the user is prompted
-# to select one of the licenses, and this test returns 1 if they do
-# not.
# It accepts the following "quick bypass":
|
|
From: <sg...@us...> - 2003-08-29 11:35:02
|
Update of /cvsroot/libfunutil/libfunutil/toc/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv22146
Added Files:
toc_tests_help.sh
Log Message:
initial checkin
--- NEW FILE: toc_tests_help.sh ---
# toc_run_description = checks for --help-X and tries to do something about it.
# toc_begin_help =
# toc_tests_help looks for vars named help_* and tries to find help text for
# tests matching that pattern (that is, help_foo looks for help for test foo).
# To add help to your test wrap it in a block which begins with
# the text 'tun_run_begin_help =' and end it with '= toc_run_end_help'
# = toc_end_help
helps="$(env | grep '^help_')"
test -n "$helps" || return 0
for h in $helps; do
test=${h##help_}
test=${test%%=*}
echo "help: $test"
toc_find_test $test || {
echo "Error: cannot find test $test."
return 1
}
scr=${TOC_FIND_RESULT}
grep -q "toc_begin_help" $scr || {
echo "No help text found."
continue
}
sed -n '/^# *toc_begin_help *=/,/^#\ *= *toc_end_help/p' $scr | \
sed '/^# *toc_begin_help *=/d;/^# *= *toc_end_help/d;s/^# */ /;'
done
return 1
|
|
From: <sg...@us...> - 2003-08-29 10:45:27
|
Update of /cvsroot/libfunutil/libfunutil/toc/make In directory sc8-pr-cvs1:/tmp/cvs-serv13700 Modified Files: install.make Log Message: removed a bogus comment Index: install.make =================================================================== RCS file: /cvsroot/libfunutil/libfunutil/toc/make/install.make,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- install.make 28 Aug 2003 09:25:57 -0000 1.18 +++ install.make 29 Aug 2003 10:45:23 -0000 1.19 @@ -174,6 +174,5 @@ uninstall: uninstall-. uninstall-subdirs -# implement these to hook in to the start of the install: install-.: uninstall-.: |
|
From: <sg...@us...> - 2003-08-29 10:45:11
|
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=$?
|
|
From: <sg...@us...> - 2003-08-29 10:44:05
|
Update of /cvsroot/libfunutil/libfunutil In directory sc8-pr-cvs1:/tmp/cvs-serv13493 Modified Files: toc_shared.make.at Log Message: removed hard-coded -lreadline -lncurses Index: toc_shared.make.at =================================================================== RCS file: /cvsroot/libfunutil/libfunutil/toc_shared.make.at,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- toc_shared.make.at 28 Aug 2003 23:07:21 -0000 1.19 +++ toc_shared.make.at 29 Aug 2003 10:44:02 -0000 1.20 @@ -114,8 +114,7 @@ configure_with_libreadline = @configure_with_libreadline@ ifeq ($(configure_with_libreadline),1) - LIBREADLINE_LDADD = -lreadline - LIBREADLINE_LDADD += -lncurses # some systems need this, some don't. + LIBREADLINE_LDADD = @LIBREADLINE_LDADD@ endif @@ -144,9 +143,9 @@ if cmp -s $(2).tmp $(2); then rm -f $(2).tmp; echo "$(2) is up to date."; \ else mv -f $(2).tmp $@; echo "Updated $(2)."; fi +include $(toc_makesdir)/install.make include $(toc_makesdir)/subdirs_traverser.make include $(toc_makesdir)/cleaner.make include $(toc_makesdir)/dist.make include $(toc_makesdir)/tests.make -include $(toc_makesdir)/install.make include $(toc_makesdir)/deps.make |
|
From: <sg...@us...> - 2003-08-29 10:42:52
|
Update of /cvsroot/libfunutil/libfunutil/lib/funUtil In directory sc8-pr-cvs1:/tmp/cvs-serv13335 Modified Files: SerialTree-qxml.cpp Log Message: worked around a gcc 3.3-specific problem Index: SerialTree-qxml.cpp =================================================================== RCS file: /cvsroot/libfunutil/libfunutil/lib/funUtil/SerialTree-qxml.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- SerialTree-qxml.cpp 10 Aug 2003 10:06:21 -0000 1.19 +++ SerialTree-qxml.cpp 29 Aug 2003 10:42:45 -0000 1.20 @@ -61,7 +61,7 @@ case QDomNode::DocumentFragmentNode: os << "DocumentFragmentNode"; break; case QDomNode::NotationNode: os << "NotationNode"; break; case QDomNode::CharacterDataNode: os << "CharacterDataNode"; break; - default: os << "(wha??)"; + default: os << "WTF?"; // gcc 3.3 break on (wha??) with "trigraph ??) ignored"!!! } return os; } |
|
From: <sg...@us...> - 2003-08-29 10:40:43
|
Update of /cvsroot/libfunutil/libfunutil/toc/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv13053
Modified Files:
gnu_cpp_tools.sh
Log Message:
added --enable-werror to add -Werror to WARN
Index: gnu_cpp_tools.sh
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/tests/gnu_cpp_tools.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- gnu_cpp_tools.sh 28 Aug 2003 09:29:43 -0000 1.6
+++ gnu_cpp_tools.sh 29 Aug 2003 10:40:40 -0000 1.7
@@ -54,6 +54,12 @@
# They specified some flags.
WARN="$configure_enable_warn"
fi
+
+if test "$configure_enable_werror" = 1; then
+ WARN="-Werror $WARN"
+fi
+
+
toc_add_make WARN="$WARN"
# Presumably we could determine whether -pipe works instead of assuming
|
