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/started_ada/.cvsignore | 1 + doc/started_ada/Makefile.am | 53 +++++++++++++++++++--------------------- doc/started_ada/stamp-vti | 3 +++ doc/started_ada/started_ada.texi | 25 +++++++------------ doc/started_ada/version.texi | 3 +++ 5 files changed, 41 insertions(+), 44 deletions(-) create mode 100644 doc/started_ada/stamp-vti create mode 100644 doc/started_ada/version.texi (limited to 'doc/started_ada') diff --git a/doc/started_ada/.cvsignore b/doc/started_ada/.cvsignore index c2b1e4e025..2fa8408ff6 100644 --- a/doc/started_ada/.cvsignore +++ b/doc/started_ada/.cvsignore @@ -5,6 +5,7 @@ buildrt.texi gdb.texi index.html intro.texi +mdate-sh require.texi sample.texi started_ada diff --git a/doc/started_ada/Makefile.am b/doc/started_ada/Makefile.am index 6aed6bdb55..63742d37d4 100644 --- a/doc/started_ada/Makefile.am +++ b/doc/started_ada/Makefile.am @@ -6,54 +6,51 @@ # $Id$ # -AUTOMAKE_OPTIONS = foreign +AUTOMAKE_OPTIONS = foreign 1.4 -PROJECT=started_ada +PROJECT = started_ada +EDITION = 1 include $(top_srcdir)/project.am -COMMON_FILES=$(top_srcdir)/common/cpright.texi $(top_builddir)/common/setup.texi - -GENERATED_FILES= buildada.texi buildrt.texi gdb.texi intro.texi \ +GENERATED_FILES = buildada.texi buildrt.texi gdb.texi intro.texi \ require.texi sample.texi -FILES= tversions.texi +COMMON_FILES = $(top_srcdir)/common/setup.texi $(top_srcdir)/common/cpright.texi + +FILES = tversions.texi info_TEXINFOS = started_ada.texi started_ada_TEXINFOS = $(FILES) $(COMMON_FILES) $(GENERATED_FILES) -buildrt.t: $(top_srcdir)/started/buildrt.t - $(LN_S) $< - -intro.texi: intro.t tversions.texi - $(BMENU) -c -p "Top" \ +$(srcdir)/intro.texi: intro.t tversions.texi + $(BMENU2) -c -p "Top" \ -u "Top" \ - -n "Requirements" $< + -n "Requirements" < $< > $@ -require.texi: require.t tversions.texi - $(BMENU) -c -p "GNAT Chat Mailing List" \ +$(srcdir)/require.texi: require.t tversions.texi + $(BMENU2) -c -p "GNAT Chat Mailing List" \ -u "Top" \ - -n "Building the GNAT Cross Compiler Toolset" $< + -n "Building the GNAT Cross Compiler Toolset" < $< > $@ -buildada.texi: buildada.t tversions.texi - $(BMENU) -c -p "Insure GCC and GNAT Environment Variables Are Not Set" \ +$(srcdir)/buildada.texi: buildada.t tversions.texi + $(BMENU2) -c -p "Insure GCC and GNAT Environment Variables Are Not Set" \ -u "Top" \ - -n "Building RTEMS" $< + -n "Building RTEMS" < $< > $@ -buildrt.texi: buildrt.t tversions.texi - $(BMENU) -c -p "Running the bit_ada Script" \ +$(srcdir)/buildrt.texi: ../started/buildrt.t tversions.texi + $(BMENU2) -c -p "Running the bit_ada Script" \ -u "Top" \ - -n "Building the Sample Application" $< + -n "Building the Sample Application" < $< > $@ -sample.texi: sample.t tversions.texi - $(BMENU) -c -p "Using the RTEMS configure Script Directly" \ +$(srcdir)/sample.texi: sample.t tversions.texi + $(BMENU2) -c -p "Using the RTEMS configure Script Directly" \ -u "Top" \ - -n "Building the GNU Debugger" $< + -n "Building the GNU Debugger" < $< > $@ -gdb.texi: gdb.t tversions.texi - $(BMENU) -c -p "Application Executable" \ +$(srcdir)/gdb.texi: gdb.t tversions.texi + $(BMENU2) -c -p "Application Executable" \ -u "Top" \ - -n "" $< + -n "" < $< > $@ EXTRA_DIST = *.t -CLEANFILES += buildrt.t diff --git a/doc/started_ada/stamp-vti b/doc/started_ada/stamp-vti new file mode 100644 index 0000000000..27e5ccd0cb --- /dev/null +++ b/doc/started_ada/stamp-vti @@ -0,0 +1,3 @@ +@set UPDATED 1 June 2000 +@set EDITION 1 +@set VERSION 4.5.0-beta3 diff --git a/doc/started_ada/started_ada.texi b/doc/started_ada/started_ada.texi index 2036d45ffb..375fab6212 100644 --- a/doc/started_ada/started_ada.texi +++ b/doc/started_ada/started_ada.texi @@ -19,6 +19,7 @@ @c Master file for the Getting Started (C) Guide @c +@include version.texi @include ../common/setup.texi @c @@ -26,25 +27,17 @@ @c @include tversions.texi -@ignore -@ifinfo -@format -START-INFO-DIR-ENTRY -* Getting Started with GNAT/RTEMS (started_ada): -END-INFO-DIR-ENTRY -@end format -@end ifinfo -@end ignore +@ifset use-ascii +@dircategory RTEMS On-Line Manual +@direntry +* Getting Started with GNAT/RTEMS: (started_ada) +@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 @@ -56,9 +49,9 @@ END-INFO-DIR-ENTRY @finalout @title Getting Started with GNAT/RTEMS -@subtitle Edition @value{edition}, for @value{version} +@subtitle Edition @value{EDITION}, for @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/started_ada/version.texi b/doc/started_ada/version.texi new file mode 100644 index 0000000000..27e5ccd0cb --- /dev/null +++ b/doc/started_ada/version.texi @@ -0,0 +1,3 @@ +@set UPDATED 1 June 2000 +@set EDITION 1 +@set VERSION 4.5.0-beta3 -- cgit v1.2.3