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

Comparing COMP/SCRAM/src/BuildSystem/BuildDataUtils.pm (file contents):
Revision 1.2 by sashby, Fri Dec 10 13:41:37 2004 UTC vs.
Revision 1.4 by sashby, Wed Mar 9 19:28:19 2005 UTC

# Line 162 | Line 162 | sub exporteddatatypes
162   sub defined_group
163     {
164     my $self=shift;
165 <   # Return a list of keys (group names) for defined groups:
166 <   return keys %{$self->{content}->{DEFINED_GROUP}};
165 >
166 >   if (exists($self->{content}->{DEFINED_GROUP}))
167 >      {  
168 >      # Return a list of keys (group names) for defined groups:
169 >      return [ keys %{$self->{content}->{DEFINED_GROUP}} ];
170 >      }
171 >   else
172 >      {
173 >      return 0;
174 >      }
175     }
176  
177   sub dataforgroup
# Line 196 | Line 204 | sub basic_tags()
204     my $datatags=[];
205     my $buildtags=[ qw(BIN LIBRARY APPLICATION MODULE BUILDPRODUCTS) ];
206     my $skiptags=[ qw(DEFINED_GROUP ARCH EXPORT GROUP USE CLASSPATH) ];
207 +   my $otherskiptags=[ qw( SKIPPEDDIRS ) ];
208     my @all_skip_tags;
209    
210 <   push(@all_skip_tags,@$skiptags,@$buildtags);
210 >   push(@all_skip_tags,@$skiptags,@$buildtags,@$otherskiptags);
211  
212     foreach my $t (keys %{$self->{content}})
213        {
# Line 211 | Line 220 | sub clean()
220     {
221     my $self=shift;
222     my (@tags) = @_;
223 +  
224     # Delete some useless entries:
225     delete $self->{makefilecontent};
226     delete $self->{simpledoc};
227     delete $self->{id};
228     delete $self->{tagcontent};
229     delete $self->{nested};
220 –  
221 –   delete $self->{DEPENDENCIES};
230  
231 +   delete $self->{DEPENDENCIES};
232 +  
233     map
234        {
235        delete $self->{content}->{$_} if (exists($self->{content}->{$_}));

Diff Legend

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