Index: ossp-pkg/l2/.configure RCS File: /v/ossp/cvs/ossp-pkg/l2/Attic/.configure,v co -q -kk -p'1.2' '/v/ossp/cvs/ossp-pkg/l2/Attic/.configure,v' | diff -u - /dev/null -L'ossp-pkg/l2/.configure' 2>/dev/null --- ossp-pkg/l2/.configure +++ /dev/null 2024-04-23 16:55:00.000000000 +0200 @@ -1,6 +0,0 @@ -#!/bin/sh -./configure \ - --prefix=/tmp/l2 \ - --disable-shared \ - --enable-debug \ - "$@" Index: ossp-pkg/l2/Makefile.in RCS File: /v/ossp/cvs/ossp-pkg/l2/Makefile.in,v rcsdiff -q -kk '-r1.31' '-r1.32' -u '/v/ossp/cvs/ossp-pkg/l2/Makefile.in,v' 2>/dev/null --- Makefile.in 2001/11/07 16:18:38 1.31 +++ Makefile.in 2001/11/08 09:53:33 1.32 @@ -114,21 +114,11 @@ l2_ut_sa.c \ l2_version.c -# file containing the official version information -_VERSION_FILE = \ - l2_version.c - -# helper macro for updating version information -_VERSION = \ - $(SHTOOL) version -lc -nL2 -pl2_ $$OPT $(_VERSION_FILE);\ - V=`$(SHTOOL) version -lc -dlong $(_VERSION_FILE)`;\ - sed -e "s/Version .*(.*)/Version $$V/g" README.n && mv README.n README - # helper macro for generating a Unix manual page _MANPAGE = \ - V1=`$(SHTOOL) version -lc -dshort $(_VERSION_FILE)`; \ - V2=`$(SHTOOL) version -lc -dlong $(_VERSION_FILE)`; \ - D=`$(SHTOOL) version -lc -dlong $(_VERSION_FILE) |\ + V1=`$(SHTOOL) version -lc -dshort l2_version.c`; \ + V2=`$(SHTOOL) version -lc -dlong l2_version.c`; \ + D=`$(SHTOOL) version -lc -dlong l2_version.c |\ sed -e 's;.*(;;' -e 's;).*;;'`; \ $(POD2MAN) --section=$${SEC} --center="$${ONELINE}" \ --release="$$D" --date="$${NAME} $$V1" $(S)$${BASENAME}.pod |\ @@ -181,15 +171,15 @@ $(LIBTOOL) --mode=link --quiet $(CC) $(LDFLAGS) -o l2_sockmon l2_sockmon.o $(LIBS) # build Unix manual pages -l2-config.1: l2-config.pod $(_VERSION_FILE) +l2-config.1: l2-config.pod l2_version.c BASENAME="l2-config"; SEC=1; \ NAME="L2"; ONELINE="Logging Library"; \ $(_MANPAGE) -l2.3: l2.pod $(_VERSION_FILE) +l2.3: l2.pod l2_version.c BASENAME="l2"; SEC=3; \ NAME="L2"; ONELINE="Logging Library"; \ $(_MANPAGE) -l2++.3: l2++.pod $(_VERSION_FILE) +l2++.3: l2++.pod l2_version.c BASENAME="l2++"; SEC=3; \ NAME="L2"; ONELINE="Logging Library (C++)"; \ $(_MANPAGE) @@ -267,7 +257,7 @@ $(RM) l2.h # remove everything which can be regenerated -# by "autoconf && autoheader && ./configure && make all" +# by "./devtool autogen" realclean: distclean $(RM) configure $(RM) config.guess config.sub @@ -280,25 +270,6 @@ $(RM) l2_spec_scan.c $(RM) l2_spec_parse.c l2_spec_parse.h -# roll a distribution tarball -dist: distclean - @$(SHTOOL) fixperm -v .; \ - V=`$(SHTOOL) version -l c -d short l2_version.c`; \ - $(SHTOOL) tarball -o l2-$${V}.tar.gz -d str-$${V} -u ossp -g ossp \ - -e 'CVS,\.cvsignore,\.[ao],^\.,autogen.sh' -c 'gzip --best' . - -# increase or update version information -new-version: - @V="$(VERSION)"; \ - if [ ".$$V" != . ]; then \ - OPT="-s$$V"; \ - else \ - OPT="-e"; \ - fi; \ - $(_VERSION) -update-version: - @OPT="-s`$(SHTOOL) version -lc -dshort $(_VERSION_FILE)`" && $(_VERSION) - # create dependencies depend: all cp Makefile.in Makefile.in.bak \ Index: ossp-pkg/l2/autogen.sh RCS File: /v/ossp/cvs/ossp-pkg/l2/Attic/autogen.sh,v co -q -kk -p'1.4' '/v/ossp/cvs/ossp-pkg/l2/Attic/autogen.sh,v' | diff -u - /dev/null -L'ossp-pkg/l2/autogen.sh' 2>/dev/null --- ossp-pkg/l2/autogen.sh +++ /dev/null 2024-04-23 16:55:00.000000000 +0200 @@ -1,75 +0,0 @@ -#!/bin/sh -## -## L2 - OSSP Logging Library -## Copyright (c) 2001 The OSSP Project (http://www.ossp.org/) -## Copyright (c) 2001 Cable & Wireless Deutschland (http://www.cw.com/de/) -## -## This file is part of OSSP L2, a flexible logging library which -## can be found at http://www.ossp.org/pkg/l2/. -## -## Permission to use, copy, modify, and distribute this software for -## any purpose with or without fee is hereby granted, provided that -## the above copyright notice and this permission notice appear in all -## copies. -## -## THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED -## WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -## IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR -## CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF -## USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -## ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -## OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT -## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -## SUCH DAMAGE. -## -## autogen.sh: auto-generate library build environment tools -## - -# generator tools version sanity check -for spec in \ - "autoconf --version 4 2.52 2.5*" \ - "libtoolize --version 4 1.4.2 1.4*" \ - "shtoolize -v 3 1.5.4 1.5.*" -do - set -- $spec - t="$1" - o="$2" - p="$3" - e="$4" - a="$5" - v=`($t $o | head -1 | awk "{ print \\\$$p; }") 2>/dev/null` - if [ ".$v" = . ]; then - echo "$0:ERROR: unable to determine version of $t" 1>&2 - exit 1 - fi - eval "${t}_version=\"$v\"" - case "$v" in - $e ) - ;; - $a ) - echo "$0:WARNING: $t version $v still accepted, although expected $e." 1>&2 - ;; - * ) - echo "$0:ERROR: $t version $e expected, but found $v." 1>&2 - ;; - esac -done - -# GNU Libtool generation -echo "GNU Libtool $libtoolize_version -> ltmain.sh, libtool.m4, config.guess, config.sub" -libtoolize --force --copy >/dev/null 2>&1 -cp `libtoolize --force --copy --dry-run | grep "add the contents of" |\ - sed -e 's;^[^\`]*\`;;' -e "s;'.*;;"` libtool.m4 - -# GNU Autoconf generation -echo "GNU Autoconf $autoconf_version -> configure, config.h.in" -autoconf -autoheader - -# GNU Shtool generation -echo "GNU Shtool $shtoolize_version -> shtool" -shtoolize -q all - Index: ossp-pkg/l2/devtool RCS File: /v/ossp/cvs/ossp-pkg/l2/devtool,v co -q -kk -p'1.1' '/v/ossp/cvs/ossp-pkg/l2/devtool,v' | diff -u /dev/null - -L'ossp-pkg/l2/devtool' 2>/dev/null --- ossp-pkg/l2/devtool +++ - 2024-04-23 16:58:14.776594115 +0200 @@ -0,0 +1,47 @@ +#!/bin/sh +## +## devtool -- Development Tool +## Copyright (c) 2001 Ralf S. Engelschall +## + +if [ $# -eq 0 ]; then + echo "devtool:USAGE: devtool [ ...]" 1>&2 + exit 1 +fi + +cmd="$1" +shift + +devtoolfunc="./devtool.func" + +if [ ! -f devtool.conf ]; then + echo "devtool:ERROR: no devtool.conf in current directory" 1>&2 + exit 1 +fi + +cmdline=`grep "^%$cmd" devtool.conf` +if [ ".$cmdline" = . ]; then + echo "devtool:ERROR: command $cmd not found in devtool.conf" 1>&2 + exit 1 +fi + +if [ ".$TMPDIR" != . ]; then + tmpdir="$TMPDIR" +elif [ ".$TEMPDIR" != . ]; then + tmpdir="$TEMPDIR" +else + tmpdir="/tmp" +fi +tmpfile="$tmpdir/rc.$$.tmp" + +rm -f $tmpfile +touch $tmpfile +echo ". $devtoolfunc" >>$tmpfile +( sed >$tmpfile + +sh $tmpfile "$@" + +rm -f $tmpfile >/dev/null 2>&1 || true + Index: ossp-pkg/l2/devtool.conf RCS File: /v/ossp/cvs/ossp-pkg/l2/devtool.conf,v co -q -kk -p'1.1' '/v/ossp/cvs/ossp-pkg/l2/devtool.conf,v' | diff -u /dev/null - -L'ossp-pkg/l2/devtool.conf' 2>/dev/null --- ossp-pkg/l2/devtool.conf +++ - 2024-04-23 16:58:14.779217606 +0200 @@ -0,0 +1,31 @@ +## +## devtool.conf -- Development Tool Configuration +## + +%autogen + @autogen shtool 1.5.4 "1.5.*" all + @autogen libtool 1.4.2 "1.4*" + @autogen autoconf 2.52 "2.5.*" + +%autoclean + @autoclean shtool + @autoclean libtool + @autoclean autoconf + +%configure + ./configure \ + --prefix=/tmp/l2 \ + --disable-shared \ + --enable-debug \ + "$@" + +%version + ./shtool version -l c -n "OSSP L2" -p "l2_" -e l2_version.c + +%dist + make distclean >/dev/null 2>&1 + ./shtool fixperm -v . + V=`./shtool version -l c -d short l2_version.c` + ./shtool tarball -o l2-${V}.tar.gz -d l2-${V} -u ossp -g ossp \ + -e 'CVS,\.cvsignore,\.[ao],^\.,devtool.conf' -c 'gzip --best' . + Index: ossp-pkg/l2/devtool.func RCS File: /v/ossp/cvs/ossp-pkg/l2/devtool.func,v co -q -kk -p'1.1' '/v/ossp/cvs/ossp-pkg/l2/devtool.func,v' | diff -u /dev/null - -L'ossp-pkg/l2/devtool.func' 2>/dev/null --- ossp-pkg/l2/devtool.func +++ - 2024-04-23 16:58:14.781882140 +0200 @@ -0,0 +1,72 @@ +## +## devtool.func -- Development Tool Functions +## Copyright (c) 2001 Ralf S. Engelschall +## + +devtool_require () { + t="$1"; o="$2"; p="$3"; e="$4"; a="$5" + v=`($t $o | head -1 | awk "{ print \\\$$p; }") 2>/dev/null` + if [ ".$v" = . ]; then + echo "devtool:ERROR: unable to determine version of $t" 1>&2 + exit 1 + fi + case "$v" in + $e ) + ;; + $a ) + echo "devtool:WARNING: $t version $v still accepted, although expected $e." 1>&2 + ;; + * ) + echo "devtool:ERROR: $t version $e expected, but found $v." 1>&2 + exit 1 + ;; + esac + echo "$v" +} + +devtool_autogen () { + tool=$1 + shift + case $tool in + autoconf ) + autoconf_version=`devtool_require autoconf --version 4 "$1" "$2"` + echo "generating (GNU Autoconf $autoconf_version): configure config.h.in" + autoconf + autoheader 2>&1 | grep -v "is unchanged" + ;; + libtool ) + libtoolize_version=`devtool_require libtoolize --version 4 "$1" "$2"` + echo "generating (GNU Libtool $libtoolize_version): ltmain.sh, libtool.m4, config.guess, config.sub" + libtoolize --force --copy >/dev/null 2>&1 + cp `libtoolize --force --copy --dry-run | grep "add the contents of" |\ + sed -e 's;^[^\`]*\`;;' -e "s;'.*;;"` libtool.m4 + ;; + shtool ) + shtoolize_version=`devtool_require shtoolize -v 3 "$1" "$2"` + echo "generating (GNU Shtool $shtoolize_version): shtool" + shift + shift + shtoolize -q "$@" + ;; + esac +} + +devtool_autoclean () { + tool=$1 + shift + case $tool in + autoconf ) + echo "removing: configure config.h.in" + rm -f configure config.h.in + ;; + libtool ) + echo "removing: ltmain.sh libtool.m4 config.guess config.sub" + rm -f ltmain.sh libtool.m4 config.guess config.sub + ;; + shtool ) + echo "removing: shtool" + rm -f shtool + ;; + esac +} + Index: ossp-pkg/l2/l2_version.c RCS File: /v/ossp/cvs/ossp-pkg/l2/l2_version.c,v rcsdiff -q -kk '-r1.3' '-r1.4' -u '/v/ossp/cvs/ossp-pkg/l2/l2_version.c,v' 2>/dev/null --- l2_version.c 2001/09/13 14:22:02 1.3 +++ l2_version.c 2001/11/08 09:53:34 1.4 @@ -1,5 +1,5 @@ /* -** l2_version.c -- Version Information for L2 (syntax: C/C++) +** l2_version.c -- Version Information for OSSP L2 (syntax: C/C++) ** [automatically generated and maintained by GNU shtool] */ @@ -8,7 +8,7 @@ #ifndef _L2_VERSION_C_ #define _L2_VERSION_C_ -#define L2_VERSION 0x001200 +#define L2_VERSION 0x002200 typedef struct { const int v_hex; @@ -32,13 +32,13 @@ #undef _L2_VERSION_C_AS_HEADER_ l2_version_t l2_version = { - 0x001200, - "0.1.0", - "0.1.0 (13-Sep-2001)", - "This is L2, Version 0.1.0 (13-Sep-2001)", - "L2 0.1.0 (13-Sep-2001)", - "L2/0.1.0", - "@(#)L2 0.1.0 (13-Sep-2001)", + 0x002200, + "0.2.0", + "0.2.0 (08-Nov-2001)", + "This is OSSP L2, Version 0.2.0 (08-Nov-2001)", + "OSSP L2 0.2.0 (08-Nov-2001)", + "OSSP L2/0.2.0", + "@(#)OSSP L2 0.2.0 (08-Nov-2001)", "$Id$" };