|
Check-in Number:
|
2521 | |
| Date: |
2002-Aug-19 21:10:37 (local)
2002-Aug-19 19:10:37 (UTC) |
| User: | rse |
| Branch: | |
| Comment: |
Switched to the OSSP devtool build environment
and upgraded to GNU shtool 1.6.1 and GNU autoconf 2.53. |
| Tickets: |
|
| Inspections: |
|
| Files: |
|
ossp-pkg/shiela/.cvsignore 1.2 -> 1.3
--- .cvsignore 2001/02/10 16:40:26 1.2
+++ .cvsignore 2002/08/19 19:10:37 1.3
@@ -3,3 +3,5 @@
shiela.1
shiela-install
shiela-install.1
+config.h
+config.h.in
|
|
ossp-pkg/shiela/ChangeLog 1.9 -> 1.10
--- ChangeLog 2001/12/31 15:00:31 1.9
+++ ChangeLog 2002/08/19 19:10:37 1.10
@@ -9,7 +9,11 @@
ChangeLog
- Changes between 0.9.1 and 0.9.2 (10-Feb-2001 to xx-Jan-2002):
+ Changes between 0.9.1 and 0.9.2 (10-Feb-2001 to 19-Aug-2002):
+
+ *) Switched to the OSSP devtool build environment
+ and upgraded to GNU shtool 1.6.1 and GNU autoconf 2.53.
+ [Ralf S. Engelschall]
*) Fixed warning in dereferencing uninitialized variable.
[Ralf S. Engelschall, Markus Sander]
|
|
ossp-pkg/shiela/Makefile.in 1.2 -> 1.3
--- Makefile.in 2001/02/10 16:40:26 1.2
+++ Makefile.in 2002/08/19 19:10:37 1.3
@@ -66,28 +66,5 @@
distclean: clean
$(RM) config.cache config.status config.log
- $(RM) Makefile
-
-dist: distclean
- @echo "Fixing source tree permissions"; \
- $(SHTOOL) fixperm *
- @V=`$(SHTOOL) version -l txt -d short VERSION`; \
- echo "Rolling tarball shiela-$${V}.tar.gz:"; \
- $(SHTOOL) tarball -o shiela-$${V}.tar.gz \
- -e 'CVS,\.cvsignore,^\.' -c 'gzip -9' -u ossp -g shiela .; \
- ls -l shiela-$${V}.tar.gz
-
-update-tools:
- shtoolize -q -o shtool echo mkdir install tarball fixperm version path
- $(RM) configure
- autoconf
-
-update-version:
- V=`./shtool version -l txt -d short VERSION`; \
- $(SED) -e "s/version = '.*'/version = '$$V'/" <shiela.pl >shiela.pl.n && mv shiela.pl.n shiela.pl; \
- $(SED) -e "s/version=\".*\"/version=\"$$V\"/" <shiela-install.sh >shiela-install.sh.n && mv shiela-install.sh.n shiela-install.sh; \
- V=`./shtool version -l txt -d long VERSION`; \
- $(SED) -e "s/Version .*(.*)/Version $$V/g" <README >README.n && mv README.n README; \
- $(SED) -e "s/B<OSSP Shiela> .*/B<OSSP Shiela> $$V/" <shiela.pod >shiela.pod.n && mv shiela.pod.n shiela.pod; \
- $(SED) -e "s/B<OSSP Shiela> .*/B<OSSP Shiela> $$V/" <shiela-install.pod >shiela-install.pod.n && mv shiela-install.pod.n shiela-install.pod
+ $(RM) Makefile config.h
|
|
ossp-pkg/shiela/README 1.4 -> 1.5
--- README 2001/12/31 15:00:31 1.4
+++ README 2002/08/19 19:10:37 1.5
@@ -7,7 +7,7 @@
OSSP Shiela - Access Control and Logging Facility for CVS
Copyright (c) 2000-2002 Ralf S. Engelschall <rse@engelschall.com>
- Version 0.9.2 (05-May-2001)
+ Version
Shiela is an access control and logging facility for use with the
Concurrent Versions System (CVS). It is intended to be hooked into CVS's
|
|
ossp-pkg/shiela/VERSION 1.3 -> 1.4
--- VERSION 2001/05/04 13:25:18 1.3
+++ VERSION 2002/08/19 19:10:37 1.4
@@ -1,3 +1,6 @@
- This is OSSP Shiela, Version 0.9.2 (05-May-2001)
+ VERSION -- Version Information for OSSP shiela (syntax: Text)
+ [automatically generated and maintained by GNU shtool]
+
+ This is OSSP shiela, Version 0.9.2 (19-Aug-2002)
|
|
ossp-pkg/shiela/configure is a binary file
ossp-pkg/shiela/configure.ac -> 1.1
*** /dev/null Sat Apr 27 13:45:35 2024
--- - Sat Apr 27 13:49:58 2024
***************
*** 0 ****
--- 1,38 ----
+
+ AC_PREREQ(2.53)
+ AC_INIT
+
+ V=`./shtool version -ltxt -dlong VERSION`
+ ./shtool echo -e "Configuring %BOSSP shiela%b, Version %B${V}%b"
+ echo "Copyright (c) 2000-2002 Ralf S. Engelschall <rse@engelschall.com>"
+
+ AC_MSG_CHECKING(for Perl program)
+ AC_ARG_WITH(perl,dnl
+ [ --with-perl=PATH force the use of a particular Perl program],
+ with_perl="$withval",
+ if test ".$with_perl" = .; then
+ with_perl=`./shtool path -m perl5 perl`
+ fi
+ )dnl
+ PATH_PERL="$with_perl"
+ AC_SUBST(PATH_PERL)
+ AC_MSG_RESULT($PATH_PERL)
+
+ AC_MSG_CHECKING(for CVS program)
+ AC_ARG_WITH(cvs,dnl
+ [ --with-cvs=PATH force the use of a particular CVS program],
+ with_cvs="$withval",
+ if test ".$with_cvs" = .; then
+ with_perl=`./shtool path cvs`
+ fi
+ )dnl
+ PATH_CVS="$with_cvs"
+ AC_SUBST(PATH_CVS)
+ AC_MSG_RESULT($PATH_CVS)
+
+ AC_SET_MAKE
+
+ AC_CONFIG_HEADERS(config.h)
+ AC_CONFIG_FILES([Makefile])
+ AC_OUTPUT
+
|
|
ossp-pkg/shiela/configure.in 1.3 -> 1.4
ossp-pkg/shiela/devtool -> 1.1
*** /dev/null Sat Apr 27 13:45:35 2024
--- - Sat Apr 27 13:49:58 2024
***************
*** 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/shiela/devtool.conf -> 1.1
*** /dev/null Sat Apr 27 13:45:35 2024
--- - Sat Apr 27 13:49:58 2024
***************
*** 0 ****
--- 1,68 ----
+ ##
+ ## devtool.conf -- Development Tool Configuration
+ ##
+
+ %autogen
+ @autogen shtool 1.6.1 "1.6.*" all
+ @autogen autoconf 2.53 "2.5[3-9]*"
+
+ %autoclean
+ @autoclean shtool
+ @autoclean autoconf
+
+ %configure
+ ./configure \
+ --prefix=/tmp/shiela \
+ "$@"
+
+ %release
+ ./devtool version
+ ./devtool tag
+ ./devtool dist
+ ./devtool upload
+
+ %version
+ ./shtool version -ltxt -n "OSSP shiela" -e VERSION
+ V=`./shtool version -ltxt -dlong VERSION`
+ sed -e "s/Version .*(.*)/Version $V/g" <README >README.n && mv README.n README
+ sed -e "s/version = '.*'/version = '$V'/" <shiela.pl >shiela.pl.n && mv shiela.pl.n shiela.pl
+ sed -e "s/version=\".*\"/version=\"$V\"/" <shiela-install.sh >shiela-install.sh.n && mv shiela-install.sh.n shiela-install.sh
+ V=`./shtool version -l txt -d long VERSION`
+ sed -e "s/Version .*(.*)/Version $V/g" <README >README.n && mv README.n README
+ sed -e "s/B<OSSP Shiela> .*/B<OSSP Shiela> $V/" <shiela.pod >shiela.pod.n && mv shiela.pod.n shiela.pod
+ sed -e "s/B<OSSP Shiela> .*/B<OSSP Shiela> $V/" <shiela-install.pod >shiela-install.pod.n && mv shiela-install.pod.n shiela-install.pod
+
+ %tag
+ V=`./shtool version -ltxt -dshort VERSION | sed -e 's;\.;_;g'`
+ echo "+++ tagging CVS sources as SHIELA_${V}"
+ cvs tag SHIELA_${V}
+
+ %dist
+ echo "+++ removing old tarballs"
+ rm -f shiela-*.tar.gz
+ echo "+++ generating"
+ ./devtool autoclean
+ ./devtool autogen
+ echo "+++ configuring"
+ ./configure
+ echo "+++ building"
+ make clean all man
+ echo "+++ cleaning"
+ make distclean
+ echo "+++ fixing"
+ ./shtool fixperm -v .
+ echo "+++ rolling"
+ V=`./shtool version -ltxt -dshort VERSION`
+ ./shtool tarball -o shiela-${V}.tar.gz -d shiela-${V} -u ossp -g ossp \
+ -e 'CVS,\.cvsignore,\.[ao]$,^\.,devtool*,*.tar.gz,^#.*,.*~$' -c 'gzip --best' .
+ ls -l shiela-${V}.tar.gz
+ echo "+++ testing"
+ gunzip <shiela-${V}.tar.gz | tar tvf - | head -10
+ echo "[...]"
+ gunzip <shiela-${V}.tar.gz | tar tvf - | tail -10
+
+ %upload
+ echo "+++ copying to ftp://ftp.ossp.org/pkg/tool/shiela/"
+ V=`./shtool version -ltxt -dshort VERSION`
+ scp shiela-${V}.tar.gz master.ossp.org:/e/ossp/ftp/pkg/tool/shiela/
+
|
|
ossp-pkg/shiela/devtool.func -> 1.1
*** /dev/null Sat Apr 27 13:45:35 2024
--- - Sat Apr 27 13:49:58 2024
***************
*** 0 ****
--- 1,73 ----
+ ##
+ ## 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"
+ rm -rf autom4te.cache >/dev/null 2>&1
+ ;;
+ 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/shiela/shiela-install.pod 1.4 -> 1.5
--- shiela-install.pod 2001/12/31 15:00:31 1.4
+++ shiela-install.pod 2002/08/19 19:10:38 1.5
@@ -32,7 +32,7 @@
=head1 VERSION
-B<OSSP Shiela> 0.9.2 (05-May-2001)
+B<OSSP Shiela> 0.9.2 (19-Aug-2002)
=head1 DESCRIPTION
|
|
ossp-pkg/shiela/shiela-install.sh 1.5 -> 1.6
--- shiela-install.sh 2001/12/31 15:00:31 1.5
+++ shiela-install.sh 2002/08/19 19:10:38 1.6
@@ -25,7 +25,7 @@
## shiela-install: Shiela repository install program (syntax: Bourne-Shell)
##
-version="0.9.2"
+version="0.9.2 (19-Aug-2002)"
prefix="@prefix@"
bindir="@bindir@"
|
|
ossp-pkg/shiela/shiela.pl 1.15 -> 1.16
--- shiela.pl 2001/12/31 15:00:32 1.15
+++ shiela.pl 2002/08/19 19:10:38 1.16
@@ -25,7 +25,7 @@
## shiela: Shiela control program (syntax: Perl)
##
-my $version = '0.9.2';
+my $version = '0.9.2 (19-Aug-2002)';
require 5.005;
|
|
ossp-pkg/shiela/shiela.pod 1.4 -> 1.5
--- shiela.pod 2001/12/31 15:00:32 1.4
+++ shiela.pod 2002/08/19 19:10:38 1.5
@@ -32,7 +32,7 @@
=head1 VERSION
-B<OSSP Shiela> 0.9.2 (05-May-2001)
+B<OSSP Shiela> 0.9.2 (19-Aug-2002)
=head1 DESCRIPTION
|
|
ossp-pkg/shiela/shtool 1.4 -> 1.5
--- shtool 2001/05/04 13:25:18 1.4
+++ shtool 2002/08/19 19:10:38 1.5
@@ -1180,7 +1180,7 @@
vGNU="${name} ${triple} (${tim})"
vWeb="${name}/${triple}"
vSCCS="@(#)${name} ${triple} (${tim})"
- vRCS="\$Id: shtool,v 1.4 2001/05/04 13:25:18 rse Exp ${name} ${triple} (${tim}) \$"
+ vRCS="\$Id: shtool,v 1.5 2002/08/19 19:10:38 rse dead ${name} ${triple} (${tim}) \$"
# determine string out of filename
# (do NOT try to optimize this in any way because of portability)
|
|
