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

Comparing COMP/SCRAM/src/BuildSystem/BuildFile.pm (file contents):
Revision 1.18 by sashby, Tue May 14 14:27:13 2002 UTC vs.
Revision 1.30 by sashby, Tue Feb 27 11:59:44 2007 UTC

# Line 1 | Line 1
1 < # BuildFile
1 > #____________________________________________________________________
2 > # File: BuildFile.pm
3 > #____________________________________________________________________
4 > #  
5 > # Author: Shaun Ashby <Shaun.Ashby@cern.ch>
6 > # Update: 2003-12-03 19:03:15+0100
7 > # Revision: $Id$
8   #
9 < # Interface
10 < # ---------
11 < # new(toolbox)
6 < # ParseBuildFile($base,$path,$file)
7 < # ParseBuildFileExport(filename)
8 < # BlockClassPath() : Return the class path
9 < # ignore()      : return 1 if directory should be ignored 0 otherwise
10 <
9 > # Copyright: 2003 (C) Shaun Ashby
10 > #
11 > #--------------------------------------------------------------------
12   package BuildSystem::BuildFile;
12 use Utilities::Verbose;
13 use ActiveDoc::SimpleDoc;
14 use BuildSystem::ToolBox;
13   require 5.004;
14 < @ISA=qw(Utilities::Verbose);
14 > use Exporter;
15 > use ActiveDoc::SimpleDoc;
16  
17 < BEGIN {
18 < $buildfile="BuildFile";
19 < }
20 <
21 < sub new {
22 <        my $class=shift;
23 <        my $self={};
24 <        bless $self, $class;
25 <        $self->{toolbox}=shift;
26 <        $self->{Arch}=1;
27 <        push @{$self->{ARCHBLOCK}}, $self->{Arch};
28 <        return $self;
29 < }
30 <
31 < sub ignore {
32 <        my $self=shift;
33 <        $self->verbose(">> ignore......<<");
34 <        
35 <        return (defined $self->{ignore})?$self->{ignore}:0;
36 < }
37 <
38 < sub _initswitcher {
39 <        my $self=shift;
40 <        my $switch=ActiveDoc::SimpleDoc->new();
41 <        my $parse="makebuild";
42 <        $self->verbose(">> _initswitcher: <<");
44 <        $switch->newparse($parse);
45 <        $switch->addignoretags($parse);
46 <        $self->_commontags($switch,$parse);
47 <        $switch->addtag($parse,"Build", \&Build_start, $self);
48 <        $switch->addtag($parse,"none",
49 <                                        \&OutToMakefile,$self,
50 <                                        \&OutToMakefile, $self,
51 <                                        "", $self);
52 <        $switch->addtag($parse,"Bin",
53 <                                        \&Bin_start,$self,
54 <                                        \&OutToScreen, $self,
55 <                                        "", $self);
56 <        $switch->addtag($parse,"Module",
57 <                                        \&Module_start,$self,
58 <                                        \&OutToScreen, $self,
59 <                                        "", $self);
60 <
61 <        $switch->addtag($parse,"ProductStore",
62 <                                        \&Store_start,$self,
63 <                                        "", $self,
64 <                                        "", $self);
65 <        $switch->addtag($parse,"LibType",
66 <                                        \&LibType_Start,$self,
67 <                                        \&LibType_text, $self,
68 <                                        \&LibType_end,$self);
69 <        $switch->addtag($parse,"ConfigurationClass",
70 <                                        \&Class_StartTag,$self,
71 <                                        \&OutToMakefile, $self,
72 <                                        "", $self);
73 <        $switch->addtag($parse,"ClassPath",
74 <                                        \&setBlockClassPath,$self,
75 <                                        \&OutToMakefile, $self,
76 <                                        "", $self);
77 <        $switch->addtag($parse,"AssociateGroup",
78 <                                        "",$self,
79 <                                        \&AssociateGroup,$self,
80 <                                        "", $self);
81 <        $switch->addtag($parse,"Environment",
82 <                                        \&Environment_start,$self,
83 <                                        \&OutToMakefile, $self,
84 <                                        \&Environment_end,$self);
85 <        $switch->addtag($parse,"Export",
86 <                                        \&export_start,$self,
87 <                                        \&OutToMakefile, $self,
88 <                                        \&export_end,$self);
89 <        return $switch;
90 < }
91 <
92 < sub _commontags {
93 <        my $self=shift;
94 <        my $switch=shift;
95 <        my $parse=shift;
96 <        
97 <        $self->verbose(">> _commontags: SW ".$switch." PARSE ".$parse." <<");
98 <        
99 <        $switch->grouptag("Export",$parse);
100 <        $switch->addtag($parse,"Use",\&Use_start,$self,
101 <                                               \&OutToMakefile, $self,
102 <                                                "", $self);
103 <        $switch->addtag($parse,"Group",\&Group_start,$self,
104 <                                               \&OutToMakefile, $self,
105 <                                                "", $self);
106 <        $switch->grouptag("Group",$parse);
107 <        $switch->addtag($parse,"External",
108 <                                        \&External_StartTag,$self,
109 <                                        \&OutToMakefile, $self,
110 <                                        "", $self);
111 <        $switch->addtag($parse,"lib",
112 <                                        \&lib_start,$self,
113 <                                        \&OutToMakefile, $self,
114 <                                        "", $self);
115 <        $switch->addtag($parse,"Architecture",
116 <                                        \&Arch_Start,$self,
117 <                                        \&OutToMakefile, $self,
118 <                                        \&Arch_End,$self);
119 <        $switch->addtag($parse,"INCLUDE_PATH",
120 <                                        \&IncludePath_Start,$self,
121 <                                        \&OutToMakefile, $self,
122 <                                        "",$self);
123 <        return $switch;
124 < }
125 <
126 < sub ParseBuildFile {
127 <        my $self=shift;
128 <        my $base=shift;
129 <        my $path=shift;
130 <        my $filename=shift @_;
131 <        my $fullfilename;
132 <        if ( $filename!~/^\// ) {
133 <         $fullfilename="$base/$path/$filename";
134 <        }
135 <        else {
136 <         $fullfilename=$filename;
137 <        }
138 <
139 <        $self->verbose(">> ParseBuildFile: FN ".$fullfilename." <<");
140 <        
141 <        $self->{path}=$path;
142 <        $numbins=0;
143 <        $self->{envnum}=0;
144 <        $self->{envlevel}=0;
145 <        $self->{currentenv}="$ENV{LOCALTOP}/$ENV{INTwork}/$self->{path}/".
146 <                                                                "BuildFile.mk";
147 <        $self->{switch}=$self->_initswitcher();
148 <        $self->{switch}->filetoparse($fullfilename);
149 <
150 <        # open a temporary gnumakefile to store output.
151 <        use Utilities::AddDir;
152 <        AddDir::adddir("$ENV{LOCALTOP}/$ENV{INTwork}/$self->{path}");
153 <        my $fh=FileHandle->new();
154 <        open ( $fh, ">$ENV{LOCALTOP}/$ENV{INTwork}/".$self->{path}."/BuildFile.mk"
155 <          ) or die "Unable to open /$ENV{INTwork}/".$self->{path}."/BuildFile.mk $!\n";
156 <        @{$self->{filehandlestack}}=($fh);
157 <        # make an alias
158 <        *GNUmakefile=$fh;
159 <        if ( -e $ENV{LatestBuildFile} ) {
160 <          print GNUmakefile "include $ENV{LatestBuildFile}\n";
161 <        }
162 <
163 <        $ENV{LatestBuildFile}="$ENV{LOCALTOP}/$ENV{INTwork}/".$self->{path}."/BuildFile.mk";
164 <        $self->{switch}->parse("makebuild"); # sort out supported tags
165 <        if ( $numbins > 0 ) {
166 <         print GNUmakefile <<ENDTEXT;
167 < ifndef BINMODE
168 < help::
169 < \t\@echo Generic Binary targets
170 < \t\@echo ----------------------
171 < endif
172 < ENDTEXT
173 <         foreach $target ( keys %$targettypes ) {
174 <         print GNUmakefile <<ENDTEXT;
175 < ifndef BINMODE
176 < help::
177 < \t\@echo $target
178 < endif
179 < ENDTEXT
180 <         }
181 <        }
182 <        close GNUmakefile;
183 < }
184 <
185 < sub ParseBuildFile_Export {
186 <        my $self=shift;
187 <        my $filename=shift;
188 <
189 <        $self->verbose(">> ParseBuildFile_Export: FN ".$filename." <<");
190 <        
191 <        my $bf=BuildSystem::BuildFile->new($self->{toolbox});
192 <        if ( defined $self->{remoteproject} ) {
193 <           $bf->{remoteproject}=$self->{remoteproject};
194 <        }
195 <        $bf->_parseexport($filename);
196 <        undef $bf;
197 < }
198 <
199 < sub _location {
200 <        my $self=shift;
201 <        use File::Basename;
202 <        $self->verbose(">> _location: <<");
203 <        return dirname($self->{switch}->filetoparse());
204 < }
205 <
206 < sub _parseexport {
207 <        my $self=shift;
208 <        my $filename=shift;
209 <        $self->verbose(">> _parseexport: FN ".$filename." <<");
210 <        
211 <        my $switchex=ActiveDoc::SimpleDoc->new();
212 <        $switchex->filetoparse($filename);
213 <        $switchex->newparse("export");
214 <        $switchex->addignoretags("export");
215 <        $switchex->addtag("export","Export",
216 <                                        \&export_start_export,$self,
217 <                                        \&OutToMakefile, $self,
218 <                                        \&export_end_export,$self);
219 <        $self->_commontags($switchex,"export");
220 <        $switchex->allowgroup("__export","export");
221 <        $self->{switch}=$switchex;
222 <        $switchex->parse("export"); # sort out supported tags
223 < }
224 <
225 < sub _pushremoteproject {
226 <        my $self=shift;
227 <        my $path=shift;
228 <
229 <        $self->verbose(">> _pushremoteproject: PATH ".$path." <<");
230 <        
231 <        if ( defined $self->{remoteproject} ) {
232 <          push @{$self->{rpstack}}, $self->{remoteproject};
233 <        }
234 <        $self->{remoteproject}=$path;
235 < }
236 <
237 < sub _popremoteproject {
238 <        my $self=shift;
239 <        $self->verbose(">> _popremoteproject:  <<");
240 <        
241 <        if ( $#{$self->{rpstack}} >=0 ) {
242 <          $self->{remoteproject}=pop @{$self->{rpstack}};
243 <        }
244 <        else {
245 <          undef $self->{remoteproject};
246 <        }
247 < }
248 <
249 < sub _toolmapper {
250 <        my $self=shift;
251 <
252 <        if ( ! defined $self->{mapper} ) {
253 <           require BuildSystem::ToolMapper;
254 <           $self->{mapper}=BuildSystem::ToolMapper->new();
255 <        }
256 <        $self->verbose(">> _toolmapper: TM ".$self->{mapper}."<<");
257 <        return $self->{mapper};
258 < }
259 <
260 <
261 < # ---- Tag routines
262 <
263 < #-- Override a class type with the <ConfigurationClass type=xxx> tag
264 < #   the type tag will pick up a pre-defined class type from project space.
265 <
266 < sub Class_StartTag {
267 <        my $self=shift;
268 <        my $name=shift;
269 <        my $hashref=shift;
270 <
271 <        $self->verbose(">> Classs_StartTag: NM ".$name." <<");
272 <        
273 <        if ( $self->{Arch} ) {
274 <         if ( defined $$hashref{'type'} ) {
275 <                $ClassName=$$hashref{'type'};
276 <         }
277 <        }
278 < }
279 <
280 < sub IncludePath_Start
17 > @ISA=qw(Exporter);
18 > @EXPORT_OK=qw( );
19 > #
20 > sub new()
21 >   ###############################################################
22 >   # new                                                         #
23 >   ###############################################################
24 >   # modified : Wed Dec  3 19:03:22 2003 / SFA                   #
25 >   # params   :                                                  #
26 >   #          :                                                  #
27 >   # function :                                                  #
28 >   #          :                                                  #
29 >   ###############################################################
30 >   {
31 >   my $proto=shift;
32 >   my $class=ref($proto) || $proto;
33 >   $self={};
34 >   bless $self,$class;
35 >   $self->{DEPENDENCIES} = {};
36 >   $self->{content} = {};
37 >   $self->{scramdoc}=ActiveDoc::SimpleDoc->new();
38 >   $self->{scramdoc}->newparse("builder",__PACKAGE__,'Subs');
39 >   return $self;
40 >   }
41 >
42 > sub parse()
43     {
44     my $self=shift;
45 <   my $name=shift;
46 <   my $hashref=shift;
45 >   my ($filename)=@_;
46 >   $self->{scramdoc}->filetoparse($filename);
47 >   $self->{scramdoc}->parse("builder");
48 >   # We're done with the SimpleDoc object so delete it:
49 >   delete $self->{scramdoc};
50 >   }
51 >
52 > sub classpath()
53 >   {
54 >   my ($object,$name,%attributes)=@_;
55 >   # The getter part:
56 >   if (ref($object) eq __PACKAGE__)
57 >      {
58 >      return $self->{content}->{CLASSPATH};
59 >      }
60    
61 <   $self->verbose(">> IncludePath_Start: NM ".$name." <<");
61 >   $self->{nested} == 1 ? push(@{$self->{tagcontent}->{CLASSPATH}}, $attributes{'path'})
62 >      : push(@{$self->{content}->{CLASSPATH}}, $attributes{'path'});
63 >   }
64 >
65 > sub productstore()
66 >   {
67 >   my ($object,$name,%attributes)=@_;
68 >   # The getter part:
69 >   if (ref($object) eq __PACKAGE__)
70 >      {
71 >      # Return an array of ProductStore hashes:
72 >      return $self->{content}->{PRODUCTSTORE};
73 >      }
74    
75 <   $self->{switch}->checktag( $name, $hashref, 'path');
76 <   if ( $self->{Arch} )
75 >   $self->{nested} == 1 ? push(@{$self->{tagcontent}->{PRODUCTSTORE}}, \%attributes)
76 >      : push(@{$self->{content}->{PRODUCTSTORE}}, \%attributes) ;
77 >   }
78 >
79 > sub include()
80 >   {
81 >   my $self=shift;
82 >   # Return an array of required includes:
83 >   return $self->{content}->{INCLUDE};
84 >   }
85 >
86 > sub include_path()
87 >   {
88 >   my ($object,$name,%attributes)=@_;
89 >   $self->{nested} == 1 ? push(@{$self->{tagcontent}->{INCLUDE}}, $attributes{'path'})
90 >      : push(@{$self->{content}->{INCLUDE}}, $attributes{'path'});
91 >   }
92 >
93 > sub use()
94 >   {
95 >   my $object=shift;
96 >   # The getter part:
97 >   if (ref($object) eq __PACKAGE__)
98 >      {
99 >      # Add or return uses (package deps):
100 >      @_ ? push(@{$self->{content}->{USE}},@_)
101 >         : @{$self->{content}->{USE}};
102 >      }
103 >   else
104        {
105 <      print GNUmakefile "INCLUDE:=\$(filter-out ".$self->_location()."/".$$hashref{'path'}.",\$(INCLUDE))","\n";
106 <      print GNUmakefile "INCLUDE+=".$self->_location()."/".$$hashref{'path'}."\n";
105 >      my ($name,%attributes)=@_;
106 >      $self->{DEPENDENCIES}->{$attributes{'name'}} = 1;
107 >      $self->{nested} == 1 ? push(@{$self->{tagcontent}->{USE}}, $attributes{'name'})
108 >         : push(@{$self->{content}->{USE}}, $attributes{'name'});
109        }
110     }
111  
112 < #
113 < # generic build tag
114 < #
115 < sub Build_start {
116 <        my $self=shift;
301 <        my $name=shift;
302 <        my $hashref=shift;
303 <
304 <        $self->verbose(">> Build_start: NM ".$name." <<");
305 <        
306 <        $self->{switch}->checktag($name,$hashref,'class');
307 <        if ( $self->{Arch} ) {
308 <
309 <          # -- determine the build products name
310 <          my $name;
311 <          if ( exists $$hashref{'name'} ) {
312 <            $name=$$hashref{'name'};
313 <          }
314 <          else {
315 <            $self->{switch}->parseerror("No name specified for build product");
316 <          }
317 <
318 <          # -- check we have a lookup for the class type
319 <          my $mapper=$self->_toolmapper();
320 <          if ( ! $mapper->exists($$hashref{'class'}) ) {
321 <            $self->{switch}->parseerror("Unknown class : ".$$hashref{'class'});
322 <          }
323 <          else {
324 <           my @types=$self->_toolmapper()->types($$hashref{'class'});
325 <           my @deftypes=$self->_toolmapper()->defaulttypes($$hashref{'class'});
326 <
327 <           my $fh=$self->{filehandlestack}[0];
328 <           my @targets=();
329 <
330 <           # -- generate generic targets
331 <           print $fh "ifndef _BuildLink_\n";
332 <           print $fh "# -- Generic targets\n";
333 <           push @targets, $$hashref{'class'};
334 <           foreach $dtype ( @deftypes ) {
335 <            print $fh $$hashref{'class'}."::".$$hashref{'class'}."_".
336 <                                                                $dtype."\n";
337 <           }
338 <           print $fh "\n";
339 <
340 <           # -- generate targets for each type
341 <           foreach $type ( @types ) {
342 <
343 <            # -- generic name for each type
344 <            my $pattern=$$hashref{'class'}."_".$type;
345 <            my $dirname=$$hashref{'class'}."_".$type."_".$name;
346 <            print $fh "# ------ $pattern rules ---------------\n";
347 <            print $fh $$hashref{'class'}."_".$type."::".$$hashref{'class'}.
348 <                                                        "_".$type."_$name\n\n";
349 <
350 <            # -- create a new directory for each type
351 <            push @targets, $pattern;
352 <            my $dirname=$$hashref{'class'}."_".$type."_".$name;
353 <            my $here="$ENV{LOCALTOP}/$ENV{INTwork}/".$self->{path}."/".$dirname;
354 <            my $makefile=$here."/BuildFile.mk";
355 <
356 <            # -- create link targets to the directory
357 <            push @targets, $dirname;
358 <            print $fh "# -- Link Targets to $type directories\n";
359 <            print $fh "$dirname: make_$dirname\n";
360 <            print $fh "\t\@cd $here; \\\n";
361 <            print $fh "\t\$(MAKE) LatestBuildFile=$makefile _BuildLink_=1".
362 <                        " workdir=$here ".
363 <                        " -f \$(TOOL_HOME)/basics.mk datestamp \$\@; \n\n";
364 <
365 <            # -- write target to make makefile for each directory
366 <            print $fh "# -- Build target directories\n";
367 <            print $fh "make_$dirname:\n";
368 <            print $fh "\tif [ ! -e \"$makefile\" ]; then \\\n";
369 <            print $fh "\t if [ ! -d \"$here\" ]; then \\\n";
370 <            print $fh "\t  mkdir $here; \\\n";
371 <            print $fh "\t fi;\\\n";
372 <            print $fh "\t cd $dirname; \\\n";
373 <            print $fh "\t echo include ".$self->{currentenv}." > ".
374 <                                                        "$makefile; \\\n";
375 <            print $fh "\t echo VPATH+=$ENV{LOCALTOP}/".$self->{path}.
376 <                                        " >> $makefile; \\\n";
377 <            print $fh "\t echo buildname=$name >> $makefile;\\\n";
378 <            print $fh "\t echo ".$dirname.":".$pattern." >> $makefile;\\\n";
379 <            if ( defined (my @file=$mapper->rulesfile($$hashref{'class'})) ) {
380 <             foreach $f ( @file ) {
381 <              print $fh "\t echo -include $f >> $makefile; \\\n";
382 <             }
383 <            }
384 <            print $fh "\tfi\n";
385 <            print $fh "\n";
112 > sub architecture()
113 >   {
114 >   my ($object,$name,%attributes)=@_;
115 >   $self->pushlevel(\%attributes); # Set nested to 1;
116 >   }
117  
118 <            # -- cleaning targets
119 <            push @targets, "clean_$dirname";
120 <            print $fh "# -- cleaning targets\n";
121 <            print $fh "clean::clean_$dirname\n";
122 <            print $fh "clean_".$dirname."::\n";
392 <            print $fh "\t\@echo cleaning $dirname\n";
393 <            print $fh "\t\@if [ -d $here ]; then \\\n";
394 <            print $fh "\tcd $here; \\\n";
395 <            print $fh "\t\$(MAKE) LatestBuildFile=$makefile workdir=".
396 <                        $here." _BuildLink_=1 -f ".
397 <                        "\$(TOOL_HOME)/basics.mk clean; \\\n";
398 <            print $fh "\tfi\n\n";
399 <
400 <
401 <          }
402 <          # -- help targets
403 <          print $fh "helpheader::\n";
404 <          print $fh "\t\@echo Targets available:\n";
405 <          print $fh "\t\@echo ------------------\n\n";
406 <          print $fh "help::helpheader\n";
407 <          foreach $target ( @targets ) {
408 <            print $fh "help::\n";
409 <            print $fh "\t\@echo $target\n"
410 <          }
411 <          print $fh "endif\n";
412 <         } # end else
413 <        }
414 < }
415 <
416 < sub Bin_start {
417 <        my $self=shift;
418 <        my $name=shift;
419 <        my $hashref=shift;
420 <
421 <        my $fileclass;
422 <        my @tools;
423 <        my $tool;
424 <        my $filename;
425 <        my $objectname;
426 <
427 <        $self->verbose(">>          <<");
428 <        
429 <        $self->{switch}->checktag($name,$hashref,'file');
430 <        if ( $self->{Arch} ) {
431 <        if ( ! defined $$hashref{name} ) {
432 <                ($$hashref{name}=$$hashref{file})=~s/\..*//;
433 <        }
434 <        ($filename=$$hashref{file})=~s/\..*//;
435 <
436 <        # Create a new directory for each binary target
437 <        my $dirname="bin_".$$hashref{name};
438 <        AddDir::adddir("$ENV{LOCALTOP}/$ENV{INTwork}/".$self->{path}."/$dirname");
439 <        open (binGNUmakefile,
440 <           ">$ENV{LOCALTOP}/$ENV{INTwork}/".$self->{path}."/$dirname/BuildFile.mk") or die           "Unable to make $ENV{LOCALTOP}/$ENV{INTwork}/$self->{path}/$dirname/".
441 <           "BuildFile.mk $!\n";
442 <
443 <        # Create the link targets
444 <        $numbins++;
445 <        my $fh=$self->{filehandlestack}[0];
446 <        print $fh <<ENDTEXT;
447 <
448 < # Link Targets to binary directories
449 < ifdef BINMODE
450 < # We dont want to build a library here
451 < override files:=
452 < endif
453 < ifndef BINMODE
454 <
455 < define stepdown_$$hashref{'name'}
456 < if [ -d "$ENV{LOCALTOP}/$ENV{INTwork}/$self->{path}/$dirname" ]; then \\
457 < cd $ENV{LOCALTOP}/$ENV{INTwork}/$self->{path}/$dirname; \\
458 < \$(MAKE) BINMODE=true LatestBuildFile=$ENV{LOCALTOP}/$ENV{INTwork}/$self->{path}/$dirname/BuildFile.mk workdir=\$(workdir)/$dirname -f \$(TOOL_HOME)/basics.mk datestamp \$\@; \\
459 < fi
460 < endef
461 <
462 < define stepdown2_$$hashref{'name'}
463 < if [ -d "$ENV{LOCALTOP}/$ENV{INTwork}/$self->{path}/$dirname" ]; then \\
464 < cd $ENV{LOCALTOP}/$ENV{INTwork}/$self->{path}/$dirname; \\
465 < \$(MAKE) BINMODE=true LatestBuildFile=$ENV{LOCALTOP}/$ENV{INTwork}/$self{path}/$dirname/BuildFile.mk workdir=\$(workdir)/$dirname -f \$(TOOL_HOME)/basics.mk datestamp \$\*; \\
466 < fi
467 <
468 < endef
469 <
470 < bin_$$hashref{'name'}_%:: dummy
471 <        \@\$(stepdown2_$$hashref{'name'})
472 <
473 < $$hashref{'name'}_%:: dummy
474 <        \@\$(stepdown_$$hashref{'name'})
475 <
476 < help bin bin_debug bin_debug_local bin_insure bin_Insure clean $$hashref{'name'}:: dummy
477 <        \@\$(stepdown_$$hashref{'name'})
478 <
479 < binfiles+=$$hashref{'file'}
480 < locbinfiles+=$dirname/$$hashref{'file'}
481 < endif
482 <
483 <
484 < ENDTEXT
485 <
486 <
487 < # the binary specifics makefile
488 <        print binGNUmakefile "include ".$self->{currentenv}."\n";
489 <        print binGNUmakefile "VPATH+=$ENV{LOCALTOP}/$self{path}\n";
490 <
491 < # alias for bin_Insure
492 <        print binGNUmakefile <<ENDTEXT;
493 <
494 < bin_insure:bin_Insure
495 < ifdef MAKETARGET_bin_insure
496 < MAKETARGET_$$hashref{name}_Insure=1
497 < endif
498 <
499 < # debuggging target
500 < $$hashref{'name'}_echo_% :: echo_%
501 <
502 < # help targets
503 < help::
504 < \t\@echo Targets For $$hashref{'name'}
505 < \t\@echo -------------------------------------
506 < \t\@echo $$hashref{'name'}  - default build
507 < \t\@echo bin_$$hashref{'name'}_clean - executable specific cleaning
508 < ENDTEXT
509 <
510 < # Make generic rules for each type
511 <        $targettypes={
512 <                "bin" => 'o',
513 <                "bin_debug" => 'd',
514 <                "bin_debug_local" => 'l_d',
515 <                "bin_Insure" => 'Insure'
516 <        };
517 <        #
518 <        foreach $target ( keys %$targettypes ) {
519 <          print binGNUmakefile <<ENDTEXT;
520 <
521 < # Type $target specifics
522 < ifdef MAKETARGET_$target
523 < MAKETARGET_$$hashref{name}_$$targettypes{$target}=1
524 < endif
525 < $target ::$$hashref{name}_$$targettypes{$target}
526 <
527 < bintargets+=$$hashref{name}_$$targettypes{$target}
528 < help::
529 < \t\@echo $$hashref{name}_$$targettypes{$target}
530 < clean::
531 < \t\@if [ -f \$(binarystore)/$$hashref{name}_$$targettypes{$target} ]; then \\
532 < \techo Removing \$(binarystore)/$$hashref{name}; \\
533 < \trm \$(binarystore)/$$hashref{name}_$$targettypes{$target}; \\
534 < \tfi
535 <
536 < ENDTEXT
537 <          ($objectname=$$hashref{file})=~s/\..*/_$$targettypes{$target}\.o/;
538 <          ${"objectname_$$targettypes{$target}"}=$objectname;
539 <          print binGNUmakefile "$objectname:$$hashref{name}.dep\n";
540 <        } # end loop
541 <
542 <        print binGNUmakefile "$$hashref{name}_Insure.exe:.psrc\n";
543 <        print binGNUmakefile "$$hashref{name}_d.exe:$objectname_d\n";
544 <        print binGNUmakefile "\t\$(CClinkCmdDebug)\n";
545 <        print binGNUmakefile "\t\@\$(SCRAMPERL) \$(SCRAM_HOME)/src/scramdatestamp \$\@\.ds \$\@ \$\^\n";
546 <        print binGNUmakefile "$$hashref{name}_l_d.exe:$objectname_d\n";
547 <        print binGNUmakefile "\t\$(CClinkCmdDebugLocal)\n";
548 <        print binGNUmakefile "\t\@\$(SCRAMPERL) \$(SCRAM_HOME)/src/scramdatestamp \$\@\.ds \$\@ \$\^\n";
549 <        print binGNUmakefile "$$hashref{name}_Insure.exe:$objectname_Insure\n";
550 <        print binGNUmakefile "\t\$(CClinkCmdInsure)\n";
551 <        print binGNUmakefile "\t\@\$(SCRAMPERL) \$(SCRAM_HOME)/src/scramdatestamp \$\@\.ds \$\@ \$\^\n";
552 <        print binGNUmakefile "$$hashref{name}_o.exe:$objectname_o\n";
553 <        print binGNUmakefile "\t\$(CClinkCmd)\n";
554 <        print binGNUmakefile "\t\@\$(SCRAMPERL) \$(SCRAM_HOME)/src/scramdatestamp \$\@\.ds \$\@ \$\^\n";
555 <        print binGNUmakefile "$$hashref{name}.dep:$$hashref{file}\n";
556 <        print binGNUmakefile "-include $$hashref{name}.dep\n";
557 < print binGNUmakefile <<ENDTEXT;
558 < clean::
559 < \t\@if [ -f \$(binarystore)/$$hashref{name} ]; then \\
560 < \techo Removing \$(binarystore)/$$hashref{name}; \\
561 < \trm \$(binarystore)/$$hashref{name}; \\
562 < \tfi
563 <
564 < $$hashref{name}_d.exe:\$(libslocal_d)
565 < $$hashref{name}_o.exe:\$(libslocal)
566 < ifdef MCCABE_DATA_DIR
567 < $$hashref{name}_mccabe.exe: \$(libslocal_d) \$(MCCABE_DATA_DIR)/mccabeinstr/instplus.cpp
568 < endif
569 < $$hashref{name}_Insure.exe:\$(libslocal_I)
570 < $$hashref{name}_d:$$hashref{name}_d.exe
571 <        \@cp $$hashref{name}_d.exe \$(binarystore)/$$hashref{name}
572 < $$hashref{name}_l_d:$$hashref{name}_l_d.exe
573 <        \@cp $$hashref{name}_l_d.exe \$(binarystore)/$$hashref{name}
574 < $$hashref{name}_Insure:$$hashref{name}_Insure.exe
575 <        \@cp $$hashref{name}_Insure.exe \$(binarystore)/$$hashref{name}_Insure
576 < $$hashref{name}:$$hashref{name}_d.exe
577 <        \@mv $$hashref{name}_d.exe \$(binarystore)/$$hashref{name}
578 < $$hashref{name}_o:$$hashref{name}_o.exe
579 <        \@mv $$hashref{name}_o.exe \$(binarystore)/$$hashref{name}
580 < binfiles+=$$hashref{file}
581 < ENDTEXT
582 <        }
583 <        close binGNUmakefile;
584 < }
585 <
586 < sub Module_start {
587 <        my $self=shift;
588 <        my $name=shift;
589 <        my $hashref=shift;
590 <
591 <        my $fileclass;
592 <        my @tools;
593 <        my $tool;
594 <        my $filename;
595 <        my $objectname;
596 <
597 <        $self->verbose(">> In module_start: ".$name." <<");
598 <        
599 <        $self->{switch}->checktag($name,$hashref,'file');
600 <        if ( $self->{Arch} ) {
601 <        if ( ! defined $$hashref{name} ) {
602 <                ($$hashref{name}=$$hashref{file})=~s/\..*//;
603 <        }
604 <        ($filename=$$hashref{file})=~s/\..*//;
605 <
606 <        # Create a new directory for each module target
607 <        my $dirname="module_".$$hashref{name};
608 <        AddDir::adddir("$ENV{LOCALTOP}/$ENV{INTwork}/".$self->{path}."/$dirname");
609 <        open (moduleGNUmakefile,
610 <           ">$ENV{LOCALTOP}/$ENV{INTwork}/".$self->{path}."/$dirname/BuildFile.mk") or die           "Unable to make $ENV{LOCALTOP}/$ENV{INTwork}/$self->{path}/$dirname/".
611 <           "BuildFile.mk $!\n";
612 <
613 <        # Create the link targets
614 <        $numbins++;
615 <        my $fh=$self->{filehandlestack}[0];
616 <        print $fh <<ENDTEXT;
617 <
618 < # Link Targets to module directories
619 < ifdef MODULEMODE
620 < # We dont want to build a library here
621 < override files:=
622 < endif
623 < ifndef MODULEMODE
118 > sub architecture_()
119 >   {
120 >   $self->{content}->{ARCH}->{$self->{id}->{'name'}}=$self->{tagcontent};
121 >   $self->poplevel();
122 >   }
123  
124 < BINMODE=true
125 <  
126 < define stepdown_$$hashref{'name'}
127 < if [ -d "$ENV{LOCALTOP}/$ENV{INTwork}/$self->{path}/$dirname" ]; then \\
128 < cd $ENV{LOCALTOP}/$ENV{INTwork}/$self->{path}/$dirname; \\
129 < \$(MAKE) MODULEMODE=true LatestBuildFile=$ENV{LOCALTOP}/$ENV{INTwork}/$self->{path}/$dirname/BuildFile.mk workdir=\$(workdir)/$dirname -f \$(TOOL_HOME)/basics.mk datestamp \$\@; \\
130 < fi
131 < endef
132 <
133 < define stepdown2_$$hashref{'name'}
635 < if [ -d "$ENV{LOCALTOP}/$ENV{INTwork}/$self->{path}/$dirname" ]; then \\
636 < cd $ENV{LOCALTOP}/$ENV{INTwork}/$self->{path}/$dirname; \\
637 < \$(MAKE) MODULEMODE=true LatestBuildFile=$ENV{LOCALTOP}/$ENV{INTwork}/$self{path}/$dirname/BuildFile.mk workdir=\$(workdir)/$dirname -f \$(TOOL_HOME)/basics.mk datestamp \$\*; \\
638 < fi
639 <
640 < endef
641 <
642 < module_$$hashref{'name'}_%:: dummy
643 <        \@\$(stepdown2_$$hashref{'name'})
644 <
645 < $$hashref{'name'}_%:: dummy
646 <        \@\$(stepdown_$$hashref{'name'})
647 <
648 < help module module_debug module_debug_local module_insure module_Insure clean $$hashref{'name'}:: dummy
649 <        \@\$(stepdown_$$hashref{'name'})
650 <
651 < modulefiles+=$$hashref{'file'}
652 < locmodulefiles+=$dirname/$$hashref{'file'}
653 < endif
654 <
655 <
656 < ENDTEXT
657 <
658 <
659 < # the module specifics makefile
660 <        print moduleGNUmakefile "include ".$self->{currentenv}."\n";
661 <        print moduleGNUmakefile "VPATH+=$ENV{LOCALTOP}/$self{path}\n";
662 <
663 < # alias for bin_Insure
664 <        print moduleGNUmakefile <<ENDTEXT;
665 <
666 < module_insure:module_Insure
667 < ifdef MAKETARGET_module_insure
668 < MAKETARGET_$$hashref{name}_Insure=1
669 < endif
670 <
671 < # debuggging target
672 < $$hashref{'name'}_echo_% :: echo_%
673 <
674 < # help targets
675 < help::
676 < \t\@echo  
677 < \t\@echo Targets For $$hashref{'name'}
678 < \t\@echo -------------------------------------
679 < \t\@echo $$hashref{'name'}  - default build
680 < \t\@echo module_$$hashref{'name'}_clean - executable specific cleaning
681 < ENDTEXT
682 <
683 < # Make generic rules for each type
684 <        $targettypes={
685 <                "module" => 'o',
686 <                "module_debug" => 'd',
687 <                "module_debug_local" => 'l_d',
688 <                "module_Insure" => 'Insure'
689 <        };
690 <        #
691 <        foreach $target ( keys %$targettypes ) {
692 <          print moduleGNUmakefile <<ENDTEXT;
693 <
694 < # Type $target specifics
695 < ifdef MAKETARGET_$target
696 < MAKETARGET_$$hashref{name}_$$targettypes{$target}=1
697 < endif
698 < $target ::$$hashref{name}_$$targettypes{$target}
699 <
700 < moduletargets+=$$hashref{name}_$$targettypes{$target}
701 < help::
702 < \t\@echo $$hashref{name}_$$targettypes{$target}
703 < clean::
704 < \t\@if [ -f \$(modulestore)/$$hashref{name}_$$targettypes{$target} ]; then \\
705 < \techo Removing \$(modulestore)/$$hashref{name}; \\
706 < \trm \$(modulestore)/$$hashref{name}_$$targettypes{$target}; \\
707 < \tfi
708 <
709 < ENDTEXT
710 <          ($objectname=$$hashref{file})=~s/\..*/_$$targettypes{$target}\.o/;
711 <          ${"objectname_$$targettypes{$target}"}=$objectname;
712 <          print moduleGNUmakefile "$objectname:$$hashref{name}.dep\n";
713 <        } # end loop
714 <        print moduleGNUmakefile "MDFLAGS= -shared -Wl,-soname,\$\@","\n";
715 <        print moduleGNUmakefile "$$hashref{name}_Insure.so:.psrc\n";
716 <        print moduleGNUmakefile "$$hashref{name}_d.so:$objectname_d\n";
717 <        print moduleGNUmakefile "\t\$(CClinkCmdDebug) \$(MDFLAGS)\n";
718 <        print moduleGNUmakefile "\t\@\$(SCRAMPERL) \$(SCRAM_HOME)/src/scramdatestamp \$\@\.ds \$\@ \$\^\n";
719 <        print moduleGNUmakefile "$$hashref{name}_l_d.so:$objectname_d\n";
720 <        print moduleGNUmakefile "\t\$(CClinkCmdDebugLocal) \$(MDFLAGS)\n";
721 <        print moduleGNUmakefile "\t\@\$(SCRAMPERL) \$(SCRAM_HOME)/src/scramdatestamp \$\@\.ds \$\@ \$\^\n";
722 <        print moduleGNUmakefile "$$hashref{name}_Insure.so:$objectname_Insure\n";
723 <        print moduleGNUmakefile "\t\$(CClinkCmdInsure) \$(MDFLAGS)\n";
724 <        print moduleGNUmakefile "\t\@\$(SCRAMPERL) \$(SCRAM_HOME)/src/scramdatestamp \$\@\.ds \$\@ \$\^\n";
725 <        print moduleGNUmakefile "$$hashref{name}_o.so:$objectname_o\n";
726 <        print moduleGNUmakefile "\t\$(CClinkCmd) \$(MDFLAGS)\n";
727 <        print moduleGNUmakefile "\t\@\$(SCRAMPERL) \$(SCRAM_HOME)/src/scramdatestamp \$\@\.ds \$\@ \$\^\n";
728 <        print moduleGNUmakefile "$$hashref{name}.dep:$$hashref{file}\n";
729 <        print moduleGNUmakefile "-include $$hashref{name}.dep\n";
730 < print moduleGNUmakefile <<ENDTEXT;
731 < clean::
732 < \t\@if [ -f \$(modulestore)/lib$$hashref{name} ]; then \\
733 < \techo Removing \$(modulestore)/lib$$hashref{name}; \\
734 < \trm \$(modulestore)/lib$$hashref{name}; \\
735 < \tfi
124 > sub export()
125 >   {
126 >   $self->pushlevel(); # Set nested to 1;
127 >   }
128 >
129 > sub export_()
130 >   {
131 >   $self->{content}->{EXPORT} = $self->{tagcontent};
132 >   $self->poplevel();
133 >   }
134  
135 + sub lib()
136 +   {
137 +   my ($object,$name,%attributes)=@_;
138 +   # The getter part:
139 +   if (ref($object) eq __PACKAGE__)
140 +      {
141 +      # Return an array of required libs:
142 +      return $self->{content}->{LIB};      
143 +      }
144 +  
145 +   my $libname;
146    
147 < $$hashref{name}_d.so:\$(libslocal_d)
148 < $$hashref{name}_o.so:\$(libslocal)
149 < ifdef MCCABE_DATA_DIR
150 < $$hashref{name}_mccabe.so: \$(libslocal_d) \$(MCCABE_DATA_DIR)/mccabeinstr/instplus.cpp
151 < endif
152 < $$hashref{name}_Insure.so:\$(libslocal_I)
153 < $$hashref{name}_d:$$hashref{name}_d.so
154 <        \@cp $$hashref{name}_d.so \$(modulestore)/lib$$hashref{name}
155 < $$hashref{name}_l_d:$$hashref{name}_l_d.so
156 <        \@cp $$hashref{name}_l_d.so \$(modulestore)/lib$$hashref{name}
748 < $$hashref{name}_Insure:$$hashref{name}_Insure.so
749 <        \@cp $$hashref{name}_Insure.so \$(modulestore)/lib$$hashref{name}_Insure
750 < $$hashref{name}:$$hashref{name}_d.so
751 <        \@mv $$hashref{name}_d.so \$(modulestore)/lib$$hashref{name}
752 < $$hashref{name}_o:$$hashref{name}_o.so
753 <        \@mv $$hashref{name}_o.so \$(modulestore)/lib$$hashref{name}.so
754 < modulefiles+=$$hashref{file}
755 < ENDTEXT
756 <        }
757 <        close moduleGNUmakefile;
758 < }
759 <
760 <
761 < sub External_StartTag {
762 <        my $self=shift;
763 <        my $name=shift;
764 <        my $hashref=shift;
765 <
766 <        $self->verbose(">> External_StartTag: NM ".$name." <<");
767 <        
768 <        my $tool;
769 <        if ( $self->{Arch} ) {
770 <        $self->{switch}->checktag($name,$hashref,'ref');
771 <
772 <        # -- oo toolbox stuff
773 <        # - get the appropriate tool object
774 <        $$hashref{'ref'}=~tr[A-Z][a-z];
775 <        if ( ! exists $$hashref{'version'} ) {
776 <         $tool=$self->{toolbox}->gettool($$hashref{'ref'});
777 <        }
778 <        else {
779 <         $tool=$self->{toolbox}->gettool($$hashref{'ref'},$$hashref{'version'});
780 <        }
781 <        if ( ! defined $tool ) {
782 <          $self->{switch}->parseerror("Unknown Tool Specified ("
783 <                                                        .$$hashref{'ref'}.")");
784 <        }
785 <
786 <        # -- old fashioned GNUmakefile stuff
787 <        print GNUmakefile $$hashref{'ref'};
788 <        if ( defined $$hashref{'version'} ) {
789 <                print GNUmakefile "_V_".$$hashref{'version'};
790 <        }
791 <        print GNUmakefile "=true\n";
792 <        
793 <        # -- Sub system also specified?
794 <        if ( exists $$hashref{'use'} ) {
795 <           # -- look for a buildfile
796 <           my @paths=$tool->getfeature("INCLUDE");
797 <           my $file="";
798 <           my ($path,$testfile);
799 <           foreach $path ( @paths ) {
800 <             $testfile=$path."/".$$hashref{'use'}."/BuildFile" ;
801 <             if ( -f $testfile ) {
802 <                $file=$testfile;
803 <                $self->_pushremoteproject($path);
804 <             }
805 <           }
806 <           if ( $file eq "" ) {
807 <             $self->{switch}->parseerror("Unable to find SubSystem $testfile");
808 <           }
809 <           $self->ParseBuildFile_Export($file);
810 <           $self->_popremoteproject();
147 >   if (exists($attributes{'position'}))
148 >      {
149 >      if ($attributes{'position'} eq 'first')
150 >         {
151 >         $libname = "F:".$attributes{'name'};
152 >         }
153 >      else
154 >         {
155 >         # There was a position entry but it didn't make sense:
156 >         $libname = $attributes{'name'};
157           }
158 <        }
159 < }      
158 >      }
159 >   else
160 >      {
161 >      $libname = $attributes{'name'};
162 >      }
163 >   # We have a libname, add it to the list:
164 >   $self->{nested} == 1 ? push(@{$self->{tagcontent}->{LIB}}, $libname)
165 >      : push(@{$self->{content}->{LIB}}, $libname);
166 >   }
167 >
168 > sub libtype()
169 >   {
170 >   my ($object,$name,%attributes)=@_;
171 >   # The getter part:
172 >   if (ref($object) eq __PACKAGE__)
173 >      {
174 >      # Return an array of required libs:
175 >      return $self->{content}->{LIBTYPE};      
176 >      }
177  
178 < sub Group_start {
179 <        my $self=shift;
180 <        my $name=shift;
818 <        my $hashref=shift;
819 <        
820 <        $self->verbose(">> Group_start: NM ".$name." <<");
821 <        
822 <        $self->{switch}->checktag($name, $hashref, 'name');
823 <        if ( $self->{Arch} ) {
824 <        print GNUmakefile "GROUP_".$$hashref{'name'};
825 <        if ( defined $$hashref{'version'} ) {
826 <                print GNUmakefile "_V_".$$hashref{'version'};
827 <        }
828 <        print GNUmakefile "=true\n";
829 <        }
830 < }      
178 >   $self->{nested} == 1 ? push(@{$self->{tagcontent}->{LIBTYPE}}, $attributes{'type'})
179 >      : push(@{$self->{content}->{LIBTYPE}}, $attributes{'type'});
180 >   }
181  
182 < sub Use_start
182 > sub skip()
183     {
184 <   my $self=shift;
185 <   my $name=shift;
186 <   my $hashref=shift;
187 <   my $filename;
838 <   use Utilities::SCRAMUtils;
184 >   my ($object,$name,%attributes)=@_;
185 >   $self->{nested} == 1 ? $self->{tagcontent}->{SKIPPEDDIRS} = [ 1 ]
186 >      : $self->{content}->{SKIPPEDDIRS} = [ 1 ];
187 >   }
188  
189 <   $self->verbose(">> Use_start: NM ".$name." <<");
189 > sub skip_message()
190 >   {
191 >   my ($object,$name,@message) = @_;
192 >   # Save any message text between <skip> tags:
193 >   if ($#message > -1)
194 >      {
195 >      $self->{nested} == 1 ? push(@{$self->{tagcontent}->{SKIPPEDDIRS}}, [ @message ])
196 >         : push(@{$self->{content}->{SKIPPEDDIRS}}, [ @message ]);
197 >      }
198 >   }
199 >
200 > sub skip_()
201 >   {
202 >   my ($object,$name)=@_;
203 >   }
204 >
205 > sub makefile()
206 >   {
207 >   my ($object,$name,%attributes)=@_;
208 >   # The getter part:
209 >   if (ref($object) eq __PACKAGE__)
210 >      {
211 >      # Return Makefile content:
212 >      return $self->{content}->{MAKEFILE};
213 >      }
214    
215 <   $self->{switch}->checktag($name, $hashref, "name");
216 <   if ( $self->{Arch} )
215 >   # Set our own Char handler so we can collect the content
216 >   # of the Makefile tag:
217 >   $object->setHandlers(Char => \&makefile_content);
218 >   $self->{makefilecontent} = [];
219 >   }
220 >
221 > sub makefile_content()
222 >   {
223 >   my ($object, @strings) = @_;
224 >   push(@{$self->{makefilecontent}},@strings);
225 >   }
226 >
227 > sub makefile_()
228 >   {
229 >   my ($object,$name)=@_;
230 >   $self->{nested} == 1 ? push(@{$self->{tagcontent}->{MAKEFILE}}, join('',@{$self->{makefilecontent}}))
231 >      : push(@{$self->{content}->{MAKEFILE}}, join('',@{$self->{makefilecontent}}));
232 >   delete $self->{makefilecontent};
233 >   # Unset the Char handler to revert to the default behaviour:
234 >   $object->setHandlers(Char => 0);
235 >   }
236 >
237 > sub define_group()
238 >   {
239 >   my ($object,$name,%attributes)=@_;
240 >   $self->pushlevel(\%attributes); # Set nested to 1;
241 >   }
242 >
243 > sub define_group_()
244 >   {
245 >   $self->{content}->{DEFINED_GROUP}->{$self->{id}->{'name'}}=$self->{tagcontent};
246 >   $self->poplevel();
247 >   }
248 >
249 > sub group()
250 >   {
251 >   my $object=shift;
252 >   # The getter part:
253 >   if (ref($object) eq __PACKAGE__)
254        {
255 <      if ( exists $$hashref{'group'} )
256 <         {
257 <         print GNUmakefile "GROUP_".$$hashref{'group'}."=true\n";
258 <         }
259 <      if ( ! defined $self->{remoteproject} )
255 >      # Add or return groups:
256 >      @_ ? push(@{$self->{content}->{GROUP}},@_)
257 >         : @{$self->{content}->{GROUP}};
258 >      }
259 >   else
260 >      {
261 >      my ($name,%attributes)=@_;
262 >      $self->{nested} == 1 ? push(@{$self->{tagcontent}->{GROUP}}, $attributes{'name'})
263 >         : push(@{$self->{content}->{GROUP}}, $attributes{'name'});
264 >      }
265 >   }
266 >
267 > sub flags()
268 >   {
269 >   my ($object,$name,%attributes)=@_;
270 >   # The getter part:
271 >   if (ref($object) eq __PACKAGE__)
272 >      {
273 >      # Return an array of ProductStore hashes:
274 >      return $self->{content}->{FLAGS};
275 >      }
276 >  
277 >   # Extract the flag name and its value:
278 >   my ($flagname,$flagvaluestring) = each %attributes;
279 >   $flagname =~ tr/[a-z]/[A-Z]/; # Keep flag name uppercase
280 >   chomp($flagvaluestring);
281 >   # Split the value on whitespace so we can push all
282 >   # individual flags into an array:
283 >   my @flagvalues = split(' ',$flagvaluestring);
284 >   # Is current tag within another tag block?
285 >   if ($self->{nested} == 1)
286 >      {
287 >      # Check to see if the current flag name is already stored in the hash. If so,
288 >      # just add the new values to the array of flag values:
289 >      if (exists ($self->{tagcontent}->{FLAGS}->{$flagname}))
290           {
291 <         $filename=SCRAMUtils::checkfile("/$ENV{INTsrc}/$$hashref{name}/BuildFile");
291 >         push(@{$self->{tagcontent}->{FLAGS}->{$flagname}},@flagvalues);
292           }
293        else
294           {
295 <         $filename=$self->{remoteproject}."/$$hashref{name}/BuildFile";
856 <         print "Trying $filename\n";
857 <         if ( ! -f $filename ) { $filename=""; };
295 >         $self->{tagcontent}->{FLAGS}->{$flagname} = [ @flagvalues ];
296           }
297 <      if ( $filename ne "" )
297 >      }
298 >   else
299 >      {
300 >      if (exists ($self->{content}->{FLAGS}->{$flagname}))
301           {
302 <         $self->ParseBuildFile_Export( $filename );
302 >         push(@{$self->{content}->{FLAGS}->{$flagname}},@flagvalues);
303           }
304        else
305           {
306 <         $self->{switch}->parseerror("Unable to detect Appropriate ".
866 <                                     "decription file for <$name name=".$$hashref{name}.">");
306 >         $self->{content}->{FLAGS}->{$flagname} = [ @flagvalues ];
307           }
308        }
309     }
310  
311 < sub CheckBuildFile {
312 <         my $self=shift;
313 <         my $classdir=shift;
314 <         my $ClassName="";
315 <         my $thisfile="$classdir/$buildfile";
316 <        
877 <         if ( -e $ENV{LOCALTOP}."/".$thisfile ) {
878 <            $DefaultBuildfile="$ENV{LOCALTOP}/$thisfile";
879 <            $self->ParseBuildFile($ENV{LOCALTOP}, $classdir, $buildfile);
880 <         }
881 <         elsif ( -e $ENV{RELEASETOP}."/".$thisfile ) {
882 <            $DefaultBuildfile="$ENV{RELEASETOP}/$thisfile";
883 <            $self->ParseBuildFile($ENV{RELEASETOP}, $classdir, $buildfile);
884 <         }
885 <         $self->verbose(">> CheckBuildFile: FN ".$thisfile." CN ".$ClassName." <<");
886 <         return $ClassName;
887 < }
888 <
889 < # List association groups between <AssociateGroup> tags
890 < # seperated by newlines or spaces
891 < sub AssociateGroup {
892 <        my $self=shift;
893 <        my $name=shift;
894 <        my $string=shift;
895 <        my $word;
896 <
897 <        $self->verbose(">> AssociateGroup: NM ".$name." ST ".$string." <<");
898 <        
899 <        if ( $self->{Arch} ) {
900 <        foreach $word ( (split /\s/, $string) ){
901 <                chomp $word;
902 <                next if /^#/;
903 <                if ( $word=~/none/ ) {
904 <                        $self->{ignore}=1;
905 <                }
906 <        }
907 <        }
908 < }
909 <
910 < sub Arch_Start {
911 <        my $self=shift;
912 <        my $name=shift;
913 <        my $hashref=shift;
914 <
915 <        $self->verbose(">> Arch_Start: NM ".$name." <<");
916 <        
917 <        $self->{switch}->checktag($name, $hashref,'name');
918 <        ( ($ENV{SCRAM_ARCH}=~/$$hashref{name}.*/) )? ($self->{Arch}=1)
919 <                                                : ($self->{Arch}=0);
920 <        push @{$self->{ARCHBLOCK}}, $self->{Arch};
921 < }
922 <
923 < sub Arch_End {
924 <        my $self=shift;
925 <        my $name=shift;
926 <        
927 <        $self->verbose(">> Arch_End: NM ".$name." <<");
928 <
929 <        pop @{$self->{ARCHBLOCK}};
930 <        $self->{Arch}=$self->{ARCHBLOCK}[$#{$self->{ARCHBLOCK}}];
931 < }
932 <
933 < # Split up the Class Block String into a useable array
934 < sub _CutBlock {
935 <    my $self=shift;
936 <    my $string= shift @_;
937 <
938 <    $self->verbose(">> _CutBlock: ST ".$string." <<");
939 <    
940 <    @BlockClassA = split /\//, $string;
941 < }
942 <
943 < sub OutToMakefile {
944 <        my $self=shift;
945 <        my $name=shift;
946 <        my @vars=@_;
947 <        
948 <        $self->verbose(">> OutToMakefile: <<");
949 <
950 <        if ( $self->{Arch} ) {
951 <          $self->verbose(">> CONT: ".$#vars." lines <<");
952 <          print GNUmakefile @vars;
953 <        }
954 < }
955 <
956 < sub OutToScreen {
957 <        my $name=shift;
958 <        my @vars=@_;
959 <        
960 <        if ( $self->{Arch} ) {
961 <          print @vars;
962 <        }
963 < }
964 < sub setBlockClassPath {
965 <        my $self=shift;
966 <        my $name=shift;
967 <        my $hashref=shift;
968 <
969 <        $self->verbose(">> setBlockClassPath: NM ".$name." <<");
970 <        
971 <        $self->{switch}->checktag($name, $hashref, 'path');
972 <        $self->{BlockClassPath}=$self->{BlockClassPath}.":".$$hashref{path};
973 <        $self->_CutBlock($$hashref{path});
974 < }
975 <
976 < sub BlockClassPath {
977 <        my $self=shift;
978 <
979 <        $self->verbose(">> BlockClassPath: <<");
980 <
981 <        return $self->{BlockClassPath};
982 < }
983 <
984 < sub export_start_export {
985 <        my $self=shift;
986 <        my $name=shift;
987 <        my $hashref=shift;
988 <
989 <        $self->verbose(">> export_start_export: NM ".$name." <<");
990 <        
991 <        $self->{switch}->opengroup("__export");
992 < }
993 <
994 < sub export_start {
995 <        my $self=shift;
996 <        my $name=shift;
997 <        my $hashref=shift;
998 <
999 <        $self->verbose(">> export_start: NM ".$name." <<");
1000 <        
1001 <        $self->{switch}->opengroup("__export");
1002 <        if ( exists $$hashref{autoexport} ) {
1003 <          print GNUmakefile "scram_autoexport=".$$hashref{autoexport}."\n";
1004 <          if ( $$hashref{autoexport}=~/true/ ) {
1005 <           $self->{switch}->allowgroup("__export","makebuild");
1006 <          }
1007 <          else {
1008 <           $self->{switch}->disallowgroup("__export","makebuild");
1009 <          }
1010 <        }
1011 <        # -- allow default setting from other makefiles
1012 <        print GNUmakefile "ifeq (\$(scram_autoexport),true)\n";
1013 < }
1014 <
1015 < sub export_end_export {
1016 <        my $self=shift;
1017 <        $self->verbose(">> export_end_export: <<");
1018 <        $self->{switch}->closegroup("__export");
1019 < }
1020 <
1021 < sub export_end {
1022 <        my $self=shift;
1023 <        $self->verbose(">> export_end: <<");
1024 <        $self->{switch}->closegroup("__export");
1025 <        print GNUmakefile "endif\n";
1026 < }
311 > sub allflags()
312 >   {
313 >   my $self=shift;
314 >   # Return hash data for flags:
315 >   return $self->{content}->{FLAGS};
316 >   }
317  
318 < #
319 < # Standard lib tag
320 < #
321 < sub lib_start
318 > sub archspecific()
319 >   {
320 >   my $self=shift;
321 >  
322 >   # Check to see if there is arch-dependent data. If so, return it:
323 >   if ((my $nkeys=keys %{$self->{content}->{ARCH}}) > 0)
324 >      {
325 >      while (my ($k,$v) = each %{$self->{content}->{ARCH}})
326 >         {
327 >         if ( $ENV{SCRAM_ARCH} =~ /$k.*/ )
328 >            {
329 >            return $self->{content}->{ARCH}->{$k};
330 >            }
331 >         }
332 >      }
333 >   return "";
334 >   }
335 >
336 > sub bin()
337 >   {
338 >   my ($object,$name,%attributes) = @_;
339 >   $self->pushlevel(\%attributes);# Set nested to 1;
340 >   }
341 >
342 > sub bin_()
343 >   {
344 >   # Need unique name for the binary (always use name of product). Either use "name"
345 >   # given, or use "file" value minus the ending:
346 >   if (exists ($self->{id}->{'name'}))
347 >      {
348 >      $name = $self->{id}->{'name'};
349 >      }
350 >   else
351 >      {
352 >      ($name) = ($self->{id}->{'file'} =~ /(.*)?\..*$/);
353 >      }
354 >
355 >   # Store the data:
356 >   $self->productcollector($name,'bin','BIN');
357 >   $self->poplevel();
358 >   }
359 >
360 > sub module()
361 >   {
362 >   my ($object,$name,%attributes) = @_;
363 >   $self->pushlevel(\%attributes);# Set nested to 1;
364 >   }
365 >
366 > sub module_()
367 >   {
368 >   # Need unique name for the module (always use name of product). Either use "name"
369 >   # given, or use "file" value minus the ending:
370 >   if (exists ($self->{id}->{'name'}))
371 >      {
372 >      $name = $self->{id}->{'name'};
373 >      }
374 >   else
375 >      {
376 >      ($name) = ($self->{id}->{'file'} =~ /(.*)?\..*$/);
377 >      }
378 >
379 >   # Store the data:
380 >   $self->productcollector($name,'mod','MODULE');
381 >   $self->poplevel();
382 >   }
383 >
384 > sub application()
385 >   {
386 >   my ($object,$name,%attributes) = @_;
387 >   $self->pushlevel(\%attributes);# Set nested to 1;
388 >   }
389 >
390 > sub application_()
391 >   {
392 >   # Need unique name for the application (always use name of product). Either use "name"
393 >   # given, or use "file" value minus the ending:
394 >   if (exists ($self->{id}->{'name'}))
395 >      {
396 >      $name = $self->{id}->{'name'};
397 >      }
398 >   else
399 >      {
400 >      ($name) = ($self->{id}->{'file'} =~ /(.*)?\..*$/);
401 >      }
402 >
403 >   # Store the data:
404 >   $self->productcollector($name,'app','APPLICATION');
405 >   $self->poplevel();
406 >   }
407 >
408 > sub library()
409 >   {
410 >   my ($object,$name,%attributes) = @_;
411 >   $self->pushlevel(\%attributes);# Set nested to 1;
412 >   }
413 >
414 > sub library_()
415 >   {
416 >   # Need unique name for the library (always use name of product). Either use "name"
417 >   # given, or use "file" value minus the ending:
418 >   if (exists ($self->{id}->{'name'}))
419 >      {
420 >      $name = $self->{id}->{'name'};
421 >      }
422 >   else
423 >      {
424 >      ($name) = ($self->{id}->{'file'} =~ /(.*)?\..*$/);
425 >      }
426 >
427 >   # Store the data:
428 >   $self->productcollector($name,'lib','LIBRARY');
429 >   $self->poplevel();
430 >   }
431 >
432 > sub plugin()
433 >   {
434 >   my ($object,$name,%attributes) = @_;
435 >   $self->pushlevel(\%attributes);# Set nested to 1;
436 >   }
437 >
438 > sub plugin_()
439 >   {
440 >   # Need unique name for the plugin (always use name of product). Either use "name"
441 >   # given, or use "file" value minus the ending:
442 >   if (exists ($self->{id}->{'name'}))
443 >      {
444 >      $name = $self->{id}->{'name'};
445 >      }
446 >   else
447 >      {
448 >      ($name) = ($self->{id}->{'file'} =~ /(.*)?\..*$/);
449 >      }
450 >
451 >   # Store the data:
452 >   $self->productcollector($name,'plugin','PLUGIN');
453 >   $self->poplevel();
454 >   }
455 >
456 > sub unittest()
457 >   {
458 >   my ($object,$name,%attributes) = @_;
459 >   $self->pushlevel(\%attributes);# Set nested to 1;
460 >   }
461 >
462 > sub unittest_()
463 >   {
464 >   # Need unique name for the unittest (always use name of product). Either use "name"
465 >   # given, or use "file" value minus the ending:
466 >   if (exists ($self->{id}->{'name'}))
467 >      {
468 >      $name = $self->{id}->{'name'};
469 >      }
470 >   else
471 >      {
472 >      ($name) = ($self->{id}->{'file'} =~ /(.*)?\..*$/);
473 >      }
474 >
475 >   # Store the data:
476 >   $self->productcollector($name,'unittest','unittest');
477 >   $self->poplevel();
478 >   }
479 >
480 > sub productcollector()
481     {
482     my $self=shift;
483 <   my $name=shift;
484 <   my $hashref=shift;
483 >   my ($name,$typeshort,$typefull)=@_;
484 >   # Create a new Product object for storage of data:
485 >   use BuildSystem::Product;
486 >   my $product = BuildSystem::Product->new();
487 >   # Store the name:
488 >   $product->name($name);
489 >   $product->type($typeshort);
490 >   # Store the files. Take the BuildFile path as the initial path for
491 >   # expanding source file globs:
492 >   $product->_files($self->{id}->{'file'},[ $self->{scramdoc}->filetoparse() ]);
493 >   # Store the data content:
494 >   $product->_data($self->{tagcontent});
495 >   # And store in a hash (all build products in same place):
496 >   $self->{content}->{BUILDPRODUCTS}->{$typefull}->{$name} = $product;
497 >   }
498 >
499 > sub pushlevel
500 >   {
501 >   my $self = shift;
502 >   my ($info)=@_;
503    
504 <   $self->verbose(">> lib_start: NM ".$name." <<");
504 >   $self->{id} = $info if (defined $info);
505 >   $self->{nested} = 1;
506 >   $self->{tagcontent}={};
507 >   }
508 >
509 > sub poplevel
510 >   {
511 >   my $self = shift;
512 >   delete $self->{id};
513 >   delete $self->{nested};
514 >   delete $self->{tagcontent};
515 >   }
516 >
517 > sub dependencies()
518 >   {
519 >   my $self=shift;
520 >   # Make a copy of the variable so that
521 >   # we don't have a DEPENDENCIES entry in RAWDATA:
522 >   my %DEPS=%{$self->{DEPENDENCIES}};
523 >   delete $self->{DEPENDENCIES};
524 >   return \%DEPS;
525 >   }
526 >
527 > sub skippeddirs()
528 >   {
529 >   my $self=shift;
530 >   my ($here)=@_;
531 >   my $skipped;
532 >
533 >   if ($self->{content}->{SKIPPEDDIRS}->[0] == 1)
534 >      {
535 >      $skipped = [ @{$self->{content}->{SKIPPEDDIRS}} ];
536 >      delete $self->{content}->{SKIPPEDDIRS};
537 >      }
538    
539 <   $self->{switch}->checktag($name, $hashref, 'name');
539 >   delete $self->{content}->{SKIPPEDDIRS};
540 >   return $skipped;
541 >   }
542 >
543 > sub hasexport()
544 >   {
545 >   my $self=shift;
546 >   # Check to see if there is a valid export block:
547 >   my $nkeys = $self->exporteddatatypes();
548 >   $nkeys > 0 ? return 1 : return 0;
549 >   }
550 >
551 > sub has()
552 >   {
553 >   my $self=shift;
554 >   my ($datatype)=@_;  
555 >   (exists ($self->{content}->{$datatype})) ? return 1 : return 0;
556 >   }
557 >
558 > sub exported()
559 >   {
560 >   my $self=shift;
561 >   # Return a hash. Keys are type of data provided:
562 >   return ($self->{content}->{EXPORT});
563 >   }
564 >
565 > sub exporteddatatypes()
566 >   {
567 >   my $self=shift;
568 >   # Return exported data types:
569 >   return keys %{$self->{content}->{EXPORT}};
570 >   }
571 >
572 > sub defined_group()
573 >   {
574 >   my $self=shift;
575  
576 <   if ( $self->{Arch} )
576 >   if (exists($self->{content}->{DEFINED_GROUP}))
577 >      {  
578 >      # Return a list of keys (group names) for defined groups:
579 >      return [ keys %{$self->{content}->{DEFINED_GROUP}} ];
580 >      }
581 >   else
582        {
583 <      print GNUmakefile "lib+=$$hashref{name}\n";
583 >      return 0;
584        }
585     }
586  
587 < #
588 < # libtype specification
589 < #
590 < sub LibType_Start {
591 <        my $self=shift;
592 <        my $name=shift;
593 <        my $hashref=shift;
594 <        
595 <        $self->verbose(">> LibType_Start: NM ".$name." <<");
596 <        
597 <        if ( $self->{Arch} ) {
598 <        if ( defined $self->{libtype_conext} ) {
599 <          $self->{switch}->parseerror("<$name> tag cannot be specified".
600 <                " without a </$name> tag to close previous context");
601 <        }
602 <        else {
603 <        $self->{libtype_conext}=1;
604 <        $self->{switch}->checktag($name, $hashref, 'type');
605 <        
606 <        print GNUmakefile "# Specify Library Type\n";
607 <        print GNUmakefile "DefaultLibsOff=yes\n";
608 <        if ( $$hashref{'type'}=~/^archive/i ) {
609 <          print GNUmakefile "LibArchive=true\n";
610 <        }
611 <        elsif ($$hashref{'type'}=~/debug_archive/i ) {
612 <          print GNUmakefile "LibDebugArchive=true\n";
613 <        }
614 <        elsif ($$hashref{'type'}=~/debug_shared/i ) {
615 <          print GNUmakefile "LibDebugShared=true\n";
616 <        }
617 <        elsif ($$hashref{'type'}=~/shared/i ) {
618 <          print GNUmakefile 'LibShared=true'."\n";
619 <        }
620 <        print GNUmakefile "\n";
621 <        }
622 <        }
623 < }
624 <
625 < sub LibType_text {
626 <        my $self=shift;
627 <        my $name=shift;
628 <        my $string=shift;
629 <        $self->verbose(">> LibType_text: NM ".$name." <<");
630 <
631 <        if ( $self->{Arch} ) {
632 <          $string=~s/\n/ /g;
633 <          print GNUmakefile "libmsg::\n\t\@echo Library info: ";
634 <          print GNUmakefile $string;
635 <          print GNUmakefile "\n";
636 <        }
637 < }
638 <
639 < sub LibType_end {
640 <        my $self=shift;
641 <        my $name=shift;
642 <
643 <        $self->verbose(">> LibType_end: NM ".$name." <<");
644 <
645 <        undef $self->{libtype_conext};
646 < }
647 <
648 < sub Environment_start {
649 <        my $self=shift;
650 <        my $name=shift;
651 <        my $hashref=shift;
652 <
653 <        $self->verbose(">> Environment_start: NM ".$name." <<");
654 <        
655 <        if ( $self->{Arch} ) {
656 <          $self->{envnum}++;
657 <
658 <          # open a new Environment File
659 <          my $envfile="$ENV{LOCALTOP}/$ENV{INTwork}/$self->{path}/Env_".
1120 <                $self->{envnum}.".mk";
1121 <          use FileHandle;
1122 <          my $fh=FileHandle->new();
1123 <          open ($fh,">$envfile") or die "Unable to open file $envfile \n$!\n";
1124 <          push @{$self->{filehandlestack}}, $fh;
1125 <          *GNUmakefile=$fh;
1126 <
1127 <          # include the approprate environment file
1128 <          if ( $self->{envlevel} == 0 ) {
1129 <             print GNUmakefile "include $ENV{LOCALTOP}/$ENV{INTwork}/".
1130 <                $self->{path}."/BuildFile.mk\n";
1131 <          }
1132 <          else {
1133 <             print GNUmakefile "include $ENV{LOCALTOP}/$ENV{INTwork}/".
1134 <                $self->{path}."/Env_".$self->{Envlevels}[$self->{envlevel}].".mk\n";
1135 <          }
1136 <          $self->{envlevel}++;
1137 <          $self->{Envlevels}[$self->{envlevel}]=$self->{envnum};
1138 <          $self->{currentenv}="$ENV{LOCALTOP}/$ENV{INTwork}/$self->{path}/Env_$self->{envnum}.mk";
1139 <        }
1140 < }
1141 <
1142 < sub Environment_end {
1143 <        my $self=shift;
1144 <        my $fd;
1145 <
1146 <        $self->verbose(">> Environment_end: NM ".$name." <<");
1147 <
1148 <        if ( $self->{Arch} ) {
1149 <          $self->{envlevel}--;
1150 <          if ( $self->{envlevel} < 0 ) {
1151 <            print "Too many </Environent> Tags on $self->{switch}->line()\n";
1152 <            exit 1;
1153 <          }
1154 <          close GNUmakefile;
1155 <          # restore the last filehandle
1156 <          $fd=pop @{$self->{filehandlestack}};
1157 <          close $fd;
1158 <          *GNUmakefile=$self->{filehandlestack}[$#{$self->{filehandlestack}}];
1159 <          if ( $self->{envlevel} < 1 ) {
1160 <            $self->{currentenv}="$ENV{LOCALTOP}/$ENV{INTwork}/$self->{path}/".
1161 <                        "BuildFile.mk";
1162 <          }
1163 <          else {
1164 <            $self->{currentenv}=
1165 <             "$ENV{LOCALTOP}/$ENV{INTwork}/$self->{path}/Env_".
1166 <                $self->{Envlevels}[$self->{envlevel}];
1167 <          }
1168 <        }
1169 < }
1170 <
1171 < sub Store_start {
1172 <        my $self=shift;
1173 <        my $name=shift;
1174 <        my $hashref=shift;
1175 <
1176 <        $self->verbose(">> Store_start: NM ".$name." <<");
1177 <
1178 <        if ( $self->{Arch} ) {
1179 <          $self->{switch}->checktag( $name, $hashref, 'name' );
1180 <
1181 <          # -- store creation
1182 <          my $dir=$$hashref{'name'};
1183 <          AddDir::adddir($ENV{LOCALTOP}."/".$dir);
1184 <          if ( exists $$hashref{'type'} ) {
1185 <            # -- architecture specific store
1186 <            if ( $$hashref{'type'}=~/^arch/i ) {
1187 <                $dir=$dir."/".$ENV{SCRAM_ARCH};
1188 <                AddDir::adddir($ENV{LOCALTOP}."/".$dir);
1189 <            }
1190 <            else {
1191 <                $self->parseerror("Unknown type in <$name> tag");
1192 <            }
1193 <          }
1194 <
1195 <          # -- set make variables for the store
1196 <          print GNUmakefile "SCRAMSTORENAME_".$$hashref{'name'}.":=".$dir."\n";
1197 <          print GNUmakefile "SCRAMSTORE_".$$hashref{'name'}.":=".
1198 <                                        $ENV{LOCALTOP}."/".$dir."\n";
1199 <          print GNUmakefile "VPATH+=".$ENV{LOCALTOP}
1200 <                        ."/".$dir.":".$ENV{RELEASETOP}."/".$dir."\n";
1201 <        }
1202 < }
587 > sub dataforgroup()
588 >   {
589 >   my $self=shift;
590 >   my ($groupname)=@_;
591 >   # Return hash containing data for defined group
592 >   # $groupname or return undef:
593 >   return $self->{content}->{DEFINED_GROUP}->{$groupname};
594 >   }
595 >
596 > sub buildproducts()
597 >   {
598 >   my $self=shift;
599 >   # Returns hash of build products and their data:
600 >   return $self->{content}->{BUILDPRODUCTS};
601 >   }
602 >
603 > sub values()
604 >   {
605 >   my $self=shift;
606 >   my ($type)=@_;
607 >   # Get a list of values from known types
608 >   return $self->{content}->{BUILDPRODUCTS}->{$type};
609 >   }
610 >
611 > sub basic_tags()
612 >   {
613 >   my $self=shift;
614 >   my $datatags=[];
615 >   my $buildtags=[ qw(BIN LIBRARY APPLICATION MODULE PLUGIN BUILDPRODUCTS) ];
616 >   my $skiptags=[ qw(DEFINED_GROUP ARCH EXPORT GROUP USE CLASSPATH) ];
617 >   my $otherskiptags=[ qw( SKIPPEDDIRS ) ];
618 >   my @all_skip_tags;
619 >  
620 >   push(@all_skip_tags,@$skiptags,@$buildtags,@$otherskiptags);
621 >
622 >   foreach my $t (keys %{$self->{content}})
623 >      {
624 >      push(@$datatags,$t),if (! grep($t eq $_, @all_skip_tags));
625 >      }
626 >   return @{$datatags};
627 >   }
628 >
629 > sub clean()
630 >   {
631 >   my $self=shift;
632 >   my (@tags) = @_;
633 >
634 >   # Delete some useless entries:
635 >   delete $self->{makefilecontent};
636 >   delete $self->{simpledoc};
637 >   delete $self->{id};
638 >   delete $self->{tagcontent};
639 >   delete $self->{nested};
640 >
641 >   delete $self->{DEPENDENCIES};
642 >  
643 >   map
644 >      {
645 >      delete $self->{content}->{$_} if (exists($self->{content}->{$_}));
646 >      } @tags;
647 >  
648 >   return $self;
649 >   }
650 >
651 > sub AUTOLOAD()
652 >   {
653 >   my ($xmlparser,$name,%attributes)=@_;
654 >   return if $AUTOLOAD =~ /::DESTROY$/;
655 >   my $name=$AUTOLOAD;
656 >   $name =~ s/.*://;
657 >   }
658 >
659 > 1;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines