From fc76a6aa19af9606f260993811ac0dee8ec4e886 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 1 Jun 2000 15:29:01 +0000 Subject: Patch rtemsdoc-4.5.0-rc-8.diff from Ralf Corsepius . Ralf's comments follow: Changes: * Enhanced versioning: - Addition of automake's version.texi support - Replacement of rtemsdoc's former versioning support by automake's versioning support (Abandoning RTEMS-UPDATE-* etc.) - Abandoning setup.texi.in - Add EDITION to each documents Makefile.am - version.texi support in project.am - Addition of maintainer mode (currently only used to prevent incorrectly updating timestamps when users touch automake's version.texi timestamp files (stamp-vti)). * Fixing info dir support - Use texinfo's @dircategory and @direntry instead of infos *-DIR-ENTRY - $(infodir)/dir is now correctly set up * Avoid using temporary files - Pipe texts through REPLACE2 into BMENU2 instead of using temporary files. - Abandon using bmenu in favor of bmenu2 (bmenu could be removed now) * Prepare Makefile.ams for building in a separate buildtree - prefix files with $(srcdir) in Makefile.am for files which must be generated inside of the source tree Notes: * rtemsdoc can not yet be build in a separate source-tree, but we are very close to it. * You as the maintainer of this package now should always use --enable-maintainer-mode to configure rtemsdoc. --- doc/filesystem/.cvsignore | 1 + doc/filesystem/Makefile.am | 65 +++++++++++++++++++++--------------------- doc/filesystem/filesystem.texi | 25 ++++++---------- doc/filesystem/stamp-vti | 3 ++ doc/filesystem/version.texi | 3 ++ 5 files changed, 48 insertions(+), 49 deletions(-) create mode 100644 doc/filesystem/stamp-vti create mode 100644 doc/filesystem/version.texi (limited to 'doc/filesystem') diff --git a/doc/filesystem/.cvsignore b/doc/filesystem/.cvsignore index 9097a9318c..3e414d9dd3 100644 --- a/doc/filesystem/.cvsignore +++ b/doc/filesystem/.cvsignore @@ -20,6 +20,7 @@ fsrequirements.texi imfs.texi index.html init.texi +mdate-sh miniimfs.texi mounting.texi patheval.texi diff --git a/doc/filesystem/Makefile.am b/doc/filesystem/Makefile.am index 5b02ed1d39..84d7344eed 100644 --- a/doc/filesystem/Makefile.am +++ b/doc/filesystem/Makefile.am @@ -6,63 +6,62 @@ # $Id$ # -AUTOMAKE_OPTIONS = foreign +AUTOMAKE_OPTIONS = foreign 1.4 -PROJECT=filesystem +PROJECT = filesystem +EDITION = 1 include $(top_srcdir)/project.am -BMENU+= -c +BMENU2 += -c -COMMON_FILES=$(top_srcdir)/common/cpright.texi $(top_builddir)/common/setup.texi +GENERATED_FILES = patheval.texi init.texi mounting.texi syscalls.texi \ + fsrequirements.texi imfs.texi miniimfs.texi tftp.texi +COMMON_FILES = $(top_srcdir)/common/setup.texi $(top_srcdir)/common/cpright.texi -GENERATED_FILES=patheval.texi \ - init.texi mounting.texi syscalls.texi fsrequirements.texi imfs.texi \ - miniimfs.texi tftp.texi - -FILES= preface.texi +FILES = preface.texi info_TEXINFOS = filesystem.texi filesystem_TEXINFOS = $(FILES) $(COMMON_FILES) $(GENERATED_FILES) -patheval.texi: patheval.t - $(BMENU) -p "" \ +$(srcdir)/patheval.texi: patheval.t + $(BMENU2) -p "" \ -u "Top" \ - -n "" $< + -n "" < $< > $@ -init.texi: init.t - $(BMENU) -p "" \ +$(srcdir)/init.texi: init.t + $(BMENU2) -p "" \ -u "Top" \ - -n "" $< + -n "" < $< > $@ -mounting.texi: mounting.t - $(BMENU) -p "" \ +$(srcdir)/mounting.texi: mounting.t + $(BMENU2) -p "" \ -u "Top" \ - -n "" $< + -n "" < $< > $@ -syscalls.texi: syscalls.t - $(BMENU) -p "" \ +$(srcdir)/syscalls.texi: syscalls.t + $(BMENU2) -p "" \ -u "Top" \ - -n "" $< + -n "" < $< > $@ -fsrequirements.texi: fsrequirements.t - $(BMENU) -p "" \ +$(srcdir)/fsrequirements.texi: fsrequirements.t + $(BMENU2) -p "" \ -u "Top" \ - -n "" $< + -n "" < $< > $@ -imfs.texi: imfs.t - $(BMENU) -p "" \ +$(srcdir)/imfs.texi: imfs.t + $(BMENU2) -p "" \ -u "Top" \ - -n "" $< + -n "" < $< > $@ -miniimfs.texi: miniimfs.t - $(BMENU) -p "" \ +$(srcdir)/miniimfs.texi: miniimfs.t + $(BMENU2) -p "" \ -u "Top" \ - -n "" $< + -n "" < $< > $@ -tftp.texi: tftp.t - $(BMENU) -p "" \ +$(srcdir)/tftp.texi: tftp.t + $(BMENU2) -p "" \ -u "Top" \ - -n "" $< + -n "" < $< > $@ EXTRA_DIST = *.t diff --git a/doc/filesystem/filesystem.texi b/doc/filesystem/filesystem.texi index eabde38005..738b8a6247 100644 --- a/doc/filesystem/filesystem.texi +++ b/doc/filesystem/filesystem.texi @@ -19,27 +19,20 @@ @c Master file for the Filesystem Design Guide @c +@include version.texi @include ../common/setup.texi -@ignore -@ifinfo -@format -START-INFO-DIR-ENTRY -* RTEMS Filesystem Design Guide: -END-INFO-DIR-ENTRY -@end format -@end ifinfo -@end ignore +@ifset use-ascii +@dircategory RTEMS On-Line Manual +@direntry +* RTEMS Filesystem Design Guide: (filesystem). +@end direntry +@end ifset @c @c Title Page Stuff @c -@set edition @value{RTEMS-EDITION} -@set version @value{RTEMS-VERSION} -@set update-date @value{RTEMS-UPDATE-DATE} -@set update-month @value{RTEMS-UPDATE-MONTH} - @c @c I don't really like having a short title page. --joel @c @@ -51,9 +44,9 @@ END-INFO-DIR-ENTRY @finalout @title RTEMS Filesystem Design Guide -@subtitle Edition @value{edition}, for RTEMS @value{version} +@subtitle Edition @value{EDITION}, for RTEMS @value{VERSION} @sp 1 -@subtitle @value{update-month} +@subtitle @value{UPDATED} @author On-Line Applications Research Corporation @page @include ../common/cpright.texi diff --git a/doc/filesystem/stamp-vti b/doc/filesystem/stamp-vti new file mode 100644 index 0000000000..27e5ccd0cb --- /dev/null +++ b/doc/filesystem/stamp-vti @@ -0,0 +1,3 @@ +@set UPDATED 1 June 2000 +@set EDITION 1 +@set VERSION 4.5.0-beta3 diff --git a/doc/filesystem/version.texi b/doc/filesystem/version.texi new file mode 100644 index 0000000000..27e5ccd0cb --- /dev/null +++ b/doc/filesystem/version.texi @@ -0,0 +1,3 @@ +@set UPDATED 1 June 2000 +@set EDITION 1 +@set VERSION 4.5.0-beta3 -- cgit v1.2.3