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/ada_user/.cvsignore | 1 + doc/ada_user/Makefile.am | 37 ++++++++++++++++++++----------------- doc/ada_user/ada_user.texi | 26 ++++++++++---------------- doc/ada_user/stamp-vti | 3 +++ doc/ada_user/version.texi | 3 +++ 5 files changed, 37 insertions(+), 33 deletions(-) create mode 100644 doc/ada_user/stamp-vti create mode 100644 doc/ada_user/version.texi (limited to 'doc/ada_user') diff --git a/doc/ada_user/.cvsignore b/doc/ada_user/.cvsignore index 2ad221aaad..786d251596 100644 --- a/doc/ada_user/.cvsignore +++ b/doc/ada_user/.cvsignore @@ -19,5 +19,6 @@ ada_user.toc ada_user.tp ada_user.vr index.html +mdate-sh rtemspie.pdf states.pdf diff --git a/doc/ada_user/Makefile.am b/doc/ada_user/Makefile.am index a1d23e721e..1249c3af26 100644 --- a/doc/ada_user/Makefile.am +++ b/doc/ada_user/Makefile.am @@ -6,25 +6,29 @@ # $Id$ # -AUTOMAKE_OPTIONS = foreign +AUTOMAKE_OPTIONS = foreign 1.4 -PROJECT=ada_user +PROJECT = ada_user +EDITION = 1 include $(top_srcdir)/project.am -COMMON_FILES= $(top_srcdir)/common/cpright.texi \ - $(top_srcdir)/user/bsp.texi $(top_srcdir)/user/clock.texi \ - $(top_srcdir)/user/concepts.texi $(top_srcdir)/user/datatypes.texi \ - $(top_srcdir)/user/conf.texi $(top_srcdir)/user/dirstat.texi \ - $(top_srcdir)/user/dpmem.texi $(top_srcdir)/user/event.texi \ - $(top_srcdir)/user/fatal.texi $(top_srcdir)/user/glossary.texi $(top_srcdir)/user/init.texi \ - $(top_srcdir)/user/intr.texi $(top_srcdir)/user/io.texi $(top_srcdir)/user/mp.texi $(top_srcdir)/user/msg.texi \ - $(top_srcdir)/user/overview.texi $(top_srcdir)/user/part.texi $(top_srcdir)/user/preface.texi \ - $(top_srcdir)/user/region.texi $(top_srcdir)/user/rtmon.texi $(top_srcdir)/user/schedule.texi \ - $(top_srcdir)/user/sem.texi $(top_srcdir)/user/signal.texi $(top_srcdir)/user/task.texi \ - $(top_srcdir)/user/timer.texi $(top_srcdir)/user/userext.texi - -FILES= example.texi +COMMON_FILES = $(top_srcdir)/user/bsp.texi $(top_srcdir)/user/clock.texi \ + $(top_srcdir)/user/concepts.texi $(top_srcdir)/user/datatypes.texi \ + $(top_srcdir)/user/conf.texi $(top_srcdir)/user/dirstat.texi \ + $(top_srcdir)/user/dpmem.texi $(top_srcdir)/user/event.texi \ + $(top_srcdir)/user/fatal.texi $(top_srcdir)/user/glossary.texi \ + $(top_srcdir)/user/init.texi $(top_srcdir)/user/intr.texi \ + $(top_srcdir)/user/io.texi $(top_srcdir)/user/mp.texi \ + $(top_srcdir)/user/msg.texi $(top_srcdir)/user/overview.texi \ + $(top_srcdir)/user/part.texi $(top_srcdir)/user/preface.texi \ + $(top_srcdir)/user/region.texi $(top_srcdir)/user/rtmon.texi \ + $(top_srcdir)/user/schedule.texi $(top_srcdir)/user/sem.texi \ + $(top_srcdir)/user/signal.texi $(top_srcdir)/user/task.texi \ + $(top_srcdir)/user/timer.texi $(top_srcdir)/user/userext.texi \ + $(top_srcdir)/common/setup.texi $(top_srcdir)/common/cpright.texi + +FILES = example.texi rtemspie.eps: $(top_srcdir)/user/rtemspie.eps $(LN_S) $< @@ -41,7 +45,7 @@ states.png: $(top_srcdir)/user/states.png CLEANFILES += rtemsarc.png rtemspie.png states.png info_TEXINFOS = ada_user.texi -ada_user_TEXINFOS = $(FILES) $(COMMON_FILES) $(GENERATED_FILES) +ada_user_TEXINFOS = $(FILES) $(COMMON_FILES) $(GENERATED_FILES) if USE_HTML html_project_DATA += rtemsarc.png rtemspie.png states.png @@ -49,4 +53,3 @@ endif $(PROJECT).dvi: rtemspie.eps states.eps PDF_IMAGES = rtemspie.pdf states.pdf - diff --git a/doc/ada_user/ada_user.texi b/doc/ada_user/ada_user.texi index eeeaa067ad..e9c401a5f2 100644 --- a/doc/ada_user/ada_user.texi +++ b/doc/ada_user/ada_user.texi @@ -25,17 +25,16 @@ @c 2. Why does paragraphindent show up in HTML? @c +@include version.texi @include ../common/setup.texi -@ignore -@ifinfo -@format -START-INFO-DIR-ENTRY -* RTEMS Ada User: (ada_user). The Ada User's Guide -END-INFO-DIR-ENTRY -@end format -@end ifinfo -@end ignore +@ifset use-ascii +@dircategory RTEMS On-Line Manual +@direntry +* RTEMS Ada User: (ada_user). The Ada User's Guide +@end direntry +@end ifset + @c variable substitution info: @c @@ -55,11 +54,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 @@ -71,9 +65,9 @@ END-INFO-DIR-ENTRY @finalout @title RTEMS Applications Ada User's 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/ada_user/stamp-vti b/doc/ada_user/stamp-vti new file mode 100644 index 0000000000..27e5ccd0cb --- /dev/null +++ b/doc/ada_user/stamp-vti @@ -0,0 +1,3 @@ +@set UPDATED 1 June 2000 +@set EDITION 1 +@set VERSION 4.5.0-beta3 diff --git a/doc/ada_user/version.texi b/doc/ada_user/version.texi new file mode 100644 index 0000000000..27e5ccd0cb --- /dev/null +++ b/doc/ada_user/version.texi @@ -0,0 +1,3 @@ +@set UPDATED 1 June 2000 +@set EDITION 1 +@set VERSION 4.5.0-beta3 -- cgit v1.2.3