ChangeLogTag: Wed Mar 12 08:25:17 2003 Chad Elliott <elliott_c@ociweb.com>

6 files changed, 43 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index 78afe1d9e22..8a4e372ee2d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+Wed Mar 12 08:25:17 2003  Chad Elliott  <elliott_c@ociweb.com>
+
+        * bin/MakeProjectCreator/config/acedefaults.mpb:
+        * bin/MakeProjectCreator/config/aceexe.mpb:
+        * bin/MakeProjectCreator/config/acelib.mpb:
+        * bin/MakeProjectCreator/config/global.mpb:
+
+          Changed the global values to be generic and moved the defaults for
+          ACE into the acedefaults base project.
+
+        * bin/MakeProjectCreator/modules/ProjectCreator.pm:
+
+          Fixed a bug where header and inline files would be added to a
+          project even if they were specified to be empty.
+
 Wed Mar 12 07:03:54 2003  Chad Elliott  <elliott_c@ociweb.com>
 
         * netsvcs/servers/Makefile.bor:
diff --git a/bin/MakeProjectCreator/config/acedefaults.mpb b/bin/MakeProjectCreator/config/acedefaults.mpb
new file mode 100644
index 00000000000..cf89851f568
--- /dev/null
+++ b/bin/MakeProjectCreator/config/acedefaults.mpb
@@ -0,0 +1,5 @@
+project {
+  defaultlibs += ACE
+  dllout       = $(ACE_ROOT)/bin
+  libout       = .
+}
diff --git a/bin/MakeProjectCreator/config/aceexe.mpb b/bin/MakeProjectCreator/config/aceexe.mpb
index d722f20a544..72ea4c138b5 100644
--- a/bin/MakeProjectCreator/config/aceexe.mpb
+++ b/bin/MakeProjectCreator/config/aceexe.mpb
@@ -1,4 +1,4 @@
-project: aceversion {
+project: acedefaults, aceversion {
   depends  += ace
   includes += $(ACE_ROOT)
   libpaths += $(ACE_ROOT)/ace
diff --git a/bin/MakeProjectCreator/config/acelib.mpb b/bin/MakeProjectCreator/config/acelib.mpb
index d722f20a544..72ea4c138b5 100644
--- a/bin/MakeProjectCreator/config/acelib.mpb
+++ b/bin/MakeProjectCreator/config/acelib.mpb
@@ -1,4 +1,4 @@
-project: aceversion {
+project: acedefaults, aceversion {
   depends  += ace
   includes += $(ACE_ROOT)
   libpaths += $(ACE_ROOT)/ace
diff --git a/bin/MakeProjectCreator/config/global.mpb b/bin/MakeProjectCreator/config/global.mpb
index cf432adf891..31fd4ed706b 100644
--- a/bin/MakeProjectCreator/config/global.mpb
+++ b/bin/MakeProjectCreator/config/global.mpb
@@ -1,5 +1,4 @@
 project {
-  defaultlibs = ACE
-  dllout      = $(ACE_ROOT)/bin
-  libout      = .
+  dllout = .
+  libout = .
 }
diff --git a/bin/MakeProjectCreator/modules/ProjectCreator.pm b/bin/MakeProjectCreator/modules/ProjectCreator.pm
index be0d58eb4db..ef2bb79b6fd 100644
--- a/bin/MakeProjectCreator/modules/ProjectCreator.pm
+++ b/bin/MakeProjectCreator/modules/ProjectCreator.pm
@@ -103,6 +103,7 @@ sub new {
   $self->{'want_dynamic_projects'} = $dynamic;
   $self->{'want_static_projects'}  = $static;
   $self->{'flag_overrides'}        = {};
+  $self->{'special_supplied'}      = {};
 
   ## Set up the verbatim constructs
   $self->{'verbatim'} = {};
@@ -216,6 +217,7 @@ sub parse_line {
         $self->{'idl_defaulted'}    = 0;
         $self->{'flag_overrides'}   = {};
         $self->{'source_defaulted'} = 0;
+        $self->{'special_supplied'} = {};
       }
       else {
         ## Project Beginning
@@ -372,6 +374,13 @@ sub parse_components {
     $$comps{$current} = [];
   }
 
+  foreach my $special (@specialComponents) {
+    if ($special eq $tag) {
+      $self->{'special_supplied'}->{$tag} = 1;
+      last;
+    }
+  }
+
   while(<$fh>) {
     my($line) = $self->strip_line($_);
 
@@ -1180,14 +1189,16 @@ sub generate_defaults {
   ## Now, if the @specialComponents are still empty
   ## then take any file that matches the components extension
   foreach my $tag (@specialComponents) {
-    my($names) = $self->{$tag};
-    if (defined $names) {
-      foreach my $name (keys %$names) {
-        my($comps) = $$names{$name};
-        foreach my $comp (keys %$comps) {
-          my($array) = $$comps{$comp};
-          if (!defined $$array[0] || $self->{'source_defaulted'}) {
-            $self->generate_default_components(\@files, $tag);
+    if (!$self->{'special_supplied'}->{$tag}) {
+      my($names) = $self->{$tag};
+      if (defined $names) {
+        foreach my $name (keys %$names) {
+          my($comps) = $$names{$name};
+          foreach my $comp (keys %$comps) {
+            my($array) = $$comps{$comp};
+            if (!defined $$array[0] || $self->{'source_defaulted'}) {
+              $self->generate_default_components(\@files, $tag);
+            }
           }
         }
       }