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.8 by sashby, Thu Nov 29 12:56:11 2001 UTC vs.
Revision 1.10 by sashby, Tue Dec 4 19:24:04 2001 UTC

# Line 74 | Line 74 | sub selectedtools
74        {
75        if ( $self->{selected}{$tool} eq "SELECTED" )
76           {
77 +         $self->verbose(">> Adding tool $tool to list of selected tools");
78           push @toollist, $tool;
79           }
80 +      $self->verbose(">> Tool $tool was deselected");
81        }
82     return @toollist;
83     }
# Line 235 | Line 237 | sub Restrict_start {
237   sub Restrict_end {
238          my $self=shift;
239          my $name=shift;
240 <
240 >        
241          if ( $self->{Arch} ) {
242          if ( $#{$self->{restrictstack}} >= 0 ) {
243            $self->_autoselect(pop @{$self->{restrictstack}});
# Line 254 | Line 256 | sub require_start {
256          $self->{switch}->checktag( $name, $hashref, 'version');
257          $self->{switch}->checktag( $name, $hashref, 'name');
258          $self->{switch}->checktag( $name, $hashref, 'url');
259 <
259 >        
260          if ( $self->{reqcontext} == 1 ) {
261            $self->{switch}->parseerror(
262 <                "Open new $name conext without previous </$name>");
262 >                "Open new $name context without previous </$name>");
263          }
264          $self->{reqcontext}=1;
265          $$hashref{'name'}=~tr[A-Z][a-z];
# Line 267 | Line 269 | sub require_start {
269          my $urlobj=$self->{switch}->expandurl($$hashref{'url'});
270          $self->{url}{$$hashref{'name'}}=$urlobj->url();
271  
272 +
273 +        # Disable the auto select mechanism. Now, we start with
274 +        # all tools having a flag "UNSELECTED". Then we choose
275 +        # which we wish to select:
276 +        if ( $self->{Arch} )
277 +           {
278 +            $self->{selected}{$$hashref{'name'}}="UNSELECTED";
279 +           }
280 +
281          # -- selection
282 <        if ( $self->{Arch} ) {
283 <          if ( $self->_autoselect() ) {
284 <             $self->{selected}{$$hashref{'name'}}=1;
285 <          }
286 <          else {
287 <             $self->{selected}{$$hashref{'name'}}=0;
288 <          }
289 <        }
282 > #       if ( $self->{Arch} ) {
283 > #         if ( $self->_autoselect() ) {
284 > #            $self->{selected}{$$hashref{'name'}}="UNSELECTED";
285 > #         }
286 > #         else {
287 > #            $self->{selected}{$$hashref{'name'}}="DESELECTED";
288 > #         }
289 > #       }
290 >
291 >        # Output the tool name here with the value
292 >        # of its' select flag:
293 >        $self->verbose(">> Tool name: ".$$hashref{'name'}." sel/desel flag value: ".
294 >                       $self->{selected}{$$hashref{'name'}} ." ");
295 >
296          $self->{creqtool}=$$hashref{'name'};
297          $self->{creqversion}=$$hashref{'version'};
298          $self->{reqtext}{$self->{creqtool}}{$self->{creqversion}}="";

Diff Legend

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