|
Check-in Number:
|
1496 | |
| Date: |
2002-Jan-02 19:10:41 (local)
2002-Jan-02 18:10:41 (UTC) |
| User: | rse |
| Branch: | |
| Comment: |
switch to devtool |
| Tickets: |
|
| Inspections: |
|
| Files: |
|
ossp-pkg/xds/Makefile.in 1.36 -> 1.37
--- Makefile.in 2002/01/02 17:13:44 1.36
+++ Makefile.in 2002/01/02 18:10:41 1.37
@@ -164,25 +164,6 @@
-$(RMDIR) $(DESTDIR)$(includedir)
-$(RMDIR) $(DESTDIR)$(bindir)
-# roll a distribution tarball
-dist: distclean
- @$(SHTOOL) fixperm -v .; \
- V=`$(SHTOOL) version -l c -d short xds_version.c`; \
- $(SHTOOL) tarball -o xds-$${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)
-
# Dependencies
$(LIB_OBJS): xds_p.h xds.h
|
|
ossp-pkg/xds/autogen.sh 1.3 -> 1.4
ossp-pkg/xds/config.guess 1.1 -> 1.2
ossp-pkg/xds/config.h.in 1.1 -> 1.2
ossp-pkg/xds/config.sub 1.1 -> 1.2
ossp-pkg/xds/configure is a binary file
ossp-pkg/xds/devtool -> 1.1
*** /dev/null Sat Nov 23 01:15:20 2024
--- - Sat Nov 23 01:15:20 2024
***************
*** 0 ****
--- 1,47 ----
+ #!/bin/sh
+ ##
+ ## devtool -- Development Tool
+ ## Copyright (c) 2001-2002 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/xds/devtool.conf -> 1.1
*** /dev/null Sat Nov 23 01:15:20 2024
--- - Sat Nov 23 01:15:20 2024
***************
*** 0 ****
--- 1,32 ----
+ ##
+ ## 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/xds \
+ --disable-shared \
+ --enable-maintainer \
+ --enable-debug \
+ "$@"
+
+ %version
+ ./shtool version -l c -n "OSSP XDS" -p "xds_" -e xds_version.c
+
+ %dist
+ make distclean >/dev/null 2>&1
+ ./shtool fixperm -v .
+ V=`./shtool version -l c -d short xds_version.c`
+ ./shtool tarball -o xds-${V}.tar.gz -d xds-${V} -u ossp -g ossp \
+ -e 'CVS,\.cvsignore,\.[ao],^\.,devtool.conf' -c 'gzip --best' .
+
|
|
ossp-pkg/xds/devtool.func -> 1.1
*** /dev/null Sat Nov 23 01:15:20 2024
--- - Sat Nov 23 01:15:20 2024
***************
*** 0 ****
--- 1,72 ----
+ ##
+ ## devtool.func -- Development Tool Functions
+ ## Copyright (c) 2001-2002 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/xds/libtool.m4 1.2 -> 1.3
ossp-pkg/xds/ltmain.sh 1.1 -> 1.2
ossp-pkg/xds/shtool 1.1 -> 1.2
