From 4a1900ec7604043d6c4767342f148041d2f1b86e Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Wed, 4 Sep 2002 23:24:20 +0000 Subject: Regenerated html docs. Tweaked how Makefile.am builds tarballs. --- ChangeLog | 9 ++++++++- Clean.tcl | 14 ++++++++++++-- Makefile.am | 27 +++++++++++++++------------ Makefile.in | 29 ++++++++++++++++------------- NEWS | 9 +++++++++ doc/Makefile.am | 4 +++- doc/Makefile.in | 2 +- doc/README | 2 -- doc/overview.sgml | 6 +++--- runtest.exp | 2 +- 10 files changed, 68 insertions(+), 36 deletions(-) delete mode 100644 doc/README diff --git a/ChangeLog b/ChangeLog index 86bb64b..c68db5f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2002-09-04 Rob Savoye + + * Clean.tcl (cleanfiles): Add more patterns to remove. + * Makefile.am: Fix tarball target to clean up the source tree + better. + 2002-09-03 Rob Savoye * Makefile.am: Add support to build Solaris and HPUX packages. @@ -15,6 +21,7 @@ * example/hello/Makefile.am: Build C based example. * example/hello/configure.in: Add AC_NO_EXECUTABLES, so things configure without building C++ executables. + * configure: Regenerated. 2002-08-30 Nick Clifton @@ -48,7 +55,7 @@ * baseboards/v850-sim.exp (target_install): Add v850e-elf. -2002-07-16 +2002-07-16 Rob Savoye * doc/user.sgml: Add new tutorial by Niklaus Giger as a new chapter. diff --git a/Clean.tcl b/Clean.tcl index 97782f5..94cc1d1 100755 --- a/Clean.tcl +++ b/Clean.tcl @@ -5,7 +5,7 @@ # directory not in the .clean file list. This should only # be used by maintainers when producing a release. -# Copyright (C) 2000, 2001 Free Software Foundation, Inc. +# Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -122,8 +122,18 @@ proc cleanfiles { directory } { if ![info exists cleanfile] { verbose "WARNING: no .clean file in $directory, removing the default set of \"*! core CVS RCS\"" 3 set allfiles [glob -nocomplain "$directory/*~"] - append allfiles " [glob -nocomplain "$directory/core"]" + append allfiles " [glob -nocomplain "$directory/core*"]" append allfiles " [glob -nocomplain "$directory/CVS"]" + append allfiles " [glob -nocomplain "$directory/Cvs.*"]" + append allfiles " [glob -nocomplain "$directory/*.out"]" + append allfiles " [glob -nocomplain "$directory/*.dvi"]" + append allfiles " [glob -nocomplain "$directory/*.rej"]" + append allfiles " [glob -nocomplain "$directory/*.orig"]" + append allfiles " [glob -nocomplain "$directory/*.log"]" + append allfiles " [glob -nocomplain "$directory/*.cvsignore"]" + append allfiles " [glob -nocomplain "$directory/*.tgz"]" + append allfiles " [glob -nocomplain "$directory/*.tar.gz"]" + append allfiles " [glob -nocomplain "$directory/autom4te.cache"]" append allfiles " [glob -nocomplain "$directory/RCS"]" append allfiles " [glob -nocomplain "$directory/.\#*"]" } else { diff --git a/Makefile.am b/Makefile.am index 1326a0d..940878a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -49,14 +49,15 @@ tarball: overview.html overview.ps overview.pdf src=$(srcdir); \ dir=`(cd $${src}; pwd)`; \ (cd dejagnu-${VERSION} ; $${dir}/Clean.tcl); \ - -mkdir -p doc/overview; \ - -cp -fr doc/overview dejagnu-${VERSION}/doc/; \ - -cp -fr doc/overview.ps dejagnu-${VERSION}/doc/; \ - -cp -fr doc/overview.pdf dejagnu-${VERSION}/doc/; \ - tar cvf ../dejagnu-${VERSION}.tar dejagnu-${VERSION}; \ - gzip -9fv ../dejagnu-${VERSION}.tar; \ - cp -f ../dejagnu-${VERSION}.tar.gz /usr/src/redhat/SOURCES/; \ - cp -f $${dir}/redhat/dejagnu.spec /usr/src/redhat/SPECS/ + mkdir -p doc/html; \ + cp -fr doc/html dejagnu-${VERSION}/doc/; \ + cp -fr doc/overview.ps dejagnu-${VERSION}/doc/; \ + cp -fr doc/overview.pdf dejagnu-${VERSION}/doc/; \ + cp -fr doc/overview.rtf dejagnu-${VERSION}/doc/; \ + tar cvf ../dejagnu-${VERSION}.tar dejagnu-${VERSION}; \ + gzip -9fv ../dejagnu-${VERSION}.tar; \ + cp -f ../dejagnu-${VERSION}.tar.gz /usr/src/redhat/SOURCES/; \ + cp -f $${dir}/redhat/dejagnu.spec /usr/src/redhat/SPECS/ # this builds a date stamped tarball of the current sources snapshot: @@ -66,10 +67,11 @@ snapshot: src=$(srcdir); \ dir=`(cd $${src}; pwd)`; \ (cd dejagnu-${DATE} ; $${dir}/Clean.tcl); - -mkdir -p doc/overview - -cp -fr doc/overview dejagnu-${DATE}/doc/ + -mkdir -p doc/html + -cp -fr doc/html dejagnu-${DATE}/doc/ -cp -fr doc/overview.ps dejagnu-${DATE}/doc/ -cp -fr doc/overview.pdf dejagnu-${DATE}/doc/ + -cp -fr doc/overview.rtf dejagnu-${DATE}/doc/ tar cf ../dejagnu-${DATE}.tar dejagnu-${DATE} gzip -9fv ../dejagnu-${DATE}.tar @@ -90,10 +92,11 @@ deb: overview.html overview.ps overview.pdf dir=`(cd $${src}; pwd)`; \ (cd dejagnu-${VERSION} ; $${dir}/Clean.tcl); -mkdir -p doc/html; - -cp -fr $(srcdir)/debian dejagnu-${VERSION}/; - -cp -fr doc/overview dejagnu-${VERSION}/doc/; + -cp -fr $(srcdir)/debian dejagnu-${VERSION}/ + -cp -fr doc/html dejagnu-${VERSION}/doc/; -cp -fr doc/overview.ps dejagnu-${VERSION}/doc/; -cp -fr doc/overview.pdf dejagnu-${VERSION}/doc/; + -cp -fr doc/overview.rtf dejagnu-${VERSION}/doc/; (cd dejagnu-${VERSION}; dpkg-buildpackage) # this builds a Solaris style pkg package. diff --git a/Makefile.in b/Makefile.in index d2f7c88..e624452 100644 --- a/Makefile.in +++ b/Makefile.in @@ -532,14 +532,15 @@ tarball: overview.html overview.ps overview.pdf src=$(srcdir); \ dir=`(cd $${src}; pwd)`; \ (cd dejagnu-${VERSION} ; $${dir}/Clean.tcl); \ - -mkdir -p doc/overview; \ - -cp -fr doc/overview dejagnu-${VERSION}/doc/; \ - -cp -fr doc/overview.ps dejagnu-${VERSION}/doc/; \ - -cp -fr doc/overview.pdf dejagnu-${VERSION}/doc/; \ - tar cvf ../dejagnu-${VERSION}.tar dejagnu-${VERSION}; \ - gzip -9fv ../dejagnu-${VERSION}.tar; \ - cp -f ../dejagnu-${VERSION}.tar.gz /usr/src/redhat/SOURCES/; \ - cp -f $${dir}/redhat/dejagnu.spec /usr/src/redhat/SPECS/ + mkdir -p doc/html; \ + cp -fr doc/html dejagnu-${VERSION}/doc/; \ + cp -fr doc/overview.ps dejagnu-${VERSION}/doc/; \ + cp -fr doc/overview.pdf dejagnu-${VERSION}/doc/; \ + cp -fr doc/overview.rtf dejagnu-${VERSION}/doc/; \ + tar cvf ../dejagnu-${VERSION}.tar dejagnu-${VERSION}; \ + gzip -9fv ../dejagnu-${VERSION}.tar; \ + cp -f ../dejagnu-${VERSION}.tar.gz /usr/src/redhat/SOURCES/; \ + cp -f $${dir}/redhat/dejagnu.spec /usr/src/redhat/SPECS/ # this builds a date stamped tarball of the current sources snapshot: @@ -550,9 +551,10 @@ snapshot: dir=`(cd $${src}; pwd)`; \ (cd dejagnu-${DATE} ; $${dir}/Clean.tcl); -mkdir -p doc/overview - -cp -fr doc/overview dejagnu-${DATE}/doc/ + -cp -fr doc/html dejagnu-${DATE}/doc/ -cp -fr doc/overview.ps dejagnu-${DATE}/doc/ -cp -fr doc/overview.pdf dejagnu-${DATE}/doc/ + -cp -fr doc/overview.rtf dejagnu-${DATE}/doc/ tar cf ../dejagnu-${DATE}.tar dejagnu-${DATE} gzip -9fv ../dejagnu-${DATE}.tar @@ -573,10 +575,11 @@ deb: overview.html overview.ps overview.pdf dir=`(cd $${src}; pwd)`; \ (cd dejagnu-${VERSION} ; $${dir}/Clean.tcl); -mkdir -p doc/html; - -cp -fr $(srcdir)/debian dejagnu-${VERSION}/; - -cp -fr doc/overview dejagnu-${VERSION}/doc/; + -cp -fr $(srcdir)/debian dejagnu-${VERSION}/ + -cp -fr doc/html dejagnu-${VERSION}/doc/; -cp -fr doc/overview.ps dejagnu-${VERSION}/doc/; -cp -fr doc/overview.pdf dejagnu-${VERSION}/doc/; + -cp -fr doc/overview.rtf dejagnu-${VERSION}/doc/; (cd dejagnu-${VERSION}; dpkg-buildpackage) # this builds a Solaris style pkg package. @@ -593,8 +596,8 @@ solpkg: $(srcdir)/pkg/prototype here=`pwd`; \ cd /tmp; \ pkgmk -o -r / -d /tmp; \ - tar cf $$(here)/dejagnu-${VERSION}.SPARC.2.8.pkg.tar DejaGnu; \ - gzip -9fv $$(here)/dejagnu-${VERSION}.SPARC.2.8.pkg.tar + tar cf $$here/dejagnu-${VERSION}.SPARC.2.8.pkg.tar DejaGnu; \ + gzip -9fv $$here/dejagnu-${VERSION}.SPARC.2.8.pkg.tar rm -fr /tmp/prototype /tmp/pkginfo /tmp/DejaGnu # this builds a HPUX style depot file diff --git a/NEWS b/NEWS index f6325d8..0aeb61e 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,12 @@ + Changes from 1.4.2 + 1. New XML output option, so test results can be loaded into a + database. + 2. Support for the KFAIL/KPASS (known failures). This is + mostly oriented towards GDB testing. + 3. New "Hello World" example. + 4. New tutorial chapter. + 5. Test cases build with either GCC 2.x or 3.x. + Changes from 1.4.1 1. Various patches for bugs reported from net users. 2. Test case builds with either libstdc++-v3 (as used by diff --git a/doc/Makefile.am b/doc/Makefile.am index 6c8acfe..e2df907 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -51,7 +51,9 @@ docs: $(TARGETS) # now for some extra dependencies that the automatic rules will not # catch: -html rtf overview.pdf overview.ps overview.dvi overview.rtf overview.html: overview.sgml ref.sgml user.sgml +html/book1.html rtf overview.pdf overview.ps overview.dvi overview.rtf overview.html: overview.sgml ref.sgml user.sgml + +html/book1.html: overview.sgml ref.sgml user.sgml clean realclean distclean: rm -fr $(TARGETS) DBHTOHTML* html dejagnu.info* overview.junk overview overview.{aux,dvi,log,ps,pdf,tex} diff --git a/doc/Makefile.in b/doc/Makefile.in index b1e19ff..99b8572 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -96,7 +96,7 @@ DIST_SOURCES = NROFF = nroff MANS = $(man_MANS) -DIST_COMMON = README Makefile.am Makefile.in +DIST_COMMON = Makefile.am Makefile.in all: all-am .SUFFIXES: diff --git a/doc/README b/doc/README deleted file mode 100644 index fc8ae45..0000000 --- a/doc/README +++ /dev/null @@ -1,2 +0,0 @@ -One can obtain the Free DocBook Tools for Linux and NT at -http://nis-www.lanl.gov/~rosalia/mydocs/docbook-intro.html diff --git a/doc/overview.sgml b/doc/overview.sgml index 657a51b..b807dc6 100644 --- a/doc/overview.sgml +++ b/doc/overview.sgml @@ -54,7 +54,7 @@ into another language, under the above conditions for modified versions. &dj; The GNU Testing Framework - 2002 July 16 + 2002 Sept 04 &version New release @@ -207,8 +207,8 @@ into another language, under the above conditions for modified versions. GDB. When we replaced it with the Expect-based framework, it was like DejaGnu all over again... But more importantly, it was also named after my daughter,Deja Snow Savoye (now 9 - years old in Dec of 1998), who was a toddler during DejaGnu's + URL="mailto:deja@welcomehome.org">Deja Snow Savoye (now 12 + years old in Sept of 2002), who was a toddler during DejaGnu's creation. diff --git a/runtest.exp b/runtest.exp index 5c77b77..31d08bf 100755 --- a/runtest.exp +++ b/runtest.exp @@ -20,7 +20,7 @@ # This file was written by Rob Savoye. (rob@welcomehome.org) -set frame_version 1.4.3pre +set frame_version 1.4.3 if ![info exists argv0] { send_error "Must use a version of Expect greater than 5.0\n" exit 1 -- cgit v1.2.3