ChangeLogTag: Tue Jul 23 09:48:15 2002 Chad Elliott <elliott_c@ociweb.com>

2 files changed, 32 insertions, 6 deletions

diff --git a/modules/Driver.pm b/modules/Driver.pm
index 2ca8ff71..f3f6455a 100644
--- a/modules/Driver.pm
+++ b/modules/Driver.pm
@@ -23,7 +23,7 @@ sub new {
   my(@creators) = @_;
   my($self)     = bless {'path'     => $path,
                          'name'     => $name,
-                         'version'  => 0.9,
+                         'version'  => 1.0,
                          'types'    => {},
                          'creators' => \@creators,
                         }, $class;
@@ -240,10 +240,10 @@ sub run {
   if (!defined $global) {
     $global = $self->{'path'} . "/config/global.mpb";
   }
-  if (!defined $include[0]) {
-    push(@include, $self->{'path'} . "/config");
-    push(@include, $self->{'path'} . "/templates");
-  }
+  ## Always add the default include paths
+  unshift(@include, $self->{'path'} . "/config");
+  unshift(@include, $self->{'path'} . "/templates");
+
   if ($reldefs) {
     if (!defined $relative{'ACE_ROOT'} && defined $ENV{ACE_ROOT}) {
       $relative{'ACE_ROOT'} = $ENV{ACE_ROOT};
diff --git a/modules/ProjectCreator.pm b/modules/ProjectCreator.pm
index 22c09c69..a8835e92 100644
--- a/modules/ProjectCreator.pm
+++ b/modules/ProjectCreator.pm
@@ -767,6 +767,33 @@ sub generate_default_components {
             $self->{'idl_defaulted'} = 1;
             $self->process_assignment('tao', 1);
           }
+          elsif ($tag eq 'source_files') {
+            ## If we are auto-generating the source_files, then
+            ## we need to make sure that any idl generated source
+            ## files that are added are put at the front of the list.
+            my(@front) = ();
+            my(@copy)  = @$array;
+            my(@exts)  = $self->generated_source_extensions($tag);
+
+            @$array = ();
+            foreach my $file (@copy) {
+              my($found) = 0;
+              foreach my $ext (@exts) {
+                if ($file =~ /$ext$/) {
+                  push(@front, $file);
+                  $found = 1;
+                  last;
+                }
+              }
+              if (!$found) {
+                push(@$array, $file);
+              }
+            }
+
+            if (defined $front[0]) {
+              unshift(@$array, @front);
+            }
+          }
         }
       }
     }
@@ -855,7 +882,6 @@ sub generate_default_idl_generated {
 sub add_source_corresponding_component_files {
   my($self)  = shift;
   my($tag)   = shift;
-#  my($names) = $self->{'source_files'};
   my(@all)   = ();
   my($vc)    = $self->{'valid_components'};