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

5 files changed, 70 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 9c3c409c352..cb6e92fe0f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+Tue Jul 23 09:48:15 2002  Chad Elliott  <elliott_c@ociweb.com>
+
+        * bin/MakeProjectCreator/modules/Driver.pm:
+
+          Always add the default include paths.
+
+        * bin/MakeProjectCreator/modules/ProjectCreator.pm:
+
+          Make sure that idl generated source files go at the front of the
+          file list in auto-generates source lists.
+
+        * bin/MakeProjectCreator/templates/gnu.mpd:
+
+          Only add LIB and SHLIB assignments if we are generating a Makefile
+          for libraries.
 Mon Jul 22 22:30:53 2002  Nanbor Wang  <nanbor@cs.wustl.edu>
 
 	* ACEXML/common/XML_Common.dsp: Added the macro definition
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 9c3c409c352..cb6e92fe0f7 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,18 @@
+Tue Jul 23 09:48:15 2002  Chad Elliott  <elliott_c@ociweb.com>
+
+        * bin/MakeProjectCreator/modules/Driver.pm:
+
+          Always add the default include paths.
+
+        * bin/MakeProjectCreator/modules/ProjectCreator.pm:
+
+          Make sure that idl generated source files go at the front of the
+          file list in auto-generates source lists.
+
+        * bin/MakeProjectCreator/templates/gnu.mpd:
+
+          Only add LIB and SHLIB assignments if we are generating a Makefile
+          for libraries.
 Mon Jul 22 22:30:53 2002  Nanbor Wang  <nanbor@cs.wustl.edu>
 
 	* ACEXML/common/XML_Common.dsp: Added the macro definition
diff --git a/bin/MakeProjectCreator/modules/Driver.pm b/bin/MakeProjectCreator/modules/Driver.pm
index 2ca8ff71249..f3f6455ae3d 100644
--- a/bin/MakeProjectCreator/modules/Driver.pm
+++ b/bin/MakeProjectCreator/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/bin/MakeProjectCreator/modules/ProjectCreator.pm b/bin/MakeProjectCreator/modules/ProjectCreator.pm
index 22c09c69553..a8835e9275d 100644
--- a/bin/MakeProjectCreator/modules/ProjectCreator.pm
+++ b/bin/MakeProjectCreator/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'};
 
diff --git a/bin/MakeProjectCreator/templates/gnu.mpd b/bin/MakeProjectCreator/templates/gnu.mpd
index d4abe58c1de..41a4d5f6f79 100644
--- a/bin/MakeProjectCreator/templates/gnu.mpd
+++ b/bin/MakeProjectCreator/templates/gnu.mpd
@@ -36,8 +36,11 @@ ifeq (<%comp%>, $(findstring <%comp%>, $(CURRENT_COMPONENTS)))
 <%endfor%>
 <%if(exename)%>
 BIN = $(BIN_UNCHECKED)
-<%else%>
+<%endif%>
+<%if(staticname)%>
 LIB   = $(LIB_UNCHECKED)
+<%endif%>
+<%if(sharedname)%>
 SHLIB = $(SHLIB_UNCHECKED)
 <%endif%>
 <%foreach(comps)%>
@@ -48,8 +51,12 @@ endif
 <%if(tagname)%>
 ifeq (,$(<%tagname%>))
 <%endif%>
+<%if(staticname)%>
 LIB   = $(LIB_UNCHECKED)
+<%endif%>
+<%if(sharedname)%>
 SHLIB = $(SHLIB_UNCHECKED)
+<%endif%>
 <%if(tagname)%>
 else
 <%foreach(tagchecks)%>