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 21:38:38
|
Update of /cvsroot/libfunutil/libfunutil/toc/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv1045/toc/tests
Modified Files:
readline.sh
Log Message:
silence the ncurses check if we don't end up needing it.
Index: readline.sh
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/tests/readline.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- readline.sh 29 Aug 2003 11:47:07 -0000 1.7
+++ readline.sh 31 Aug 2003 21:38:35 -0000 1.8
@@ -49,11 +49,11 @@
LIBREADLINE_LDADD="-lreadline"
nc=-lncurses
if toc_find_failok nm > /dev/null; then
- echo -n "? Do we also need to link against $nc? ... "
+# echo -n "? Do we also need to link against $nc? ... "
if ${TOC_FIND_RESULT} ${lib} | grep -q tgoto; then
- echo "It doesn't seem so."
+ true
else
- echo "It seems so. Adding $nc."
+ echo "It seems we also need to link against $n."
LIBREADLINE_LDADD="${LIBREADLINE_LDADD} $nc"
fi
else
@@ -64,5 +64,5 @@
configure_with_libreadline=1
toc_add_config_h HAVE_READLINE=1
toc_add_make configure_with_libreadline=1
-toc_add_make LIBREADLINE_LDADD=${LIBREADLINE_LDADD}
+toc_add_make LIBREADLINE_LDADD="${LIBREADLINE_LDADD}"
return 0
|
|
From: <sg...@us...> - 2003-08-31 21:38:05
|
Update of /cvsroot/libfunutil/libfunutil/toc/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv935/toc/tests
Modified Files:
gnu_cpp_tools.sh
Log Message:
tweaks to --enable-werror
Index: gnu_cpp_tools.sh
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/tests/gnu_cpp_tools.sh,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- gnu_cpp_tools.sh 29 Aug 2003 11:35:15 -0000 1.8
+++ gnu_cpp_tools.sh 31 Aug 2003 21:38:01 -0000 1.9
@@ -6,6 +6,7 @@
# with --enable-debug="-O3 -fno-inline" etc.
# --enable-warn causes stuff to be built -Wall. To turn on -Werror, go
# --enable-warn="-Wall -Werror" etc.
+# --enable-werror same as --enable-warn="-Wall -Werror"
#
# It calls toc_add_make for the following:
# - CC /path/to/gcc?
@@ -56,9 +57,14 @@
WARN="$configure_enable_warn"
fi
-if test "$configure_enable_werror" = 1; then
- WARN="-Werror $WARN"
+if test "x$configure_enable_werror" != x0; then
+ if test "x$configure_enable_werror" = x1; then
+ WARN="-Wall -Werror $WARN"
+ else
+ WARN="$WARN $configure_enable_werror"
+ fi
fi
+
toc_add_make WARN="$WARN"
|
|
From: <sg...@us...> - 2003-08-31 21:37:17
|
Update of /cvsroot/libfunutil/libfunutil/toc/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv801/toc/tests
Modified Files:
buildtool.sh
Log Message:
Added note about where to find buildtool.
Index: buildtool.sh
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/tests/buildtool.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- buildtool.sh 31 Aug 2003 00:43:27 -0000 1.1
+++ buildtool.sh 31 Aug 2003 21:37:14 -0000 1.2
@@ -14,6 +14,8 @@
bin=${TOC_FIND_RESULT}
val=1
ret=0
+else
+ echo "buildtool not found. You can get it from http://buildtool.sourceforge.net/"
fi
toc_add_make BUILDTOOL_BIN=${bin}
toc_add_make $varname=${val}
|
|
From: <sg...@us...> - 2003-08-31 21:36:40
|
Update of /cvsroot/libfunutil/libfunutil/toc/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv609/toc/tests
Modified Files:
accept_license.sh
Log Message:
removed an extraneous newline :/
Index: accept_license.sh
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/tests/accept_license.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- accept_license.sh 30 Aug 2003 19:20:31 -0000 1.4
+++ accept_license.sh 31 Aug 2003 21:36:36 -0000 1.5
@@ -30,7 +30,7 @@
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
+ echo -n "Tap ENTER to continue."; read
${PAGER-more} $lc
err=$?
test $err = 0 || {
|
|
From: <sg...@us...> - 2003-08-31 21:36:03
|
Update of /cvsroot/libfunutil/libfunutil/toc/sbin
In directory sc8-pr-cvs1:/tmp/cvs-serv320/toc/sbin
Modified Files:
toc_core.sh
Log Message:
Some quoting/scoping-related quasi-fixes. --verbose now works differently, enabling --loud and disabling --quiet. Added toc_tests_help to the core tests, to allow it to be called very early, but this is extremely arguable.
Index: toc_core.sh
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/sbin/toc_core.sh,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- toc_core.sh 31 Aug 2003 20:32:56 -0000 1.24
+++ toc_core.sh 31 Aug 2003 21:36:00 -0000 1.25
@@ -165,8 +165,8 @@
i=$((i - 1))
while test $i -ge 0; do
foo=${CONFIG_DOT_MAKE_ARRAY[$i]}
- k="${foo%%=*}"
- v="${foo#*=}"
+ local k="${foo%%=*}"
+ local v="${foo#*=}"
test "$arg" = "$k" && {
ret=0
theval="$v"
@@ -665,7 +665,7 @@
while [ "$#" -gt 0 ]; do
VAR=
VAL=
- arg=$1
+ arg="$1"
shift
case $arg in
--help|-?)
@@ -690,8 +690,10 @@
--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-loud, --loud | Enables some otherwise superfluous information.
+ --verbose | Enables --loud and disables --quiet
--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
@@ -701,10 +703,15 @@
VAR=$(echo $arg | sed "s,^--\(.*\)=.*,\1,;")
VAL=$(echo $arg | sed "s,^--.*=\(.*\),\1,")
;;
- --loud|--verbose|--toc-loud)
+ --loud|--toc-loud)
VAR=TOC_LOUD
VAL=1
;;
+ --verbose)
+ TOC_QUIET=0
+ TOC_LOUD=1
+ export TOC_QUIET TOC_LOUD
+ ;;
--quiet)
VAR=TOC_QUIET
VAL=1
@@ -776,6 +783,8 @@
echo "Configuring build environment."
toc_parseargs --prefix=${prefix} "$@"
toc_loudly 'Loud mode enabled.'
+
+toc_run_fail toc_tests_help
toc_quietly <<-EOF
${TOC_BOLD_}Emoticon legend:${_TOC_BOLD}
|
|
From: <sg...@us...> - 2003-08-31 21:34:40
|
Update of /cvsroot/libfunutil/libfunutil/toc/make In directory sc8-pr-cvs1:/tmp/cvs-serv32525/toc/make Modified Files: install.make Log Message: libs are now installed 0755 by default. Index: install.make =================================================================== RCS file: /cvsroot/libfunutil/libfunutil/toc/make/install.make,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- install.make 31 Aug 2003 20:23:02 -0000 1.22 +++ install.make 31 Aug 2003 21:34:36 -0000 1.23 @@ -125,16 +125,17 @@ # } -INSTALLER_BIN_FLAGS_BINS = -s +INSTALLER_BIN_FLAGS_BINS = -s -m 0755 INSTALLER_BIN_FLAGS_NONBINS = -m 0644 +INSTALLER_BIN_FLAGS_LIBS = -m 0755 # default install flags for the installable file categories: INSTALL_BINS_INSTALL_FLAGS ?= $(INSTALLER_BIN_FLAGS_BINS) INSTALL_SBINS_INSTALL_FLAGS ?= $(INSTALLER_BIN_FLAGS_BINS) -INSTALL_LIBS_INSTALL_FLAGS ?= $(INSTALLER_BIN_FLAGS_NONBINS) -INSTALL_PACKAGE_LIBS_INSTALL_FLAGS ?= $(INSTALLER_BIN_FLAGS_NONBINS) -INSTALL_LIBEXECS_INSTALL_FLAGS ?= $(INSTALLER_BIN_FLAGS_NONBINS) +INSTALL_LIBS_INSTALL_FLAGS ?= $(INSTALLER_BIN_FLAGS_LIBS) +INSTALL_PACKAGE_LIBS_INSTALL_FLAGS ?= $(INSTALLER_BIN_FLAGS_LIBS) +INSTALL_LIBEXECS_INSTALL_FLAGS ?= $(INSTALLER_BIN_FLAGS_LIBS) INSTALL_HEADERS_INSTALL_FLAGS ?= $(INSTALLER_BIN_FLAGS_NONBINS) INSTALL_PACKAGE_HEADERS_INSTALL_FLAGS ?= $(INSTALLER_BIN_FLAGS_NONBINS) INSTALL_PACKAGE_INSTALL_FLAGS ?= $(INSTALLER_BIN_FLAGS_NONBINS) |
|
From: <sg...@us...> - 2003-08-31 20:33:35
|
Update of /cvsroot/libfunutil/libfunutil
In directory sc8-pr-cvs1:/tmp/cvs-serv21869
Modified Files:
toc_shared.make.at
Log Message:
removed some code which is now in toc/make/*
Index: toc_shared.make.at
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc_shared.make.at,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- toc_shared.make.at 31 Aug 2003 00:50:26 -0000 1.21
+++ toc_shared.make.at 31 Aug 2003 20:33:30 -0000 1.22
@@ -1,3 +1,5 @@
+#!/usr/bin/make
+# ^^^ this is only to help emacs
# toc_shared.make.at is the template file for toc_shared.make.
# The .at file is processed by the configure script
# to create toc_shared.make. Makefiles should have this line:
@@ -126,34 +128,5 @@
endif
-
-
-# toc_get_makefile_var call()able:
-# $1 = VAR_NAME
-# $2 = optional filename (defaults to Makefile)
-toc_get_makefile_var = $(shell $(toc_tocdir)/bin/getMakefileVar $(1) $(2))
-#toc_get_makefile_var = $(shell fn=$(2); test -z "$$fn" && fn=Makefile; ${MAKE} -np -f $$fn | grep '^$(1)')
-
-TOC_ATPARSER_BIN = $(top_srcdir)/toc/bin/atsign_parse
-
-
-# toc_atparse_file call()able:
-# Similar to the toc shell function of the same name, except for different
-# arguments:
-# filters an input file using toc's at-parser (e.g., @TOKENS@), and sends output to $2.
-# $2 is only updated if the generated output is different, so it is dependencies-safe.
-#
-# $1 = input template
-# $2 = output file
-# $3 = list of properties, e.g. FOO=bar BAR=foo
-toc_atparse_file = \
- $(TOC_ATPARSER_BIN) $(3) < $(1) > $(2).tmp; \
- 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)/toc_mainincludes.make
include $(toc_makesdir)/tests.make
-include $(toc_makesdir)/deps.make
|
|
From: <sg...@us...> - 2003-08-31 20:33:00
|
Update of /cvsroot/libfunutil/libfunutil/toc/sbin
In directory sc8-pr-cvs1:/tmp/cvs-serv21765/toc/sbin
Modified Files:
toc_core.sh
Log Message:
Added optional second arg to toc_get_make, to tell it out echo output. Added $prefix to toc.make. Added toc_export function.
Index: toc_core.sh
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/sbin/toc_core.sh,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- toc_core.sh 31 Aug 2003 00:40:48 -0000 1.23
+++ toc_core.sh 31 Aug 2003 20:32:56 -0000 1.24
@@ -147,30 +147,37 @@
}
function toc_get_make
-{ # an inefficient way to get a key which has been previously set
+{ # gets a key which has been previously set
# via toc_add_make. The value is not echoed, but is in the
# global var ${TOC_GET_MAKE}. Returns 0 if it finds the var
# and 1 if it does not.
+ #
# $1 = name of var.
- i=${#CONFIG_DOT_MAKE_ARRAY[@]}
- arg=$1
- theval=
+ # [$2] = if 1 then the result is echoed. If 2 then $1=${TOC_GET_MAKE}
+ # is echoed. Default behaviour is to not output anything.
+ # A pneumonic for $2: 1 stands for one part (the value) and 2
+ # stands for 2 parts (the key and the value).
TOC_GET_MAKE=
- ret=1
+ local i=${#CONFIG_DOT_MAKE_ARRAY[@]}
+ local arg="$1"
+ local theval=
+ local ret=1
i=$((i - 1))
while test $i -ge 0; do
foo=${CONFIG_DOT_MAKE_ARRAY[$i]}
- k=${foo%%=*}
- v=${foo#*=}
+ k="${foo%%=*}"
+ v="${foo#*=}"
test "$arg" = "$k" && {
ret=0
- theval=$v
+ theval="$v"
break
}
i=$((i - 1))
done
- TOC_GET_MAKE=$theval
- toc_debug toc_get_make $arg=$theval
+ TOC_GET_MAKE="$theval"
+ test "x$2" = "x1" && echo ${TOC_GET_MAKE}
+ test "x$2" = "x2" && echo $arg="${TOC_GET_MAKE}"
+ toc_debug toc_get_make "$arg=$theval"
return $ret
}
@@ -219,8 +226,9 @@
tocmakeprops=${cmake}.props
cp $makeprops $tocmakeprops
cat <<EOF >> $tocmakeprops
-TOC_RELATIVE_DIR=${shortform##./}
TOC_TOP_SRCDIR=${relpath##./}
+prefix=${prefix}
+TOC_RELATIVE_DIR=${shortform##./}
TOC_SHARED_MAKEFILE=${TOC_SHARED_MAKEFILE}
TOC_EMOTICON_OKAY=${TOC_EMOTICON_OKAY}
TOC_EMOTICON_WARNING= ${TOC_EMOTICON_WARNING}
@@ -336,13 +344,14 @@
#
# It returns 1 if ${TOC_FIND_RESULT} is empty (i.e., if it found anything),
# else it returns 0.
- function toc_find_in_path ()
+ function toc_find_in_path
{
+ toc_debug toc_find_in_path $@
TOC_FIND_RESULT= # holds the quasi-return value
local app=$1
shift
- local path=$@
- test -n "$path" || path=$PATH
+ local path="$@"
+ test -n "$path" || path="$PATH"
# strange: when run as: toc_find_in_path ls $PATH
# path is space-separated!
# echo path=$path
@@ -372,6 +381,8 @@
#
# Only call these funcs with one key/val pair at a time, to allow for
# proper handling of foo="something with spaces in it"
+ #
+ # usage: toc_add_make VAR="VAR's value, presumably."
function toc_add_make
{
toc_debug "toc_add_make: $@"
@@ -387,6 +398,15 @@
toc_add_make $@
toc_add_config_h $@
}
+ function toc_export
+ { # the ultimate in laziness: toc_add_config plus shell export.
+ toc_debug toc_export $@
+ toc_add_config $@
+ local args="$@"
+ local k="${args%%=*}"
+ local v="${args##*=}"
+ eval "export $k='$v'"
+ }
} # end config manipulator
@@ -493,7 +513,8 @@
# 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}}
+ shift
+ path="${@-${PATH}}"
toc_quietly -n "? find $bin ..."
toc_find_in_path $bin $path || {
toc_quietly "not found ${TOC_EMOTICON_WARNING}"
@@ -604,6 +625,27 @@
}
} # end toc_atfilter_file
+
+
+function toc_makerelative
+{ # usage: toc_makerelative /foo/bar/one/two /foo/bar
+ # sets global var TOC_MAKERELATIVE to the "return value".
+ # In the above example, it should = ./../..
+ local startat=${1-$PWD}
+ local relto=${2-${TOC_TOPDIR}}
+ test -n "$relto" || $relto=$PWD
+ test -f $startat && startat=$(dirname $startat)
+ local dn=$startat/bogus
+ local dn=${dn%*/*}
+ local rel="."
+ while test -n "$dn" -a "$dn" != "$relto" -a "$dn" != "/"; do
+ rel="$rel/.."
+ dn=${dn%*/*}
+ done
+ TOC_MAKERELATIVE=${rel##./}
+}
+
+
function toc_endconfigure
{ # ends the configuration process, processing the files
# which need to be @-parsed
@@ -621,9 +663,9 @@
toc_debug "toc_parseargs: Handling command-line arguments: $@"
# mostly stolen from the qt 3.1.0 configure script :)
while [ "$#" -gt 0 ]; do
- local VAR=
- local VAL=
- local arg=$1
+ VAR=
+ VAL=
+ arg=$1
shift
case $arg in
--help|-?)
@@ -725,26 +767,7 @@
}
done
return 0
-}
-
-
-function toc_makerelative
-{ # usage: toc_makerelative /foo/bar/one/two /foo/bar
- # sets global var TOC_MAKERELATIVE to the "return value".
- # In the above example, it should = ./../..
- local startat=${1-$PWD}
- local relto=${2-${TOC_TOPDIR}}
- test -n "$relto" || $relto=$PWD
- test -f $startat && startat=$(dirname $startat)
- local dn=$startat/bogus
- local dn=${dn%*/*}
- local rel="."
- while test -n "$dn" -a "$dn" != "$relto" -a "$dn" != "/"; do
- rel="$rel/.."
- dn=${dn%*/*}
- done
- TOC_MAKERELATIVE=${rel##./}
-}
+} # end parseargs
# We do some initial sanity checking here,
|
|
From: <sg...@us...> - 2003-08-31 20:29:36
|
Update of /cvsroot/libfunutil/libfunutil/toc/sbin
In directory sc8-pr-cvs1:/tmp/cvs-serv21107/toc/sbin
Modified Files:
toconfigure
Log Message:
now passing on "$@" to toc_core. Dunno if it's necessary, but seems so.
Index: toconfigure
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/sbin/toconfigure,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- toconfigure 30 Aug 2003 19:20:31 -0000 1.9
+++ toconfigure 31 Aug 2003 20:29:30 -0000 1.10
@@ -47,7 +47,7 @@
# todo: implement toc_find_in_path() here so we can use it to find toc_core.sh
# for now assume we must source it from $(top_srcdir).
CORE_SH=toc/sbin/toc_core.sh
- source ${CORE_SH} || { # core toc functions and initial sanity test
+ source ${CORE_SH} "$@" || { # core toc functions and initial sanity test
echo "toconfigure: Pain! Suffering! Loading toc_core.sh failed!"
exit 4
}
|
|
From: <sg...@us...> - 2003-08-31 20:29:02
|
Update of /cvsroot/libfunutil/libfunutil/toc/bin
In directory sc8-pr-cvs1:/tmp/cvs-serv20994/toc/bin
Modified Files:
makedist
Log Message:
changed the md5 sums file name.
Index: makedist
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/bin/makedist,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- makedist 31 Aug 2003 00:51:40 -0000 1.3
+++ makedist 31 Aug 2003 20:28:58 -0000 1.4
@@ -59,7 +59,7 @@
$md5 = `which md5sum 2>/dev/null`;
if( $md5 ) {
- $md5file = "$basename/MD5SUMS.$basename";
+ $md5file = "$basename/md5.sums.$basename";
print STDERR "Generating md5 sums: $md5file\n";
# execcmd( "cd $basename; for x in \$(find . -type f); do md5sum \$x >> MD5SUMS.$basename; done" );
execcmd( "for x in \$(cat $tarfileslist); do md5sum \$x; done > $md5file" )
|
|
From: <sg...@us...> - 2003-08-31 20:28:45
|
Update of /cvsroot/libfunutil/libfunutil/toc/bin
In directory sc8-pr-cvs1:/tmp/cvs-serv20955/toc/bin
Modified Files:
install-sh
Log Message:
cygwin-related workarounds: try to handle .exe files properly and quotes $src, so hopefully files with spaces in the names are okay.
Index: install-sh
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/bin/install-sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- install-sh 28 Aug 2003 23:07:57 -0000 1.1
+++ install-sh 31 Aug 2003 20:28:42 -0000 1.2
@@ -112,8 +112,16 @@
true
fi
+# cygwin workaround: added by st...@wa... for use with toc.
+if [ -f "$src".exe ] ; then
+ src="$src.exe"
+ dst_suffix=".exe"
+ echo CYGWIN WORKAROUND: src=$src
+fi
+
+
if [ x"$dir_arg" != x ]; then
- dst=$src
+ dst="$src"
src=""
if [ -d $dst ]; then
@@ -128,12 +136,12 @@
# might cause directories to be created, which would be especially bad
# if $src (and thus $dsttmp) contains '*'.
- if [ -f $src -o -d $src ]
+ if [ -f "$src" -o -d "$src" ]
then
true
else
- echo "install: $src does not exist"
- exit 1
+ echo "install: $src does not exist"
+ exit 1
fi
if [ x"$dst" = x ]
@@ -149,7 +157,7 @@
if [ -d $dst ]
then
- dst="$dst"/`basename $src`
+ dst="$dst"/`basename "$src"`
else
true
fi
@@ -190,6 +198,12 @@
done
fi
+# cygwin workaround:
+if [ x"$dst_suffix" != x ]; then
+ dst="$dst$dst_suffix"
+ echo "CYGWIN WORKAROUND? dst=$dst"
+fi
+
if [ x"$dir_arg" != x ]
then
$doit $instcmd $dst &&
@@ -225,7 +239,7 @@
# Move or copy the file name to the temp name
- $doit $instcmd $src $dsttmp &&
+ $doit $instcmd "$src" $dsttmp &&
trap "rm -f ${dsttmp}" 0 &&
|
|
From: <sg...@us...> - 2003-08-31 20:27:43
|
Update of /cvsroot/libfunutil/libfunutil/toc/bin
In directory sc8-pr-cvs1:/tmp/cvs-serv20833/toc/bin
Modified Files:
atsign_parse
Log Message:
added support for include:KEY=PATH.
Index: atsign_parse
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/bin/atsign_parse,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- atsign_parse 30 Aug 2003 19:20:30 -0000 1.2
+++ atsign_parse 31 Aug 2003 20:27:39 -0000 1.3
@@ -2,12 +2,16 @@
# ( ^^^^ when run with -n it tries to read in files named after the args. e.g. foo=bar)
#
# Takes command-line args in the format:
-# foo=bar bar=foobar ...
+# foo=bar [[include:]bar=foobar] ...
# and parses stdin, replacing @foo@ with bar and @bar@ with foobar.
# All output goes to stdout.
#
# Intended to be used as a simple parser for Makefile.in-type files.
#
+# Special key type:
+# include:KEY=VAL
+# will try to read the file VAL and import it in place of @KEY@.
+#
# Optional arguments:
# [-f filename] will read in that file. It must be in the form KEY=VALUE, with one key/value per line.
# [-c] will enable "cleanup mode". Any @TOKENS@ in the input stream which were not explicitely
@@ -56,6 +60,13 @@
$val = $2;
if( $STRIP_LEADING_DASHES ) { $key =~ s/^-+//; }
#print STDERR ": [$key]=[$val]\n";
+ if( $key =~ m|^include:(.+)| ) {
+ $key = $1;
+ open INFILE, "<$val" or die "Cannot open file '$val', as requested by @include:$key@!";
+ @foo = <INFILE>;
+ close INFILE;
+ $val = join( "", @foo );
+ }
$args{$key} = $val;
}
} # /BEGIN
|
|
From: <sg...@us...> - 2003-08-31 20:27:16
|
Update of /cvsroot/libfunutil/libfunutil/toc/make In directory sc8-pr-cvs1:/tmp/cvs-serv20732/toc/make Modified Files: toc.make.at Log Message: added vars: prefix, toc_tocdir, toc_makesdir. Index: toc.make.at =================================================================== RCS file: /cvsroot/libfunutil/libfunutil/toc/make/toc.make.at,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- toc.make.at 28 Aug 2003 23:10:34 -0000 1.4 +++ toc.make.at 31 Aug 2003 20:27:08 -0000 1.5 @@ -1,4 +1,4 @@ -#/bin/make +#!/bin/make # # toc.make.at: template makefile for toc.make, a core concept of the # toc build process. This is filtered at the end of the configure @@ -7,13 +7,15 @@ default: all all: FORCE: ; @true + +prefix = @prefix@ top_srcdir = @TOC_TOP_SRCDIR@ toc_tocdir = $(top_srcdir)/toc - +toc_makesdir = $(toc_tocdir)/make +toc_bindir = $(toc_tocdir)/bin TOC_SHARED_MAKEFILE = $(top_srcdir)/@TOC_SHARED_MAKEFILE@ include $(TOC_SHARED_MAKEFILE) - TOC_PWD_FROM_TOPSRC = @TOC_RELATIVE_DIR@ DISTCLEAN_FILES += $(wildcard toc.make toc.qmake) |
|
From: <sg...@us...> - 2003-08-31 20:26:47
|
Update of /cvsroot/libfunutil/libfunutil/toc/make
In directory sc8-pr-cvs1:/tmp/cvs-serv20565/toc/make
Modified Files:
subdirs_traverser.make
Log Message:
major rewrites vis-a-vis subdirs handling.
Index: subdirs_traverser.make
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/make/subdirs_traverser.make,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- subdirs_traverser.make 31 Aug 2003 00:44:26 -0000 1.9
+++ subdirs_traverser.make 31 Aug 2003 20:26:43 -0000 1.10
@@ -16,39 +16,43 @@
# $1 = list of dirs
# $2 = target
toc_make_subdirs = \
- test -z "$(1)" && exit 0; \
+ test "x$(1)" = "x" && exit 0; \
+ tgt="$(2)"; test -z "$$tgt" && tgt="all"; \
for b in $(1) ""; do test -z "$$b" && continue; \
pwd=$$(pwd); \
- tgt="$(2)"; test -z "$$tgt" && tgt="all"; \
- echo "Making $$tgt in directory $$pwd/$$b..."; \
- ${MAKE} --no-print-directory -C $$b $(2) || exit; \
+ cd $$pwd/$$b || exit; \
+ echo "Making $$tgt in $$pwd/$${b}"; \
+ ${MAKE} $$tgt || exit; \
+ cd $$pwd || exit; \
done
SUBDIRS_CLEANERS = $(patsubst %,clean-%,$(SUBDIRS))
SUBDIRS_DISTCLEANERS = $(patsubst %,distclean-%,$(SUBDIRS))
$(SUBDIRS_CLEANERS) $(SUBDIRS_DISTCLEANERS):
@dir=$@;target=$$dir; dir=$${dir##*-}; target=$${target%%-*}; \
- ${MAKE} -C $$dir $$target;
+ ${MAKE} -C $$dir $$target
.PHONY: subdirs $(SUBDIRS) $(SUBDIRS_CLEANERS) $(SUBDIRS_DISTCLEANERS) \
distclean-subdirs clean-subdirs
$(SUBDIRS):
- ${MAKE} -C $@
+ @$(call toc_make_subdirs,$@)
# make $* as a subdirectory:
-subdir-%:
+subdir-%: # makes $* subdir
@$(call toc_make_subdirs,$*)
-clean-%:
- @test -d "$*" || exit 0; $(call toc_make_subdirs,$*,clean)
+clean-%: # cleans $* subdir
+ @$(call toc_make_subdirs,$*,clean)
+# @test -d "$*" || exit 0;
distclean-%:
- @test -d "$*" || exit 0; $(call toc_make_subdirs,$*,distclean)
+ @$(call toc_make_subdirs,$*,distclean)
+subdirs-%: # calls $* target in all $(SUBDIRS)
+ @$(call toc_make_subdirs,$(SUBDIRS),$*)
+
subdirs: $(addprefix subdir-,$(SUBDIRS))
clean-subdirs: $(patsubst %,clean-%,$(SUBDIRS))
distclean-subdirs: $(patsubst %,distclean-%,$(SUBDIRS))
-clean: clean-subdirs
-distclean: clean-PWD distclean-subdirs
|
|
From: <sg...@us...> - 2003-08-31 20:26:21
|
Update of /cvsroot/libfunutil/libfunutil/toc/make In directory sc8-pr-cvs1:/tmp/cvs-serv20360/toc/make Modified Files: qmake2make.make Log Message: added comments about why not to NOT generate deps on clean/distclean. Index: qmake2make.make =================================================================== RCS file: /cvsroot/libfunutil/libfunutil/toc/make/qmake2make.make,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- qmake2make.make 28 Aug 2003 09:26:48 -0000 1.14 +++ qmake2make.make 31 Aug 2003 20:26:10 -0000 1.15 @@ -56,8 +56,10 @@ };\ echo "# the following dependencies were added by $(QMAKE_QMAKE2MAKE_MAKE)" >> $@; \ $(DEPSGEN_BIN) $$includes -- $$sources $$mocs >> $@; \ - echo "# end $(QMAKE_QMAKE2MAKE_MAKE) dependencies" >> $@; \ - + echo "# end $(QMAKE_QMAKE2MAKE_MAKE) dependencies" >> $@; +#ifeq (,$(strip $(filter clean distclean,$(MAKECMDGOALS)))) +# we can't ignore clean because the qmake file may need to be regen'd to change it's clean rules. :/ +#endif # todo: some more complete rules, gen'd via makerules.QMAKES, and then add only an # 'include ( ... )' to the qmake output. |
|
From: <sg...@us...> - 2003-08-31 20:23:31
|
Update of /cvsroot/libfunutil/libfunutil/toc/make
In directory sc8-pr-cvs1:/tmp/cvs-serv19946/toc/make
Modified Files:
dist.make
Log Message:
fixed a bogus directory display bug.
Index: dist.make
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/make/dist.make,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- dist.make 31 Aug 2003 00:46:07 -0000 1.9
+++ dist.make 31 Aug 2003 20:23:28 -0000 1.10
@@ -37,12 +37,14 @@
dist-tar: $(DIST_FILES_TARBALL)
$(DIST_FILES_TARBALL): $(DIST_FILES_FILE)
@echo "Making dist tarball..."; \
- pwd=$$(pwd); \
+ cd $(top_srcdir) > /dev/null; \
+ top=$$(pwd); \
+ cd - > /dev/null; \
tmpfile=.toc.DIST_FILES.toplevel; \
echo '' > $$tmpfile; \
find . -name $(DIST_FILES_FILE) | \
xargs cat >> $$tmpfile; \
- perl -pe "s|$${pwd}/||" $$tmpfile > foo.bar; \
+ perl -pe "s|$${top}/||" $$tmpfile > foo.bar; \
sort < foo.bar > $$tmpfile; rm foo.bar; \
$(TOC_MAKEDIST_BIN) $$tmpfile $@ || exit; \
rm $$tmpfile
@@ -50,13 +52,20 @@
dist-compress:
dist-.: $(DIST_FILES_TARBALL) dist-compress
-configure_dist_use_gzip ?= 1
+configure_dist_use_gzip ?= 0
configure_dist_use_bzip ?= 0
configure_dist_use_zip ?= 0
+
+GZIP_BIN = $(call dist_find_bin,gzip)
+ifneq (,$(GZIP_BIN))
+configure_dist_use_gzip = 1
+endif
+
BZIP_BIN = $(call dist_find_bin,bzip2)
ifneq (,$(BZIP_BIN))
configure_dist_use_bzip = 1
endif
+
ZIP_BIN = $(call dist_find_bin,zip)
ifneq (,$(ZIP_BIN))
configure_dist_use_zip = 1
@@ -68,7 +77,7 @@
dist-gzip: dist dist-tarball-gzip
dist-tarball-gzip: $(DIST_FILES_TARBALL).gz
$(DIST_FILES_TARBALL).gz: $(DIST_FILES_TARBALL)
- gzip -c $< > $@
+ $(GZIP_BIN) -c $< > $@
endif
# ^^^ end gzip
@@ -78,7 +87,7 @@
dist-bzip: dist dist-tarball-bzip
dist-tarball-bzip: $(DIST_FILES_TARBALL).bz2
$(DIST_FILES_TARBALL).bz2: $(DIST_FILES_TARBALL)
- bzip2 -c $< > $@
+ $(BZIP_BIN) -c $< > $@
endif
# ^^^ end bzip
@@ -91,7 +100,7 @@
$(DIST_TARBALL_ZIP): $(DIST_FILES_TARBALL)
@test -d $(DIST_NAME) && rm -fr $(DIST_NAME); true
@tar xf $<
- zip -qr $@ $(DIST_NAME)
+ $(ZIP_BIN) -qr $@ $(DIST_NAME)
@rm -fr $(DIST_NAME)
endif
# ^^^ end infozip
@@ -114,25 +123,18 @@
./configure $(DIST_TESTDIST_ARGS) && make || exit $$?
@echo "$@ $(PACKAGE_NAME)-$(PACKAGE_VERSION) completed. $(TOC_EMOTICON_OKAY)"
-# MD5_BIN = md5sum
-# MD5_LIST = MD5SUMS.$(DIST_NAME)
-# $(MD5_LIST): $(DIST_FILES_TARBALL)
-# @-rm $@ 2>&1 > /dev/null;
-# @echo "Creating $@..."; \
-# for m in $$(tar tf $(DIST_FILES_TARBALL) | sed -e 's|$(DIST_NAME)/||'); do \
-# test -d $$m && continue; \
-# $(MD5_BIN) $$m; \
-# done > $@
-
MD5_BIN = $(call dist_find_bin,md5sum*)
ifeq (,$(MD5_BIN))
$(warning MD5_BIN not pointing to md5sum application. Skipping md5-related checks.)
else
-MD5_LIST = MD5SUMS.$(DIST_NAME)
-dist-checkmd5:
- @echo "Checking distribution md5 sums against $(MD5_LIST)..."
- @$(MD5_BIN) --check $(MD5_LIST) | grep FAILED || exit 0 && exit 1
+MD5_LIST = md5.sums.$(DIST_NAME)
+
+md5check-%:
+ @echo "Checking distribution md5 sums against $*..."
+ @$(MD5_BIN) --check $* | grep FAILED || exit 0 && exit 1
@echo "${TOC_EMOTICON_OKAY}"
+md5check: md5check-$(MD5_LIST)
+
endif
# ^^^ end md5 stuff
|
Update of /cvsroot/libfunutil/libfunutil/toc/make
In directory sc8-pr-cvs1:/tmp/cvs-serv19869/toc/make
Modified Files:
cpp_bins.make cpp_dynamic_libs.make cpp_static_libs.make
deps.make install.make makerules.BIN_PROGRAMS
makerules.INSTALL_XXX
Log Message:
made some changes to the generic rules generation approach.
Index: cpp_bins.make
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/make/cpp_bins.make,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- cpp_bins.make 31 Aug 2003 00:46:33 -0000 1.6
+++ cpp_bins.make 31 Aug 2003 20:23:01 -0000 1.7
@@ -39,14 +39,20 @@
CLEAN_FILES += $(wildcard $(BIN_PROGRAMS))
endif
-BIN_PROGRAMS_DEPSFILE = .toc.BIN_PROGRAMS.deps
+BIN_PROGRAMS_DEPSFILE = .toc.BIN_PROGRAMS.make
BIN_PROGRAMS_RULES_GENERATOR = $(dir $(BIN_PROGRAMS_MAKEFILE))makerules.BIN_PROGRAMS
+BIN_PROGRAMS_COMMON_DEPS += Makefile $(BIN_PROGRAMS_MAKEFILE) $(BIN_PROGRAMS_OBJECTS)
$(BIN_PROGRAMS_DEPSFILE): Makefile $(BIN_PROGRAMS_RULES_GENERATOR) $(BIN_PROGRAMS_MAKEFILE)
+ifneq (,$(strip $(filter distclean clean,$(MAKECMDGOALS))))
+ @echo "$(MAKECMDGOALS): skipping BIN_PROGRAMS rules generation."
+else
@echo "Generating BIN_PROGRAMS rules."; \
- $(BIN_PROGRAMS_RULES_GENERATOR) $(BIN_PROGRAMS) > $@
+ $(call toc_generate_rules,BIN_PROGRAMS,$(BIN_PROGRAMS)) > $@
+
-include $(BIN_PROGRAMS_DEPSFILE)
+endif
deps: $(BIN_PROGRAMS_DEPSFILE)
Index: cpp_dynamic_libs.make
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/make/cpp_dynamic_libs.make,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- cpp_dynamic_libs.make 26 Aug 2003 00:58:54 -0000 1.8
+++ cpp_dynamic_libs.make 31 Aug 2003 20:23:01 -0000 1.9
@@ -67,8 +67,12 @@
SHARED_LIBS_DEPSFILE = .toc.deps.SHARED_LIBS.make
deps: $(SHARED_LIBS_INSTALL_RULES)
$(SHARED_LIBS_DEPSFILE): Makefile $(SHARED_LIBS_MAKEFILE) $(SHARED_LIBS_RULES_GENERATOR)
+ifneq (,$(strip $(filter distclean clean,$(MAKECMDGOALS))))
+ @echo "$(MAKECMDGOALS): skipping SHARED_LIBS rules generation."
+else
@echo "Generating rules for SHARED_LIBS."; \
- $(SHARED_LIBS_RULES_GENERATOR) $(SHARED_LIBS) > $@
+ $(call toc_generate_rules,SHARED_LIBS,$(SHARED_LIBS)) > $@
+endif
-include $(SHARED_LIBS_DEPSFILE)
CLEAN_FILES += $(SHARED_LIBS_SOFILES) $(wildcard $(patsubst %,%.*,$(SHARED_LIBS_SOFILES)))
Index: cpp_static_libs.make
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/make/cpp_static_libs.make,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- cpp_static_libs.make 26 Aug 2003 00:58:54 -0000 1.5
+++ cpp_static_libs.make 31 Aug 2003 20:23:02 -0000 1.6
@@ -24,12 +24,16 @@
ifneq (,$(STATIC_LIBS_A))
-STATIC_LIBS_DEPSFILE = .toc.deps.STATIC_LIBS.make
+STATIC_LIBS_DEPSFILE = .toc.STATIC_LIBS.make
STATIC_LIBS_RULES_GENERATOR = $(dir $(STATIC_LIBS_MAKEFILE))makerules.STATIC_LIBS
$(STATIC_LIBS_DEPSFILE): Makefile $(STATIC_LIBS_MAKEFILE) $(STATIC_LIBS_RULES_GENERATOR)
+ifneq (,$(strip $(filter distclean clean,$(MAKECMDGOALS))))
+ @echo "$(MAKECMDGOALS): skipping STATIC_LIBS rules generation."
+else
@echo "Generating rules for STATIC_LIBS."; \
- $(STATIC_LIBS_RULES_GENERATOR) $(STATIC_LIBS) > $@
+ $(call toc_generate_rules,STATIC_LIBS,$(STATIC_LIBS)) > $@
+endif
-include $(STATIC_LIBS_DEPSFILE)
deps: $(STATIC_LIBS_DEPSFILE)
Index: deps.make
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/make/deps.make,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- deps.make 30 Aug 2003 19:20:30 -0000 1.8
+++ deps.make 31 Aug 2003 20:23:02 -0000 1.9
@@ -2,14 +2,12 @@
# Usage:
# include path/to/this/file
#
-# That will set up a 'deps' target which deps all .cpp files and updates
+# That will set up a 'deps' target which deps all C/C++ files and updates
# the deps when any of those files, or the Makefile, changes.
# That's normally all there is to it.
-# You will often see ".toc.deps.c.make not found" warnings, but make takes
-# care of generating and including it, so it's nothing to be concerned about.
-DEPS_C_SOURCES_GLOB = *.cpp *.c *.c++ *.C *.cc *.moc
-SOURCE_FILES_TO_DEP = $(sort $(wildcard $(DEPS_C_SOURCES_GLOB)))
+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
@@ -31,16 +29,20 @@
TOC_C_DEPSFILE = .toc.deps.c.make
$(TOC_C_DEPSFILE): $(DEPSGEN_BIN) $(SOURCE_FILES_TO_DEP) Makefile $(TOC_C_DEPS_MAKEFILE)
+ifneq (,$(strip $(filter clean distclean,$(MAKECMDGOALS))))
+ @echo "$(MAKECMDGOALS): skipping source code dependencies generation."
+else
@test -n "$(SOURCE_FILES_TO_DEP)" || exit 0; \
echo "Generating source file dependencies for $(DEPS_C_SOURCES_GLOB)"; \
$(call toc_make_c_deps,$(SOURCE_FILES_TO_DEP),) > $@
+-include $(TOC_C_DEPSFILE)
+endif
deps-c: $(TOC_C_DEPSFILE)
deps: deps-c
CLEAN_FILES += $(TOC_C_DEPSFILE)
all: deps-c
--include $(TOC_C_DEPSFILE)
endif
Index: install.make
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/make/install.make,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- install.make 31 Aug 2003 00:44:12 -0000 1.21
+++ install.make 31 Aug 2003 20:23:02 -0000 1.22
@@ -41,6 +41,10 @@
$(error install.make requires that the variable INSTALLER_BIN point to a version of install which is vaguely compatible with GNU install.)
endif
+#INSTALL_BINS_SUFFIX ?=
+#ifeq (1,$(configure_with_CYGWIN))
+#INSTALL_BINS_SUFFIX = .exe
+#endif
# This whole echo/grep thing is to force it to work on some of my
# older machines where more sane approaches don't seem to work.
@@ -146,8 +150,11 @@
# Make 3.79 is very common, but doesn't support $(eval).
# todo? move this into the configure process?
$(INSTALL_DEPS_FILE): $(INSTALL_MAKEFILE) $(INSTALL_XXX_GENERATOR)
- @echo "Creating generic installation rules..."; \
- $(INSTALL_XXX_GENERATOR) \
+ifneq (,$(strip $(filter clean distclean,$(MAKECMDGOALS))))
+ @echo "$(MAKECMDGOALS): skipping INSTALL_XXX rules generation."
+else
+ @echo "Generating rules for INSTALL_XXX."; \
+ $(call toc_generate_rules,INSTALL_XXX,\
BINS=bin \
SBINS=sbin \
LIBS=lib \
@@ -157,7 +164,9 @@
PACKAGE_HEADERS='include/$$(PACKAGE_NAME)' \
PACKAGE_DATA='share/$$(PACKAGE_NAME)' \
DOCS='share/doc/$$(PACKAGE_NAME)' \
- > $@
+ ) > $@
+endif
+
-include $(INSTALL_DEPS_FILE)
install: $(INSTALL_DEPS_FILE)
.PHONY: install-. uninstall-.
Index: makerules.BIN_PROGRAMS
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/make/makerules.BIN_PROGRAMS,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- makerules.BIN_PROGRAMS 28 Aug 2003 09:16:56 -0000 1.1
+++ makerules.BIN_PROGRAMS 31 Aug 2003 20:23:02 -0000 1.2
@@ -5,7 +5,7 @@
echo "usage: $0 appone [apptwo ...]"
exit 1
}
-echo "BIN_PROGRAMS_COMMON_DEPS = $0 Makefile \$(BIN_PROGRAMS_MAKEFILE) \$(BIN_PROGRAMS_OBJECTS)"
+echo "BIN_PROGRAMS_COMMON_DEPS += $0"
for t in $@; do
cat <<EOF
$t: \$(BIN_PROGRAMS_COMMON_DEPS) \$(${t}_bin_OBJECTS)
Index: makerules.INSTALL_XXX
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/make/makerules.INSTALL_XXX,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- makerules.INSTALL_XXX 28 Aug 2003 09:26:25 -0000 1.2
+++ makerules.INSTALL_XXX 31 Aug 2003 20:23:02 -0000 1.3
@@ -12,17 +12,20 @@
tgt=${kvp%%=*}
dest='$(prefix)/'${kvp##*=}
cat <<EOF
+# rules for INSTALL_${tgt}:
INSTALL_${tgt}_DEST ?= $dest
install-${tgt}: FORCE
@\$(call toc_make_install,\$(INSTALL_${tgt}),\$(INSTALL_${tgt}_DEST),\$(INSTALL_${tgt}_INSTALL_FLAGS))
install-${tgt}-update: FORCE
@\$(call toc_make_install_update,\$(INSTALL_${tgt}),\$(INSTALL_${tgt}_DEST),\$(INSTALL_${tgt}_INSTALL_FLAGS))
uninstall-${tgt}:
- @\$(call toc_make_uninstall,\$(INSTALL_${tgt}),\$(INSTALL_${tgt}_DEST),\$(INSTALL_${tgt}_INSTALL_FLAGS))
+ @\$(call toc_make_uninstall,\$(INSTALL_${tgt}),\$(INSTALL_${tgt}_DEST))
install-${tgt}-symlink:
@\$(call toc_make_install_symlink,\$(INSTALL_${tgt}),\$(INSTALL_${tgt}_DEST))
install: install-${tgt}
uninstall: uninstall-${tgt}
install-update: install-${tgt}-update
+# end INSTALL_${tgt} rules
+
EOF
done
|
|
From: <sg...@us...> - 2003-08-31 20:22:18
|
Update of /cvsroot/libfunutil/libfunutil/toc/make
In directory sc8-pr-cvs1:/tmp/cvs-serv19739/toc/make
Modified Files:
cleaner.make
Log Message:
we now clean subdirs depth-first.
Index: cleaner.make
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/make/cleaner.make,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- cleaner.make 26 Aug 2003 00:58:54 -0000 1.4
+++ cleaner.make 31 Aug 2003 20:22:15 -0000 1.5
@@ -1,4 +1,4 @@
-# makefile snippet.
+#!/usr/bin/make -f
# Usage:
#
# CLEAN_FILES += *~ foo bar
@@ -11,22 +11,25 @@
CLEAN_FILES += $(DEPS_FILE) $(DIST_LISTFILE)
-toc_clean_files = test -z "$(1)" && exit 0; \
+toc_clean_files = test "x$(1)" = "x" && exit 0; \
echo Cleaning: $(1); \
- for x in $(1) ""; do test -z "$$x" && continue; \
- rm $$x &> /dev/null; \
+ for x in $(1) ""; do test -z "$${x}" && continue; \
+ test -w $$x || continue; \
+ rm $$x || exit; \
done; \
exit 0
clean-.:
- @$(call toc_clean_files,$(CLEAN_FILES))
-clean: clean-.
-# it is important that subdirs get added as clean deps AFTER clean-. is,
-# unless you want to completely customize the clean order, in which case
-# you should comment-out 'clean: clean-.' and order them yourself.
-
+ @$(call toc_clean_files,$(wildcard $(CLEAN_FILES)))
+clean-subdirs:
+clean: clean-subdirs clean-.
+# we clean depth-first to keep some top-level generated files from being nuked :/
+# todo: fix this by moving those files into a generated-files-only dir.
+#
# Note: distclean does not depend on clean so that a recursive distclean does not
# climb down the tree twice :/
-distclean:
- @$(call toc_clean_files,$(CLEAN_FILES) $(DISTCLEAN_FILES))
+distclean-.:
+ @$(call toc_clean_files,$(wildcard $(CLEAN_FILES) $(DISTCLEAN_FILES)))
+distclean-subdirs:
+distclean: distclean-subdirs distclean-.
|
|
From: <sg...@us...> - 2003-08-31 20:21:11
|
Update of /cvsroot/libfunutil/libfunutil In directory sc8-pr-cvs1:/tmp/cvs-serv19558 Modified Files: Makefile Log Message: removed some comment blather. Index: Makefile =================================================================== RCS file: /cvsroot/libfunutil/libfunutil/Makefile,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- Makefile 31 Aug 2003 00:50:26 -0000 1.9 +++ Makefile 31 Aug 2003 20:21:08 -0000 1.10 @@ -4,19 +4,17 @@ SUBDIRS = lib util tests include SUBDIRS += doc SUBDIRS += toc -# Your project only needs to include the 'toc' subdir if you are going -# to do a 'make dist', so the end user can configure the tree. -cleanorder = lib include -#clean: $(patsubst %,clean-%,$(cleanorder)) -#distclean: $(patsubst %,distclean-%,$(cleanorder)) -# You should clean in reverse order of normal build so, generally speaking, -# but this depends largely on your tree. In this particular case -# the clean will fail if we don't re-order, because of the heavy dependencies -# on include/config.h. deps.make tries to generate deps and can't find -# config.h, so it gets pissed off. -# This re-ordering must currently be done before toc.make is included. :/ + + +# note: we re-order the clean deps to make sure the shared makefile and config.h +# don't get deleted until near the end. +cleanorder = toc doc tests util lib include . +clean: $(patsubst %,clean-%,$(cleanorder)) +distclean: $(patsubst %,distclean-%,$(cleanorder)) include toc.make + + # include toc.make to get toc's goodies # Unfortunately, toc.make must be included after SUBDIRS (if any) are declared. # That's an implementation detail i'll deal with later. |
|
From: <sg...@us...> - 2003-08-31 20:18:42
|
Update of /cvsroot/libfunutil/libfunutil In directory sc8-pr-cvs1:/tmp/cvs-serv19096 Modified Files: configure Log Message: now properly passes on args with spaces in them. Index: configure =================================================================== RCS file: /cvsroot/libfunutil/libfunutil/configure,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- configure 29 Aug 2003 11:39:27 -0000 1.7 +++ configure 31 Aug 2003 20:18:38 -0000 1.8 @@ -17,4 +17,4 @@ # 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 $@ +source toc/sbin/toconfigure "$@" |
|
From: <sg...@us...> - 2003-08-31 00:51:43
|
Update of /cvsroot/libfunutil/libfunutil/toc/bin
In directory sc8-pr-cvs1:/tmp/cvs-serv13736
Modified Files:
makedist
Log Message:
added md5 info for the tarred files
Index: makedist
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/bin/makedist,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- makedist 28 Aug 2003 23:08:27 -0000 1.2
+++ makedist 31 Aug 2003 00:51:40 -0000 1.3
@@ -23,23 +23,14 @@
open DLIST, "<$DISTFILES_LIST" || die "Cannot open dist files list, $DISTFILES_LIST!";
@list = <DLIST>;
+# print @list;
close DLIST;
@thelist = ();
-#@nonofiles = ();
-#"|/CVS/?|","|toc\.make$|"
-# $skipit = false;
-# foreach $n ( @nonofiles ) {
-# if( $l =~ $n ) {
-# $skipit=true;
-# break;
-# }
-# }
-# next if $skipit;
-
foreach $l (@list) {
next if $l =~ /^#/;
+ next if $l =~ m|^(.*/)?toc.q?make$|;
chomp( $l );
next unless $l =~ /\w/;
@@ -62,9 +53,23 @@
$tarargs = "--exclude='*.o' --exclude='CVS' --exclude='toc.make' --files-from=$tarfileslist";
+
execcmd( "tar cf - $tarargs | tar xf - -C \"$basename\"" );
-execcmd( "rm $tarfileslist" );
# ^^^^ got that? it's simpler than cp'ing the list of files to their proper subdirs. :)
+
+$md5 = `which md5sum 2>/dev/null`;
+if( $md5 ) {
+ $md5file = "$basename/MD5SUMS.$basename";
+ print STDERR "Generating md5 sums: $md5file\n";
+# execcmd( "cd $basename; for x in \$(find . -type f); do md5sum \$x >> MD5SUMS.$basename; done" );
+ execcmd( "for x in \$(cat $tarfileslist); do md5sum \$x; done > $md5file" )
+} else {
+ print STDERR "Warning: no md5sum found, so not including md5 info.\n";
+}
+
+
+
+execcmd( "rm $tarfileslist" );
execcmd( "tar cf \"$TARBALL\" \"$basename\"" );
execcmd( "rm -fr \"$basename\"" );
|
|
From: <sg...@us...> - 2003-08-31 00:50:30
|
Update of /cvsroot/libfunutil/libfunutil In directory sc8-pr-cvs1:/tmp/cvs-serv13622 Modified Files: Makefile configure.libfunutil toc_shared.make.at Log Message: added buildtool-related checks. Index: Makefile =================================================================== RCS file: /cvsroot/libfunutil/libfunutil/Makefile,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- Makefile 29 Aug 2003 05:40:12 -0000 1.8 +++ Makefile 31 Aug 2003 00:50:26 -0000 1.9 @@ -32,8 +32,10 @@ DIST_FILES += configure toc_shared.make.at toc_shared.qmake.at DIST_FILES += configure.$(PACKAGE_NAME) DIST_FILES += README README.bt README.toc COPYING +ifeq (1,$(configure_with_buildtool)) DIST_FILES += Makefile.bt buildtool.d/config buildtool.d/defs buildtool.d/docs DIST_FILES += data/libfunUtil.bpf.in data/Makefile.bt +endif all: $(TOC_SHARED_MAKEFILE) subdirs Index: configure.libfunutil =================================================================== RCS file: /cvsroot/libfunutil/libfunutil/configure.libfunutil,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- configure.libfunutil 30 Aug 2003 19:21:11 -0000 1.17 +++ configure.libfunutil 31 Aug 2003 00:50:26 -0000 1.18 @@ -1,10 +1,7 @@ # 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 -#toc_run_fail accept_license COPYING || toc_die 42 "You didn't accept the license agreement!" +toc_run_failok buildtool toc_add_config PACKAGE_COPYRIGHT="GNU General Public License, version 2. Copyright (c) 2000-2003 Rusty Ballinger (bo...@so...) and stephan beal (sg...@us...)." Index: toc_shared.make.at =================================================================== RCS file: /cvsroot/libfunutil/libfunutil/toc_shared.make.at,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- toc_shared.make.at 29 Aug 2003 10:44:02 -0000 1.20 +++ toc_shared.make.at 31 Aug 2003 00:50:26 -0000 1.21 @@ -53,9 +53,17 @@ pkgincludedir = $(includedir)/@PACKAGE_NAME@ pkgdocsdir = $(datadir)/doc/@PACKAGE_NAME@ - toc_makesdir = $(toc_tocdir)/make + +# enable/disable 'buildtool'. This is here because i can't do +# a make dist because some BT-related files are missing. ;) +configure_with_buildtool = @configure_with_buildtool@ +ifeq (1,$(configure_with_buildtool)) +BUILDTOOL_BIN = @BUILDTOOL_BIN@ +else +BUILDTOOL_BIN = +endif CC = @CC@ |
|
From: <sg...@us...> - 2003-08-31 00:50:29
|
Update of /cvsroot/libfunutil/libfunutil/tests/funUtil In directory sc8-pr-cvs1:/tmp/cvs-serv13622/tests/funUtil Modified Files: Makefile Log Message: added buildtool-related checks. Index: Makefile =================================================================== RCS file: /cvsroot/libfunutil/libfunutil/tests/funUtil/Makefile,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- Makefile 29 Aug 2003 06:44:43 -0000 1.21 +++ Makefile 31 Aug 2003 00:50:26 -0000 1.22 @@ -16,7 +16,10 @@ BIN_PROGRAMS = testStrings -DIST_FILES += $(wildcard *.qmake *.cpp *.h *.xml *.c++ Makefile) Makefile.bt +DIST_FILES += $(wildcard *.qmake *.cpp *.h *.xml *.c++ Makefile) +ifeq (1,$(configure_with_buildtool)) +DIST_FILES += Makefile.bt +endif DIST_FILES += \ test-clparser.sh \ test-dice.sh \ |
|
From: <sg...@us...> - 2003-08-31 00:46:41
|
Update of /cvsroot/libfunutil/libfunutil/toc/make In directory sc8-pr-cvs1:/tmp/cvs-serv13205 Modified Files: cpp_bins.make Log Message: fixed a cygwin-related CLEAN_FILES omission. Index: cpp_bins.make =================================================================== RCS file: /cvsroot/libfunutil/libfunutil/toc/make/cpp_bins.make,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- cpp_bins.make 30 Aug 2003 19:20:30 -0000 1.5 +++ cpp_bins.make 31 Aug 2003 00:46:33 -0000 1.6 @@ -20,6 +20,10 @@ BIN_PROGRAMS_MAKEFILE = $(toc_makesdir)/cpp_bins.make +ifeq (1,$(configure_with_CYGWIN)) +BIN_PROGRAMS_LDADD += -lcygwin +endif + # toc_link_binary call()able function: # $1 = binary file name # $2 = optional arguments to linker. @@ -29,7 +33,8 @@ ifneq (,$(BIN_PROGRAMS)) ifeq (1,$(configure_with_CYGWIN)) -CLEAN_FILES += $(wildcard $(addsuffix .exe,$(BIN_PROGRAMS))) +CLEAN_FILES += $(addsuffix .exe,$(BIN_PROGRAMS)) +CLEAN_FILES += $(wildcard *.exe.stackdump) else CLEAN_FILES += $(wildcard $(BIN_PROGRAMS)) endif |
|
From: <sg...@us...> - 2003-08-31 00:46:11
|
Update of /cvsroot/libfunutil/libfunutil/toc/make
In directory sc8-pr-cvs1:/tmp/cvs-serv13137
Modified Files:
dist.make
Log Message:
enable by default bzip/zip if the bins are found. Added md5 checking for the dist files.
Index: dist.make
===================================================================
RCS file: /cvsroot/libfunutil/libfunutil/toc/make/dist.make,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- dist.make 30 Aug 2003 19:20:30 -0000 1.8
+++ dist.make 31 Aug 2003 00:46:07 -0000 1.9
@@ -4,12 +4,14 @@
# it takes a list of files/dirs to create a distribution tarball from.
# This snippet requires a filesystem-valid $(PACKAGE_NAME)-$(PACKAGE_VERSION)
# combination
-DIST_FILES_FILE = .toc.distfiles.list
+DIST_FILES_FILE = .toc.DIST_FILES
CLEAN_FILES += $(wildcard $(DIST_FILES_FILE))
+dist_find_bin = $(firstword $(wildcard $(addsuffix /$(1),$(subst :, ,$(toc_tocdir)/bin:$(PATH)))))
+
FORCE:
-TOC_MAKEDIST_BIN ?= $(toc_tocdir)/bin/makedist
+TOC_MAKEDIST_BIN ?= $(call dist_find_bin,makedist)
ifeq (,$(wildcard $(TOC_MAKEDIST_BIN)))
$(error TOC_MAKEDIST_BIN must be set to point to the makedist application.)
endif
@@ -18,13 +20,15 @@
$(DIST_FILES_FILE): FORCE Makefile
@test -z "$(DIST_FILES)" && exit 0; \
- test -f $@ && rm $@; \
+ pwd=$$(pwd); \
for f in "" $(DIST_FILES); do test -z "$$f" && continue; \
- relpath=$${PWD}/$$f; \
- echo $$relpath >> $@; \
- done
+ echo $$pwd/$$f; \
+ done > $@;
+dist: $(DIST_FILES_FILE)
+dist: dist-subdirs dist-.
+dist: dist-subdirs dist-.
ifeq (.,$(top_srcdir))
DIST_NAME = $(PACKAGE_NAME)-$(PACKAGE_VERSION)
@@ -33,10 +37,13 @@
dist-tar: $(DIST_FILES_TARBALL)
$(DIST_FILES_TARBALL): $(DIST_FILES_FILE)
@echo "Making dist tarball..."; \
- tmpfile=.toc.dist.tmp; \
+ pwd=$$(pwd); \
+ tmpfile=.toc.DIST_FILES.toplevel; \
echo '' > $$tmpfile; \
- find . -name $(DIST_FILES_FILE) | xargs cat >> $$tmpfile; \
- perl -pe "s|$${PWD}/||" $$tmpfile > foo.bar; sort < foo.bar > $$tmpfile; rm foo.bar; \
+ find . -name $(DIST_FILES_FILE) | \
+ xargs cat >> $$tmpfile; \
+ perl -pe "s|$${pwd}/||" $$tmpfile > foo.bar; \
+ sort < foo.bar > $$tmpfile; rm foo.bar; \
$(TOC_MAKEDIST_BIN) $$tmpfile $@ || exit; \
rm $$tmpfile
@@ -46,6 +53,14 @@
configure_dist_use_gzip ?= 1
configure_dist_use_bzip ?= 0
configure_dist_use_zip ?= 0
+BZIP_BIN = $(call dist_find_bin,bzip2)
+ifneq (,$(BZIP_BIN))
+configure_dist_use_bzip = 1
+endif
+ZIP_BIN = $(call dist_find_bin,zip)
+ifneq (,$(ZIP_BIN))
+configure_dist_use_zip = 1
+endif
ifeq (1,$(configure_dist_use_gzip))
CLEAN_FILES += $(wildcard $(DIST_FILES_TARBALL).gz)
@@ -77,6 +92,7 @@
@test -d $(DIST_NAME) && rm -fr $(DIST_NAME); true
@tar xf $<
zip -qr $@ $(DIST_NAME)
+ @rm -fr $(DIST_NAME)
endif
# ^^^ end infozip
@@ -98,11 +114,31 @@
./configure $(DIST_TESTDIST_ARGS) && make || exit $$?
@echo "$@ $(PACKAGE_NAME)-$(PACKAGE_VERSION) completed. $(TOC_EMOTICON_OKAY)"
+# MD5_BIN = md5sum
+# MD5_LIST = MD5SUMS.$(DIST_NAME)
+# $(MD5_LIST): $(DIST_FILES_TARBALL)
+# @-rm $@ 2>&1 > /dev/null;
+# @echo "Creating $@..."; \
+# for m in $$(tar tf $(DIST_FILES_TARBALL) | sed -e 's|$(DIST_NAME)/||'); do \
+# test -d $$m && continue; \
+# $(MD5_BIN) $$m; \
+# done > $@
+
+MD5_BIN = $(call dist_find_bin,md5sum*)
+ifeq (,$(MD5_BIN))
+$(warning MD5_BIN not pointing to md5sum application. Skipping md5-related checks.)
+else
+MD5_LIST = MD5SUMS.$(DIST_NAME)
+dist-checkmd5:
+ @echo "Checking distribution md5 sums against $(MD5_LIST)..."
+ @$(MD5_BIN) --check $(MD5_LIST) | grep FAILED || exit 0 && exit 1
+ @echo "${TOC_EMOTICON_OKAY}"
+endif
+# ^^^ end md5 stuff
endif
-# ^^^ in the $(top_srcdir)?
+# ^^^ end of $(top_srcdir) block
+
dist-subdirs:
@$(call toc_make_subdirs,$(SUBDIRS),dist)
-
-dist: dist-subdirs dist-.
|
