1 files changed, 16 insertions, 9 deletions

diff --git a/ACE/bin/generate_doxygen.pl b/ACE/bin/generate_doxygen.pl
index e001fb827de..3fd02934168 100755
--- a/ACE/bin/generate_doxygen.pl
+++ b/ACE/bin/generate_doxygen.pl
@@ -21,11 +21,15 @@ if (!defined $TAO_ROOT) {
 if (!defined $CIAO_ROOT) {
     $CIAO_ROOT = "$TAO_ROOT/CIAO";
 }
+if (!defined $DANCE_ROOT) {
+    $DANCE_ROOT = "$TAO_ROOT/DAnCE";
+}
 
 $is_release = 0;
 $exclude_ace = 0;
 $exclude_tao = !-r "$TAO_ROOT/VERSION";
 $exclude_ciao = !-r "$CIAO_ROOT/VERSION";
+$exclude_dance = !-r "$DANCE_ROOT/VERSION";
 $verbose = 0;
 $perl_path = '/usr/bin/perl';
 $html_output_dir = '.';
@@ -44,6 +48,7 @@ if (defined $DDS_ROOT && -r "$DDS_ROOT/VERSION") {
              'ace_rmcast',
              'ace_ssl',
              'ace_qos',
+             'ace_inet',
              'acexml');
 @TAO_DOCS = ('tao'
              ,'tao_anytypecode'
@@ -73,11 +78,10 @@ if (defined $DDS_ROOT && -r "$DDS_ROOT/VERSION") {
              ,'tao_costime'
              ,'tao_costrader'
              ,'tao_portablegroup'
-             ,'tao_pss'
              ,'tao_ifr');
-@CIAO_DOCS = ('ciao_config_handlers'
-             ,'ciao_DAnCE'
+@CIAO_DOCS = ('ciao_dds4ccm'
              ,'ciao');
+@DANCE_DOCS = ('DAnCE');
 @DDS_DOCS = ('dds');
 
 # Modify defaults using the command line arguments
@@ -92,10 +96,11 @@ if (!-r "$ACE_ROOT/ace/config.h") {
     $wrote_configh = 1;
 }
 
-&generate_doxy_files ('ACE',  "$ACE_ROOT", @ACE_DOCS) if (!$exclude_ace);
-&generate_doxy_files ('TAO',  "$TAO_ROOT", @TAO_DOCS) if (!$exclude_tao);
-&generate_doxy_files ('CIAO', "$CIAO_ROOT", @CIAO_DOCS) if (!$exclude_ciao);
-&generate_doxy_files ('DDS',  "$DDS_ROOT", @DDS_DOCS) if $dds;
+&generate_doxy_files ('ACE',  " $ACE_ROOT", " $ACE_ROOT/VERSION", @ACE_DOCS) if (!$exclude_ace);
+&generate_doxy_files ('TAO',  " $TAO_ROOT", " $TAO_ROOT/VERSION", @TAO_DOCS) if (!$exclude_tao);
+&generate_doxy_files ('CIAO', " $CIAO_ROOT", " $CIAO_ROOT/VERSION", @CIAO_DOCS) if (!$exclude_ciao);
+&generate_doxy_files ('DANCE'," $DANCE_ROOT", " $DANCE_ROOT/VERSION", @DANCE_DOCS) if (!$exclude_dance);
+&generate_doxy_files ('DDS',   "$DDS_ROOT", " $DDS_ROOT/VERSION", @DDS_DOCS) if $dds;
 
 unlink "$ACE_ROOT/ace/config.h" if $wrote_configh;
 
@@ -114,6 +119,8 @@ sub parse_args {
       $exclude_tao = 1;
     } elsif ($ARGV[0] eq "-exclude_ciao") {
       $exclude_ciao = 1;
+    } elsif ($ARGV[0] eq "-exclude_dance") {
+      $exclude_dance = 1;
     } elsif ($ARGV[0] eq "-include_dds") {
       $dds = 1;
     } elsif ($ARGV[0] eq "-verbose") {
@@ -145,8 +152,8 @@ sub generate_doxy_files {
 
   my $KIT = shift;
   my $ROOT_DIR = shift;
+  my $VERSION_FILE= shift;
   my @DOCS = @_;
-  my $VERSION_FILE = "$ROOT_DIR/VERSION";
 
   my $VERSION = 'Snapshot ('.
     POSIX::strftime("%Y/%m/%d-%H:%M", localtime)
@@ -292,7 +299,7 @@ sub get_versions () {
   my ($major_version, $minor_version, $beta_version);
 
   open (VERSION, '<'.$VERSION_FILE)  ||
-    die "$0: unable to open VERSION\n";
+    die "$0: unable to open $VERSION_FILE\n";
   while (<VERSION>) {
     chomp;
     if (/$KIT version (\d+)\.(\d+)\.(\d+)/) {