OSSP CVS Repository

ossp - Check-in [1464]
Not logged in
[Honeypot]  [Browse]  [Home]  [Login]  [Reports
[Search]  [Ticket]  [Timeline
  [Patchset]  [Tagging/Branching

Check-in Number: 1464
Date: 2001-Dec-31 13:03:09 (local)
2001-Dec-31 12:03:09 (UTC)
User:thl
Branch:
Comment: switch to devtool stuff
Tickets:
Inspections:
Files:
ossp-pkg/lmtp2nntp/.configure      1.11->removed
ossp-pkg/lmtp2nntp/Makefile.in      1.31 -> 1.32     2 inserted, 12 deleted
ossp-pkg/lmtp2nntp/autogen.sh      1.11->removed
ossp-pkg/lmtp2nntp/devtool      added-> 1.1
ossp-pkg/lmtp2nntp/devtool.conf      added-> 1.1
ossp-pkg/lmtp2nntp/devtool.func      added-> 1.1
ossp-pkg/lmtp2nntp/lmtp2nntp_version.c      1.1 -> 1.2     6 inserted, 6 deleted

ossp-pkg/lmtp2nntp/.configure 1.11 -> 1.12



ossp-pkg/lmtp2nntp/Makefile.in 1.31 -> 1.32

--- Makefile.in  2001/12/31 11:09:52     1.31
+++ Makefile.in  2001/12/31 12:03:09     1.32
@@ -56,7 +56,8 @@
         $(CC) $(CFLAGS) -c $<
 
 #   convinience rule for calling _SUBDIRS with various make targets
-_SUBDIRS_all _SUBDIRS_check _SUBDIRS_install _SUBDIRS_uninstall _SUBDIRS_clean _SUBDIRS_distclean _SUBDIRS_depend:
+_SUBDIRS_all _SUBDIRS_check _SUBDIRS_install _SUBDIRS_uninstall _SUBDIRS_clean \
+_SUBDIRS_distclean _SUBDIRS_realclean _SUBDIRS_depend:
         @$(MAKE) $(MFLAGS) \
                  _SUBDIRS_TARGET=`echo $@ | sed -e 's/^_SUBDIRS_//'` \
                  _SUBDIRS_STEPDOWN 
@@ -110,17 +111,6 @@
         -rm -f configure
         -rm -f shtool
 
-new-version:
-        @$(SHTOOL) version -lc -n lmtp2nntp -p lmtp2nntp_ -e lmtp2nntp_version.c; \
-        V=`$(SHTOOL) version -lc -dlong lmtp2nntp_version.c`; \
-        sed -e "s/Version .*(.*)/Version $$V/g" <README >README.n && mv README.n README
-
-dist: distclean
-        @$(SHTOOL) fixperm -v .; \
-        V=`$(SHTOOL) version -lc -dshort lmtp2nntp_version.c`; \
-        $(SHTOOL) tarball -o lmtp2nntp-$${V}.tar.gz -d lmtp2nntp-$${V} -u ossp -g ossp \
-                          -e 'CVS,\.cvsignore,\.[ao],^\.,/\.,autogen.sh,*.tar.gz,*.bak,TODO' -c 'gzip --best' .
-
 check: lmtp2nntp
         @./test.sh
 


ossp-pkg/lmtp2nntp/autogen.sh 1.11 -> 1.12



ossp-pkg/lmtp2nntp/devtool -> 1.1

*** /dev/null    Fri Oct 22 09:45:01 2021
--- -    Fri Oct 22 09:45:05 2021
***************
*** 0 ****
--- 1,47 ----
+ #!/bin/sh
+ ##
+ ##  devtool -- Development Tool
+ ##  Copyright (c) 2001 Ralf S. Engelschall <rse@engelschall.com> 
+ ##
+ 
+ if [ $# -eq 0 ]; then
+     echo "devtool:USAGE: devtool <command> [<arg> ...]" 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 <devtool.conf -e "1,/^%common/d" -e '/^%.*/,$d'
+   sed <devtool.conf -e "1,/^%$cmd/d" -e '/^%.*/,$d' ) |\
+ sed -e 's;\([  ]\)@\([a-zA-Z_][a-zA-Z0-9_]*\);\1devtool_\2;' >>$tmpfile
+ 
+ sh $tmpfile "$@"
+ 
+ rm -f $tmpfile >/dev/null 2>&1 || true
+ 


ossp-pkg/lmtp2nntp/devtool.conf -> 1.1

*** /dev/null    Fri Oct 22 09:45:01 2021
--- -    Fri Oct 22 09:45:05 2021
***************
*** 0 ****
--- 1,58 ----
+ ##
+ ##  devtool.conf -- Development Tool Configuration
+ ##
+ 
+ %autogen
+     @autogen shtool   1.5.4 "1.5.*" all
+     @autogen autoconf 2.52  "2.5.*"
+ 
+     echo "===> lib_str (devtool autogen)"
+     (cd lib_str && ./devtool autogen)
+     echo "<=== lib_str"
+     echo "===> lib_l2 (devtool autogen)"
+     (cd lib_l2 && ./devtool autogen)
+     echo "<=== lib_l2"
+     echo "===> lib_sa (devtool autogen)"
+     (cd lib_sa && ./devtool autogen)
+     echo "<=== lib_sa"
+     echo "===> lib_var (devtool autogen)"
+     (cd lib_var && ./devtool autogen)
+     echo "<=== lib_var"
+ 
+ %autoclean
+     @autoclean shtool
+     @autoclean autoconf
+ 
+     echo "===> lib_str (devtool autoclean)"
+     (cd lib_str && ./devtool autoclean)
+     echo "<=== lib_str"
+     echo "===> lib_l2 (devtool autoclean)"
+     (cd lib_l2 && ./devtool autoclean)
+     echo "<=== lib_l2"
+     echo "===> lib_sa (devtool autoclean)"
+     (cd lib_sa && ./devtool autoclean)
+     echo "<=== lib_sa"
+     echo "===> lib_var (devtool autoclean)"
+     (cd lib_var && ./devtool autoclean)
+     echo "<=== lib_var"
+ 
+ %configure
+     ./configure \
+         --prefix=/tmp/lmtp2nntp \
+         --disable-shared \
+         --enable-maintainer \
+         --enable-debug \
+         "$@"
+ 
+ %version
+     ./shtool version -l c -n "OSSP lmtp2nntp" -p "lmtp2nntp_" -e lmtp2nntp_version.c
+        V=`./shtool version -lc -dlong lmtp2nntp_version.c`
+        sed -e "s/Version .*(.*)/Version $V/g" <README >README.n && mv README.n README
+ 
+ %dist
+     make distclean >/dev/null 2>&1
+     ./shtool fixperm -v .
+     V=`./shtool version -l c -d short lmtp2nntp_version.c`
+     ./shtool tarball -o lmtp2nntp-${V}.tar.gz -d lmtp2nntp-${V} -u ossp -g ossp \
+                      -e 'CVS,\.cvsignore,\.[ao],^\.,devtool.conf,*.tar.gz,*.bak,00TODO' -c 'gzip --best' .
+ 


ossp-pkg/lmtp2nntp/devtool.func -> 1.1

*** /dev/null    Fri Oct 22 09:45:01 2021
--- -    Fri Oct 22 09:45:05 2021
***************
*** 0 ****
--- 1,72 ----
+ ##
+ ##  devtool.func -- Development Tool Functions
+ ##  Copyright (c) 2001 Ralf S. Engelschall <rse@engelschall.com> 
+ ##
+ 
+ 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
+ }
+ 


ossp-pkg/lmtp2nntp/lmtp2nntp_version.c 1.1 -> 1.2

--- lmtp2nntp_version.c  2001/12/31 11:09:53     1.1
+++ lmtp2nntp_version.c  2001/12/31 12:03:09     1.2
@@ -1,5 +1,5 @@
 /*
-**  lmtp2nntp_version.c -- Version Information for lmtp2nntp (syntax: C/C++)
+**  lmtp2nntp_version.c -- Version Information for OSSP lmtp2nntp (syntax: C/C++)
 **  [automatically generated and maintained by GNU shtool]
 */
 
@@ -35,11 +35,11 @@
     0x102002,
     "1.2a2",
     "1.2a2 (31-Dec-2001)",
-    "This is lmtp2nntp, Version 1.2a2 (31-Dec-2001)",
-    "lmtp2nntp 1.2a2 (31-Dec-2001)",
-    "lmtp2nntp/1.2a2",
-    "@(#)lmtp2nntp 1.2a2 (31-Dec-2001)",
-    "$Id: lmtp2nntp 1.2a2 (31-Dec-2001) $"
+    "This is OSSP lmtp2nntp, Version 1.2a2 (31-Dec-2001)",
+    "OSSP lmtp2nntp 1.2a2 (31-Dec-2001)",
+    "OSSP lmtp2nntp/1.2a2",
+    "@(#)OSSP lmtp2nntp 1.2a2 (31-Dec-2001)",
+    "$Id: OSSP lmtp2nntp 1.2a2 (31-Dec-2001) $"
 };
 
 #endif /* _LMTP2NNTP_VERSION_C_AS_HEADER_ */

CVSTrac 2.0.1