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.9 by sashby, Mon Dec 3 19:02:04 2001 UTC vs.
Revision 1.22 by sashby, Wed Feb 15 17:14:17 2006 UTC

# Line 21 | Line 21 | use Utilities::Verbose;
21   require 5.004;
22   @ISA=qw(Utilities::Verbose);
23  
24 < sub new {
25 <        my $class=shift;
26 <        my $self={};
27 <        bless $self, $class;
28 <        $self->{dbstore}=shift;
29 <        $self->{file}=shift;
30 <        $self->{cache}=$self->{dbstore}->cache();
31 <        if ( @_ ) {
32 <          $self->arch(shift);
33 <        }
34 <        $self->verbose("Initialising a new Requirements Doc");
35 <        $self->{mydocversion}="2.0";
36 <        $self->{Arch}=1;
37 <        push @{$self->{ARCHBLOCK}}, $self->{Arch};
38 <        $self->init($self->{file});
39 <        return $self;
40 < }
41 <
42 < sub url {
43 <        my $self=shift;
44 <        if ( @_ ) {
45 <          $self->{file}=shift;
46 <        }
47 <        return $self->{file}
48 < }
24 > sub new
25 >   {
26 >   my $class=shift;
27 >   my $self={};
28 >   bless $self, $class;
29 >   $self->{dbstore}=shift;
30 >   $self->{file}=shift;
31 >   $self->{cache}=$self->{dbstore}->cache();
32  
33 < sub setup
33 >   if ( @_ )
34 >      {
35 >      $self->arch(shift);
36 >      }
37 >   $self->verbose("Initialising a new Requirements Doc");
38 >   $self->{mydocversion}="2.0";
39 >   # Counter for downloaded tools: zero it here. It will
40 >   # be auto-incremented as each tool is selected:
41 >   $self->{selectcounter}=0;
42 >  
43 >   $self->{Arch}=1;
44 >   push @{$self->{ARCHBLOCK}}, $self->{Arch};
45 >   $self->init($self->{file});
46 >   return $self;
47 >   }
48 >
49 > sub toolmanager
50     {
51     my $self=shift;
52 <   my $toolbox=shift;
53 <   my $tool;
52 >  
53 >   @_ ? $self->{toolmanagerobject} = shift
54 >      : $self->{toolmanagerobject};
55 >  
56 >   }
57 >
58 > sub configversion
59 >   {
60 >   my $self=shift;
61 >   @_ ? $self->{configversion} = shift
62 >      : $self->{configversion};
63 >   }
64  
65 <   foreach $tool ( $self->selectedtools() )
65 > sub url
66 >   {
67 >   my $self=shift;
68 >  
69 >   if ( @_ )
70        {
71 <      $self->verbose("Setting Up Tool $tool");
59 <      $toolbox->toolsetup($tool, $self->version($tool), $self->toolurl($tool));
71 >      $self->{file}=shift;
72        }
73 +   return $self->{file};
74     }
75  
76 < sub tools {
77 <        my $self=shift;
78 <        return @{$self->{tools}};
79 < }
76 > sub tools
77 >   {
78 >   my $self=shift;
79 >   return @{$self->{tools}};
80 >   }
81  
82 < sub selectedtools
82 > sub toolcomment
83     {
84     my $self=shift;
85 <   my @toollist=();
85 >   my $tool=shift;
86 >   my $version=shift;
87 >  
88 >   return $self->{reqtext}{$tool}{$version};
89 >   }
90  
91 <   foreach $tool (  @{$self->{tools}} )
91 > sub distributionurl
92 >   {
93 >   my $self=shift;
94 >   my $tool=shift;
95 >   my $version=shift;
96 >  
97 >   return ( defined $self->{dist}{$tool}{$version})?
98 >      $self->{dist}{$tool}{$version}:undef;
99 >   }
100 >
101 > sub version
102 >   {
103 >   my $self=shift;
104 >   my $tool=shift;
105 >   return $self->{'version'}{$tool};
106 >   }
107 >
108 > sub toolurl
109 >   {
110 >   my $self=shift;
111 >   my $tool=shift;
112 >   return $self->{'url'}{$tool};
113 >   }
114 >
115 > sub init
116 >   {
117 >   my $self=shift;
118 >   my $url=shift;
119 >  
120 >   my $switch=ActiveDoc::ActiveDoc->new($self->{dbstore});
121 >   $switch->verbosity($self->verbosity());
122 >   $switch->url($url);
123 >   $switch->newparse("ordering");
124 >   $switch->addbasetags("ordering");
125 >  
126 >   $switch->addtag("ordering","Architecture",
127 >                   \&Arch_Start,$self,
128 >                   "", $self,
129 >                   \&Arch_End, $self);
130 >   $switch->addtag("ordering","select",
131 >                   \&select_start,$self,
132 >                   "", $self,
133 >                   "", $self);
134 >   $switch->grouptag("Architecture","ordering");
135 >   $switch->addtag("ordering","require",
136 >                   \&require_start,$self,
137 >                   \&require_text, $self,
138 >                   \&require_end, $self);
139 >  
140 >   $self->{reqcontext}=0;
141 >   $self->{switch}=$switch;
142 >   undef $self->{restrictstack};
143 >   @{$self->{tools}}=();
144 >  
145 >   my($doctype,$docversion)=$switch->doctype();
146 >   # -- for backwards compatability only parse if we have a docversion
147 >   #    defined:
148 >   if ( defined $docversion )
149 >      {
150 >      if ($docversion eq $self->{mydocversion})
151 >         {
152 >         @{$self->{ArchStack}}=();
153 >         $self->verbose("Initial Document Parse");
154 >         $self->{switch}->parse("ordering");
155 >         # Set the config version. If there isn't a version, it means that we
156 >         # have a stand-alone repository for the toolbox, rather than a CVS
157 >         # one. Hence, no CVS tag (== version):
158 >         ($switch->{configurl}->param('version') eq '') ?
159 >            $self->configversion("STANDALONE") :
160 >            $self->configversion($switch->{configurl}->param('version'));
161 >         }
162 >      else
163 >         {
164 >         $self->verbose("wrong doc version - not parsing");
165 >         }
166 >      }
167 >   else
168        {
169 <      if ( $self->{selected}{$tool} eq "SELECTED" )
169 >      $self->verbose("wrong doc type - not parsing");
170 >      }
171 >   }
172 >
173 > sub arch
174 >   {
175 >   my $self=shift;
176 >   # $self->arch is the SCRAM_ARCH value:
177 >   if ( @_ )
178 >      {
179 >      $self->{arch}=shift;
180 >      }
181 >   else
182 >      {
183 >      if ( ! defined $self->{arch} )
184           {
185 <         $self->verbose(">> Adding tool $tool to list of selected tools");
78 <         push @toollist, $tool;
185 >         $self->{arch}="";
186           }
80      $self->verbose(">> Tool $tool was deselected");
187        }
188 <   return @toollist;
188 >   return $self->{arch};
189     }
190  
191 < sub toolcomment {
192 <        my $self=shift;
193 <        my $tool=shift;
194 <        my $version=shift;
195 <
90 <        return $self->{reqtext}{$tool}{$version};
91 < }
92 <
93 < sub distributionurl {
94 <        my $self=shift;
95 <        my $tool=shift;
96 <        my $version=shift;
97 <
98 <        return ( defined $self->{dist}{$tool}{$version})?
99 <                        $self->{dist}{$tool}{$version}:undef;
100 < }
101 <
102 < sub version {
103 <        my $self=shift;
104 <        my $tool=shift;
105 <        return $self->{'version'}{$tool};
106 < }
107 <
108 < sub toolurl {
109 <        my $self=shift;
110 <        my $tool=shift;
111 <        return $self->{'url'}{$tool};
112 < }
113 <
114 < sub init {
115 <        my $self=shift;
116 <        my $url=shift;
117 <
118 <        my $switch=ActiveDoc::ActiveDoc->new($self->{dbstore});
119 <        $switch->verbosity($self->verbosity());
120 <        $switch->url($url);
121 <        $switch->newparse("ordering");
122 <        $switch->addbasetags("ordering");
123 <        $switch->addtag("ordering","Architecture",
124 <                                        \&Arch_Start,$self,
125 <                                        "", $self,
126 <                                        \&Arch_End, $self);
127 <        $switch->addtag("ordering","Restrict",
128 <                                        \&Restrict_start,$self,
129 <                                        "", $self,
130 <                                        \&Restrict_end, $self);
131 <        $switch->addtag("ordering","deselect",
132 <                                        \&deselect_start,$self,
133 <                                        "", $self,
134 <                                        "", $self);
135 <        $switch->addtag("ordering","select",
136 <                                        \&select_start,$self,
137 <                                        "", $self,
138 <                                        "", $self);
139 <        $switch->addtag("ordering","distribution",
140 <                                        \&disttag,$self);
141 <        $switch->grouptag("Architecture","ordering");
142 <        $switch->addtag("ordering","require",
143 <                                        \&require_start,$self,
144 <                                        \&require_text, $self,
145 <                                        \&require_end, $self);
146 <
147 <        $self->{reqcontext}=0;
148 <        $self->{switch}=$switch;
149 <        undef $self->{restrictstack};
150 <        @{$self->{tools}}=();
151 <        
152 <        my($doctype,$docversion)=$switch->doctype();
153 <        # -- for backwards compatability only parse if we have a docversion
154 <        #    defined
155 <        if ( defined $docversion ) {
156 <          if ( $docversion eq $self->{mydocversion} ) {
157 <            @{$self->{ArchStack}}=();
158 <            $self->verbose("Initial Document Parse");
159 <            $self->{switch}->parse("ordering");
160 <          }
161 <          else {
162 <            $self->verbose("wrong doc version - not parsing");
163 <          }
164 <        }
165 <        else {
166 <          $self->verbose("wrong doc type - not parsing");
167 <        }
168 < }
169 <
170 < sub arch {
171 <        my $self=shift;
172 <        if ( @_ ) {
173 <          $self->{arch}=shift
174 <        }
175 <        else {
176 <          if ( ! defined $self->{arch} ) {
177 <            $self->{arch}="";
178 <          }
179 <        }
180 <        return $self->{arch};
181 < }
182 <
183 < sub archlist {
184 <        my $self=shift;
185 <        return @{$self->{ArchStack}};
186 < }
187 <
188 < sub getreqforarch {
189 <        my $self=shift;
190 <        my $arch=shift;
191 <
192 <        if ( ! defined $self->{reqsforarch}{$arch} ) {
193 <          $self->{reqsforarch}{$arch}=
194 <                BuildSystem::Requirements->new($self->{dbstore},$self->{file},
195 <                                                $arch);
196 <        }
197 <        return $self->{reqsforarch}{$arch};
198 < }
199 <
200 <
201 < sub download {
202 <        my $self=shift;
203 <
204 <        my $tool;
205 <        foreach $tool ( $self->tools() ) {
206 <          $self->verbose("Downloading ".$self->toolurl($tool));
207 <          # get into the cache
208 <          $self->{switch}->urlget($self->toolurl($tool));
209 <        }
210 < }
211 <
212 < sub _autoselect {
213 <        my $self=shift;
214 <        if ( @_ ) {
215 <          $self->{autoselect}=shift;
216 <        }
217 <        # -- default is true
218 <        return ((defined $self->{autoselect})?$self->{autoselect}:1);
219 < }
220 <
221 < # ---- Tag routines
222 <
223 < sub Restrict_start {
224 <        my $self=shift;
225 <        my $name=shift;
226 <        my $hashref=shift;
227 <
228 <        $self->{switch}->checktag( $name, $hashref, 'autoselect');
229 <        if ( $self->{Arch} ) {
230 <        # -- create selection state stack
231 <        push @{$self->{restrictstack}}, $self->_autoselect();
232 <        $self->_autoselect(
233 <                (($$hashref{'autoselect'}=~/true/i)?1:0));
234 <        }
235 < }
236 <
237 < sub Restrict_end {
238 <        my $self=shift;
239 <        my $name=shift;
240 <
241 <        if ( $self->{Arch} ) {
242 <        if ( $#{$self->{restrictstack}} >= 0 ) {
243 <          $self->_autoselect(pop @{$self->{restrictstack}});
244 <        }
245 <        else {
246 <          $self->{switch}->parseerror("Unmatched </$name>");
247 <        }
248 <        }
249 < }
250 <
251 < sub require_start {
252 <        my $self=shift;
253 <        my $name=shift;
254 <        my $hashref=shift;
255 <        
256 <        $self->{switch}->checktag( $name, $hashref, 'version');
257 <        $self->{switch}->checktag( $name, $hashref, 'name');
258 <        $self->{switch}->checktag( $name, $hashref, 'url');
259 <
260 <        if ( $self->{reqcontext} == 1 ) {
261 <          $self->{switch}->parseerror(
262 <                "Open new $name conext without previous </$name>");
263 <        }
264 <        $self->{reqcontext}=1;
265 <        $$hashref{'name'}=~tr[A-Z][a-z];
266 <        push @{$self->{tools}}, $$hashref{'name'};
267 <        $self->{version}{$$hashref{'name'}}=$$hashref{'version'};
268 <        # -- make sure the full url is taken
269 <        my $urlobj=$self->{switch}->expandurl($$hashref{'url'});
270 <        $self->{url}{$$hashref{'name'}}=$urlobj->url();
271 <
272 <        # -- selection
273 <        if ( $self->{Arch} ) {
274 <          if ( $self->_autoselect() ) {
275 <             $self->{selected}{$$hashref{'name'}}=1;
276 <          }
277 <          else {
278 <             $self->{selected}{$$hashref{'name'}}=0;
279 <          }
280 <        }
281 <        $self->{creqtool}=$$hashref{'name'};
282 <        $self->{creqversion}=$$hashref{'version'};
283 <        $self->{reqtext}{$self->{creqtool}}{$self->{creqversion}}="";
284 < }
285 <
286 < sub require_text {
287 <        my $self=shift;
288 <        my $name=shift;
289 <        my $string=shift;
290 <
291 <        chomp $string;
292 <        $self->{reqtext}{$self->{creqtool}}{$self->{creqversion}}=
293 <                $self->{reqtext}{$self->{creqtool}}{$self->{creqversion}}.
294 <                $string;
295 <                
296 < }
297 <
298 < sub require_end {
299 <        my $self=shift;
300 <        my $name=shift;
301 <
302 <        if ( $self->{reqcontext} != 1 ) {
303 <          $self->{switch}->parseerror("No matching tag for </$name>");
304 <        }
305 <        else {
306 <          $self->{reqcontext}=0;
307 <        }
308 < }
191 > sub archlist
192 >   {
193 >   my $self=shift;
194 >   return @{$self->{ArchStack}};
195 >   }
196  
197 < sub select_start
197 > sub getreqforarch
198 >   {
199 >   my $self=shift;
200 >   my $arch=shift;
201 >  
202 >   if ( ! defined $self->{reqsforarch}{$arch} )
203 >      {
204 >      $self->{reqsforarch}{$arch}=
205 >         BuildSystem::Requirements->new($self->{dbstore},$self->{file},
206 >                                        $arch);
207 >      }
208 >   return $self->{reqsforarch}{$arch};
209 >   }
210 >
211 > sub download
212 >   {
213 >   my $self=shift;
214 >   my $tool;
215 >   $| = 1; # Unbuffer the output
216 >
217 >   print  "Downloading tool descriptions....","\n";
218 >   print  " ";
219 >   foreach $tool ( $self->tools() )
220 >      {
221 >      print "#";
222 >      $self->verbose("Downloading ".$self->toolurl($tool));
223 >      # get into the cache:
224 >      $self->{switch}->urlget($self->toolurl($tool));
225 >      }
226 >   print "\nDone.","\n";
227 >   # So now add the list of downloaded tools, and which were
228 >   # selected, to tool cache:
229 >   print "Tool info cached locally.","\n","\n";
230 >
231 >   # Now copy required info from this object to ToolManager (ToolCache):
232 >   $self->toolmanager()->downloadedtools($self->{tools});
233 >   $self->toolmanager()->defaultversions($self->{version});
234 >   $self->toolmanager()->toolurls($self->{url});
235 >   $self->toolmanager()->selected($self->{selected});
236 >   }
237 >
238 > sub _autoselect
239 >   {
240 >   my $self=shift;
241 >   if ( @_ )
242 >      {
243 >      $self->{autoselect}=shift;
244 >      }
245 >   # -- default is true
246 >   return ((defined $self->{autoselect})?$self->{autoselect}:1);
247 >   }
248 >
249 > sub require_start
250     {
251     my $self=shift;
252     my $name=shift;
253     my $hashref=shift;
254 <
254 >  
255 >   $self->{switch}->checktag( $name, $hashref, 'version');
256     $self->{switch}->checktag( $name, $hashref, 'name');
257 +   $self->{switch}->checktag( $name, $hashref, 'url');
258 +  
259 +   if ( $self->{reqcontext} == 1 )
260 +      {
261 +      $self->{switch}->parseerror(
262 +                                  "Open new $name context without previous </$name>");
263 +      }
264 +   $self->{reqcontext}=1;
265     $$hashref{'name'}=~tr[A-Z][a-z];
266 +  
267 +   # Add protection so that architecture tags are obeyed during download:
268     if ( $self->{Arch} )
269        {
270 <      $self->verbose("Selecting ".$$hashref{'name'});
271 <      $self->{selected}{$$hashref{'name'}} = "SELECTED";
272 <      $self->verbose(">> Tool select flag = ".$self->{selected}{$$hashref{'name'}}."\n");
270 >      # Add tool to the tool array:
271 >      push @{$self->{tools}}, $$hashref{'name'};
272 >      
273 >      # If the tool already has an entry, modify the version string to
274 >      # include both versions. The versions can later be separated and
275 >      # parsed as normal:
276 >      if (defined $self->{version}{$$hashref{'name'}})
277 >         {
278 >         # Don't need an extra entry for this tool onto tool array:
279 >         pop @{$self->{tools}}, $$hashref{'name'};
280 >         # Modify the version string to append the other tool version.
281 >         # Separate using a colon:
282 >         my $newversion=$self->{version}{$$hashref{'name'}}.":".$$hashref{'version'};
283 >         $self->{version}{$$hashref{'name'}}=$newversion;
284 >         }
285 >      else
286 >         {
287 >         $self->{version}{$$hashref{'name'}}=$$hashref{'version'};
288 >         }
289 >      # -- make sure the full url is taken
290 >      my $urlobj=$self->{switch}->expandurl($$hashref{'url'});
291 >
292 >      $self->{url}{$$hashref{'name'}}=$urlobj->url();
293 >
294 >      $self->{creqtool}=$$hashref{'name'};
295 >      $self->{creqversion}=$$hashref{'version'};
296 >      $self->{reqtext}{$self->{creqtool}}{$self->{creqversion}}="";
297        }
298     }
299  
300 < sub deselect_start
300 > sub require_text
301 >   {
302 >   my $self=shift;
303 >   my $name=shift;
304 >   my $string=shift;
305 >  
306 >   chomp $string;
307 >   $self->{reqtext}{$self->{creqtool}}{$self->{creqversion}}=
308 >      $self->{reqtext}{$self->{creqtool}}{$self->{creqversion}}.
309 >      $string;  
310 >   }
311 >
312 > sub require_end
313     {
314     my $self=shift;
315     my $name=shift;
330   my $hashref=shift;
316    
317 +   if ( $self->{reqcontext} != 1 )
318 +      {
319 +      $self->{switch}->parseerror("No matching tag for </$name>");
320 +      }
321 +   else
322 +      {
323 +      $self->{reqcontext}=0;
324 +      }
325 +   }
326 +
327 + sub select_start
328 +   {
329 +   my $self=shift;
330 +   my $name=shift;
331 +   my $hashref=shift;
332 +
333     $self->{switch}->checktag( $name, $hashref, 'name');
334     $$hashref{'name'}=~tr[A-Z][a-z];
335     if ( $self->{Arch} )
336        {
337 <      $self->verbose("Deselecting ".$$hashref{'name'});
338 <      $self->{selected}{$$hashref{'name'}} = "DESELECTED";
339 <      $self->verbose(">> Tool select flag = ".$self->{selected}{$$hashref{'name'}}."\n");
337 >      $self->verbose("Selecting ".$$hashref{'name'});
338 >      # Increment counter:
339 >      $self->{selectcounter}++;
340 >      $self->{selected}{$$hashref{'name'}}=$self->{selectcounter};
341        }
342     }
343  
344 < sub Arch_Start {
345 <        my $self=shift;
346 <        my $name=shift;
347 <        my $hashref=shift;
348 <
349 <        $self->{switch}->checktag($name, $hashref,'name');
350 <        
351 <        ( ($self->arch()=~/$$hashref{name}.*/) )? ($self->{Arch}=1)
352 <                                                : ($self->{Arch}=0);
353 <        $self->verbose(($self->{Arch}?"OK":"skipping")." ".$$hashref{name});
354 <        push @{$self->{ARCHBLOCK}}, $self->{Arch};
355 <        push @{$self->{ArchStack}}, $$hashref{'name'};
356 < }
357 <
358 < sub Arch_End {
359 <        my $self=shift;
360 <        my $name=shift;
361 <
362 <        pop @{$self->{ARCHBLOCK}};
363 <        $self->{Arch}=$self->{ARCHBLOCK}[$#{$self->{ARCHBLOCK}}];
364 < }
365 <
366 < sub disttag {
367 <        my $self=shift;
368 <        my $name=shift;
369 <        my $hashref=shift;
370 <
371 <        if ( exists $$hashref{'url'} ) {
372 <          $self->{dist}{$self->{creqtool}}{$self->{creqversion}}=
373 <                                                        $$hashref{'url'};
374 <        }
375 < }
344 > sub Arch_Start
345 >   {
346 >   my $self=shift;
347 >   my $name=shift;
348 >   my $hashref=shift;
349 >  
350 >   # Check the architecture tag:
351 >   $self->{switch}->checktag($name, $hashref,'name');  
352 >   ( ($self->arch()=~/$$hashref{name}.*/) )? ($self->{Arch}=1)
353 >      : ($self->{Arch}=0);
354 >  
355 >   $self->verbose(($self->{Arch}?"OK":"skipping")." ".$$hashref{name});
356 >   push @{$self->{ARCHBLOCK}}, $self->{Arch};
357 >   push @{$self->{ArchStack}}, $$hashref{'name'};
358 >   }
359 >
360 > sub Arch_End
361 >   {
362 >   my $self=shift;
363 >   my $name=shift;
364 >   pop @{$self->{ARCHBLOCK}};
365 >   $self->{Arch}=$self->{ARCHBLOCK}[$#{$self->{ARCHBLOCK}}];
366 >   }
367 >
368 > sub disttag
369 >   {
370 >   my $self=shift;
371 >   my $name=shift;
372 >   my $hashref=shift;
373 >  
374 >   if ( exists $$hashref{'url'} )
375 >      {
376 >      $self->{dist}{$self->{creqtool}}{$self->{creqversion}}=
377 >         $$hashref{'url'};
378 >      }
379 >   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines