ChangeLogTag: Wed Jan 4 08:09:20 2006 Chad Elliott <elliott_c@ociweb.com>

2 files changed, 12 insertions, 15 deletions

diff --git a/ChangeLog b/ChangeLog
index 810b06dc..b2fb061f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Wed Jan  4 08:09:20 2006  Chad Elliott  <elliott_c@ociweb.com>
+
+        * modules/ProjectCreator.pm:
+
+          Fixed a bug where adding a grouped set of source files that are
+          generated using a wildcard would cause a duplicate of the default
+          group if files were added to a different after the generated
+          group.
+
 Tue Jan  3 08:26:34 2006  Chad Elliott  <elliott_c@ociweb.com>
 
         * USAGE:
diff --git a/modules/ProjectCreator.pm b/modules/ProjectCreator.pm
index 6d9e20a6..cd7880ea 100644
--- a/modules/ProjectCreator.pm
+++ b/modules/ProjectCreator.pm
@@ -1196,19 +1196,7 @@ sub parse_components {
       else {
         ## It was used, so we need to add that name to
         ## the set of group names unless it's already been added.
-        my($groups)   = $self->get_assignment($grtag);
-        my($addgroup) = 1;
-        if (defined $groups) {
-          foreach my $group (@{$self->create_array($groups)}) {
-            if ($current eq $group) {
-              $addgroup = 0;
-              last;
-            }
-          }
-        }
-        if ($addgroup) {
-          $self->process_assignment_add($grtag, $current);
-        }
+        $self->process_assignment_add($grtag, $current);
       }
       if ($set) {
         $current = $defgroup;
@@ -1649,8 +1637,8 @@ sub remove_duplicate_addition {
     ## assignment with either addition or subtraction, we are going to
     ## perform a little fix on the value to avoid multiple
     ## libraries and to try to insure the correct linking order
-    if ($name eq 'macros'   ||
-        $name eq 'libpaths' || $name eq 'includes' || $name =~ /libs$/) {
+    if ($name eq 'macros' || $name eq 'libpaths' ||
+        $name eq 'includes' || $name =~ /libs$/ || $name =~ /^$grouped_key/) {
       my($allowed) = '';
       my(%parts)   = ();