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