summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog25
-rw-r--r--ChangeLogs/ChangeLog-02a25
-rw-r--r--ChangeLogs/ChangeLog-03a25
-rw-r--r--ace/config-doxygen.h76
-rwxr-xr-xbin/generate_doxygen.pl155
-rw-r--r--etc/ace.doxygen7
-rw-r--r--etc/ace_rmcast.doxygen9
-rw-r--r--etc/ace_ssl.doxygen9
-rw-r--r--etc/tao.doxygen11
-rw-r--r--etc/tao_dynamicany.doxygen11
-rw-r--r--etc/tao_dynamicinterface.doxygen11
-rw-r--r--etc/tao_esf.doxygen13
-rw-r--r--etc/tao_iormanip.doxygen12
-rw-r--r--etc/tao_iortable.doxygen12
-rw-r--r--etc/tao_portableserver.doxygen12
-rw-r--r--etc/tao_rtevent.doxygen14
16 files changed, 387 insertions, 40 deletions
diff --git a/ChangeLog b/ChangeLog
index 3063710f213..fcc9f0e2189 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,28 @@
+Wed Nov 8 10:27:00 2000 Carlos O'Ryan <coryan@uci.edu>
+
+ * bin/generate_doxygen.pl:
+ Automates the invocation of doxygen. It modifies the doxygen
+ templates in $ACE_ROOT/etc and creates the right directory
+ hierarchy to receive the files.
+
+ * ace/config-doxygen.h:
+ Configuration file used to generate the doxygen files.
+ Notice that this is not a valid configuration for any platform,
+ for example, it enables both the Win32 and the POSIX AIO calls.
+
+ * etc/ace.doxygen:
+ * etc/ace_rmcast.doxygen:
+ * etc/ace_ssl.doxygen:
+ * etc/tao.doxygen:
+ * etc/tao_dynamicany.doxygen:
+ * etc/tao_dynamicinterface.doxygen:
+ * etc/tao_esf.doxygen:
+ * etc/tao_iormanip.doxygen:
+ * etc/tao_iortable.doxygen:
+ * etc/tao_portableserver.doxygen:
+ * etc/tao_rtevent.doxygen:
+ Minor mods to make the generate_doxygen.pl job easier.
+
Wed Nov 8 09:02:10 2000 Carlos O'Ryan <coryan@uci.edu>
* apps/Gateway/Gateway/Makefile:
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 3063710f213..fcc9f0e2189 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,28 @@
+Wed Nov 8 10:27:00 2000 Carlos O'Ryan <coryan@uci.edu>
+
+ * bin/generate_doxygen.pl:
+ Automates the invocation of doxygen. It modifies the doxygen
+ templates in $ACE_ROOT/etc and creates the right directory
+ hierarchy to receive the files.
+
+ * ace/config-doxygen.h:
+ Configuration file used to generate the doxygen files.
+ Notice that this is not a valid configuration for any platform,
+ for example, it enables both the Win32 and the POSIX AIO calls.
+
+ * etc/ace.doxygen:
+ * etc/ace_rmcast.doxygen:
+ * etc/ace_ssl.doxygen:
+ * etc/tao.doxygen:
+ * etc/tao_dynamicany.doxygen:
+ * etc/tao_dynamicinterface.doxygen:
+ * etc/tao_esf.doxygen:
+ * etc/tao_iormanip.doxygen:
+ * etc/tao_iortable.doxygen:
+ * etc/tao_portableserver.doxygen:
+ * etc/tao_rtevent.doxygen:
+ Minor mods to make the generate_doxygen.pl job easier.
+
Wed Nov 8 09:02:10 2000 Carlos O'Ryan <coryan@uci.edu>
* apps/Gateway/Gateway/Makefile:
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 3063710f213..fcc9f0e2189 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,28 @@
+Wed Nov 8 10:27:00 2000 Carlos O'Ryan <coryan@uci.edu>
+
+ * bin/generate_doxygen.pl:
+ Automates the invocation of doxygen. It modifies the doxygen
+ templates in $ACE_ROOT/etc and creates the right directory
+ hierarchy to receive the files.
+
+ * ace/config-doxygen.h:
+ Configuration file used to generate the doxygen files.
+ Notice that this is not a valid configuration for any platform,
+ for example, it enables both the Win32 and the POSIX AIO calls.
+
+ * etc/ace.doxygen:
+ * etc/ace_rmcast.doxygen:
+ * etc/ace_ssl.doxygen:
+ * etc/tao.doxygen:
+ * etc/tao_dynamicany.doxygen:
+ * etc/tao_dynamicinterface.doxygen:
+ * etc/tao_esf.doxygen:
+ * etc/tao_iormanip.doxygen:
+ * etc/tao_iortable.doxygen:
+ * etc/tao_portableserver.doxygen:
+ * etc/tao_rtevent.doxygen:
+ Minor mods to make the generate_doxygen.pl job easier.
+
Wed Nov 8 09:02:10 2000 Carlos O'Ryan <coryan@uci.edu>
* apps/Gateway/Gateway/Makefile:
diff --git a/ace/config-doxygen.h b/ace/config-doxygen.h
new file mode 100644
index 00000000000..5755e551691
--- /dev/null
+++ b/ace/config-doxygen.h
@@ -0,0 +1,76 @@
+/**
+ * This is a configuration file to define all the macros that Doxygen
+ * needs
+ *
+ * @file config-doxygen.h
+ *
+ * $Id$
+ *
+ * @author Carlos O'Ryan <coryan@uci.edu>
+ * @author Darrell Brunsch <brunsch@uci.edu>
+ *
+ */
+#ifndef ACE_CONFIG_DOXYGEN_H
+#define ACE_CONFIG_DOXYGEN_H
+
+/// Make the wchar_t interfaces available.
+#define ACE_HAS_WCHAR
+
+/// Make all the emulation versions of string operations visible
+// #define ACE_LACKS_WCSTOK
+#define ACE_LACKS_ITOW
+#define ACE_LACKS_STRCASECMP
+#define ACE_LACKS_STRCSPN
+#define ACE_LACKS_STRCHR
+#define ACE_LACKS_STRRCHR
+#define ACE_LACKS_WCSCAT
+#define ACE_LACKS_WCSCHR
+#define ACE_LACKS_WCSCMP
+#define ACE_LACKS_WCSCPY
+#define ACE_LACKS_WCSICMP
+#define ACE_LACKS_WCSLEN
+#define ACE_LACKS_WCSNCAT
+#define ACE_LACKS_WCSNCMP
+#define ACE_LACKS_WCSNCPY
+#define ACE_LACKS_WCSNICMP
+#define ACE_LACKS_WCSPBRK
+#define ACE_LACKS_WCSRCHR
+#define ACE_LACKS_WCSCSPN
+#define ACE_LACKS_WCSSPN
+#define ACE_LACKS_WCSSTR
+
+/// Support for threads enables several important classes
+#define ACE_HAS_THREADS
+
+/// Support for Win32 enables the WFMO_Reactor and several Async I/O
+/// classes
+#define ACE_WIN32
+
+/// Enable support for POSIX Asynchronous I/O calls
+#define ACE_HAS_AIO_CALLS
+
+/// Enable support for TLI interfaces
+#define ACE_HAS_TLI
+
+/// Enable support for the SSL wrappers
+#define ACE_HAS_SSL 1
+
+/// Several GUI Reactors that are only enabled in some platforms.
+#define ACE_HAS_XT
+#define ACE_HAS_FL
+#define ACE_HAS_QT
+#define ACE_HAS_TK
+#define ACE_HAS_GTK
+
+/// Enable exceptions
+#define ACE_HAS_EXCEPTIONS
+
+/// TAO features that should be documented too
+#define TAO_HAS_RT_CORBA 1
+#define TAO_HAS_MINIMUM_CORBA 1
+#define TAO_HAS_AMI 1
+#define TAO_HAS_INTERFACE_REPOSITORY 1
+#define TAO_HAS_INTERCEPTORS 1
+#define TAO_HAS_SMART_PROXIES 1
+
+#endif /* ACE_CONFIG_DOXYGEN_H */
diff --git a/bin/generate_doxygen.pl b/bin/generate_doxygen.pl
new file mode 100755
index 00000000000..9e594209d93
--- /dev/null
+++ b/bin/generate_doxygen.pl
@@ -0,0 +1,155 @@
+eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
+ & eval 'exec perl -S $0 $argv:q'
+ if 0;
+
+# -*- perl -*-
+# $Id$
+#
+
+require POSIX;
+require File::Path;
+
+# Configuration and default values
+
+$is_release = 0;
+@ACE_DOCS = ('ace',
+ 'ace_rmcast',
+ 'ace_ssl');
+@TAO_DOCS = ('tao',
+ 'tao_portableserver',
+ 'tao_dynamicany',
+ 'tao_dynamicinterface',
+ 'tao_iormanip',
+ 'tao_iortable',
+ 'tao_esf',
+ 'tao_rtevent');
+
+# Modify defaults using the command line arguments
+&parse_args ();
+
+open(CONFIG_H, ">ace/config.h")
+ || die "Cannot create config file\n";
+print CONFIG_H "#include \"ace/config-doxygen.h\"\n";
+close (CONFIG_H);
+
+&generate_doxy_files ('ACE', 'VERSION', @ACE_DOCS);
+&generate_doxy_files ('TAO', 'TAO/VERSION', @TAO_DOCS);
+
+unlink "ace/config.h";
+
+exit 0;
+
+sub parse_args {
+ my @ARGS = ();
+ while ($#ARGV >= 0) {
+ if (!($ARGV[0] =~ m/^-/)) {
+ push @ARGS, $ARGV[0];
+ } elsif ($ARGV[0] eq "-is_release") {
+ $is_release = 1;
+ } else {
+ print "Ignoring option $ARGV[0]\n";
+ }
+ shift @ARGV;
+ }
+ @ARGV = @ARGS;
+}
+
+sub generate_doxy_files {
+
+ my $KIT = shift;
+ my $VERSION_FILE = shift;
+ my @DOCS = @_;
+
+ my $VERSION = 'Snapshot ('.
+ POSIX::strftime("%Y/%m/%d @ %H:%M", localtime)
+ .')';
+
+ foreach my $i (@DOCS) {
+ if ($is_release) {
+ my ($major, $minor, $beta) = &get_versions ($KIT, $VERSION_FILE);
+ $VERSION = $major.'.'.$minor.'.'.$beta;
+ }
+
+ my $input = "etc/".$i.".doxygen";
+ my $output = "/tmp/".$i.".".$$.".doxygen";
+
+ open(DOXYINPUT, $input)
+ || die "Cannot open doxygen input file $input\n";
+ open(DOXYOUTPUT, ">$output")
+ || die "Cannot open doxygen output file $output\n";
+
+ my $output_dir = 'html';
+ while (<DOXYINPUT>) {
+ chomp;
+ if (/^PROJECT_NUMBER/) {
+ print DOXYOUTPUT "PROJECT_NUMBER = ", $VERSION, "\n";
+ } elsif (/^HTML_OUTPUT/) {
+ my @field = split(' = ');
+ $output_dir = $field[1];
+ print DOXYOUTPUT $_, "\n";
+ } else {
+ print DOXYOUTPUT $_, "\n";
+ }
+ }
+ close (DOXYOUTPUT);
+ close (DOXYINPUT);
+
+ File::Path::mkpath($output_dir, 0, 0755);
+
+ &run_doxy ($output, $output_dir);
+
+ unlink $output;
+ }
+}
+
+sub run_doxy {
+ my $config = shift;
+ my $output = shift;
+ open(DOX,"doxygen $config 2>&1 |")
+ || die "cannot start ACE doxygen process\n";
+ while (<DOX>) {
+ print $_;
+ }
+ close (DOX)
+ || die "error while running doxygen on $config\n";
+
+ if (!-d $output) {
+ die "cannot find output directory <$output> \n";
+ }
+}
+
+########
+######## Retrieve version information from VERSION file(s).
+########
+sub get_versions () {
+ my $KIT = shift;
+ my $VERSION_FILE = shift;
+ my ($major_version, $minor_version, $beta_version);
+
+ open (VERSION, '<'.$VERSION_FILE) ||
+ die "$0: unable to open VERSION\n";
+ while (<VERSION>) {
+ chomp;
+ if (/$KIT version (\d+)\.(\d+)\.(\d+)/) {
+ $major_version = $1;
+ $minor_version = $2;
+ $beta_version = $3;
+ last;
+ } elsif (/$KIT version (\d+)\.(\d+)[^\.]/) {
+ #### Previous release was a minor.
+ $major_version = $1;
+ $minor_version = $2;
+ $beta_version = '0';
+ last;
+ } elsif (/$KIT version (\d+)[^\.]/) {
+ #### Previous release was a major.
+ $major_version = $1;
+ $minor_version = '0';
+ $beta_version = '0';
+ last;
+ }
+ }
+ close VERSION;
+
+ return ($major_version, $minor_version, $beta_version);
+}
diff --git a/etc/ace.doxygen b/etc/ace.doxygen
index fd7ed66ca3a..9ba86fbc402 100644
--- a/etc/ace.doxygen
+++ b/etc/ace.doxygen
@@ -1,4 +1,7 @@
# Doxyfile 1.1.5
+#
+# $Id$
+#
PROJECT_NAME = ACE
PROJECT_NUMBER = Snapshot
@@ -113,7 +116,7 @@ ENABLE_PREPROCESSING = YES
MACRO_EXPANSION = YES
EXPAND_ONLY_PREDEF = YES
SEARCH_INCLUDES = YES
-INCLUDE_PATH = ACE_wrappers
+INCLUDE_PATH = .
PREDEFINED =
EXPAND_AS_DEFINED = ACE_RCSID \
ACE_UNIMPLEMENTED_FUNC
@@ -123,7 +126,7 @@ EXPAND_AS_DEFINED = ACE_RCSID \
#---------------------------------------------------------------------------
TAGFILES =
-GENERATE_TAGFILE = ace_html/ACE.tag
+GENERATE_TAGFILE = html/ace/ACE.tag
ALLEXTERNALS = NO
PERL_PATH = /usr/bin/perl
diff --git a/etc/ace_rmcast.doxygen b/etc/ace_rmcast.doxygen
index b5dce36fa52..796ea23a0a4 100644
--- a/etc/ace_rmcast.doxygen
+++ b/etc/ace_rmcast.doxygen
@@ -1,4 +1,7 @@
# Doxyfile 1.1.5
+#
+# $Id$
+#
PROJECT_NAME = ACE_RMCast
PROJECT_NUMBER = Snapshot
@@ -113,7 +116,7 @@ ENABLE_PREPROCESSING = YES
MACRO_EXPANSION = YES
EXPAND_ONLY_PREDEF = YES
SEARCH_INCLUDES = YES
-INCLUDE_PATH = ACE_wrappers
+INCLUDE_PATH = .
PREDEFINED = ACE_HAS_WCHAR \
ACE_LACKS_STRCASECMP \
ACE_LACKS_STRCSPN \
@@ -127,8 +130,8 @@ EXPAND_AS_DEFINED = ACE_RCSID
# Configuration::addtions related to external references
#---------------------------------------------------------------------------
-TAGFILES = ace_html/ACE.tag=../ace_html
-GENERATE_TAGFILE = ace_rmcast_html/ACE_RMCast.tag
+TAGFILES = html/ace/ACE.tag=..
+GENERATE_TAGFILE = html/ace/rmcast/ACE_RMCast.tag
ALLEXTERNALS = NO
PERL_PATH = /usr/bin/perl
diff --git a/etc/ace_ssl.doxygen b/etc/ace_ssl.doxygen
index 69b779c1be0..4ddc03b57d4 100644
--- a/etc/ace_ssl.doxygen
+++ b/etc/ace_ssl.doxygen
@@ -1,4 +1,7 @@
# Doxyfile 1.1.5
+#
+# $Id$
+#
PROJECT_NAME = ACE_SSL
PROJECT_NUMBER = Snapshot
@@ -113,7 +116,7 @@ ENABLE_PREPROCESSING = YES
MACRO_EXPANSION = NO
EXPAND_ONLY_PREDEF = NO
SEARCH_INCLUDES = YES
-INCLUDE_PATH = ACE_wrappers
+INCLUDE_PATH = .
PREDEFINED =
EXPAND_AS_DEFINED =
@@ -121,8 +124,8 @@ EXPAND_AS_DEFINED =
# Configuration::addtions related to external references
#---------------------------------------------------------------------------
-TAGFILES = ace_html/ACE.tag=../ace_html
-GENERATE_TAGFILE = ace_ssl_html/ACE_SSL.tag
+TAGFILES = html/ace/ACE.tag=..
+GENERATE_TAGFILE = html/ace/ssl/ACE_SSL.tag
ALLEXTERNALS = NO
PERL_PATH = /usr/bin/perl
diff --git a/etc/tao.doxygen b/etc/tao.doxygen
index 42f11b960ad..ff78bab78fc 100644
--- a/etc/tao.doxygen
+++ b/etc/tao.doxygen
@@ -1,4 +1,7 @@
# Doxyfile 1.1.5
+#
+# $Id$
+#
PROJECT_NAME = TAO
PROJECT_NUMBER = Snapshot
@@ -113,7 +116,7 @@ ENABLE_PREPROCESSING = YES
MACRO_EXPANSION = YES
EXPAND_ONLY_PREDEF = YES
SEARCH_INCLUDES = YES
-INCLUDE_PATH = TAO ACE_wrappers
+INCLUDE_PATH = TAO .
PREDEFINED = ACE_HAS_WCHAR \
ACE_LACKS_STRCASECMP \
ACE_LACKS_STRCSPN \
@@ -127,8 +130,8 @@ EXPAND_AS_DEFINED = ACE_RCSID
# Configuration::addtions related to external references
#---------------------------------------------------------------------------
-TAGFILES = ace_html/ACE.tag=../ace_html
-GENERATE_TAGFILE = tao_html/TAO.tag
+TAGFILES = html/ace/ACE.tag=../ace
+GENERATE_TAGFILE = html/tao/TAO.tag
ALLEXTERNALS = NO
PERL_PATH = /usr/bin/perl
@@ -190,4 +193,4 @@ BIN_ABSPATH = /usr/bin
# documentation generated for other projects. This allows doxysearch to search
# the documentation for these projects as well.
-EXT_DOC_PATHS = ace_html
+EXT_DOC_PATHS = html/ace
diff --git a/etc/tao_dynamicany.doxygen b/etc/tao_dynamicany.doxygen
index d942b09f618..7a08f6580ee 100644
--- a/etc/tao_dynamicany.doxygen
+++ b/etc/tao_dynamicany.doxygen
@@ -1,4 +1,7 @@
# Doxyfile 1.1.5
+#
+# $Id$
+#
PROJECT_NAME = TAO_DynamicAny
PROJECT_NUMBER = Snapshot
@@ -113,7 +116,7 @@ ENABLE_PREPROCESSING = YES
MACRO_EXPANSION = YES
EXPAND_ONLY_PREDEF = YES
SEARCH_INCLUDES = YES
-INCLUDE_PATH = TAO ACE_wrappers
+INCLUDE_PATH = TAO .
PREDEFINED = ACE_HAS_WCHAR \
ACE_LACKS_STRCASECMP \
ACE_LACKS_STRCSPN \
@@ -128,8 +131,8 @@ EXPAND_AS_DEFINED = ACE_RCSID \
# Configuration::addtions related to external references
#---------------------------------------------------------------------------
-TAGFILES = ace_html/ACE.tag=../ace_html tao_html/TAO.tag=../tao_html
-GENERATE_TAGFILE = tao_dynamicany_html/TAO_DynamicAny.tag
+TAGFILES = html/ace/ACE.tag=../ace html/tao/TAO.tag=..
+GENERATE_TAGFILE = html/tao/dynamicany/TAO_DynamicAny.tag
ALLEXTERNALS = NO
PERL_PATH = /usr/bin/perl
@@ -191,4 +194,4 @@ BIN_ABSPATH = /usr/bin
# documentation generated for other projects. This allows doxysearch to search
# the documentation for these projects as well.
-EXT_DOC_PATHS = ace_html
+EXT_DOC_PATHS = html/ace
diff --git a/etc/tao_dynamicinterface.doxygen b/etc/tao_dynamicinterface.doxygen
index 53737fd9c3a..3f16a03335e 100644
--- a/etc/tao_dynamicinterface.doxygen
+++ b/etc/tao_dynamicinterface.doxygen
@@ -1,4 +1,7 @@
# Doxyfile 1.1.5
+#
+# $Id$
+#
PROJECT_NAME = TAO_DynamicInterface
PROJECT_NUMBER = Snapshot
@@ -113,7 +116,7 @@ ENABLE_PREPROCESSING = YES
MACRO_EXPANSION = YES
EXPAND_ONLY_PREDEF = YES
SEARCH_INCLUDES = YES
-INCLUDE_PATH = TAO ACE_wrappers
+INCLUDE_PATH = TAO .
PREDEFINED = ACE_HAS_WCHAR \
ACE_LACKS_STRCASECMP \
ACE_LACKS_STRCSPN \
@@ -128,8 +131,8 @@ EXPAND_AS_DEFINED = ACE_RCSID \
# Configuration::addtions related to external references
#---------------------------------------------------------------------------
-TAGFILES = ace_html/ACE.tag=../ace_html tao_html/TAO.tag=../tao_html
-GENERATE_TAGFILE = tao_dynamicinterface_html/TAO_DynamicInterface.tag
+TAGFILES = html/ace/ACE.tag=../ace html/tao/TAO.tag=..
+GENERATE_TAGFILE = html/tao/dynamicinterface/TAO_DynamicInterface.tag
ALLEXTERNALS = NO
PERL_PATH = /usr/bin/perl
@@ -191,4 +194,4 @@ BIN_ABSPATH = /usr/bin
# documentation generated for other projects. This allows doxysearch to search
# the documentation for these projects as well.
-EXT_DOC_PATHS = ace_html
+EXT_DOC_PATHS = html/ace
diff --git a/etc/tao_esf.doxygen b/etc/tao_esf.doxygen
index 35dadd2be9b..4869fef032d 100644
--- a/etc/tao_esf.doxygen
+++ b/etc/tao_esf.doxygen
@@ -1,4 +1,7 @@
# Doxyfile 1.1.5
+#
+# $Id$
+#
PROJECT_NAME = TAO_ESF
PROJECT_NUMBER = Snapshot
@@ -113,7 +116,7 @@ ENABLE_PREPROCESSING = YES
MACRO_EXPANSION = YES
EXPAND_ONLY_PREDEF = YES
SEARCH_INCLUDES = YES
-INCLUDE_PATH = TAO ACE_wrappers
+INCLUDE_PATH = TAO .
PREDEFINED = ACE_HAS_WCHAR \
ACE_LACKS_STRCASECMP \
ACE_LACKS_STRCSPN \
@@ -128,8 +131,10 @@ EXPAND_AS_DEFINED = ACE_RCSID \
# Configuration::addtions related to external references
#---------------------------------------------------------------------------
-TAGFILES = ace_html/ACE.tag=../ace_html tao_html/TAO.tag=../tao_html tao_portableserver_html/TAO_PortableServer.tag=../tao_portableserver_html
-GENERATE_TAGFILE = tao_esf_html/TAO_ESF.tag
+TAGFILES = html/ace/ACE.tag=../ace \
+ html/tao/TAO.tag=.. \
+ html/tao/portableserver/TAO_PortableServer.tag=../portableserver
+GENERATE_TAGFILE = html/tao/esf/TAO_ESF.tag
ALLEXTERNALS = NO
PERL_PATH = /usr/bin/perl
@@ -191,4 +196,4 @@ BIN_ABSPATH = /usr/bin
# documentation generated for other projects. This allows doxysearch to search
# the documentation for these projects as well.
-EXT_DOC_PATHS = ace_html
+EXT_DOC_PATHS = html/ace
diff --git a/etc/tao_iormanip.doxygen b/etc/tao_iormanip.doxygen
index af4b09e4bb6..b50c1bfddf8 100644
--- a/etc/tao_iormanip.doxygen
+++ b/etc/tao_iormanip.doxygen
@@ -1,4 +1,7 @@
# Doxyfile 1.1.5
+#
+# $Id$
+#
PROJECT_NAME = TAO_IORManipulation
PROJECT_NUMBER = Snapshot
@@ -113,7 +116,7 @@ ENABLE_PREPROCESSING = YES
MACRO_EXPANSION = YES
EXPAND_ONLY_PREDEF = YES
SEARCH_INCLUDES = YES
-INCLUDE_PATH = TAO ACE_wrappers
+INCLUDE_PATH = TAO .
PREDEFINED = ACE_HAS_WCHAR \
ACE_LACKS_STRCASECMP \
ACE_LACKS_STRCSPN \
@@ -128,8 +131,9 @@ EXPAND_AS_DEFINED = ACE_RCSID \
# Configuration::addtions related to external references
#---------------------------------------------------------------------------
-TAGFILES = ace_html/ACE.tag=../ace_html tao_html/TAO.tag=../tao_html
-GENERATE_TAGFILE = tao_iormanipulation_html/TAO_IORManipulation.tag
+TAGFILES = html/ace/ACE.tag=../ace \
+ html/tao/TAO.tag=..
+GENERATE_TAGFILE = html/tao/iormanipulation/TAO_IORManipulation.tag
ALLEXTERNALS = NO
PERL_PATH = /usr/bin/perl
@@ -191,4 +195,4 @@ BIN_ABSPATH = /usr/bin
# documentation generated for other projects. This allows doxysearch to search
# the documentation for these projects as well.
-EXT_DOC_PATHS = ace_html
+EXT_DOC_PATHS = html/ace
diff --git a/etc/tao_iortable.doxygen b/etc/tao_iortable.doxygen
index 827b529923c..348547facd6 100644
--- a/etc/tao_iortable.doxygen
+++ b/etc/tao_iortable.doxygen
@@ -1,4 +1,7 @@
# Doxyfile 1.1.5
+#
+# $Id$
+#
PROJECT_NAME = TAO_IORTable
PROJECT_NUMBER = Snapshot
@@ -113,7 +116,7 @@ ENABLE_PREPROCESSING = YES
MACRO_EXPANSION = YES
EXPAND_ONLY_PREDEF = YES
SEARCH_INCLUDES = YES
-INCLUDE_PATH = TAO ACE_wrappers
+INCLUDE_PATH = TAO .
PREDEFINED = ACE_HAS_WCHAR \
ACE_LACKS_STRCASECMP \
ACE_LACKS_STRCSPN \
@@ -128,8 +131,9 @@ EXPAND_AS_DEFINED = ACE_RCSID \
# Configuration::addtions related to external references
#---------------------------------------------------------------------------
-TAGFILES = ace_html/ACE.tag=../ace_html tao_html/TAO.tag=../tao_html
-GENERATE_TAGFILE = tao_iortable_html/TAO_IORTable.tag
+TAGFILES = html/ace/ACE.tag=../ace \
+ html/tao/TAO.tag=..
+GENERATE_TAGFILE = html/tao/iortable/TAO_IORTable.tag
ALLEXTERNALS = NO
PERL_PATH = /usr/bin/perl
@@ -191,4 +195,4 @@ BIN_ABSPATH = /usr/bin
# documentation generated for other projects. This allows doxysearch to search
# the documentation for these projects as well.
-EXT_DOC_PATHS = ace_html
+EXT_DOC_PATHS = html/ace
diff --git a/etc/tao_portableserver.doxygen b/etc/tao_portableserver.doxygen
index e5de7c12416..dde15d46997 100644
--- a/etc/tao_portableserver.doxygen
+++ b/etc/tao_portableserver.doxygen
@@ -1,4 +1,7 @@
# Doxyfile 1.1.5
+#
+# $Id$
+#
PROJECT_NAME = TAO_PortableServer
PROJECT_NUMBER = Snapshot
@@ -113,7 +116,7 @@ ENABLE_PREPROCESSING = YES
MACRO_EXPANSION = YES
EXPAND_ONLY_PREDEF = YES
SEARCH_INCLUDES = YES
-INCLUDE_PATH = TAO ACE_wrappers
+INCLUDE_PATH = TAO .
PREDEFINED = ACE_HAS_WCHAR \
ACE_LACKS_STRCASECMP \
ACE_LACKS_STRCSPN \
@@ -128,8 +131,9 @@ EXPAND_AS_DEFINED = ACE_RCSID \
# Configuration::addtions related to external references
#---------------------------------------------------------------------------
-TAGFILES = ace_html/ACE.tag=../ace_html tao_html/TAO.tag=../tao_html
-GENERATE_TAGFILE = tao_portableserver_html/TAO_PortableServer.tag
+TAGFILES = html/ace/ACE.tag=../ace \
+ html/tao/TAO.tag=..
+GENERATE_TAGFILE = html/tao/portableserver/TAO_PortableServer.tag
ALLEXTERNALS = NO
PERL_PATH = /usr/bin/perl
@@ -191,4 +195,4 @@ BIN_ABSPATH = /usr/bin
# documentation generated for other projects. This allows doxysearch to search
# the documentation for these projects as well.
-EXT_DOC_PATHS = ace_html
+EXT_DOC_PATHS = html/ace
diff --git a/etc/tao_rtevent.doxygen b/etc/tao_rtevent.doxygen
index 4f50056456d..8f32bf7c038 100644
--- a/etc/tao_rtevent.doxygen
+++ b/etc/tao_rtevent.doxygen
@@ -1,4 +1,7 @@
# Doxyfile 1.1.5
+#
+# $Id$
+#
PROJECT_NAME = TAO_RTEvent
PROJECT_NUMBER = Snapshot
@@ -121,7 +124,7 @@ ENABLE_PREPROCESSING = YES
MACRO_EXPANSION = YES
EXPAND_ONLY_PREDEF = YES
SEARCH_INCLUDES = YES
-INCLUDE_PATH = TAO/orbsvcs TAO ACE_wrappers
+INCLUDE_PATH = TAO/orbsvcs TAO .
PREDEFINED = ACE_HAS_WCHAR \
ACE_LACKS_STRCASECMP \
ACE_LACKS_STRCSPN \
@@ -136,8 +139,11 @@ EXPAND_AS_DEFINED = ACE_RCSID \
# Configuration::addtions related to external references
#---------------------------------------------------------------------------
-TAGFILES = ace_html/ACE.tag=../ace_html tao_html/TAO.tag=../tao_html tao_portableserver_html/TAO_PortableServer.tag=../tao_portableserver_html tao_esf_html/TAO_ESF.tag=../tao_esf_html
-GENERATE_TAGFILE = tao_rtevent_html/TAO_RTEvent.tag
+TAGFILES = html/ace/ACE.tag=../ace \
+ html/tao/TAO.tag=.. \
+ html/tao/portableserver/TAO_PortableServer.tag=../portableserver \
+ html/tao/esf/TAO_ESF.tag=../esf
+GENERATE_TAGFILE = html/tao/rtevent/TAO_RTEvent.tag
ALLEXTERNALS = NO
PERL_PATH = /usr/bin/perl
@@ -199,4 +205,4 @@ BIN_ABSPATH = /usr/bin
# documentation generated for other projects. This allows doxysearch to search
# the documentation for these projects as well.
-EXT_DOC_PATHS = ace_html
+EXT_DOC_PATHS = html/ace