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.9 by williamc, Fri Sep 29 10:32:18 2000 UTC vs.
Revision 1.15 by sashby, Wed Aug 22 12:40:13 2001 UTC

# Line 2 | Line 2
2   #
3   # Interface
4   # ---------
5 < # new(ConfigArea) : A new BuildSetup
6 < # BuildDir(directory,targets) : prepare the ground for a build and build
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;
13   use Utilities::Verbose;
14   use Utilities::SCRAMUtils;
15   use BuildSystem::BuildFile;
16 use BuildSystem::DateStampRecord;
16   use Utilities::AddDir;
17   @ISA=qw(Utilities::Verbose);
18  
# Line 21 | Line 20 | sub new {
20          my $class=shift;
21          my $self={};
22          bless $self,$class;
23 <        $self->{area}=shift;
25 <        $self->{toolbox}=$self->{area}->toolbox();
26 <        $self->{projconfigdir}=$self->{area}->configurationdir();
27 <        $self->{localtop}=$self->{area}->location();
28 <        $self->{releasearea}=$self->{area}->linkarea();
29 <        if ( ! defined $self->{releasearea} ) {
30 <           $self->{releasearea}=$self->{area};
31 <        }
32 <        $self->{releasetop}=$self->{releasearea}->location();
33 <        $self->{buildfilename}="BuildFile";
34 <        #$self->verbosity(1);
35 <        $self->_configurationsetup();
23 >        $self->{toolbox}=shift;
24          return $self;
25   }
26  
27 < sub _generateexternals {
28 <        my $self=shift;
29 <        my $outfile=shift;
30 <
31 <        # -- specify 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() ) {
81 <              foreach $val ( $toolobj->getfeature($f) ) {
82 <                print $fout "\t".$f." += ".$val."\n";
83 <              }
84 <             }
85 <             print $fout "endif\n";
86 <            }
87 <          }
88 <          # some addittional processing of specific vars
89 <          print $fout 'INCLUDEPATH+=$(addprefix -I,$(INCLUDE))'."\n";
90 <          print $fout 'LDFLAGS+=$(addprefix -L,$(LIBDIR))'."\n";
91 <          print $fout 'CPPFLAGS+=$(addprefix -D,$(CPPDEFINES))'."\n";
92 <          print $fout 'lib+=$(extralib)'."\n";
93 <          print $fout 'LDLIBS+=$(addprefix -l,$(lib))'."\n";
94 <          print $fout 'LDLIBS+=$(addprefix -l,$(REQUIRES))'."\n";
95 <
96 <          undef $fout;
97 <          $self->verbose("End Configuration Setup");
98 <        }
99 < }
100 <
101 < sub classsetup {
102 <        my $self=shift;
103 <        my $THISDIR=shift;
104 <
105 <        my $classmakefile;
106 <
107 <        my ($Class, $ClassDir, $bf)=$self->getclass($THISDIR);
108 <        $self->verbose("Class = $Class : ClassDir = $ClassDir for directory ".
109 <                        $THISDIR);
110 <
111 <        # -- should we ignore?
112 <        if ( $bf->ignore() ) {
113 <           print "Nothing to be done - empty group\n";
114 <           exit;
115 <        }      
116 <
117 <
118 <        # -- Create a makefile from the class BuildFile
119 <        my $classbuildfile=$self->{localtop}."/".
120 <                $self->{projconfigdir}."/".$Class."_BuildFile";
121 <        if ( -f $classbuildfile ) {
122 <              $classmakefile=$self->{localtop}."/".$ENV{INTwork}.
123 <                                        "/".$Class."_makefile.mk";
124 <              if ( SCRAMUtils::dated($classmakefile, $classbuildfile) ) {
125 <                # -- generate the new makefile if out of date
126 <                $self->verbose("Generating $classmakefile from".
127 <                                                " $classbuildfile");
128 <                my $classbf=BuildSystem::BuildFile->new($self->{area});
129 <                undef $ENV{LatestBuildFile}; # gets set by BuildFile
130 <                $classbf->GenerateMakefile($classbuildfile, $classmakefile);
131 <                undef $ENV{LatestBuildFile}; # gets set by BuildFile
132 <              }
133 <        }
134 <        else {
135 <           # -- No BuildFile - maybe its old style makefile
136 <              $classmakefile=$self->{localtop}."/".
137 <              $self->{projconfigdir}."/".$Class."_makefile.mk";
138 <              if ( ! -f $classmakefile ) {
139 <                   $self->error("Unable to find matching ".$Class.
140 <                                "_BuildFile or ".$Class."_makefile.mk");
141 <              }
142 <        }
143 <        # -- set LatestBuildFile
144 <        if ( $bf->buildfile() ne "" ) {
145 <          $ENV{LatestBuildFile}=$bf->makefile();
146 <        }
147 <        else {
148 <          $ENV{LatestBuildFile}=$self->{topbf}->makefile();
149 <        }
150 <
151 <        return ($Class,$ClassDir,$classmakefile);
152 < }
153 <
154 < sub _configurationsetup {
155 <        my $self=shift;
156 <
157 <        # -- set working directory
158 <        $self->{workdir}=$ENV{INTwork};
159 <        $self->{fullworkdir}=$self->{localtop}."/".$self->{workdir};
160 <
161 <        # -- make working directory
162 <        chdir $self->{localtop};
163 <        AddDir::adddir($self->{workdir});
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 <        # -- generate tool info
71 <        $self->_generateexternals($self->{fullworkdir}."/clientmakefile");
72 <
73 <        # -- process project BuildFile
74 <        $self->_topbuildfile();
75 < }
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 >      print $fout 'LD_LIBRARY_PATH:=$(subst $(space),:,$(LD_LIBRARY_PATH))'."\n";
118 >      
119 >      undef $fout;
120 >      }
121 >   }
122  
123 < sub BuildDir {
124 <        my $self=shift;
125 <        my $THISDIR=shift;
126 <        my @Targets=@_;
127 <        my $DefaultBuildFile="";
128 <
129 <        # -- Setup Class specifics
130 <        ($Class,$ClassDir,$classmakefile)=$self->classsetup($THISDIR);
131 <        $ENV{classmakefile}=$classmakefile;
132 <        $ENV{Class}=$Class;
133 <        $ENV{ClassDir}=$ClassDir;
134 <        $DefaultBuildFile=$ENV{classmakefile};
135 <        $ENV{DefaultBuildFile}=$DefaultBuildFile;
136 <
137 <        # -- Create working directory
138 <        my $workdir=$self->{workdir}."/".$ClassDir;
139 <        chdir $self->{localtop};
140 <        AddDir::adddir($workdir);
141 <        $ENV{workdir}=$workdir;
142 <        my $fullworkdir=$self->{localtop}."/".$ENV{workdir};
143 <        chdir $fullworkdir || die "Unable to enter working directory $!";
123 > sub BuildSetup
124 >   {
125 >   ###############################################################
126 >   # BuildSetup                                                  #
127 >   ###############################################################
128 >   # modified : Fri Aug 10 16:57:03 2001 / SFA                   #
129 >   # params   :                                                  #
130 >   #          :                                                  #
131 >   #          :                                                  #
132 >   #          :                                                  #
133 >   # function : Build targets.                                   #
134 >   #          :                                                  #
135 >   #          :                                                  #
136 >   ###############################################################
137 >   my $self=shift;
138 >   my $THISDIR=shift;
139 >   my @Targets=@_;
140 >   my $DefaultBuildFile="";
141 >   my $Class="";
142 >
143 >   # -- Create working directory
144 >   chdir $ENV{LOCALTOP};
145 >   AddDir::adddir($ENV{INTwork}."/".$THISDIR);
146 >
147 >   my ($Class, $ClassDir, $bf)=$self->getclass($THISDIR);
148 >   $self->verbose("Class = $Class");
149 >   $self->verbose("ClassDir = $ClassDir");
150          
151 <        # -- Set up some other useful variables for the Build
152 <        # set variables listing directories/files available
153 <        my $fh=FileHandle->new();
154 <        opendir $fh, "$self->{localtop}/$ClassDir";
155 <        my @allfiles= grep !/^\.\.?$/, readdir $fh;
156 <        undef $fh;
157 <        foreach $file ( @allfiles ) {
158 <         if ( -d "$self->{localtop}/$ClassDir/$file" ) {
159 <           $ENV{SCRAM_AVAILDIRS}=$ENV{SCRAM_AVAILDIRS}." ".$file;
160 <         }
161 <         else {
162 <           $ENV{SCRAM_AVAILFILES}=$ENV{SCRAM_AVAILFILES}." ".$file;
163 <         }
164 <        }
165 <        my $targetnumber=$#Targets;
166 <        $ENV{"MAKETARGETS"}="";
167 <        foreach $word ( @Targets ) {
168 <         if ( $word=~/.*=.*/ ) { # if we have an assignment it cant be a target
169 <           $targetnumber--;
170 <         }
171 <         else {
172 <          # set some variables for use in makefiles
173 <          $ENV{"MAKETARGET_".$word}=$word;
174 <          if ( $ENV{"MAKETARGETS"} ne "" ) {
175 <            $ENV{"MAKETARGETS"}=$ENV{"MAKETARGETS"}." ".$word;
176 <          }
177 <          else {
178 <            $ENV{"MAKETARGETS"}=$word;
179 <          }
180 <         }
181 <        }
151 >   if ( $bf->ignore() )
152 >      {
153 >      print "Nothing to be done - empty group\n";
154 >      exit;
155 >      }
156 >   shift;
157 >   $self->_generateexternals($ENV{LOCALTOP}."/".$ENV{INTwork}."/clientmakefile");
158 >
159 >   # set up the workdir variable
160 >   $ENV{workdir}=$ENV{INTwork}."/".$ClassDir;
161 >   my $fullworkdir=$ENV{LOCALTOP}."/".$ENV{workdir};
162 >  
163 >   # set up projdeps variable
164 >   my $projectfile=$ENV{projconfigdir}."/External_Dependencies";
165 >   if ( -e $ENV{LOCALTOP}."/".$projectfile )
166 >      {
167 >      $ENV{projdeps}=$ENV{LOCALTOP}."/".$projectfile;
168 >      }
169 >   elsif ( -e $ENV{RELEASETOP}."/".$projectfile )
170 >      {
171 >      $ENV{projectfile}=$ENV{RELEASETOP}."/".$projectfile;
172 >      }
173 >   if ( $DefaultBuildFile eq "" )
174 >      {
175 >      # Map Relevant makefile classmakefile directory
176 >      my $classmakefile=$ENV{projconfigdir}."/".$Class."_makefile.mk";
177 >      if ( -e $ENV{LOCALTOP}."/".$classmakefile )
178 >         {
179 >         $ENV{classmakefile}=$ENV{LOCALTOP}."/".$classmakefile;
180 >         }
181 >      elsif ( -e $ENV{RELEASETOP}."/".$classmakefile )
182 >         {
183 >         $ENV{classmakefile}=$ENV{RELEASETOP}."/".$classmakefile;
184 >         }
185 >      else
186 >         {
187 >         print "\nUnable to locate $classmakefile\n";
188 >         print " Not in $ENV{LOCALTOP}\n";
189 >         print " Not in $ENV{RELEASETOP}\n";
190 >         exit 1;
191 >         }
192 >      $DefaultBuildFile=$ENV{classmakefile}; # TODO - only for override
193 >      }
194 >  
195 >   $ENV{ClassDir}=$ClassDir;
196 >   $ENV{Class}=$Class;
197 >   $ENV{DefaultBuildFile}=$DefaultBuildFile;
198 >  
199 >   chdir $fullworkdir || die "Unable to enter working directory $!";
200 >
201 >   # Set up some other useful variables fo the Build
202 >   # list of directories available
203 >   opendir IDR, "$ENV{LOCALTOP}/$THISDIR";
204 >   @allfiles= grep !/^\.\.?$/, readdir IDR;
205 >   foreach $file ( @allfiles )
206 >      {
207 >      if ( -d "$ENV{LOCALTOP}/$THISDIR/$file" )
208 >         { # only add if its a directory
209 >         $ENV{SCRAM_AVAILDIRS}=$ENV{SCRAM_AVAILDIRS}." ".$file;
210 >         }
211 >      else
212 >         {
213 >         $ENV{SCRAM_AVAILFILES}=$ENV{SCRAM_AVAILFILES}." ".$file;
214 >         }
215 >      }
216 >   $targetnumber=$#Targets;
217  
218 <       # -- If target not specified default to the class name target
219 <       if ( $targetnumber == -1 ) {
220 <        push @Targets,$Class;
221 <       }
218 >   foreach $word ( @Targets )
219 >      {
220 >      if ( $word=~/.*=.*/ )
221 >         { # if we have an assignment it cant be a target
222 >         $targetnumber--;
223 >         }
224 >      elsif ( $word=~/^-/ )
225 >         {
226 >         $targetnumber--;
227 >         }
228 >      else
229 >         {
230 >         $ENV{"MAKETARGET_".$word}=$word;
231 >         }
232 >      }
233  
234 <    $ENV{DefaultMakefile}="$ENV{TOOL_HOME}/basics.mk";
234 >   # If not specified default to the class name target
235 >   if ( $targetnumber == -1 )
236 >      {
237 >      push @Targets,$Class;
238 >      }
239  
240 +   $ENV{DefaultMakefile}="$ENV{TOOL_HOME}/basics.mk";
241  
242 <    $SCRAM_GROUPSDIR=$self->{localtop}."/".$self->{projconfigdir}."/groups.mk";
243 <    if ( -f $SCRAM_GROUPSDIR ) {
242 >   $SCRAM_GROUPSDIR=$ENV{LOCALTOP}."/".$ENV{projconfigdir}."/groups.mk";
243 >   if ( -f $SCRAM_GROUPSDIR )
244 >      {
245        $ENV{SCRAM_GROUPSDIR}=$SCRAM_GROUPSDIR;
246 <    }
247 <
248 <    # Do a datestamp check so that make will build files that have changed
249 <    # rather than just those which are older than their dependencies
250 <    $self->_checkdatestampindir($ClassDir);
251 <
252 <        # -- call the block building method
253 <        #$report=$bs->build(@Targets);
254 <        
255 <
256 <    # The main build here
257 <    $rv=system("gmake","--no-print-directory","-r","-k","-f","$ENV{DefaultMakefile}","-I$ENV{TOOL_HOME}", @Targets);
258 <    return $rv/256; # return the exit status of gmake
259 <        
260 < }
261 <
262 < sub BuildIt {
263 <        my $self=shift;
264 <        my $dir=shift;
265 <
266 <        # -- get the building block for the directory
267 <        my $block=$self->_getdirblock($dir);
268 <
269 <        # -- is there a class block associated with the directory?
270 <        my ($class)=getclass($dir);
271 <        my $classblock=$self->_getclassblock($class);
272 <
273 <        # -- Search for Blocks up to tree root
274 <        my @dirblocks=();
275 <        my @dirs=split /\//, $dir;
276 <        my $fulldir="";
277 <        foreach $dire ( "/",@dirs ) {
269 <              $fulldir=$fulldir."/".$dire;  # root is //
270 <              my $block=$self->_getdirblock($fulldir);
271 <              last if $block->ignore(); # we dont need to go futher
272 <              push @dirblocks, $block;
273 <        }
274 <        foreach $block ( $classblock, @dirblocks ) {
275 <              # -- merge class blocks together
276 <              foreach $name ( $block->classes() ) {
277 <                $object->merge();
278 <              }
279 <              foreach $classinst ( $block->classinst() ) {
280 <                $types{$classinst->id()}=$class->newinst();
281 <                foreach $element ( $classinst ) {
282 <                  $types{$classinst->id()}->setelement($element,
283 <                                                $classinst->value($element));
284 <                }
285 <              }
286 <        }
287 <
288 <        # -- call the builder
289 <
290 < }
291 <
292 < sub _getdirblock {
293 <        my $self=shift;
294 <        my $dir=shift;
295 <
296 <        if ( ! defined $self->{blocks}{$dir} ) {
297 <        
298 <          # -- get a buildfile and do a block parse
299 <          my $bf=$self->_startbuildfile($dir);
300 <          $bf->blockparse($self->{blocks}{$dir});
301 <          
302 <        }
303 <        return $self->{blocks}{$dir};
304 < }
246 >      }
247 >  
248 >   # Do a datestamp check so that make will build files that have changed
249 >   # rather than just those which are older than their dependencies
250 >   # The main build here
251 >   $rv=system("gmake","--no-print-directory","-r","-k","-f","$ENV{DefaultMakefile}","-I$ENV{TOOL_HOME}",datestamp_config);
252 >
253 >   print "\n","scram BUILDSYSTEM: V1.0  ****","\n";
254 >
255 >   my $gmakejobsflag = "-j";
256 >   chomp(my $currentOS = `uname`);
257 >  
258 >   # Only use -j option if there are more then 1 cpu's.....
259 >   if ( $currentOS eq "Linux" )
260 >      {
261 >      chomp($ncpu=`cat /proc/cpuinfo | grep -c processor`);
262 >      }
263 >   elsif ( $currentOS eq "SunOS" )
264 >      # How can you tell how many CPUs you've got in a Sun box?:
265 >      {
266 >      $ncpu = 1;
267 >      }
268 >   else
269 >      # Who knows what the OS is. Leave as default:
270 >      {
271 >      $npcu = 1;
272 >      }
273 >  
274 >   # Modify: try to force make to spawn more than one job (option: -j ).
275 >   $rv=system("gmake","--no-print-directory","$gmakejobsflag","$ncpu","-r","-k","-f","$ENV{DefaultMakefile}","-I$ENV{TOOL_HOME}",datestamp, @Targets);
276 >   return $rv/256; # return the exit status of gmake
277 >   }
278  
279   sub getclass {
280      my $self=shift;
# Line 312 | Line 285 | sub getclass {
285      #return if $dirname eq "";
286      @DIRA=split /\//, $dirname;
287  
288 <    my $thispath=".";
289 <    # -- construct all class buildfiles in the path
288 >    $thispath=".";
289 >    # bootstrap from project buildfile if it exists
290 >    my $bf=BuildSystem::BuildFile->new($self->{toolbox});
291 >    $bf->CheckBuildFile($ENV{projconfigdir});
292 >
293 >    my @ClassPaths=split /:/, $bf->BlockClassPath();
294 >    foreach $BClassPath ( @ClassPaths ) {
295 >      next if ( $BClassPath eq "");
296 >      push @LoBCA, [ split /\//, $BClassPath ];
297 >    }
298      for ( $i=0; $i<=$#DIRA; $i++ ) {
299 <        #$thispath=(($thispath eq "")?$DIRA[$i]:$thispath."/".$DIRA[$i]);
300 <        $thispath=$thispath."/".$DIRA[$i];
301 <        if ( ! exists $self->{pathbf}{$thispath} ) {
321 <          $self->verbose("Initialising BuildFile in $thispath");
322 <          $self->{pathbf}{$thispath}=$self->_startbuildfile($thispath);
323 <        }
324 <        # -- check class overriden by BuildFile
325 <        if ( defined $self->{pathbf}{$thispath}->classname() ) {
326 <                $Class=$self->{pathbf}{$thispath}->classname();
299 >        $thispath=$thispath."/".$DIRA[$i];
300 >        if ( ($ClassName=$bf->CheckBuildFile($thispath)) ne "" ) {
301 >                $Class=$ClassName;
302                  $ClassDir=$thispath;
303          }
304 +        # TODO --- Must test against position of last new BlockCaseA
305 +        # Need to reset array LoBCA to the New BlockPath
306 +        # - merge and replace options
307 +        #
308          else {
309 <          # -- sort it out from classpath directives
310 <          foreach $BlockClassA ( @{$self->{LoBCA}} ) {
311 <           next if ( $#{$BlockClassA} < $i );
333 <           $elem=${$BlockClassA}[$i];
334 <            if ( $elem=~/^$DIRA[$i]\+/ ) {
335 <                $elem=~s/^$DIRA[$i]//;
309 >          foreach $BlockClassA ( @LoBCA ) {
310 >            if ( $$BlockClassA[0]=~/^$DIRA[$i]\+/ ) {
311 >                $$BlockClassA[0]=~s/^$DIRA[$i]//;
312              }
313 <            #print $elem." ".$DIRA[$i]."\n";
314 <            if ( $elem=~/^\+/ ) {
339 <                ($Class=$elem)=~s/^\+//;
313 >            if ( $$BlockClassA[0]=~/^\+/ ) {
314 >                ($Class=$$BlockClassA[0])=~s/^\+//;
315                  $ClassDir=$thispath;
316 +                shift @$BlockClassA;
317 +            }
318 +            else {
319 +                @$BlockClassA=();
320              }
342          #}
343         }
344        }
345    }
346    # -- default case
347    if ( $ClassDir eq "" ) {
348      if ( ! defined $self->{pathbf}{'.'}) {
349          $self->{pathbf}{'.'}=$self->_startbuildfile(".");
350          $self->verbose("DEFAULT class initialised : ".$self->{pathbf}{'.'});
351      }
352      $ClassDir=".";
353    }
354
355    # -- returns
356    ($ClassDir_c=$ClassDir)=~s/^\.\///;
357    return ( $Class, $ClassDir_c, $self->{pathbf}{$ClassDir});
358 }
359
360 #
361 # Check to see if the buildfile is local or in the release area and
362 # parse appropriately
363 #
364 sub _startbuildfile {
365         my $self=shift;
366         my $classdir=shift;
367
368         my $bf=BuildSystem::BuildFile->new($self->{area});
369         my $thisfile="$classdir/$self->{buildfilename}";
370
371         if ( -e $self->{localtop}."/".$thisfile ) {
372            $bf->buildfile($self->{localtop}."/".$thisfile);
373            $bf->ParseBuildFile($self->{localtop}, $classdir,
374                                $self->{buildfilename});
375         }
376         elsif ( -e $self->{releasetop}."/".$thisfile ) {
377            $bf->buildfile($self->{releasetop}."/".$thisfile);
378            $bf->ParseBuildFile($self->{releasetop}, $classdir,
379                                                $self->{buildfilename});
380         }
381         return $bf;
382 }
383
384 sub _topbuildfile {
385    my $self=shift;
386
387    # -- Analyse project buildfile if it exists
388    $self->{topbf}=BuildSystem::BuildFile->new($self->{area});
389
390    $self->{topbf}->buildfile($self->{localtop}."/".$self->{projconfigdir}
391                ."/".$self->{buildfilename});
392    # -- generate top level makefile
393    $self->verbose("Generating Top Level BuildFile");
394    undef $ENV{LatestBuildFile};
395    $self->{topbf}->ParseBuildFile($self->{localtop},
396                        $self->{projconfigdir},$self->{buildfilename});
397
398    my @ClassPaths=split /:/, $self->{topbf}->BlockClassPath();
399    foreach $BClassPath ( @ClassPaths ) {
400      next if ( $BClassPath eq "");
401      push @{$self->{LoBCA}}, [ split /\//, $BClassPath ];
402    }
403
404 }
405
406 sub _checkdatestampindir {
407        my $self=shift;
408        my $dir=shift;
409        
410        # -- get all local .ds files
411        my $fh=FileHandle->new();
412        my $ldir=$self->{localtop}."/".$self->{workdir}."/".$dir;
413        opendir $fh, $ldir;
414        my @dsfiles= grep /^.*\.ds$/, readdir $fh;
415        $fh->close();                  
416
417        # -- copy across ds files from releasetop if not existing locally
418        if ( $#dsfiles < 0 ) {
419          # -- get all releasetop .ds files
420          my $rdir=$self->{releasetop}."/".$self->{workdir}."/".$dir;
421          opendir $fh, $rdir;
422          my @releasedsfiles= grep /^.*\.ds$/, readdir $fh;
423          foreach $file ( @releasedsfiles ) {
424                use File::Copy;
425                $self->verbose("Copying $file from $rdir to $ldir");
426                copy($rdir."/".$file,$ldir."/".$file);
427          }
428          $fh->close();
429          @dsfiles=@releasedsfiles;
430        }
431
432        # -- process ds files
433        my $file;
434        foreach $datafile ( @dsfiles ) {
435          $self->verbose("Processing $ldir/$datafile\n");
436          my $ds=BuildSystem::DateStampRecord->new($ldir."/".$datafile);
437          $ds->verbosity($self->verbosity());
438          my $needsupdate;
439          my $productfile=$ds->product();
440          my (%files,%moddate);
441
442          # now get dates in our dependency list
443          my @datedfiles=$ds->dated();
444          if ( $#datedfiles >= 0 ) {
445            
446             $needsupdate=1;
447             $date=$datedfiles[0][1]-1;
448          }
449          else {
450           # -- extra checks for local replacement of files
451           foreach $file ( $ds->contents() ) {
452            # -- only check files
453            if ( -f $file ) {
454             $files{$file}=$ds->filedate($file);
455             # -- check to see if we have a new local copy
456             if ( ($file=~/\Q$self->{releasetop}\E/) &&
457                                ($self->{releasetop} ne $self->{localtop}) ) {
458              ($tempfile=$file)=~s/\Q$self->{releasetop}\E/$self->{localtop}/;
459              if ( -f $tempfile ) {
460                $files{$tempfile}=$files{$file};
461                $file=$tempfile;
462              }
463             }
464             $moddate{$file}=(stat($file))[9];
465             if ( $moddate{$file} != $files{$file} ) {
466              $self->verbose($file." changed");
467              $date=$moddate{$file}-1;
468              $needsupdate=1;
469             }
470            }
471           }
472          }
473          # time stamp the product file to be older than the dependencies
474          if ( $needsupdate == 1 ) { # touch file into the past
475          my $newproductfile;
476          if ( $productfile!~/\Q$self->{localtop}\E/ ) {
477           if ( $productfile=~/\Q$self->{releasetop}\E/ ) {
478             ($newproductfile=$productfile)=~
479                        s/\Q$self->{releasetop}\E/$self->{localtop}/;
480             $self->verbose("Copying $productfile to $newproductfile");
481             copy($productfile,$newproductfile);
482           }
483           else { # assume no path to worry about
484             $newproductfile=$self->{localtop}."/".$ENV{workdir}.
485                                                      "/".$productfile;
486              # -- make a local copy of the product file if not already here
487              my $oldproductfile=$self->{releasetop}."/".$ENV{workdir}.
488                                                        "/".$productfile;
489             if ( ! -f $newproductfile ) {
490              if ( -f $oldproductfile ) {  
491                $self->verbose("Copying $oldproductfile to $newproductfile");
492                copy($oldproductfile,$newproductfile);
493              }
494             }
495           }
496          }
497          else {
498             $newproductfile=$productfile;
321            }
500          if ( -f $newproductfile ) {
501            $self->verbose("Blasting $newproductfile to the past ($date)");
502            # If the (local) productfile exists - make it older
503            utime($date,$date,$newproductfile);
504          }
505          else {
506            $self->verbose("SomeThing Wrong(?) with $newproductfile\n".
507                "RELEASETOP=".$self->{releasetop}."\n".
508                "LOCALTOP=".$self->{localtop}."\n".
509                "workdir=".$ENV{workdir});
510          }
322          }
323 <        else {
324 <          $self->verbose("No need to touch $productfile");
325 <        }      
515 <        }
516 <        undef $fh;                  
323 >    }
324 >    $ClassDir=~s/^\.\///;
325 >    return ( $Class, $ClassDir, $bf);
326   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines