WebSVN – gelsvn – Diff – /branches/MPC/MPC/modules/WorkspaceCreator.pm

   $self->{'coexistence'}         = $makeco;
   $self->{'project_file_list'}   = {};
   $self->{'ordering_cache'}      = {};
   $self->{'handled_scopes'}      = {};
   $self->{'generate_ins'}        = $genins;
+  $self->{'scoped_basedir'}      = undef;
   if (defined $$exclude[0]) {
     my($type) = $self->{'wctype'};
     if (!defined $self->{'exclude'}->{$type}) {
       $self->{'exclude'}->{$type} = [];
           else {
             $name =~ s/^\(\s*//;
             $name =~ s/\s*\)$//;
             ## Replace any *'s with the default name
+            if ($name =~ /\*/) {
-            my($def) = $self->get_default_workspace_name();
+              $name = $self->fill_type_name(
-            $name = $self->fill_type_name($name, $def);
+                                    $name,
+                                    $self->get_default_workspace_name());
+            }
             $self->{'workspace_name'} = $name;
+          }
+        }
         $self->{$self->{'type_check'}} = 1;
         $error = "Invalid subtraction name: $values[1]";
         $status = 0;
+      }
+    }
     elsif ($values[0] eq 'component') {
-      if ($values[1] eq 'exclude') {
-        ($status, $error) = $self->parse_exclude($ih, $values[2]);
-      }
-      else {
-        ($status, $error) = $self->parse_scope($ih,
+      ($status, $error) = $self->parse_scope($ih,
-                                               $values[1],
+                                             $values[1],
-                                               $values[2],
+                                             $values[2],
-                                               \%validNames);
+                                             \%validNames);
-      }
+    }
     else {
       $error = "Unrecognized line: $line";
       $status = 0;
+    }
   return 0, 'Unable to open ' . $file;
+}
+sub parse_scope {
+  my($self)        = shift;
+  my($fh)          = shift;
+  my($name)        = shift;
+  my($type)        = shift;
+  my($validNames)  = shift;
+  my($flags)       = shift;
+  my($elseflags)   = shift;
+  if ($name eq 'exclude') {
+    return $self->parse_exclude($fh, $type);
+  }
+  else {
+    return $self->SUPER::parse_scope($fh, $name, $type,
+                                     $validNames, $flags, $elseflags);
+  }
+}
 sub parse_exclude {
   my($self)        = shift;
   my($fh)          = shift;
   my($typestr)     = shift;
   my($status)      = 0;
   my($errorString) = 'Unable to process exclude';
+  my($negated)     = undef;
   if ($typestr eq $self->get_default_component_name()) {
     $typestr = $self->{'wctype'};
+  }
   my(@exclude) = ();
   my(%types)   = ();
   @types{split(/\s*,\s*/, $typestr)} = ();
   ## If there is a negation at all, add our
   ## current type, it may be removed below
   if ($typestr =~ /!/) {
+    $negated = 1;
     $types{$self->{wctype}} = 1;
     ## Process negated exclusions
     foreach my $key (keys %types) {
-      if ($key =~ /^!(\w+)/) {
+      if ($key =~ /^!\s*(\w+)/) {
         ## Remove the negated key
         delete $types{$key};
         ## Then delete the key that was negated in the exclusion.
         delete $types{$1};
           $errorString = undef;
+        }
         last;
+      }
       else {
+        if (defined $self->{'scoped_basedir'}) {
+          $line = $self->{'scoped_basedir'} . '/' . $line;
+        }
         push(@exclude, $line);
+      }
+    }
     foreach my $type (keys %types) {
+      }
       push(@{$self->{'exclude'}->{$type}}, @exclude);
+    }
+  }
   else {
+    if ($negated) {
-    ($status, $errorString) = $self->parse_scope($fh,
+      ($status, $errorString) = $self->SUPER::parse_scope($fh,
-                                                 'exclude',
+                                                          'exclude',
-                                                 $typestr,
+                                                          $typestr,
-                                                 \%validNames);
+                                                          \%validNames);
+    }
+    else {
+      ## If this exclude block didn't match the current type and the
+      ## exclude wasn't negated, we need to eat the exclude block so that
+      ## these lines don't get included into the workspace.
+      while(<$fh>) {
+        my($line) = $self->preprocess_line($fh, $_);
+        if ($line =~ /^}(.*)$/) {
+          if (defined $1 && $1 ne '') {
+            $status = 0;
+            $errorString = "Trailing characters found: '$1'";
+          }
+          else {
+            $status = 1;
+            $errorString = undef;
+          }
+          last;
+        }
+      }
+    }
+  }
   return $status, $errorString;
+}
       $$flags{'cmdline'} =~ s/\$PWD(\W)/$dir$1/g;
       $$flags{'cmdline'} =~ s/\$PWD$/$dir/;
+    }
     ## Go back to the previous directory and add the directory contents
-    ($status, $error) = $self->handle_scoped_unknown($type, $flags, '.');
+    ($status, $error) = $self->handle_scoped_unknown(undef, $type, $flags, '.');
+  }
   $self->{'handled_scopes'}->{$type} = undef;
   return $status, $error;
+}
 sub handle_scoped_unknown {
   my($self)   = shift;
+  my($fh)     = shift;
   my($type)   = shift;
   my($flags)  = shift;
   my($line)   = shift;
   my($status) = 1;
   my($error)  = undef;
   my($dupchk) = undef;
+  if ($line =~ /^\w+.*{/) {
+    if (defined $fh) {
+      my(@values) = ();
+      my($tc) = $self->{$self->{'type_check'}};
+      $self->{$self->{'type_check'}} = 1;
+      ($status, $error, @values) = $self->parse_line($fh, $line);
+      $self->{$self->{'type_check'}} = $tc;
+    }
+    else {
+      $status = 0;
+      $error  = 'Unhandled line: ' . $line;
+    }
+    return $status, $error;
+  }
   if ($type eq $aggregated) {
     $line = $self->{'scoped_basedir'} . ($line ne '.' ? "/$line" : '');
     my(%dup) = ();
     @dup{@{$self->{'project_files'}}} = ();
     $dupchk = \%dup;
+        }
+      }
       @files = @acceptable;
+    }
-    if (defined $dupchk) {
+    foreach my $file (@files) {
-      foreach my $file (@files) {
+      if (!$self->excluded($file)) {
-        if (exists $$dupchk{$file}) {
+        if (defined $dupchk && exists $$dupchk{$file}) {
           $self->warning("Duplicate mpc file ($file) added by an " .
                          'aggregate workspace.  It will be ignored.');
+        }
         else {
           $self->{'scoped_assign'}->{$file} = $flags;
           push(@{$self->{'project_files'}}, $file);
+        }
+      }
+    }
-    else {
-      foreach my $file (@files) {
-        $self->{'scoped_assign'}->{$file} = $flags;
-        push(@{$self->{'project_files'}}, $file);
-      }
-    }
+  }
   else {
     if ($line =~ /\.$wsext$/) {
       ## An aggregated workspace within an aggregated workspace.
       ($status, $error) = $self->aggregated_workspace($line);
+    }
     else {
+      if (!$self->excluded($line)) {
-      if (defined $dupchk && exists $$dupchk{$line}) {
+        if (defined $dupchk && exists $$dupchk{$line}) {
-        $self->warning("Duplicate mpc file ($line) added by an " .
+          $self->warning("Duplicate mpc file ($line) added by an " .
-                       'aggregate workspace.  It will be ignored.');
+                         'aggregate workspace.  It will be ignored.');
-      }
+        }
-      else {
+        else {
-        $self->{'scoped_assign'}->{$line} = $flags;
+          $self->{'scoped_assign'}->{$line} = $flags;
-        push(@{$self->{'project_files'}}, $line);
+          push(@{$self->{'project_files'}}, $line);
+        }
+      }
+    }
+  }
   $self->{'handled_scopes'}->{$type} = 1;
       my(@f) = $self->generate_default_file_list(
                          $file,
                          $self->{'exclude'}->{$self->{'wctype'}});
       $self->search_for_files(\@f, $array, $impl);
       if ($impl) {
+        $file =~ s/^\.\///;
         unshift(@$array, $file);
+      }
+    }
     else {
       if ($file =~ /\.mpc$/) {
+        $file =~ s/^\.\///;
         unshift(@$array, $file);
+      }
+    }
+  }
+}

Subversion Repositories gelsvn

(root)/branches/MPC/MPC/modules/WorkspaceCreator.pm – Rev 68 → 71