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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines