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/new_chapters/.cvsignore | 1 + doc/new_chapters/Makefile.am | 73 +++++++++++++++++++------------------- doc/new_chapters/new_chapters.texi | 25 +++++-------- doc/new_chapters/stamp-vti | 3 ++ doc/new_chapters/version.texi | 3 ++ 5 files changed, 52 insertions(+), 53 deletions(-) create mode 100644 doc/new_chapters/stamp-vti create mode 100644 doc/new_chapters/version.texi (limited to 'doc/new_chapters') diff --git a/doc/new_chapters/.cvsignore b/doc/new_chapters/.cvsignore index 363e0155f3..3f92db3986 100644 --- a/doc/new_chapters/.cvsignore +++ b/doc/new_chapters/.cvsignore @@ -7,6 +7,7 @@ dumpcontrol.texi error.texi eventlog.texi index.html +mdate-sh monitor.texi new_chapters new_chapters*.html diff --git a/doc/new_chapters/Makefile.am b/doc/new_chapters/Makefile.am index faeb5e5a21..cf71a0a68e 100644 --- a/doc/new_chapters/Makefile.am +++ b/doc/new_chapters/Makefile.am @@ -6,70 +6,69 @@ # $Id$ # -AUTOMAKE_OPTIONS = foreign +AUTOMAKE_OPTIONS = foreign 1.4 -PROJECT=new_chapters +PROJECT = new_chapters +EDITION = 1 include $(top_srcdir)/project.am -COMMON_FILES=$(top_srcdir)/common/cpright.texi +GENERATED_FILES = adminiface.texi confspace.texi dumpcontrol.texi \ + eventlog.texi stackchk.texi rtmonuse.texi cpuuse.texi error.texi \ + monitor.texi -GENERATED_FILES= \ - adminiface.texi confspace.texi \ - dumpcontrol.texi eventlog.texi \ - stackchk.texi rtmonuse.texi cpuuse.texi error.texi monitor.texi +COMMON_FILES = $(top_srcdir)/common/setup.texi $(top_srcdir)/common/cpright.texi -FILES= +FILES = info_TEXINFOS = new_chapters.texi -new_chapters_TEXINFOS = $(FILES) $(COMMON_FILES) $(GENERATED_FILES) +new_chapters_TEXINFOS = $(FILES) $(COMMON_FILES) $(GENERATED_FILES) -eventlog.texi: eventlog.t - $(BMENU) -p "" \ +$(srcdir)/eventlog.texi: eventlog.t + $(BMENU2) -p "" \ -u "Top" \ - -n "" $< + -n "" < $< > $@ -dumpcontrol.texi: dumpcontrol.t - $(BMENU) -p "" \ +$(srcdir)/dumpcontrol.texi: dumpcontrol.t + $(BMENU2) -p "" \ -u "Top" \ - -n "" $< + -n "" < $< > $@ -confspace.texi: confspace.t - $(BMENU) -p "" \ +$(srcdir)/confspace.texi: confspace.t + $(BMENU2) -p "" \ -u "Top" \ - -n "" $< + -n "" < $< > $@ -adminiface.texi: adminiface.t - $(BMENU) -p "" \ +$(srcdir)/adminiface.texi: adminiface.t + $(BMENU2) -p "" \ -u "Top" \ - -n "" $< + -n "" < $< > $@ -stackchk.texi: stackchk.t - $(BMENU) -p "" \ +$(srcdir)/stackchk.texi: stackchk.t + $(BMENU2) -p "" \ -u "Top" \ - -n "" $< + -n "" < $< > $@ -rtmonuse.texi: rtmonuse.t - $(BMENU) -p "" \ +$(srcdir)/rtmonuse.texi: rtmonuse.t + $(BMENU2) -p "" \ -u "Top" \ - -n "" $< + -n "" < $< > $@ -cpuuse.texi: cpuuse.t - $(BMENU) -p "" \ +$(srcdir)/cpuuse.texi: cpuuse.t + $(BMENU2) -p "" \ -u "Top" \ - -n "" $< + -n "" < $< > $@ -error.texi: error.t - $(BMENU) -p "" \ +$(srcdir)/error.texi: error.t + $(BMENU2) -p "" \ -u "Top" \ - -n "" $< + -n "" < $< > $@ -monitor.texi: monitor.t - $(BMENU) -p "" \ +$(srcdir)/monitor.texi: monitor.t + $(BMENU2) -p "" \ -u "Top" \ - -n "" $< + -n "" < $< > $@ noinst_SCRIPTS = gen_section EXTRA_DIST = *.t STATUS TODO $(noinst_SCRIPTS) - \ No newline at end of file diff --git a/doc/new_chapters/new_chapters.texi b/doc/new_chapters/new_chapters.texi index 16e93425a2..7da7159333 100644 --- a/doc/new_chapters/new_chapters.texi +++ b/doc/new_chapters/new_chapters.texi @@ -25,17 +25,15 @@ @c 2. Why does paragraphindent show up in HTML? @c +@include version.texi @include ../common/setup.texi -@ignore -@ifinfo -@format -START-INFO-DIR-ENTRY -* New Chapters: (new_chapters). Miscellaneous New Chapters -END-INFO-DIR-ENTRY -@end format -@end ifinfo -@end ignore +@ifset use-ascii +@dircategory RTEMS On-Line Manual +@direntry +* RTEMS New Chapters: (new_chapters). Miscellaneous New Chapters +@end direntry +@end ifset @c variable substitution info: @c @@ -57,11 +55,6 @@ END-INFO-DIR-ENTRY @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 @@ -73,9 +66,9 @@ END-INFO-DIR-ENTRY @finalout @title New Chapters -@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/new_chapters/stamp-vti b/doc/new_chapters/stamp-vti new file mode 100644 index 0000000000..27e5ccd0cb --- /dev/null +++ b/doc/new_chapters/stamp-vti @@ -0,0 +1,3 @@ +@set UPDATED 1 June 2000 +@set EDITION 1 +@set VERSION 4.5.0-beta3 diff --git a/doc/new_chapters/version.texi b/doc/new_chapters/version.texi new file mode 100644 index 0000000000..27e5ccd0cb --- /dev/null +++ b/doc/new_chapters/version.texi @@ -0,0 +1,3 @@ +@set UPDATED 1 June 2000 +@set EDITION 1 +@set VERSION 4.5.0-beta3 -- cgit v1.2.3