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.10 by williamc, Wed Nov 15 10:08:27 2000 UTC vs.
Revision 1.12 by sashby, Tue Jun 12 16:02:56 2001 UTC

# Line 33 | Line 33 | require 5.004;
33  
34   @ISA=qw(Utilities::Verbose);
35  
36 < sub new {
37 <        my $class=shift;
38 <        $self={};
39 <        bless $self, $class;
40 <        # -- default settings
41 <        $self->{cachedir}=$ENV{HOME}."/.scramrc/globalcache";
42 <        $self->{scramprojectsdbdir}=$ENV{SCRAM_LOOKUPDB};
43 <        ($self->{scram_top})=( $ENV{SCRAM_HOME}=~/(.*)\//) ;
44 <
45 <        return $self;
46 < }
36 > sub new
37 >   {
38 >   my $class=shift;
39 >   $self={};
40 >   bless $self, $class;
41 >   # -- default settings
42 >   $self->{cachedir}=$ENV{HOME}."/.scramrc/globalcache";
43 >   $self->{scramprojectsdbdir}=$ENV{SCRAM_LOOKUPDB};
44 >   ($self->{scram_top})=( $ENV{SCRAM_HOME}=~/(.*)\//) ;
45 >  
46 >   return $self;
47 >   }
48  
49   sub classverbose {
50          my $self=shift;
# Line 240 | Line 241 | sub addareatoDB {
241          $self->scramprojectdb()->addarea($tagname,$version,$area);
242   }
243  
244 < sub spawnversion {
245 <        my $self=shift;
246 <        my $version=shift;
247 <
248 <        my $rv=0;
249 <        my $thisversion=$self->getversion();
250 <        if ( defined $version ) {
251 <          if ( $version ne $thisversion ) {
252 <              # first try to use the correct version
253 <              if ( -d $self->{scram_top}."/".$version ) {
254 <                $ENV{SCRAM_HOME}=$self->{scram_top}."/".$version;
255 <                $ENV{TOOL_HOME}="$ENV{SCRAM_HOME}/src";
256 <                $self->verbose("Spawning SCRAM version $version");
257 <                my $rv=system("scram", @_)/256;
258 <                exit $rv;
259 <              }
260 <              else { # if not then simply warn
261 <               print "******* Warning : scram version inconsistent ********\n";
262 <               print "This version: $thisversion; Required version: $version\n";
263 <               print "*****************************************************\n";
264 <               print "\n";
265 <              }
266 <           }
267 <        }
268 <        else {
269 <           $self->error("Undefined value for version requested");
270 <           $rv=1;
271 <        }
272 <        return $rv;
273 < }
244 > sub spawnversion
245 >   {
246 >   my $self=shift;
247 >   my $version=shift;
248 >   my $rv=0;
249 >  
250 >   my $thisversion=$self->getversion();
251 >
252 >   if ( defined $version )
253 >      {
254 >      if ( $version ne $thisversion )
255 >         {
256 >         # first try to use the correct version
257 >         if ( -d $self->{scram_top}."/".$version )
258 >            {
259 >            $ENV{SCRAM_HOME}=$self->{scram_top}."/".$version;
260 >            $ENV{TOOL_HOME}="$ENV{SCRAM_HOME}/src";
261 >            $self->verbose("Spawning SCRAM version $version");
262 >            my $rv=system("scram", @_)/256;
263 >            exit $rv;
264 >            }
265 >         else
266 >            { # if not then simply warn
267 >            print "******* Warning : scram version inconsistent ********\n";
268 >            print "This version: $thisversion; Required version: $version\n";
269 >            print "*****************************************************\n";
270 >            print "\n";
271 >            }
272 >         }
273 >      }
274 >   else
275 >      {
276 >      $self->error("Undefined value for version requested");
277 >      $rv=1;
278 >      }
279 >   return $rv;
280 >   }
281  
282   sub globalcache {
283          my $self=shift;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines