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

Comparing COMP/SCRAM/src/BuildSystem/BuildSetup.pm (file contents):
Revision 1.6 by williamc, Tue Sep 19 10:09:30 2000 UTC vs.
Revision 1.23 by sashby, Mon May 13 12:43:53 2002 UTC

# Line 2 | Line 2
2   #
3   # Interface
4   # ---------
5 < # new(ConfigArea) : A new BuildSetup
5 > # new(toolbox) : A new BuildSetup
6   # BuildSetup(directory,targets) : prepare the ground for a build and build
7   # getclass(directory) : return (Class, ClassDir, BuildFileobject)
8   #                       associated with directory
9 < # setup(dir)
9 > #
10  
11   package BuildSystem::BuildSetup;
12   require 5.004;
# Line 20 | Line 20 | sub new {
20          my $class=shift;
21          my $self={};
22          bless $self,$class;
23 <        $self->{area}=shift;
24 <        $self->{toolbox}=$self->{area}->toolbox();
25 <        $self->{projconfigdir}=$self->{area}->configurationdir();
26 <        $self->{localtop}=$self->{area}->location();
27 <        $self->{buildfilename}="BuildFile";
28 <        $self->_configurationsetup();
23 >        $self->{toolbox}=shift;
24          return $self;
25   }
26  
27 < sub _generateexternals {
28 <        my $self=shift;
29 <        my $outfile=shift;
30 <
31 <        # -- specifiy these files for dependency information
32 <        my $depfile=$self->{projconfigdir}."/External_Dependencies";
33 <
34 <        # -- get list of dependent files
35 <        my $datadir=$self->{localtop}."/.SCRAM/".$ENV{SCRAM_ARCH};
36 <        $fdir=FileHandle->new();
37 <        opendir $fdir, $datadir;
38 <        my @depfiles=grep !/^\.\.?$/, readdir $fdir;
39 <        undef $fdir;
40 <        for (my $i=0; $i<=$#depfiles; $i++ ) {
41 <           $depfiles[$i]=$datadir."/".$depfiles[$i];
42 <        }
43 <
44 <        # -- do we need to rebuild?
45 <        if ( SCRAMUtils::dated($outfile,@depfiles) ) {
46 <          print "Configuring Local Area\n";
47 <          # -- open output file
48 <          my $fout=FileHandle->new();
49 <          $fout->open(">".$outfile) or die "Unable to open $outfile for output".
50 <                                        $!."\n";
51 <
52 <          # -- print out tool/ version info
53 <          my ($tool,$toolobj,$f,$val,$version);
54 <          foreach $tool ( $self->{toolbox}->tools() ) {
55 <            $version=$self->{toolbox}->defaultversion($tool);
56 <            # default versions
57 <            print $fout "ifdef $tool\n".$tool."_V_".$version."=true\nendif\n";
58 <            # -- set up the different version  -- externals
59 <            foreach $version ( $self->{toolbox}->versions($tool) ) {
60 <             $toolobj=$self->{toolbox}->gettool($tool,$version);
61 <             @deps=$toolobj->getfeature("_externals");
62 <             foreach $d ( @deps ) {
63 <              $d=~tr[A-Z][a-z];
64 <              print $fout "ifdef ".$tool."_V_".$version."\n $d=true\nendif\n";
65 <             }
66 <             # -- tool info
67 <             print $fout "ifdef ".$tool."_V_".$version."\n";
68 <             foreach $f ( $toolobj->features() ) {
69 <              foreach $val ( $toolobj->getfeature($f) ) {
70 <                print $fout "\t".$f." += ".$val."\n";
71 <              }
72 <             }
73 <             print $fout "endif\n";
27 > sub _generateexternals
28 >   ###############################################################
29 >   # _generateexternals                                          #
30 >   ###############################################################
31 >   # modified : Thu Jul 12 12:06:50 2001 / SFA                   #
32 >   # params   :                                                  #
33 >   #          :                                                  #
34 >   #          :                                                  #
35 >   #          :                                                  #
36 >   # function :                                                  #
37 >   #          :                                                  #
38 >   #          :                                                  #
39 >   ###############################################################
40 >   {
41 >   my $self=shift;
42 >   my $outfile=shift;
43 >
44 >   # -- specifiy these files for dependency information
45 >   # NB: This file is never used!
46 >  
47 >   my $depfile=$ENV{projconfigdir}."/External_Dependencies";
48 >  
49 >   # -- get list of dependent files
50 >   my $datadir=$ENV{LOCALTOP}."/.SCRAM/".$ENV{SCRAM_ARCH};
51 >   $fdir=FileHandle->new();
52 >   opendir $fdir, $datadir;
53 >   my @depfiles=grep !/^\.\.?$/, readdir $fdir;
54 >   undef $fdir;
55 >  
56 >   for (my $i=0; $i<=$#depfiles; $i++ )
57 >      {
58 >      $depfiles[$i]=$datadir."/".$depfiles[$i];
59 >      }
60 >  
61 >   # -- do we need to rebuild?
62 >   if ( SCRAMUtils::dated($outfile,@depfiles) )
63 >      {
64 >      print "Configuring Local Area\n";
65 >      # -- open output file
66 >      my $fout=FileHandle->new();
67 >      $fout->open(">".$outfile) or die "Unable to open $outfile for output".
68 >         $!."\n";
69 >
70 >      # -- print out tool/ version info
71 >      my ($tool,$toolobj,$f,$val,$version);
72 >          
73 >      foreach $tool ( $self->{toolbox}->tools() )
74 >         {
75 >         $version=$self->{toolbox}->defaultversion($tool);
76 >        
77 >         # default versions
78 >         print $fout "ifdef $tool\n".$tool."_V_".$version."=true\nendif\n";
79 >
80 >         # -- set up the different version  -- externals
81 >         foreach $version ( $self->{toolbox}->versions($tool) )
82 >            {
83 >            $toolobj=$self->{toolbox}->gettool($tool,$version);
84 >            @deps=$toolobj->getfeature("_externals");
85 >            #
86 >            foreach $d ( @deps )
87 >               {
88 >               $d=~tr[A-Z][a-z];
89 >               print $fout "ifdef ".$tool."_V_".$version."\n $d=true\nendif\n";
90 >               }
91 >            # -- tool info
92 >            print $fout "ifdef ".$tool."_V_".$version."\n";
93 >            
94 >            foreach $f ( $toolobj->features() )
95 >               {
96 >               foreach $val ( $toolobj->getfeature($f) )
97 >                  {
98 >                  print $fout "\t".$f." += ".$val."\n";
99 >                  }
100 >               }
101 >            # -- include any makefiles associated with the tool
102 >            if ( -f $self->{toolbox}->toolmakefile($tool,$version) )
103 >               {
104 >               print $fout "-include ".
105 >                  $self->{toolbox}->toolmakefile($tool,$version)."\n";
106 >               }
107 >            print $fout "endif\n";
108              }
109 <          }
110 <          # some addittional processing of specific vars
111 <          print $fout 'INCLUDEPATH+=$(addprefix -I,$(INCLUDE))'."\n";
112 <          print $fout 'LDFLAGS+=$(addprefix -L,$(LIBDIR))'."\n";
113 <          print $fout 'CPPFLAGS+=$(addprefix -D,$(CPPDEFINES))'."\n";
114 <          print $fout 'lib+=$(extralib)'."\n";
115 <          print $fout 'LDLIBS+=$(addprefix -l,$(lib))'."\n";
116 <          print $fout 'LDLIBS+=$(addprefix -l,$(REQUIRES))'."\n";
117 <
118 <          undef $fout;
119 <          $self->verbose("End Configuration Setup");
120 <        }
92 < }
93 <
94 < sub classsetup {
95 <        my $self=shift;
96 <        my $THISDIR=shift;
97 <
98 <        my $classmakefile;
99 <
100 <        my ($Class, $ClassDir, $bf)=$self->getclass($THISDIR);
101 <        $self->verbose("Class = $Class : ClassDir = $ClassDir for directory ".
102 <                        $THISDIR);
103 <
104 <        # -- should we ignore?
105 <        if ( $bf->ignore() ) {
106 <           print "Nothing to be done - empty group\n";
107 <           exit;
108 <        }      
109 <
110 <
111 <        # -- Create a makefile from the class BuildFile
112 <        my $classbuildfile=$self->{localtop}."/".
113 <                $self->{projconfigdir}."/".$Class."_BuildFile";
114 <        if ( -f $classbuildfile ) {
115 <              $classmakefile=$self->{localtop}."/".$ENV{INTwork}.
116 <                                        "/".$Class."_makefile.mk";
117 <              if ( SCRAMUtils::dated($classmakefile, $classbuildfile) ) {
118 <                # -- generate the new makefile if out of date
119 <                $self->verbose("Generating $classmakefile from".
120 <                                                " $classbuildfile");
121 <                my $classbf=BuildSystem::BuildFile->new($self->{area});
122 <                undef $ENV{LatestBuildFile}; # gets set by BuildFile
123 <                $classbf->GenerateMakefile($classbuildfile, $classmakefile);
124 <                undef $ENV{LatestBuildFile}; # we dont want this included in the
125 <                                             # hierarchy
126 <              }
127 <        }
128 <        else {
129 <           # -- No BuildFile - maybe its old style makefile
130 <              $classmakefile=$self->{localtop}."/".
131 <              $self->{projconfigdir}."/".$Class."_makefile.mk";
132 <              if ( ! -f $classmakefile ) {
133 <                   $self->error("Unable to find matching ".$Class.
134 <                                "_BuildFile or ".$Class."_makefile.mk");
135 <              }
136 <        }
137 <        # -- set LatestBuildFile
138 <        if ( $bf->buildfile() ne "" ) {
139 <          $ENV{LatestBuildFile}=$bf->makefile();
140 <        }
141 <        else {
142 <          $ENV{LatestBuildFile}=$self->{topbf}->makefile();
143 <        }
144 <
145 <        return ($Class,$ClassDir,$classmakefile);
146 < }
147 <
148 < sub _configurationsetup {
149 <        my $self=shift;
150 <
151 <        # -- set working directory
152 <        $self->{workdir}=$ENV{INTwork};
153 <        $self->{fullworkdir}=$self->{localtop}."/".$self->{workdir};
154 <
155 <        # -- make working directory
156 <        chdir $self->{localtop};
157 <        AddDir::adddir($self->{workdir});
158 <
159 <        # -- generate tool info
160 <        $self->_generateexternals($self->{fullworkdir}."/clientmakefile");
109 >         }
110 >      # some addittional processing of specific vars
111 >      print $fout 'INCLUDEPATH+=$(addprefix -I,$(INCLUDE))'."\n";
112 >      print $fout 'LDFLAGS+=$(addprefix -L,$(LIBDIR))'."\n";
113 >      print $fout 'CPPFLAGS+=$(addprefix -D,$(CPPDEFINES))'."\n";
114 >      print $fout 'lib+=$(extralib)'."\n";
115 >      # Hack to parse the lib list and remove duplicates:
116 >      print $fout 'ORDEREDLIB=$(shell $(SCRAMPERL) $(TOOL_HOME)/ProcessLibs $(lib))',"\n";
117 >      print $fout 'LDLIBS+=$(addprefix -l,$(ORDEREDLIB))'."\n";
118 >      #print $fout 'LDLIBS+=$(addprefix -l,$(lib))'."\n";
119 >      print $fout 'LDLIBS+=$(addprefix -l,$(REQUIRES))'."\n";
120 >      print $fout 'LD_LIBRARY_PATH:=$(subst $(space),:,$(LD_LIBRARY_PATH))'."\n";
121  
122 <        # -- process project BuildFile
123 <        $self->_topbuildfile();
124 < }
122 >      undef $fout;
123 >      }
124 >   }
125  
126 < sub BuildDir {
127 <        my $self=shift;
128 <        my $THISDIR=shift;
129 <        my @Targets=@_;
130 <        my $DefaultBuildFile="";
131 <
132 <        # -- Create working directory
133 <        my $workdir=$self->{workdir}."/".$THISDIR;
134 <        chdir $self->{localtop};
135 <        AddDir::adddir($workdir);
136 <        $ENV{workdir}=$workdir;
137 <        my $fullworkdir=$self->{localtop}."/".$ENV{workdir};
138 <        chdir $fullworkdir || die "Unable to enter working directory $!";
139 <
140 <        # -- setup Class specifics
141 <        ($Class,$ClassDir,$classmakefile)=$self->classsetup($THISDIR);
142 <        $ENV{classmakefile}=$classmakefile;
143 <        $ENV{Class}=$Class;
144 <        $ENV{ClassDir}=$ClassDir;
145 <        $DefaultBuildFile=$ENV{classmakefile};
146 <        $ENV{DefaultBuildFile}=$DefaultBuildFile;
126 > sub BuildSetup
127 >   {
128 >   ###############################################################
129 >   # BuildSetup                                                  #
130 >   ###############################################################
131 >   # modified : Fri Aug 10 16:57:03 2001 / SFA                   #
132 >   # params   :                                                  #
133 >   #          :                                                  #
134 >   #          :                                                  #
135 >   #          :                                                  #
136 >   # function : Build targets.                                   #
137 >   #          :                                                  #
138 >   #          :                                                  #
139 >   ###############################################################
140 >   my $self=shift;
141 >   my $THISDIR=shift;
142 >   my @Targets=@_;
143 >   my $DefaultBuildFile="";
144 >   my $Class="";
145 >
146 >   # -- Create working directory
147 >   chdir $ENV{LOCALTOP};
148 >   AddDir::adddir($ENV{INTwork}."/".$THISDIR);
149 >
150 >   my ($Class, $ClassDir, $bf)=$self->getclass($THISDIR);
151 >   $self->verbose("Class = $Class");
152 >   $self->verbose("ClassDir = $ClassDir");
153          
154 +   if ( $bf->ignore() )
155 +      {
156 +      print "Nothing to be done - empty group\n";
157 +      exit;
158 +      }
159 +   shift;
160 +   $self->_generateexternals($ENV{LOCALTOP}."/".$ENV{INTwork}."/clientmakefile");
161 +
162 +   # set up the workdir variable
163 +   $ENV{workdir}=$ENV{INTwork}."/".$ClassDir;
164 +   my $fullworkdir=$ENV{LOCALTOP}."/".$ENV{workdir};
165 +  
166 +   # set up projdeps variable
167 +   my $projectfile=$ENV{projconfigdir}."/External_Dependencies";
168 +   if ( -e $ENV{LOCALTOP}."/".$projectfile )
169 +      {
170 +      $ENV{projdeps}=$ENV{LOCALTOP}."/".$projectfile;
171 +      }
172 +   elsif ( -e $ENV{RELEASETOP}."/".$projectfile )
173 +      {
174 +      $ENV{projectfile}=$ENV{RELEASETOP}."/".$projectfile;
175 +      }
176 +   if ( $DefaultBuildFile eq "" )
177 +      {
178 +      # Map Relevant makefile classmakefile directory
179 +      my $classmakefile=$ENV{projconfigdir}."/".$Class."_makefile.mk";
180 +      if ( -e $ENV{LOCALTOP}."/".$classmakefile )
181 +         {
182 +         $ENV{classmakefile}=$ENV{LOCALTOP}."/".$classmakefile;
183 +         }
184 +      elsif ( -e $ENV{RELEASETOP}."/".$classmakefile )
185 +         {
186 +         $ENV{classmakefile}=$ENV{RELEASETOP}."/".$classmakefile;
187 +         }
188 +      else
189 +         {
190 +         print "\nUnable to locate $classmakefile\n";
191 +         print " Not in $ENV{LOCALTOP}\n";
192 +         print " Not in $ENV{RELEASETOP}\n";
193 +         exit 1;
194 +         }
195 +      $DefaultBuildFile=$ENV{classmakefile}; # TODO - only for override
196 +      }
197 +  
198 +   $ENV{ClassDir}=$ClassDir;
199 +   $ENV{Class}=$Class;
200 +   $ENV{DefaultBuildFile}=$DefaultBuildFile;
201 +  
202 +   chdir $fullworkdir || die "Unable to enter working directory $!";
203 +
204 +   # Set up some other useful variables fo the Build
205 +   # list of directories available
206 +   opendir IDR, "$ENV{LOCALTOP}/$THISDIR";
207 +   @allfiles= grep !/^\.\.?$/, readdir IDR;
208 +   foreach $file ( @allfiles )
209 +      {
210 +      if ( -d "$ENV{LOCALTOP}/$THISDIR/$file" )
211 +         { # only add if its a directory
212 +         $ENV{SCRAM_AVAILDIRS}=$ENV{SCRAM_AVAILDIRS}." ".$file;
213 +         }
214 +      else
215 +         {
216 +         $ENV{SCRAM_AVAILFILES}=$ENV{SCRAM_AVAILFILES}." ".$file;
217 +         }
218 +      }
219 +   $targetnumber=$#Targets;
220  
221 <        # -- Set up some other useful variables for the Build
222 <        # set variables listing directories/files available
223 <        my $fh=FileHandle->new();
224 <        opendir $fh, "$self->{localtop}/$THISDIR";
225 <        my @allfiles= grep !/^\.\.?$/, readdir $fh;
226 <        undef $fh;
227 <        foreach $file ( @allfiles ) {
228 <         if ( -d "$self->{localtop}/$THISDIR/$file" ) {
229 <           $ENV{SCRAM_AVAILDIRS}=$ENV{SCRAM_AVAILDIRS}." ".$file;
230 <         }
231 <         else {
232 <           $ENV{SCRAM_AVAILFILES}=$ENV{SCRAM_AVAILFILES}." ".$file;
233 <         }
234 <        }
235 <        my $targetnumber=$#Targets;
204 <        $ENV{"MAKETARGETS"}="";
205 <        foreach $word ( @Targets ) {
206 <         if ( $word=~/.*=.*/ ) { # if we have an assignment it cant be a target
207 <           $targetnumber--;
208 <         }
209 <         else {
210 <          # set some variables for use in makefiles
211 <          $ENV{"MAKETARGET_".$word}=$word;
212 <          if ( $ENV{"MAKETARGETS"} ne "" ) {
213 <            $ENV{"MAKETARGETS"}=$ENV{"MAKETARGETS"}." ".$word;
214 <          }
215 <          else {
216 <            $ENV{"MAKETARGETS"}=$word;
217 <          }
218 <         }
219 <        }
221 >   foreach $word ( @Targets )
222 >      {
223 >      if ( $word=~/.*=.*/ )
224 >         { # if we have an assignment it cant be a target
225 >         $targetnumber--;
226 >         }
227 >      elsif ( $word=~/^-/ )
228 >         {
229 >         $targetnumber--;
230 >         }
231 >      else
232 >         {
233 >         $ENV{"MAKETARGET_".$word}=$word;
234 >         }
235 >      }
236  
237 <       # -- If target not specified default to the class name target
238 <       if ( $targetnumber == -1 ) {
239 <        push @Targets,$Class;
240 <       }
237 >   # If not specified default to the class name target
238 >   if ( $targetnumber == -1 )
239 >      {
240 >      push @Targets,$Class;
241 >      }
242  
243 <    $ENV{DefaultMakefile}="$ENV{TOOL_HOME}/basics.mk";
243 >   $ENV{DefaultMakefile}="$ENV{TOOL_HOME}/basics.mk";
244  
245 <    $SCRAM_GROUPSDIR=$self->{localtop}."/".$self->{projconfigdir}."/groups.mk";
246 <    if ( -f $SCRAM_GROUPSDIR ) {
245 >   $SCRAM_GROUPSDIR=$ENV{LOCALTOP}."/".$ENV{projconfigdir}."/groups.mk";
246 >   if ( -f $SCRAM_GROUPSDIR )
247 >      {
248        $ENV{SCRAM_GROUPSDIR}=$SCRAM_GROUPSDIR;
249 <    }
249 >      }
250 >  
251 >   # Do a datestamp check so that make will build files that have changed
252 >   # rather than just those which are older than their dependencies
253 >   # The main build here
254 >
255 >   $rv=system("gmake","--no-print-directory","-r","-k","-f","$ENV{DefaultMakefile}","-I$ENV{TOOL_HOME}",datestamp_config);
256 >
257 >   # Be verbose:
258 >   $self->verbose(">> Going to use ".$ENV{DefaultMakefile}." as the default makefile");
259 >  
260 >   my $gmakejobsflag = "-j";
261 >   # Temporarily hard-code ncpu as 1:
262 >   my $ncpu = 1;
263  
264 <    # Do a datestamp check so that make will build files that have changed
265 <    # rather than just those which are older than their dependencies
266 <    # The main build here
267 <    $rv=system("gmake","--no-print-directory","-r","-k","-f","$ENV{DefaultMakefile}","-I$ENV{TOOL_HOME}",datestamp_config);
237 <    $rv=system("gmake","--no-print-directory","-r","-k","-f","$ENV{DefaultMakefile}","-I$ENV{TOOL_HOME}",datestamp, @Targets);
238 <    return $rv/256; # return the exit status of gmake
239 < }
264 >   $rv=system("gmake","--no-print-directory","$gmakejobsflag","$ncpu","-r","-k","-f","$ENV{DefaultMakefile}","-I$ENV{TOOL_HOME}",datestamp, @Targets);
265 >
266 >   return $rv/256; # return the exit status of gmake
267 >   }
268  
269   sub getclass {
270      my $self=shift;
# Line 244 | Line 272 | sub getclass {
272      my $Class="DEFAULT";
273      my $ClassDir="";
274          
247    #return if $dirname eq "";
275      @DIRA=split /\//, $dirname;
276  
277 <    my $thispath=".";
278 <    # -- construct all class buildfiles in the path
277 >    $thispath=".";
278 >    # bootstrap from project buildfile if it exists
279 >    my $bf=BuildSystem::BuildFile->new($self->{toolbox});
280 >    $bf->CheckBuildFile($ENV{projconfigdir});
281 >
282 >    my @ClassPaths=split /:/, $bf->BlockClassPath();
283 >    foreach $BClassPath ( @ClassPaths ) {
284 >      next if ( $BClassPath eq "");
285 >      push @LoBCA, [ split /\//, $BClassPath ];
286 >    }
287      for ( $i=0; $i<=$#DIRA; $i++ ) {
288 <        #$thispath=(($thispath eq "")?$DIRA[$i]:$thispath."/".$DIRA[$i]);
289 <        $thispath=$thispath."/".$DIRA[$i];
290 <        if ( ! exists $self->{pathbf}{$thispath} ) {
256 <          $self->verbose("Initialising BuildFile in $thispath");
257 <          $self->{pathbf}{$thispath}=$self->_startbuildfile($thispath);
258 <        }
259 <        # -- check class overriden by BuildFile
260 <        if ( defined $self->{pathbf}{$thispath}->classname() ) {
261 <                $Class=$self->{pathbf}{$thispath}->classname();
288 >        $thispath=$thispath."/".$DIRA[$i];
289 >        if ( ($ClassName=$bf->CheckBuildFile($thispath)) ne "" ) {
290 >                $Class=$ClassName;
291                  $ClassDir=$thispath;
292          }
293 +        # TODO --- Must test against position of last new BlockCaseA
294 +        # Need to reset array LoBCA to the New BlockPath
295 +        # - merge and replace options
296 +        #
297          else {
298 <          # -- sort it out from classpath directives
299 <          foreach $BlockClassA ( @{$self->{LoBCA}} ) {
300 <           foreach $elem ( @$BlockClassA ) {
268 <            if ( $elem=~/^$DIRA[$i]\+/ ) {
269 <                $elem=~s/^$DIRA[$i]//;
298 >          foreach $BlockClassA ( @LoBCA ) {
299 >            if ( $$BlockClassA[0]=~/^$DIRA[$i]\+/ ) {
300 >                $$BlockClassA[0]=~s/^$DIRA[$i]//;
301              }
302 <            if ( $elem=~/^\+/ ) {
303 <                ($Class=$elem)=~s/^\+//;
302 >            if ( $$BlockClassA[0]=~/^\+/ ) {
303 >                ($Class=$$BlockClassA[0])=~s/^\+//;
304                  $ClassDir=$thispath;
305 +                shift @$BlockClassA;
306 +            }
307 +            else {
308 +                @$BlockClassA=();
309              }
310            }
276         }
311          }
312      }
313 <    # -- default case
314 <    if ( $ClassDir eq "" ) {
281 <      if ( ! defined $self->{pathbf}{'.'}) {
282 <          $self->{pathbf}{'.'}=$self->_startbuildfile(".");
283 <          $self->verbose("DEFAULT class initialised : ".$self->{pathbf}{'.'});
284 <      }
285 <      $ClassDir=".";
286 <    }
287 <
288 <    # -- retunrs
289 <    ($ClassDir_c=$ClassDir)=~s/^\.\///;
290 <    return ( $Class, $ClassDir_c, $self->{pathbf}{$ClassDir});
291 < }
292 <
293 < #
294 < # Check to see if the buildfile is local or in the release area and
295 < # parse appropriately
296 < #
297 < sub _startbuildfile {
298 <         my $self=shift;
299 <         my $classdir=shift;
300 <
301 <         my $bf=BuildSystem::BuildFile->new($self->{area});
302 <         my $thisfile="$classdir/$self->{buildfilename}";
303 <
304 <         if ( -e $self->{localtop}."/".$thisfile ) {
305 <            $bf->buildfile($self->{localtop}."/".$thisfile);
306 <            $bf->ParseBuildFile($self->{localtop}, $classdir,
307 <                                $self->{buildfilename});
308 <         }
309 <         elsif ( -e $ENV{RELEASETOP}."/".$thisfile ) {
310 <            $bf->buildfile("$ENV{RELEASETOP}/$thisfile");
311 <            $bf->ParseBuildFile($ENV{RELEASETOP}, $classdir,
312 <                                                $slef->{buildfilename});
313 <         }
314 <         return $bf;
315 < }
316 <
317 < sub _topbuildfile {
318 <    my $self=shift;
319 <
320 <    # -- Analyse project buildfile if it exists
321 <    $self->{topbf}=BuildSystem::BuildFile->new($self->{area});
322 <
323 <    $self->{topbf}->buildfile($self->{localtop}."/".$self->{projconfigdir}
324 <                ."/".$self->{buildfilename});
325 <    # -- generate top level makefile
326 <    $self->verbose("Generating Top Level BuildFile");
327 <    $self->{topbf}->ParseBuildFile($self->{localtop},
328 <                        $self->{projconfigdir},$self->{buildfilename});
329 <
330 <    my @ClassPaths=split /:/, $self->{topbf}->BlockClassPath();
331 <    foreach $BClassPath ( @ClassPaths ) {
332 <      next if ( $BClassPath eq "");
333 <      push @{$self->{LoBCA}}, [ split /\//, $BClassPath ];
334 <    }
335 <
313 >    $ClassDir=~s/^\.\///;
314 >    return ( $Class, $ClassDir, $bf);
315   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines