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

Comparing COMP/SCRAM/src/BuildSystem/ToolParser.pm (file contents):
Revision 1.2 by sashby, Fri Dec 10 13:41:37 2004 UTC vs.
Revision 1.5 by sashby, Wed Oct 5 15:37:48 2005 UTC

# Line 438 | Line 438 | sub processrawtool()
438        {
439        $tooldataobj->scram_project($self->{content}->{SCRAM_PROJECT});
440        }
441 +  
442 +   # And check to see if this tool is a compiler. If so, set
443 +   # the SCRAM_COMPILER variable in the ToolData object:
444 +   if (exists ($self->{content}->{SCRAM_COMPILER}))
445 +      {
446 +      $tooldataobj->scram_compiler($self->{content}->{SCRAM_COMPILER});
447 +      }
448  
449     # Establish the order of parsing the value strings:
450     my $order = $self->process_environments($environments);
# Line 552 | Line 559 | sub find_settings()
559        elsif (exists($ENV{$envname}))
560           {
561           # Nothing to do here:
562 +         push(@$runtime, $envname); # FIX From Shahzad.
563           next;
564           }
565        else
# Line 572 | Line 580 | sub find_settings()
580        my $type = 'RUNTIME';      
581        my $envdata = $tsv->environment($type, $rtname);
582        my ($rttype,$realrtname) = split(':',$rtname);      
583 <
583 >      
584        # Only validate paths:
585        if ($rtname =~ /:/)
586           {      

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines