ViewVC Help

View File | Revision Log | Show Annotations | Root Listing

root/cvsroot/COMP/SCRAM/src/BuildSystem/BuildSetup.pm

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.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
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
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() ) {
80	<	foreach $val ( $toolobj->getfeature($f) ) {
81	<	print $fout "\t".$f." += ".$val."\n";
82	<	}
83	<	}
84	<	print $fout "endif\n";
85	<	}
86	<	}
87	<	# some addittional processing of specific vars
88	<	print $fout 'INCLUDEPATH+=$(addprefix -I,$(INCLUDE))'."\n";
89	<	print $fout 'LDFLAGS+=$(addprefix -L,$(LIBDIR))'."\n";
90	<	print $fout 'CPPFLAGS+=$(addprefix -D,$(CPPDEFINES))'."\n";
91	<	print $fout 'lib+=$(extralib)'."\n";
92	<	print $fout 'LDLIBS+=$(addprefix -l,$(lib))'."\n";
93	<	print $fout 'LDLIBS+=$(addprefix -l,$(REQUIRES))'."\n";
94	<
95	<	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();
147	<	}
148	<
149	<	return ($Class,$ClassDir,$classmakefile);
150	<	}
151	<
152	<	sub _configurationsetup {
153	<	my $self=shift;
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	<	# -- set working directory
71	<	$self->{workdir}=$ENV{INTwork};
72	<	$self->{fullworkdir}=$self->{localtop}."/".$self->{workdir};
73	<
74	<	# -- make working directory
75	<	chdir $self->{localtop};
76	<	AddDir::adddir($self->{workdir});
77	<
78	<	# -- generate tool info
79	<	$self->_generateexternals($self->{fullworkdir}."/clientmakefile");
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	>	# 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	<
133	<	# -- Setup Class specifics
134	<	($Class,$ClassDir,$classmakefile)=$self->classsetup($THISDIR);
135	<	$ENV{classmakefile}=$classmakefile;
136	<	$ENV{Class}=$Class;
137	<	$ENV{ClassDir}=$ClassDir;
138	<	$DefaultBuildFile=$ENV{classmakefile};
139	<	$ENV{DefaultBuildFile}=$DefaultBuildFile;
140	<
141	<	# -- Create working directory
142	<	my $workdir=$self->{workdir}."/".$ClassDir;
143	<	chdir $self->{localtop};
144	<	AddDir::adddir($workdir);
145	<	$ENV{workdir}=$workdir;
146	<	my $fullworkdir=$self->{localtop}."/".$ENV{workdir};
147	<	chdir $fullworkdir || die "Unable to enter working directory $!";
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	<	# -- Set up some other useful variables for the Build
155	<	# set variables listing directories/files available
156	<	my $fh=FileHandle->new();
157	<	opendir $fh, "$self->{localtop}/$ClassDir";
158	<	my @allfiles= grep !/^\.\.?$/, readdir $fh;
159	<	undef $fh;
160	<	foreach $file ( @allfiles ) {
161	<	if ( -d "$self->{localtop}/$ClassDir/$file" ) {
162	<	$ENV{SCRAM_AVAILDIRS}=$ENV{SCRAM_AVAILDIRS}." ".$file;
163	<	}
164	<	else {
165	<	$ENV{SCRAM_AVAILFILES}=$ENV{SCRAM_AVAILFILES}." ".$file;
166	<	}
167	<	}
168	<	my $targetnumber=$#Targets;
169	<	$ENV{"MAKETARGETS"}="";
170	<	foreach $word ( @Targets ) {
171	<	if ( $word=~/.*=.*/ ) { # if we have an assignment it cant be a target
172	<	$targetnumber--;
173	<	}
174	<	else {
175	<	# set some variables for use in makefiles
176	<	$ENV{"MAKETARGET_".$word}=$word;
177	<	if ( $ENV{"MAKETARGETS"} ne "" ) {
178	<	$ENV{"MAKETARGETS"}=$ENV{"MAKETARGETS"}." ".$word;
179	<	}
180	<	else {
181	<	$ENV{"MAKETARGETS"}=$word;
182	<	}
183	<	}
184	<	}
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	<	# -- If target not specified default to the class name target
222	<	if ( $targetnumber == -1 ) {
223	<	push @Targets,$Class;
224	<	}
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	<	$ENV{DefaultMakefile}="$ENV{TOOL_HOME}/basics.mk";
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";
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	<	}
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	<	$self->_checkdatestampindir($ClassDir);
254	<
255	<	# -- call the block building method
256	<	#$report=$bs->build(@Targets);
257	<
258	<
259	<	# The main build here
260	<	$rv=system("gmake","--no-print-directory","-r","-k","-f","$ENV{DefaultMakefile}","-I$ENV{TOOL_HOME}", @Targets);
261	<	return $rv/256; # return the exit status of gmake
262	<
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	<	}
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	<	sub _getdirblock {
292	<	my $self=shift;
293	<	my $dir=shift;
264	>	$rv=system("gmake","--no-print-directory","$gmakejobsflag","$ncpu","-r","-k","-f","$ENV{DefaultMakefile}","-I$ENV{TOOL_HOME}",datestamp, @Targets);
265
266	<	if ( ! defined $self->{blocks}{$dir} ) {
267	<
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};
303	<	}
266	>	return $rv/256; # return the exit status of gmake
267	>	}
268
269		sub getclass {
270		my $self=shift;
#	Line 308 | Line 272 | sub getclass {
272		my $Class="DEFAULT";
273		my $ClassDir="";
274
311	–	#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} ) {
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();
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	<	next if ( $#{$BlockClassA} < $i );
332	<	$elem=${$BlockClassA}[$i];
333	<	if ( $elem=~/^$DIRA[$i]\+/ ) {
334	<	$elem=~s/^$DIRA[$i]//;
298	>	foreach $BlockClassA ( @LoBCA ) {
299	>	if ( $$BlockClassA[0]=~/^$DIRA[$i]\+/ ) {
300	>	$$BlockClassA[0]=~s/^$DIRA[$i]//;
301		}
302	<	#print $elem." ".$DIRA[$i]."\n";
303	<	if ( $elem=~/^\+/ ) {
338	<	($Class=$elem)=~s/^\+//;
302	>	if ( $$BlockClassA[0]=~/^\+/ ) {
303	>	($Class=$$BlockClassA[0])=~s/^\+//;
304		$ClassDir=$thispath;
305	+	shift @$BlockClassA;
306	+	}
307	+	else {
308	+	@$BlockClassA=();
309		}
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;
310		}
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	–	}
311		}
312	<	else {
313	<	$self->verbose("No need to touch $productfile");
314	<	}
509	<	}
510	<	undef $fh;
312	>	}
313	>	$ClassDir=~s/^\.\///;
314	>	return ( $Class, $ClassDir, $bf);
315		}

Diff Legend

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