100 |
|
|
101 |
|
# -- check arguments and set location |
102 |
|
if ( ! defined $location ) { |
103 |
< |
$self->error("ConfigArea: Cannont setup area without a location"); |
103 |
> |
$self->error("ConfigArea: Cannot setup new area without a location"); |
104 |
|
} |
105 |
|
if ( @_ ) { |
106 |
|
$areaname=shift; |
147 |
|
if ( @_ ) { |
148 |
|
$self->{reqdoc}=shift; |
149 |
|
} |
150 |
< |
return (defined $self->{reqdoc})?$self->{reqdoc}:undef; |
150 |
> |
if ( defined $self->{reqdoc} ) { |
151 |
> |
return $self->location()."/".$self->{reqdoc}; |
152 |
> |
} |
153 |
> |
else { |
154 |
> |
return undef; |
155 |
> |
} |
156 |
|
} |
157 |
|
|
158 |
|
sub scramversion { |
243 |
|
my $sat=Configuration::ConfigArea->new(); |
244 |
|
$sat->name($self->name()); |
245 |
|
$sat->version($self->version()); |
246 |
< |
$sat->requirementsdoc($self->requirementsdoc()); |
246 |
> |
$sat->requirementsdoc($self->{reqdoc}); |
247 |
|
$sat->configurationdir($self->configurationdir()); |
248 |
|
$sat->setup(@_); |
249 |
|
|
375 |
|
print $fh "SCRAM_PROJECTNAME=".$self->name()."\n"; |
376 |
|
print $fh "SCRAM_PROJECTVERSION=".$self->version()."\n"; |
377 |
|
print $fh "projconfigdir=".$self->configurationdir()."\n"; |
378 |
< |
print $fh "SCRAM_ProjReqsDoc=".$self->requirementsdoc()."\n"; |
378 |
> |
print $fh "SCRAM_ProjReqsDoc=".$self->{reqdoc}."\n"; |
379 |
|
if ( defined $self->linkarea() ) { |
380 |
|
my $area=$self->linkarea()->location(); |
381 |
|
if ( $area ne "" ) { |