ChangeLogTag: Wed Jan 28 13:21:00 2004 Chad Elliott <elliott_c@ociweb.com>

14 files changed, 207 insertions, 163 deletions

diff --git a/ChangeLog b/ChangeLog
index 400715fcbbc..12589547d14 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,36 @@
+Wed Jan 28 13:21:00 2004  Chad Elliott  <elliott_c@ociweb.com>
+
+        * ace/ace.mpc:
+
+          Only inherit from qt_reactor instead of qt_moc and qt_reactor.
+
+        * ace/qt_reactor.mpb:
+
+          Inherit from ace_qt and qt_moc.
+
+        * bin/MakeProjectCreator/config/ace_qt.mpb:
+        * bin/MakeProjectCreator/config/acedefaults.mpb:
+        * bin/MakeProjectCreator/config/qt.mpb:
+
+          Inherit from the ace_qt base project as part of the reorganization 
+          of qt and qt_moc.
+
+        * bin/MakeProjectCreator/modules/Creator.pm:
+        * bin/MakeProjectCreator/modules/ProjectCreator.pm:
+
+          Allow features to inherit from other base projects just as
+          projects do.
+
+        * bin/MakeProjectCreator/config/qt-min.mpb:
+        * bin/MakeProjectCreator/config/qt-min_moc.mpb:
+
+          Removed these files.
+
 Wed Jan 28 10:26:17 2004  Boris Kolpackov  <boris@dre.vanderbilt.edu>
 
-	* ace/TMCast/README:
+        * ace/TMCast/README:
 
-	  Fixed a few typos.
+          Fixed a few typos.
 
 Wed Jan 28 09:17:36 2004  Chad Elliott  <elliott_c@ociweb.com>
 
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index 88aa131f71e..9281f563b3d 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,12 @@
+Wed Jan 28 13:21:00 2004  Chad Elliott  <elliott_c@ociweb.com>
+
+        * examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc:
+
+          Use the new qt and qt_moc base projects.  The qt-min* base
+          projects have been removed and the functionality moved into qt and
+          qt_moc.  The original qt and qt_moc base projects were dispersed
+          and became different base projects.
+
 Wed Jan 28 13:02:28 2004  Boris Kolpackov  <boris@dre.vanderbilt.edu>
 
 	* CCF/Example/CIDL/LocalExecutorMapping/ExecutorMappingGenerator.cpp:
diff --git a/TAO/CIAO/examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc b/TAO/CIAO/examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc
index 941e53f0acf..27635d3cc2f 100644
--- a/TAO/CIAO/examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc
+++ b/TAO/CIAO/examples/OEP/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc
@@ -1,5 +1,5 @@
 // $Id$
-project(NavDisplayGUI_exec) : ciao_component, qt-min_moc {
+project(NavDisplayGUI_exec) : ciao_component, qt, qt_moc {
   after   += NavDisplay_exec
   sharedname = NavDisplayGUI_exec
   libs      += NavDisplay_stub NavDisplay_svnt HUDisplay_stub HUDisplay_svnt
@@ -9,16 +9,6 @@ project(NavDisplayGUI_exec) : ciao_component, qt-min_moc {
   idlflags  +=  -I ../NavDisplay -Wb,export_macro=NAVDISPLAY_EXEC_Export -Wb,export_include=NavDisplay_exec_export.h
   idlgendir = ./
 
-  specific(borland, nmake, em3, vc6, vc7, vc71) {
-    lit_libs += qt-mt230nc
-  }
-
-  // @@ Notice: If you are building with Cygwin, you may need to manually
-  //            change the following Qt library to qt-mt230nc.
-  specific(gnuace, make) {
-    lit_libs += qt-mt
-  }
-
   IDL_Files {
     ../NavDisplay/NavDisplayEI.idl
   }
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 91c8f8154fd..e6046b4d316 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,10 @@
+Wed Jan 28 13:21:00 2004  Chad Elliott  <elliott_c@ociweb.com>
+
+        * tests/QtTests/QtTests.mpc:
+
+          Inherit from the ace_qt base project as part of the reorganization
+          of qt and qt_moc.
+
 Tue Jan 27 18:05:19 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * TAO_IDL/be/be_codegen.cpp:
@@ -5,12 +12,12 @@ Tue Jan 27 18:05:19 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
         * TAO_IDL/be/be_visitor_root/root.cpp:
         * TAO_IDL/be_include/be_codegen.h:
         * TAO_IDL/be_include/be_global.h:
-        
+
           Eliminated generation of the *A.h file, containing
           declarations for Any operators and triggered by the
           option -GA. Moved generation of Any operator declarations
           back to the *C.h file. Left generation of the *A.cpp file
-          unchanged, except for removal of *A.h #include. This 
+          unchanged, except for removal of *A.h #include. This
           change allows us to avoid linking *A.cpp in
           DLLs if the Any operators are not used, while still
           allowing their declarations to be found if they are referenced
@@ -20,7 +27,7 @@ Tue Jan 27 17:41:38 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * tao/OctetSeqA.h:
         * tao/OctetSeqC.h:
-        
+
           Moved the declaration of Any operators and type code from
           OctetSeqA.h to OctetSeqC.h, so the operators can be seen
           in generated code if CORBA::OctetSeq is used there. Thanks
@@ -31,16 +38,16 @@ Mon Jan 26 17:46:18 2004  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * TAO_IDL/be/be_visitor_operation/ami_cs.cpp:
         * TAO_IDL/be/be_visitor_operation/operation.cpp:
-        
+
           In generated operation stub code, changed the name of the
           array of argument helper classes passed to Invocation_Adapter,
           so that the array name does not begin with the characters
           '_tao_'. These characters are coincidentally applied as a prefix
-          to each argument helper class identifier, and so there was a 
+          to each argument helper class identifier, and so there was a
           possibility of a name clash. Of course there is still a
           chance of a name clash with the argument identifier itself,
           but there is no way to eliminate that, only to minimize it.
-          This fix closes [BUGID:1725]. Thanks to Mouna Seri 
+          This fix closes [BUGID:1725]. Thanks to Mouna Seri
           <seri@crhc.uiuc.edu> for reporting the bug and for sending
           the example IDL file that illustrated it.
 
diff --git a/TAO/tests/QtTests/QtTests.mpc b/TAO/tests/QtTests/QtTests.mpc
index a3bb63dfc58..1013e370e62 100644
--- a/TAO/tests/QtTests/QtTests.mpc
+++ b/TAO/tests/QtTests/QtTests.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*server): taoexe, portableserver, qt_moc {
+project(*server): taoexe, portableserver, ace_qt, qt_moc {
   requires += qt
 
   MOC_Files {
@@ -15,7 +15,7 @@ project(*server): taoexe, portableserver, qt_moc {
   }
 }
 
-project(*client): taoexe, qt_moc {
+project(*client): taoexe, ace_qt, qt_moc {
   requires += qt
 
   MOC_Files {
diff --git a/ace/ace.mpc b/ace/ace.mpc
index 364cfcc62c9..c5cb99610d5 100644
--- a/ace/ace.mpc
+++ b/ace/ace.mpc
@@ -1,7 +1,7 @@
 //  -*- MPC -*- now wouldn't this be cool...
 // $Id$
 
-project(ACE) : acedefaults, aceversion, core, qt_moc, qt_reactor, other, codecs, token, svcconf, uuid, filecache {
+project(ACE) : acedefaults, aceversion, core, qt_reactor, other, codecs, token, svcconf, uuid, filecache {
   libout       = $(ACE_ROOT)/lib
   sharedname   = ACE
   dynamicflags = ACE_BUILD_DLL ACE_OS_BUILD_DLL
diff --git a/ace/qt_reactor.mpb b/ace/qt_reactor.mpb
index 2092daa59df..e596b5e5d5c 100644
--- a/ace/qt_reactor.mpb
+++ b/ace/qt_reactor.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-feature(qt) {
+feature(qt): ace_qt, qt_moc {
   MOC_Files {
     QtReactor.h
   }
diff --git a/bin/MakeProjectCreator/config/ace_qt.mpb b/bin/MakeProjectCreator/config/ace_qt.mpb
new file mode 100644
index 00000000000..28276bc89dd
--- /dev/null
+++ b/bin/MakeProjectCreator/config/ace_qt.mpb
@@ -0,0 +1,6 @@
+// -*- MPC -*-
+// $Id$
+
+feature(qt): qt {
+  macros += ACE_HAS_QT
+}
diff --git a/bin/MakeProjectCreator/config/acedefaults.mpb b/bin/MakeProjectCreator/config/acedefaults.mpb
index 53ae5adbd54..b91674f7b38 100644
--- a/bin/MakeProjectCreator/config/acedefaults.mpb
+++ b/bin/MakeProjectCreator/config/acedefaults.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project: qt, zzip {
+project: ace_qt, zzip {
   staticflags += ACE_AS_STATIC_LIBS
   includes    += $(ACE_ROOT)
   libpaths    += $(ACE_ROOT)/lib
diff --git a/bin/MakeProjectCreator/config/qt-min.mpb b/bin/MakeProjectCreator/config/qt-min.mpb
deleted file mode 100644
index 593b2f1eecd..00000000000
--- a/bin/MakeProjectCreator/config/qt-min.mpb
+++ /dev/null
@@ -1,19 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project {
-// Project using this features requires Qt library but not ACE_QtReactor.
-  includes += $(QTDIR)/include
-  libpaths += $(QTDIR)/lib
-  macros   += QT_THREAD_SUPPORT
-
-  specific(borland, nmake, em3, vc6, vc7, vc71) {
-    lit_libs += qt-mt230nc
-  }
-
-  // @@ Notice: If you are building with Cygwin, you may need to manually
-  //            change the following Qt library to qt-mt230nc.
-  specific(gnuace, make) {
-    lit_libs += qt-mt
-  }
-}
diff --git a/bin/MakeProjectCreator/config/qt-min_moc.mpb b/bin/MakeProjectCreator/config/qt-min_moc.mpb
deleted file mode 100644
index b8b3aeff9b7..00000000000
--- a/bin/MakeProjectCreator/config/qt-min_moc.mpb
+++ /dev/null
@@ -1,15 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : qt-min {
-  Define_Custom(MOC) {
-    automatic        = 0
-    command          = perl
-    commandflags     = $(ACE_ROOT)/bin/pch_cmd.pl -t -o -c $(QTDIR)/bin/moc
-    output_option    = -o
-    pch_option       = -p
-    inputext         = .h
-    pre_extension    = _moc
-    source_outputext = .cpp
-  }
-}
diff --git a/bin/MakeProjectCreator/config/qt.mpb b/bin/MakeProjectCreator/config/qt.mpb
index 4293c2ff422..407809979a4 100644
--- a/bin/MakeProjectCreator/config/qt.mpb
+++ b/bin/MakeProjectCreator/config/qt.mpb
@@ -1,10 +1,10 @@
 // -*- MPC -*-
 // $Id$
 
-feature(qt) {
+project {
   includes += $(QTDIR)/include
   libpaths += $(QTDIR)/lib
-  macros   += ACE_HAS_QT QT_THREAD_SUPPORT
+  macros   += QT_THREAD_SUPPORT
 
   specific(borland, nmake, em3, vc6, vc7, vc71) {
     lit_libs += qt-mt230nc
@@ -15,4 +15,4 @@ feature(qt) {
   specific(gnuace, make) {
     lit_libs += qt-mt
   }
-}
\ No newline at end of file
+}
diff --git a/bin/MakeProjectCreator/modules/Creator.pm b/bin/MakeProjectCreator/modules/Creator.pm
index 8b74253b61f..feb09975e6b 100644
--- a/bin/MakeProjectCreator/modules/Creator.pm
+++ b/bin/MakeProjectCreator/modules/Creator.pm
@@ -271,11 +271,31 @@ sub parse_known {
       $status = 0;
     }
   }
-  elsif ($line =~ /^(feature)\s*\(([^\)]+)\)\s*{$/) {
-    my($type)  = $1;
-    my($name)  = $2;
-    my(@names) = split(/\s*,\s*/, $name);
-    push(@values, $type, \@names);
+  elsif ($line =~ /^(feature)\s*\(([^\)]+)\)\s*(:.*)?\s*{$/) {
+    my($type)    = $1;
+    my($name)    = $2;
+    my($parents) = $3;
+    my(@names)   = split(/\s*,\s*/, $name);
+
+    if (defined $parents) {
+      my(@parents) = ();
+      $parents =~ s/^://;
+      foreach my $parent (split(',', $parents)) {
+        $parent =~ s/^\s+//;
+        $parent =~ s/\s+$//;
+        if ($parent ne '') {
+          push(@parents, $parent);
+        }
+      }
+      if (!defined $parents[0]) {
+        ## The : was used, but no parents followed.  This
+        ## is an error.
+        $errorString = 'ERROR: No parents listed';
+        $status = 0;
+      }
+      $parents = \@parents;
+    }
+    push(@values, $type, \@names, $parents);
   }
   elsif (!$self->{$self->{'type_check'}}) {
     $errorString = "ERROR: No $type was defined";
diff --git a/bin/MakeProjectCreator/modules/ProjectCreator.pm b/bin/MakeProjectCreator/modules/ProjectCreator.pm
index 5ce0956c4f3..117a37a2034 100644
--- a/bin/MakeProjectCreator/modules/ProjectCreator.pm
+++ b/bin/MakeProjectCreator/modules/ProjectCreator.pm
@@ -158,7 +158,6 @@ sub new {
   $self->{'feature_defined'}       = 0;
   $self->{'project_info'}          = [];
   $self->{'reading_parent'}        = [];
-  $self->{'feature_definitions'}   = [];
   $self->{'dexe_template_input'}   = undef;
   $self->{'lexe_template_input'}   = undef;
   $self->{'lib_template_input'}    = undef;
@@ -249,6 +248,90 @@ sub get_assignment_for_modification {
 }
 
 
+sub begin_project {
+  my($self)    = shift;
+  my($parents) = shift;
+  my($status)  = 1;
+  my($error)   = undef;
+
+  ## Deal with the inheritance hiearchy first
+  ## Add in the base projects from the command line
+  if (!$self->{'reading_global'} &&
+      !defined $self->{'reading_parent'}->[0]) {
+    my($baseprojs) = $self->get_baseprojs();
+
+    if (defined $parents) {
+      foreach my $base (@$baseprojs) {
+        my($found) = 0;
+        foreach my $parent (@$parents) {
+          if ($base eq $parent) {
+            $found = 1;
+            last;
+          }
+        }
+        if (!$found) {
+          push(@$parents, $base);
+        }
+      }
+    }
+    else {
+      $parents = $baseprojs;
+    }
+  }
+
+  if (defined $parents) {
+    foreach my $parent (@$parents) {
+      ## Read in the parent onto ourself
+      my($file) = $self->search_include_path(
+                           "$parent.$BaseClassExtension");
+      if (!defined $file) {
+        $file = $self->search_include_path(
+                             "$parent.$ProjectCreatorExtension");
+      }
+
+      if (defined $file) {
+        foreach my $currently (@{$self->{'reading_parent'}}) {
+          if ($currently eq $file) {
+            $status = 0;
+            $error = 'ERROR: Cyclic inheritance detected: ' .
+                     $parent;
+          }
+        }
+
+        if ($status) {
+          if (!defined $self->{'parents_read'}->{$file}) {
+            $self->{'parents_read'}->{$file} = 1;
+            ## Begin reading the parent
+            push(@{$self->{'reading_parent'}}, $file);
+            $status = $self->parse_file($file);
+            pop(@{$self->{'reading_parent'}});
+
+            if (!$status) {
+              $error = "ERROR: Invalid parent: $parent";
+            }
+          }
+        }
+      }
+      else {
+        $status = 0;
+        $error = "ERROR: Unable to locate parent: $parent";
+      }
+    }
+  }
+
+  ## Copy each value from global_assign into assign
+  if (!$self->{'reading_global'}) {
+    foreach my $key (keys %{$self->{'global_assign'}}) {
+      if (!defined $self->{'assign'}->{$key}) {
+        $self->{'assign'}->{$key} = $self->{'global_assign'}->{$key};
+      }
+    }
+  }
+
+  return $status, $error;
+}
+
+
 sub parse_line {
   my($self)   = shift;
   my($ih)     = shift;
@@ -331,7 +414,6 @@ sub parse_line {
             $self->{'type_specific_assign'} = {};
             $self->{'flag_overrides'}       = {};
             $self->{'parents_read'}         = {};
-            $self->{'feature_definitions'}  = [];
             $self->reset_generating_types();
           }
         }
@@ -339,101 +421,33 @@ sub parse_line {
       }
       else {
         ## Project Beginning
-        ## Deal with the inheritance hiearchy first
-        my($parents) = $values[2];
-
-        ## Add in the base projects from the command line
-        if (!$self->{'reading_global'} &&
-            !defined $self->{'reading_parent'}->[0]) {
-          my($baseprojs) = $self->get_baseprojs();
-
-          if (defined $parents) {
-            foreach my $base (@$baseprojs) {
-              my($found) = 0;
-              foreach my $parent (@$parents) {
-                if ($base eq $parent) {
-                  $found = 1;
-                  last;
-                }
-              }
-              if (!$found) {
-                push(@$parents, $base);
-              }
-            }
-          }
-          else {
-            $parents = $baseprojs;
-          }
-        }
-
-        if (defined $parents) {
-          foreach my $parent (@$parents) {
-            ## Read in the parent onto ourself
-            my($file) = $self->search_include_path(
-                                 "$parent.$BaseClassExtension");
-            if (!defined $file) {
-              $file = $self->search_include_path(
-                                   "$parent.$ProjectCreatorExtension");
-            }
+        ($status, $errorString) = $self->begin_project($values[2]);
 
-            if (defined $file) {
-              foreach my $currently (@{$self->{'reading_parent'}}) {
-                if ($currently eq $file) {
-                  $status = 0;
-                  $errorString = 'ERROR: Cyclic inheritance detected: ' .
-                                 $parent;
-                }
-              }
-
-              if ($status) {
-                if (!defined $self->{'parents_read'}->{$file}) {
-                  $self->{'parents_read'}->{$file} = 1;
-                  ## Begin reading the parent
-                  push(@{$self->{'reading_parent'}}, $file);
-                  $status = $self->parse_file($file);
-                  pop(@{$self->{'reading_parent'}});
-
-                  if (!$status) {
-                    $errorString = "ERROR: Invalid parent: $parent";
-                  }
-                }
-              }
-            }
-            else {
+        ## Set up the default project name
+        if ($status) {
+          if (defined $name) {
+            if ($name =~ /[\/\\]/) {
               $status = 0;
-              $errorString = "ERROR: Unable to locate parent: $parent";
+              $errorString = 'ERROR: Projects can not have a slash ' .
+                             'or a back slash in the name';
             }
-          }
-        }
-
-        ## Set up some initial values
-        if (defined $name) {
-          if ($name =~ /[\/\\]/) {
-            $status = 0;
-            $errorString = 'ERROR: Projects can not have a slash ' .
-                           'or a back slash in the name';
-          }
-          else {
-            $name =~ s/^\(\s*//;
-            $name =~ s/\s*\)$//;
-            $name = $self->transform_file_name($name);
+            else {
+              $name =~ s/^\(\s*//;
+              $name =~ s/\s*\)$//;
+              $name = $self->transform_file_name($name);
 
-            ## Replace any *'s with the default name
-            my($def) = $self->get_default_project_name();
-            $name = $self->fill_type_name($name, $def);
+              ## Replace any *'s with the default name
+              my($def) = $self->get_default_project_name();
+              $name = $self->fill_type_name($name, $def);
 
-            $self->set_project_name($name);
+              $self->set_project_name($name);
+            }
           }
         }
-        $self->{$typecheck} = 1;
 
-        ## Copy each value from global_assign into assign
-        if (!$self->{'reading_global'}) {
-          foreach my $key (keys %{$self->{'global_assign'}}) {
-            if (!defined $self->{'assign'}->{$key}) {
-              $self->{'assign'}->{$key} = $self->{'global_assign'}->{$key};
-            }
-          }
+        if ($status) {
+          ## Signify that we have a valid project
+          $self->{$typecheck} = 1;
         }
       }
     }
@@ -512,7 +526,7 @@ sub parse_line {
     }
     elsif ($values[0] eq 'feature') {
       $self->{'feature_defined'} = 1;
-      $self->process_feature($ih, $values[1]);
+      $self->process_feature($ih, $values[1], $values[2]);
       if ($self->{'feature_defined'}) {
         $errorString = "ERROR: Did not find the end of the feature";
         $status = 0;
@@ -732,11 +746,12 @@ sub parse_verbatim {
 
 
 sub process_feature {
-  my($self)   = shift;
-  my($fh)     = shift;
-  my($names)  = shift;
-  my($status) = 1;
-  my($error)  = '';
+  my($self)    = shift;
+  my($fh)      = shift;
+  my($names)   = shift;
+  my($parents) = shift;
+  my($status)  = 1;
+  my($error)   = '';
 
   my($requires) = '';
   my($avoids)   = '';
@@ -759,8 +774,11 @@ sub process_feature {
     ## The required features are enabled, so we say that
     ## a project has been defined and we allow the parser to
     ## find the data held within the feature.
-    $self->{'feature_defined'} = 0;
-    $self->{$self->{'type_check'}} = 1;
+    ($status, $error) = $self->begin_project($parents);
+    if ($status) {
+      $self->{'feature_defined'} = 0;
+      $self->{$self->{'type_check'}} = 1;
+    }
   }
   else {
     ## Otherwise, we read in all the lines until we find the