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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines