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

Comparing COMP/SCRAM/src/Scram/ScramFunctions.pm (file contents):
Revision 1.15 by sashby, Wed Aug 22 12:40:13 2001 UTC vs.
Revision 1.21 by sashby, Tue May 21 10:57:34 2002 UTC

# Line 82 | Line 82 | sub project {
82          return $area;
83   }
84  
85 < sub setuptoolsinarea {
86 <        my $self=shift;
87 <        my $area=shift;
88 <
89 <        # -- initialise
90 <        print "Initialising setup procedure......","\n";
91 <        $self->_allprojectinitsearcher();
92 <
93 <        # -- create a new toolbox object
94 <        my $toolbox=$self->areatoolbox($area);
95 <        $toolbox->searcher($self->_allprojectinitsearcher());
96 <
97 <        if ( @_ ) {
98 <            # -- specific tool specified
99 <            if ( my $rv=$toolbox->toolsetup(@_) ) {
100 <             if ( $rv eq 1 ) {
101 <                print "Unknown tool $toolname @ARGV\n";
102 <                exit 1;
103 <             }
104 <            }
105 <        }
106 <        else {
107 <            # -- setup all tools specified in the requirements doc
108 <            my $reqs=$self->arearequirements($area);
109 <            $self->verbose("Setup ToolBox from Requirements doc ($reqs)");
110 <            $reqs->setup($toolbox);
111 <        }
112 < }
85 > sub setuptoolsinarea
86 >   {
87 >   my $self=shift;
88 >   my $area=shift;
89 >  
90 >   # -- initialise
91 >   print "Initialising setup procedure......","\n";
92 >   $self->_allprojectinitsearcher();
93 >  
94 >   # -- create a new toolbox object
95 >   my $toolbox=$self->areatoolbox($area);
96 >   $toolbox->searcher($self->_allprojectinitsearcher());
97 >  
98 >   if ( @_ )
99 >      {
100 >      # -- specific tool specified
101 >      if ( my $rv=$toolbox->toolsetup(@_) )
102 >         {
103 >         if ( $rv eq 1 )
104 >            {
105 >            print "Unknown tool $toolname @ARGV\n";
106 >            exit 1;
107 >            }
108 >         }
109 >      }
110 >   else
111 >      {
112 >      # -- setup all tools specified in the requirements doc
113 >      print "Going to set up all tools....","\n\n";
114 >      my $reqs=$self->arearequirements($area);    
115 >      $self->verbose("Setup ToolBox from Requirements doc ($reqs)");
116 >      # reqs is a BuildSystem::Requirements object:
117 >      $reqs->setup($toolbox);
118 >      }
119 >   }
120  
121   sub satellite {
122          my $self=shift;
# Line 137 | Line 144 | sub satellite {
144          my $area=$relarea->satellite($installarea,$areaname);
145          $area->archname($self->arch());
146  
140 –        # -- copy setup info - deprecated by toolbox copy method
141 –        #$relarea->copysetup($area->location());
142 –
147          # -- copy toolbox
148          my $rtb=$self->areatoolbox($relarea);
149          my $tb=$self->areatoolbox($area);
# Line 301 | Line 305 | sub spawnversion
305              exit $rv;
306              }
307           else
308 <            { # if not then simply warn
309 <            print "******* Warning : scram version inconsistent ********\n";
310 <            print "This version: $thisversion; Required version: $version\n";
311 <            print "*****************************************************\n";
312 <            print "\n";
308 >            {
309 >            # if not then simply warn. Send output to STDERR:
310 >            if ( -t STDERR )
311 >               {
312 >               print STDERR "******* Warning : scram version inconsistent ********\n";
313 >               print STDERR "This version: $thisversion; Required version: $version\n";
314 >               print STDERR "*****************************************************\n";
315 >               print STDERR "\n";
316 >               }    
317              }
318           }
319        }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines