ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/COMP/SCRAM/src/BuildSystem/ToolManager.pm
(Generate patch)

Comparing COMP/SCRAM/src/BuildSystem/ToolManager.pm (file contents):
Revision 1.9 by sashby, Fri Apr 29 15:54:47 2005 UTC vs.
Revision 1.10 by sashby, Tue Jun 28 19:08:55 2005 UTC

# Line 277 | Line 277 | sub toolsetup()
277        # See what kind of URL (file:, http:, cvs:, svn:, .. ):
278        if ($proto eq 'file')
279           {
280 +         # Check to see if there is a ~ and substitute the user
281 +         # home directory if there is:
282 +         my ($urlpath) = ($urlv =~ m|^\~/(.*)$|);
283 +         $urlv = $ENV{HOME}."/".$urlpath;
284 +
285           # If the tool url is a file and the file exists,
286           # copy it to .SCRAM/InstalledTools and set the
287           # filename accordingly:
# Line 510 | Line 515 | sub remove_tool()
515           }
516        else
517           {
518 <         print "Deleting $toolname from cache.","\n";
518 >         # Is this tool a compiler?
519 >         if ($tooldata->scram_compiler() == 1)
520 >            {
521 >            # Also remove this from the compiler info if there happens to be an entry:
522 >            while (my ($langtype, $ctool) = each %{$self->{SCRAM_COMPILER}})
523 >               {
524 >               if ($toolname eq $ctool->[0])
525 >                  {
526 >                  delete $self->{SCRAM_COMPILER}->{$langtype};
527 >                  print "Deleting compiler $toolname from cache.","\n";
528 >                  }
529 >               }
530 >            }
531 >         else
532 >            {
533 >            print "Deleting $toolname from cache.","\n";
534 >            }
535           }
536        }
537    
538     $self->{SETUP} = $newtlist;
539 <
539 >  
540     # Now remove from the RAW tool list:
541     $self->cleanup_raw($toolname);
521  
542     print "ToolManager: Updating tool cache.","\n";
543     $self->writecache();
544     }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines