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

Comparing COMP/SCRAM/src/BuildSystem/ToolDoc.pm (file contents):
Revision 1.1.2.12 by williamc, Tue Jun 20 15:27:40 2000 UTC vs.
Revision 1.1.2.14 by williamc, Thu Jun 22 08:41:52 2000 UTC

# Line 257 | Line 257 | sub _toolparamcopy {
257          my $param=shift;
258  
259          my $rv=0;
260 +        my @params=();
261          $self->verbose("Check Other Projects for tool");
262          my @validtools=$self->_searchtools($tool);
263          if ( ! $self->interactive() ) {
264            if ( $#validtools >=0 ) {
265 <           my @params=$validtools[0]->getfeature($param);
265 >           @params=$validtools[0]->getfeature($param);
266             if ( $#params >=0 ) {
267                  $self->verbose("Extracting Feature $param from tool".
268                          " (= @params )\n");
269 <                $tool->setfeature($param,@params);
269 >                #$tool->setfeature($param,@params);
270                  $rv=1;
271             }
272            }
273          }
274 <        return $rv;
274 >        return ($rv,@params);
275   }
276  
277   # -- Tag Routines
# Line 349 | Line 350 | sub Environment_Start {
350            }
351            elsif ( ! $self->interactive() ) {
352             # check other installed copies of the tool
353 <           if ( $self->_toolparamcopy($self->{tool},$$hashref{'name'}) ) {
354 <              my @tmp=$self->{tool}->getfeature($$hashref{'name'});
355 <              $self->{Envvalue}=$tmp[0]; # assume single val parameter!
353 >           my ($rv,@params)=
354 >                $self->_toolparamcopy($self->{tool},$$hashref{'name'});
355 >           if ( $rv && ($#params == 0)) { #dont use multivalued params!
356 >              $self->{Envvalue}=$params[0]; # single val parameter
357             }
358             elsif ( defined $ENV{$$hashref{'name'}} ) {
359                # check the environment

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines