diff options
| -rw-r--r-- | ChangeLog-97b | 6 | ||||
| -rw-r--r-- | ace/Object_Manager.h | 23 | ||||
| -rw-r--r-- | bin/README.html | 2 | ||||
| -rwxr-xr-x | bin/class2info | 4 | ||||
| -rw-r--r-- | bin/class2info.awk | 2 | ||||
| -rwxr-xr-x | bin/info2doc.awk | 1 | ||||
| -rwxr-xr-x | bin/info2head | 4 | ||||
| -rwxr-xr-x | bin/info2headsrc | 4 | ||||
| -rwxr-xr-x | bin/info2man | 4 | ||||
| -rwxr-xr-x | bin/info2mml | 4 | ||||
| -rwxr-xr-x | bin/info2src | 2 | ||||
| -rwxr-xr-x | bin/man2html | 5 | ||||
| -rw-r--r-- | bin/man2html1.awk | 2 | ||||
| -rw-r--r-- | bin/man2html2.awk | 2 |
14 files changed, 36 insertions, 29 deletions
diff --git a/ChangeLog-97b b/ChangeLog-97b index 565f0157c12..69cd28e943c 100644 --- a/ChangeLog-97b +++ b/ChangeLog-97b @@ -1,3 +1,9 @@ +Fri Oct 10 14:49:40 1997 Douglas C. Schmidt <schmidt@flamenco.cs.wustl.edu> + + * bin/man2html: Added a new set rul -e 's/^$/<P>/g', which + correctly preserves paragraph boundaries. Regenerated all of + the ACE html documentation so that it is much better formatted. + Fri Oct 10 11:08:02 1997 Carlos O'Ryan <coryan@macarena.cs.wustl.edu> * tests/run_tests.sh: diff --git a/ace/Object_Manager.h b/ace/Object_Manager.h index b32fa4ff1af..3fc63e46d1d 100644 --- a/ace/Object_Manager.h +++ b/ace/Object_Manager.h @@ -43,7 +43,7 @@ class ACE_Export ACE_Object_Manager // Manager for ACE library services and singleton cleanup. // // = DESCRIPTION - // The ACE_Object_Manager manages cleanup of objects, typically + // The <ACE_Object_Manager> manages cleanup of objects, typically // singletons, at program termination. In addition to managing // the cleanup of the ACE library, it provides an interface for // application to register objects to be cleaned up. @@ -57,24 +57,24 @@ class ACE_Export ACE_Object_Manager // calls is in the reverse order of registration, i.e., that // last object/array to register gets cleaned up first. // - // The ACE_Object_Manager API includes ACE_Managed_Object. That + // The <ACE_Object_Manager> API includes <ACE_Managed_Object>. That // class is contained in a separate file because it is a // template class, and some compilers require that template and // non-template class definitions appear in separate files. // Please see ace/Managed_Object.h for a description of that - // part of the API. In summary, Managed_Object provides two - // adapters, the ACE_Cleanup_Adapter and ACE_Managed_Object + // part of the API. In summary, <ACE_Managed_Object> provides two + // adapters, the <ACE_Cleanup_Adapter> and <ACE_Managed_Object> // template classes for adapting objects of any type to be - // easily managed by the ACE_Object_Manager. There are several + // easily managed by the <ACE_Object_Manager>. There are several // mechanisms for adapting objects and arrays for cleanup at // program termination, in roughly increasing order of ease-of-use: // - // 1) Derive the object's class from ACE_Cleanup. - // 2) Allow the ACE_Object_Manager to both dynamically allocate + // 1) Derive the object's class from <ACE_Cleanup>. + // 2) Allow the <ACE_Object_Manager> to both dynamically allocate // and deallocate the object. - // 3) Provide an ACE_CLEANUP_FUNC cleanup hook for the object or + // 3) Provide an <ACE_CLEANUP_FUNC> cleanup hook for the object or // array. - // 4) Allow the ACE_Object_Manager to both preallocate the object + // 4) Allow the <ACE_Object_Manager> to both preallocate the object // or array, either statically in global data or dynamically on // the heap, when its singleton instance is construction. // @@ -90,7 +90,7 @@ class ACE_Export ACE_Object_Manager // // 2) ACE_Object_Manager::at_exit (ACE_Cleanup *object, // void *param = 0); - // can be used to register an ACE_Cleanup object + // can be used to register an <ACE_Cleanup> object // for any cleanup activity at program termination. // // The final mechanism is not general purpose, but can only @@ -105,7 +105,7 @@ class ACE_Export ACE_Object_Manager // either in global data or on the heap (selected at compile // time). These are intended to replace static locks, etc. // - // Instead of creating a static ACE_Object_Manager instance, one + // Instead of creating a static <ACE_Object_Manager> instance, one // can alternatively be created on the stack of the main program // thread. It is created just after entry to ::main (int, char // *[]), and before any existing code in that function is @@ -114,7 +114,6 @@ class ACE_Export ACE_Object_Manager // building the ACE library and your applications. This #define // is enabled in the VxWorks config files that are supplied with // ACE. - // { public: static int at_exit (ACE_Cleanup *object, void *param = 0); diff --git a/bin/README.html b/bin/README.html index 303b51be5f3..b281fbc680e 100644 --- a/bin/README.html +++ b/bin/README.html @@ -77,7 +77,7 @@ identifying line. <P> <LI> added the ability for handling template functions properly (info2src). <P> <LI> added the ability for handling nested classes, structs, unions properly - by introducing nawk-function recursion within info2doc (class2info, + by introducing gawk-function recursion within info2doc (class2info, info2doc, info2src). <P> <LI> added the ability for handling default values properly (info2src). <P> diff --git a/bin/class2info b/bin/class2info index 9498d8ab39e..6a3300fbb7e 100755 --- a/bin/class2info +++ b/bin/class2info @@ -29,9 +29,9 @@ LIBDIR=${CLASSINFOLIBDIR-"$OSE_VERSION_ROOT/bin"} INFO2INFO="$BINDIR/info2info" -AWK="nawk" +AWK="gawk" -if test "$AWK" = "nawk" +if test "$AWK" = "gawk" then VARG="-v" fi diff --git a/bin/class2info.awk b/bin/class2info.awk index 1810a8f3e0c..b2f58ce736d 100644 --- a/bin/class2info.awk +++ b/bin/class2info.awk @@ -2,7 +2,7 @@ # # = DESCRIPTION # Awk script for converting C++ class header file to classinfo file. -# Requires nawk or gawk. +# Requires gawk or gawk. # comments like /* ... */ with ... goes over multiple lines are not ok # and will be not printed as comments! # class xxx diff --git a/bin/info2doc.awk b/bin/info2doc.awk index de2016e83fb..6e0451fef3f 100755 --- a/bin/info2doc.awk +++ b/bin/info2doc.awk @@ -325,6 +325,7 @@ function csa_get_filedate_and_name() # function csa_get_() { + ; } # diff --git a/bin/info2head b/bin/info2head index 7a5510efacf..15ee9ae0f1e 100755 --- a/bin/info2head +++ b/bin/info2head @@ -29,10 +29,10 @@ export OSE_VERSION_ROOT BINDIR="$OSE_VERSION_ROOT/$OSE_HOST/bin" LIBDIR=${CLASSINFOLIBDIR-"$OSE_VERSION_ROOT/bin"} -AWK="${AWK-nawk}" +AWK="${AWK-gawk}" -if test "$AWK" = "nawk" +if test "$AWK" = "gawk" then VARG="-v" fi diff --git a/bin/info2headsrc b/bin/info2headsrc index 00fbf23465d..9b6bfcfcf77 100755 --- a/bin/info2headsrc +++ b/bin/info2headsrc @@ -25,10 +25,10 @@ export OSE_VERSION_ROOT BINDIR="$OSE_VERSION_ROOT/$OSE_HOST/bin" LIBDIR=${CLASSINFOLIBDIR-"$OSE_VERSION_ROOT/bin"} -AWK="${AWK-nawk}" +AWK="${AWK-gawk}" -if test "$AWK" = "nawk" +if test "$AWK" = "gawk" then VARG="-v" fi diff --git a/bin/info2man b/bin/info2man index 437865759bc..e38551c68ff 100755 --- a/bin/info2man +++ b/bin/info2man @@ -29,9 +29,9 @@ export OSE_VERSION_ROOT BINDIR="$OSE_VERSION_ROOT/$OSE_HOST/bin" LIBDIR=${CLASSINFOLIBDIR-"$OSE_VERSION_ROOT/bin"} -AWK="${AWK-nawk}" +AWK="${AWK-gawk}" -if test "$AWK" = "nawk" +if test "$AWK" = "gawk" then VARG="-v" fi diff --git a/bin/info2mml b/bin/info2mml index 83654da9649..d38ac0f814a 100755 --- a/bin/info2mml +++ b/bin/info2mml @@ -29,9 +29,9 @@ export OSE_VERSION_ROOT BINDIR="$OSE_VERSION_ROOT/$OSE_HOST/bin" LIBDIR=${CLASSINFOLIBDIR-"$OSE_VERSION_ROOT/bin"} -AWK="${AWK-nawk}" +AWK="${AWK-gawk}" -if test "$AWK" = "nawk" +if test "$AWK" = "gawk" then VARG="-v" fi diff --git a/bin/info2src b/bin/info2src index 32853990b52..c165b336341 100755 --- a/bin/info2src +++ b/bin/info2src @@ -27,7 +27,7 @@ export OSE_VERSION_ROOT BINDIR="$OSE_VERSION_ROOT/$OSE_HOST/bin" LIBDIR=${CLASSINFOLIBDIR-"$OSE_VERSION_ROOT/bin"} -AWK="nawk" +AWK="gawk" # # Error. diff --git a/bin/man2html b/bin/man2html index b784b44501e..e2b51561270 100755 --- a/bin/man2html +++ b/bin/man2html @@ -63,7 +63,7 @@ do -e 's/>/\>/g' \ -e 's/\\|//g' \ -e 's/\\e/\\/g' | - /bin/nawk -f ${LIBDIR}/man2html1.awk | + gawk -f ${LIBDIR}/man2html1.awk | sed -e 's^\\fB\([^\\]*\)\\fR^<B>\1</B></I>^g' \ -e 's^\\f(CO\(.[^\\]*\)\\fR^<CODE>\1</CODE>^g' \ -e 's^\\fI\(.[^\\]*\)\\fR^<I>\1</I></B>^g' \ @@ -80,9 +80,10 @@ do -e 's$^\.BE *$</pre><HR>$' \ -e 's/^\.RS.*/<UL>/' \ -e 's$^\.RE.*$</UL>$' \ + -e 's/^$/<P>/g' \ -e 's^\.SH *"*\([^"]*\)"*^</pre><H2>\1</H2>^' \ -e '/^\.[a-zA-Z]*.*/d' | - /bin/nawk -f ${LIBDIR}/man2html2.awk > ${OUTPUT} + gawk -f ${LIBDIR}/man2html2.awk > ${OUTPUT} fi shift done diff --git a/bin/man2html1.awk b/bin/man2html1.awk index a780ab70c9f..a3546ee1378 100644 --- a/bin/man2html1.awk +++ b/bin/man2html1.awk @@ -1,4 +1,4 @@ -#!/bin/nawk +#!/usr/bin/gawk # defining macros - eat them diff --git a/bin/man2html2.awk b/bin/man2html2.awk index 31c4cece3b9..149c939ce18 100644 --- a/bin/man2html2.awk +++ b/bin/man2html2.awk @@ -1,4 +1,4 @@ -#!/bin/nawk +#!/usr/bin/gawk $0 ~ "</pre><H2>SEE ALSO</H2>" { print $0 |