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

Comparing COMP/SCRAM/src/BuildSystem/TreeItem.pm (file contents):
Revision 1.4 by sashby, Tue May 24 09:09:42 2005 UTC vs.
Revision 1.5 by muzaffar, Tue Nov 6 14:13:49 2007 UTC

# Line 107 | Line 107 | sub skip()
107        : $self->{SKIP};
108     }
109  
110 + sub productstore()
111 +   {
112 +   my $self=shift;
113 +   @_ ? $self->{PRODUCTSTORES} = shift
114 +      : $self->{PRODUCTSTORES};
115 +   }
116 +  
117   sub name()
118     {
119     my $self=shift;
120 +   my $n=shift;
121 +   if(defined $n){$self->{NAME}=$n; return;}
122  
123     # Don't bother doing any work if the NAME exists already - just return it:
124     if (! exists($self->{NAME}))
# Line 131 | Line 140 | sub name()
140           # We want the name of the domain:
141           ($self->{NAME}) = ($classdir =~ m|^.*/(.*)?$|);
142           }
143 <      else
143 >      elsif ($self->{CLASS} eq 'LIBRARY')
144 >         {
145 >         #use SCRAM::ProductName;
146 >         #my $n = &SCRAM::ProductName::get_safename($classdir);
147 >         my $n="";
148 >         if ($n ne "")
149 >            {
150 >            $self->{NAME} = $n;
151 >            }
152 >         }
153 >      if (! exists($self->{NAME}))
154           {
155           # Here we have a path that ends in src/bin/test/doc etc. (for real
156           # build products). We still want to return the package name:
# Line 271 | Line 290 | sub branchmetadata()
290     if ($meta)
291        {
292        # Delete unneeded entries:
293 <      $meta->clean(qw( EXPORT DEFINED_GROUP CLASSPATH SKIPPEDDIRS ));
294 <      $self->{BRANCHMETA} = $meta;
293 >      #$meta->clean(qw( EXPORT DEFINED_GROUP CLASSPATH SKIPPEDDIRS ));
294 >      $self->{RAWDATA} = $meta;
295        }
296     else
297        {
298 <      return $self->{BRANCHMETA};
298 >      return $self->{RAWDATA};
299        }
300     }
301  
302   sub branchdata()
303     {
304     my $self=shift;
305 <   @_ ? $self->{BRANCHDATA} = shift
306 <      : $self->{BRANCHDATA};
305 >   @_ ? $self->{RAWDATA} = shift
306 >      : $self->{RAWDATA};
307     }
308  
309   sub clearmeta()
310     {
311     my $self=shift;
312 <   delete $self->{BRANCHDATA}, if (exists $self->{BRANCHDATA});
312 >   delete $self->{RAWDATA};
313     }
314  
315   sub updatechildlist()
# Line 403 | Line 422 | sub scramprojectbases()
422        : $self->{SCRAM_PROJECT_BASES};
423     }
424  
425 + sub publictype()
426 +   {
427 +   my $self=shift;
428 +   my $type=shift;
429 +   if (defined $type) {$self->{PUBLIC} = $type; return;}
430 +   if(exists $self->{PUBLIC}){return $self->{PUBLIC};}
431 +   return 0;
432 +   }
433 +
434   sub clean()
435     {
436     my $self=shift;
437 <   delete $self->{BRANCHMETA};
437 >   delete $self->{RAWDATA};
438     }
439  
440   1;

Diff Legend

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