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.13 by williamc, Wed Nov 15 14:49:23 2000 UTC vs.
Revision 1.15 by sashby, Wed Aug 22 12:40:13 2001 UTC

# Line 24 | Line 24 | sub new {
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=$ENV{projconfigdir}."/External_Dependencies";
33 <
34 <        # -- get list of dependent files
35 <        my $datadir=$ENV{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 <             # -- 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";
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 <          print $fout 'LD_LIBRARY_PATH:=$(subst $(space),:,$(LD_LIBRARY_PATH))'."\n";
118 <
119 <          undef $fout;
120 <        }
121 < }
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 BuildSetup {
124 <    my $self=shift;
125 <    my $THISDIR=shift;
126 <    my @Targets=@_;
127 <    my $DefaultBuildFile="";
128 <    my $Class="";
129 <
130 <    # -- Create working directory
131 <    chdir $ENV{LOCALTOP};
132 <    AddDir::adddir($ENV{INTwork}."/".$THISDIR);
133 <
134 <    my ($Class, $ClassDir, $bf)=$self->getclass($THISDIR);
135 <    $self->verbose("Class = $Class");
136 <    $self->verbose("ClassDir = $ClassDir");
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 <    if ( $bf->ignore() ) {
152 <        print "Nothing to be done - empty group\n";
153 <        exit;
154 <    }  
155 <    shift;
156 <    $self->_generateexternals($ENV{LOCALTOP}."/".$ENV{INTwork}."/clientmakefile");
157 <
158 <    # set up the workdir variable
159 <    $ENV{workdir}=$ENV{INTwork}."/".$ClassDir;
160 <    my $fullworkdir=$ENV{LOCALTOP}."/".$ENV{workdir};
161 <
162 <    # set up projdeps variable
163 <    my $projectfile=$ENV{projconfigdir}."/External_Dependencies";
164 <    if ( -e $ENV{LOCALTOP}."/".$projectfile ) {
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 ) {
168 >      }
169 >   elsif ( -e $ENV{RELEASETOP}."/".$projectfile )
170 >      {
171        $ENV{projectfile}=$ENV{RELEASETOP}."/".$projectfile;
172 <    }
173 <    if ( $DefaultBuildFile eq "" ) {
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 <         $ENV{classmakefile}=$ENV{LOCALTOP}."/".$classmakefile;
179 <      }
180 <      elsif ( -e $ENV{RELEASETOP}."/".$classmakefile ) {
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 <        print "\nUnable to locate $classmakefile\n";
187 <        print " Not in $ENV{LOCALTOP}\n";
188 <        print " Not in $ENV{RELEASETOP}\n";
189 <        exit 1;
190 <      }
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 <    }
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 <    $ENV{ClassDir}=$ClassDir;
219 <    $ENV{Class}=$Class;
220 <    $ENV{DefaultBuildFile}=$DefaultBuildFile;
221 <
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
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=~/^-/ ) {
223 >         }
224 >      elsif ( $word=~/^-/ )
225 >         {
226           $targetnumber--;
227 +         }
228 +      else
229 +         {
230 +         $ENV{"MAKETARGET_".$word}=$word;
231 +         }
232        }
172      else {
173        $ENV{"MAKETARGET_".$word}=$word;
174      }
175    }
233  
234 <    # If not specified default to the class name target
235 <    if ( $targetnumber == -1 ) {
236 <        push @Targets,$Class;
237 <    }
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";
240 >   $ENV{DefaultMakefile}="$ENV{TOOL_HOME}/basics.mk";
241  
242 <    $SCRAM_GROUPSDIR=$ENV{LOCALTOP}."/".$ENV{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 <    # The main build here
251 <    $rv=system("gmake","--no-print-directory","-r","-k","-f","$ENV{DefaultMakefile}","-I$ENV{TOOL_HOME}",datestamp_config);
252 <    $rv=system("gmake","--no-print-directory","-r","-k","-f","$ENV{DefaultMakefile}","-I$ENV{TOOL_HOME}",datestamp, @Targets);
253 <    return $rv/256; # return the exit status of gmake
254 < }
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;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines