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

Comparing COMP/SCRAM/src/BuildSystem/Requirements.pm (file contents):
Revision 1.13 by sashby, Mon Apr 29 16:09:23 2002 UTC vs.
Revision 1.15 by sashby, Tue Oct 15 15:56:21 2002 UTC

# Line 259 | Line 259 | sub init {
259  
260   sub arch {
261          my $self=shift;
262 +        # $self->arch is the SCRAM_ARCH value:
263          if ( @_ ) {
264            $self->{arch}=shift
265          }
# Line 360 | Line 361 | sub require_start {
361          }
362          $self->{reqcontext}=1;
363          $$hashref{'name'}=~tr[A-Z][a-z];
364 +
365 +        # Add tool to the tool array:
366          push @{$self->{tools}}, $$hashref{'name'};
367 +        # Also add its' version:
368          $self->{version}{$$hashref{'name'}}=$$hashref{'version'};
369 +
370          # -- make sure the full url is taken
371          my $urlobj=$self->{switch}->expandurl($$hashref{'url'});
372          $self->{url}{$$hashref{'name'}}=$urlobj->url();
373  
369 –
374          # Disable the auto select mechanism. Now, we start with
375          # all tools having a flag "UNSELECTED". Then we choose
376          # which we wish to select:
# Line 440 | Line 444 | sub deselect_start
444        }
445     }
446  
447 < sub Arch_Start {
448 <        my $self=shift;
449 <        my $name=shift;
450 <        my $hashref=shift;
447 > sub Arch_Start
448 >   {
449 >   my $self=shift;
450 >   my $name=shift;
451 >   my $hashref=shift;
452 >   # Check the architecture tag:
453 >   $self->{switch}->checktag($name, $hashref,'name');
454 >   # Look for a match between the architecture flag read
455 >   # from the RequirementsDoc ($$hashref{name}) and scram arch:
456 >   #if ($self->arch() =~ /$$hashref{name}.*/)
457 >   #   {
458 >      
459 >    #  }
460 >   #elsif ($self->arch() =~ /$$hashref{name}/)
461 >   #   {
462 >   #   }
463 >   #else
464 >   #   {
465 >   #   }
466 >   ( ($self->arch()=~/$$hashref{name}.*/) )? ($self->{Arch}=1)
467 >      : ($self->{Arch}=0);
468 > #   ( ($self->arch()=~/$$hashref{name}[BLAH]/) )? ($self->{Arch}=1)
469 > #      : ($self->{Arch}=0);
470  
471 <        $self->{switch}->checktag($name, $hashref,'name');
472 <        
473 <        ( ($self->arch()=~/$$hashref{name}.*/) )? ($self->{Arch}=1)
474 <                                                : ($self->{Arch}=0);
475 <        $self->verbose(($self->{Arch}?"OK":"skipping")." ".$$hashref{name});
453 <        push @{$self->{ARCHBLOCK}}, $self->{Arch};
454 <        push @{$self->{ArchStack}}, $$hashref{'name'};
455 < }
471 >  
472 >   $self->verbose(($self->{Arch}?"OK":"skipping")." ".$$hashref{name});
473 >   push @{$self->{ARCHBLOCK}}, $self->{Arch};
474 >   push @{$self->{ArchStack}}, $$hashref{'name'};
475 >   }
476  
477   sub Arch_End {
478          my $self=shift;

Diff Legend

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