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

           ## Fill in all the default values
           $self->generate_defaults();
           ## End of workspace; Have subclass write out the file
           ## Generate the project files
-          my($gstat, $creator) = $self->generate_project_files();
+          my($gstat, $creator, $err) = $self->generate_project_files();
           if ($gstat) {
             ($status, $error) = $self->write_workspace($creator, 1);
             $self->{'assign'} = {};
+          }
           else {
-            $error = 'Unable to generate all of the project files';
+            $error = $err;
             $status = 0;
+          }
           $self->{'modified_count'} = 0;
           $self->{'workspace_name'} = undef;
   if ($name eq 'exclude') {
     return $self->parse_exclude($fh, $type);
+  }
   else {
+    ## We need to make a copy of the current assignment hash
+    ## to ensure that multiply scoped assignments/additions/subtractions
+    ## work and contain the non-scoped assignments/additions/subtractions
+    if (!defined $flags) {
+      my(%copy) = %{$self->get_assignment_hash()};
+      $flags = \%copy;
+    }
     return $self->SUPER::parse_scope($fh, $name, $type,
                                      $validNames, $flags, $elseflags);
+  }
+}
   ## Make a copy of these.  We will be modifying them.
   ## It is necessary to sort the projects to get the correct ordering.
   ## Projects in the current directory must come before projects in
   ## other directories.
-  my(@projects)  = sort { my($sa) = ($a =~ /\//);
+  my(@projects)  = sort { return $self->sort_projects_by_directory($a, $b) + 0;
-                          my($sb) = ($b =~ /\//);
-                          if ($sa && !$sb) {
-                            return 1;
-                          }
-                          elsif ($sb && !$sa) {
-                            return -1;
-                          }
-                          return $a cmp $b;
                         } @{$origproj};
   my(%projinfo)  = %{$originfo};
   foreach my $prj (@projects) {
     my($top, $rest) = $self->topname($prj);
           ## If any one project file fails, then stop
           ## processing altogether.
           if (!$status) {
             ## We don't restore the state before we leave,
-            ## but that's ok since we will be exiting soon.
+            ## but that's ok since we will be exiting right now.
-            return $status, $creator;
+            return $status, $creator,
+                   "Unable to process " . ($file eq '' ? " in $dir" : $file);
+          }
           ## Get the individual project information and
           ## generated file name(s)
           $files_written = $creator->get_files_written();
+      }
       else {
         ## Unable to change to the directory.
         ## We don't restore the state before we leave,
         ## but that's ok since we will be exiting soon.
-        return 0, $creator;
+        return 0, $creator, "Unable to change directory to $dir";
+      }
       ## Return things to the way they were
       if (defined $self->{'scoped_assign'}->{$ofile}) {
         $impl = $previmpl;
+      }
       $self->warning('Circular dependency detected while processing the ' .
                      ($self->{'current_input'} eq '' ?
                        'default' : $self->{'current_input'}) .
                      ' workspace. ' .
-                     'The following directories are involved: ' .
+                     'The following directories or projects are involved: ' .
                      join(' and ', @dirs));
       return;
+    }
     ## Build up the group dependencies
 sub sort_dependencies {
   my($self)     = shift;
   my($projects) = shift;
+  my(@list)     = sort { return $self->sort_projects_by_directory($a, $b) + 0;
-  my(@list)     = sort @$projects;
+                       } @$projects;
   ## Put the projects in the order specified
   ## by the project dpendencies.  We only need to do
   ## this if there is more than one element in the array.
   if ($#list > 0) {
       elsif ($previous->[1] ne $dir) {
         push(@grindex, [$previous->[0], $li - 1]);
         $previous = [$li, $dir];
+      }
+    }
-     push(@grindex, [$previous->[0], $#list]);
+    push(@grindex, [$previous->[0], $#list]);
     ## Next, sort the individual groups
     foreach my $gr (@grindex) {
       if ($$gr[0] != $$gr[1]) {
         $self->sort_within_group(\@list, @$gr);
   return @list;
+}
 sub project_target_translation {
-  my($self)  = shift;
+  my($self) = shift;
-  my($cased) = shift;
+  my($case) = shift;
-  my(%map)   = ();
+  my(%map)  = ();
   ## Translate project names to avoid target collision with
   ## some versions of make.
   foreach my $key (keys %{$self->{'project_info'}}) {
     my($dir)  = $self->mpc_dirname($key);
     my($name) = $self->{'project_info'}->{$key}->[0];
+    ## We want to compare to the upper most directory.  This will be the
+    ## one that may conflict with the project name.
+    $dir =~ s/[\/\\].*//;
-    if (($cased && $dir eq $name) || (!$cased && lc($dir) eq lc($name))) {
+    if (($case && $dir eq $name) || (!$case && lc($dir) eq lc($name))) {
       $map{$key} = "$name-target";
+    }
     else {
       $map{$key} = $name;
+    }
   my($cwd)          = $self->getcwd();
   $self->{'project_file_list'}->{$project_name} = [ $project_file,
                                                     $cwd, \@files ];
+}
+sub sort_projects_by_directory {
+  my($self)  = shift;
+  my($left)  = shift;
+  my($right) = shift;
+  my($sa)    = ($left =~ /\//);
+  my($sb)    = ($right =~ /\//);
+  if ($sa && !$sb) {
+    return 1;
+  }
+  elsif ($sb && !$sa) {
+    return -1;
+  }
+  return $left cmp $right;
+}
 # ************************************************************
 # Virtual Methods To Be Overridden
 # ************************************************************
 sub supports_make_coexistence {

Subversion Repositories gelsvn

(root)/trunk/MPC/modules/WorkspaceCreator.pm @ 209 – Rev 107 → 198