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.25 by muzaffar, Thu Feb 7 10:51:09 2013 UTC vs.
Revision 1.26 by muzaffar, Wed Feb 13 11:44:13 2013 UTC

# Line 33 | Line 33 | sub new
33   sub initpathvars()
34     {
35     my $self=shift;
36 <   if (!exists $ENV{SCRAM_PATH_VARIABLES})
36 >   if (!exists $self->{internal}{path_variables})
37        {
38        my %pathvars=("PATH", 1, "LD_LIBRARY_PATH", 1, "DYLD_LIBRARY_PATH", 1, "DYLD_FALLBACK_LIBRARY_PATH", 1, "PYTHONPATH", 1);
39        my $p = $self->_parsetool($self->{configdir}."/Self.xml");
# Line 56 | Line 56 | sub initpathvars()
56           }
57        my $paths = join("|",keys %pathvars);
58        if ($paths){$paths = "^($paths)\$";}
59 <      $ENV{SCRAM_PATH_VARIABLES}=$paths;
59 >      $self->{internal}{path_variables}=$paths;
60        }
61     }
62  
# Line 229 | Line 229 | sub toolsdata()
229   sub _parsetool()
230     {
231     my ($self,$filename)=@_;
232 <   my $p = BuildSystem::ToolParser->new();
232 >   my $p = BuildSystem::ToolParser->new($self->{internal}{path_variables});
233     $p->filehead ('<?xml version="1.0" encoding="UTF-8" standalone="yes"?><doc type="BuildSystem::ToolDoc" version="1.0">');
234     $p->filetail ('</doc>');
235     $p->parse($filename);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines