ViewVC Help

View File | Revision Log | Show Annotations | Root Listing

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

Comparing COMP/SCRAM/src/BuildSystem/BuildFile.pm (file contents):
Revision 1.10 by williamc, Sat Oct 14 17:29:05 2000 UTC vs.
Revision 1.19 by sashby, Tue Jul 2 14:45:29 2002 UTC

#	Line 2 | Line 2
2		#
3		# Interface
4		# ---------
5	<	# new(ConfigArea)
5	>	# new(toolbox)
6		# ParseBuildFile($base,$path,$file)
7		# ParseBuildFileExport(filename)
8	–	# BlockParse(Block) : perform a parse to modify the block
8		# BlockClassPath() : Return the class path
9		# ignore()      : return 1 if directory should be ignored 0 otherwise
11	–	# classname()   : get/set the associated class
12	–	# buildfile()   : get/set BuildFile location
13	–	# makefile()    : get the generated makefile
10
11		package BuildSystem::BuildFile;
12	+	use Utilities::Verbose;
13		use ActiveDoc::SimpleDoc;
14		use BuildSystem::ToolBox;
15		require 5.004;
16	+	@ISA=qw(Utilities::Verbose);
17
18		BEGIN {
19		$buildfile="BuildFile";
#	Line 25 | Line 23 | sub new {
23		my $class=shift;
24		my $self={};
25		bless $self, $class;
26	<	$self->{area}=shift;
29	<	$self->{toolbox}=$self->{area}->toolbox();
30	<	$self->{localtop}=$self->{area}->location();
31	<	# -- set RELEASTOP
32	<	my $rarea=$self->{area}->linkarea();
33	<	if ( ! defined $rarea ) {
34	<	$self->{releasetop}=$self->{localtop};
35	<	}
36	<	else {
37	<	$self->{releasetop}=$rarea->location();
38	<	}
39	<	$self->{releasetop}=$self->{area}->location();
26	>	$self->{toolbox}=shift;
27		$self->{Arch}=1;
28		push @{$self->{ARCHBLOCK}}, $self->{Arch};
29		return $self;
30		}
31
45	–	sub buildfile {
46	–	my $self=shift;
47	–	if ( @_ ) {
48	–	$self->{buildfile}=shift;
49	–	}
50	–	return $self->{buildfile};
51	–	}
52	–
53	–	sub makefile {
54	–	my $self=shift;
55	–	if ( @_ ) {
56	–	$self->{makefile}=shift;
57	–	}
58	–	return $self->{makefile};
59	–	}
60	–
61	–	sub BlockParse {
62	–	my $self=shift;
63	–	$self->{block}=shift;
64	–
65	–	# -- set up the block parse
66	–	my $switch=$self->_initswitcher();
67	–	my $parse="block";
68	–	$switch->newparse($parse);
69	–	$switch->addignoretags($parse);
70	–	$switch->addtag($parse,"BuildParam", \&BuildBlock_start, $self);
71	–
72	–	# -- parse away
73	–	$self->{switch}->parse("block");
74	–	}
75	–
76	–	sub Parsetofh {
77	–	my $self=shift;
78	–	my $fh=shift;
79	–	$self->{buildblock}=shift;
80	–
81	–	# -- set up for parse
82	–	@{$self->{filehandlestack}}=($fh);
83	–	$self->{switch}->filetoparse($self->buildfile());
84	–	*GNUmakefile=$fh;
85	–
86	–	# -- generate makefile
87	–	$self->{switch}->parse("makebuild"); # sort out supported tags
88	–
89	–	# -- Clean up
90	–	close GNUmakefile;
91	–	}
92	–
32		sub ignore {
33		my $self=shift;
34	+	$self->verbose(">> ignore......<<");
35	+
36		return (defined $self->{ignore})?$self->{ignore}:0;
37		}
38
#	Line 99 | Line 40 | sub _initswitcher {
40		my $self=shift;
41		my $switch=ActiveDoc::SimpleDoc->new();
42		my $parse="makebuild";
43	+	$self->verbose(">> _initswitcher: <<");
44		$switch->newparse($parse);
45		$switch->addignoretags($parse);
46		$self->_commontags($switch,$parse);
47	<	#$switch->addtag($parse,"Build", \&Build_start, $self);
47	>	$switch->addtag($parse,"Build", \&Build_start, $self);
48		$switch->addtag($parse,"none",
49		\&OutToMakefile,$self,
50		\&OutToMakefile, $self,
#	Line 111 | Line 53 | sub _initswitcher {
53		\&Bin_start,$self,
54		\&OutToScreen, $self,
55		"", $self);
56	<	$switch->addtag($parse,"ProductStore",
57	<	\&Store_start,$self,
58	<	"", $self,
56	>	$switch->addtag($parse,"Module",
57	>	\&Module_start,$self,
58	>	\&OutToScreen, $self,
59		"", $self);
60	+
61	+	$switch->addtag($parse,"ProductStore",
62	+	\&Store_start,$self,
63	+	"", $self,
64	+	"", $self);
65		$switch->addtag($parse,"LibType",
66		\&LibType_Start,$self,
67		\&LibType_text, $self,
#	Line 142 | Line 89 | sub _initswitcher {
89		return $switch;
90		}
91
92	<	sub _commontags {
93	<	my $self=shift;
94	<	my $switch=shift;
95	<	my $parse=shift;
96	<
97	<	$switch->grouptag("Export",$parse);
98	<	$switch->addtag($parse,"Use",\&Use_start,$self,
99	<	\&OutToMakefile, $self,
100	<	"", $self);
101	<	$switch->addtag($parse,"Group",\&Group_start,$self,
102	<	\&OutToMakefile, $self,
103	<	"", $self);
104	<	$switch->grouptag("Group",$parse);
105	<	$switch->addtag($parse,"External",
106	<	\&External_StartTag,$self,
107	<	\&OutToMakefile, $self,
108	<	"", $self);
109	<	$switch->addtag($parse,"lib",
110	<	\&lib_start,$self,
111	<	\&OutToMakefile, $self,
112	<	"", $self);
113	<	$switch->addtag($parse,"Architecture",
114	<	\&Arch_Start,$self,
115	<	\&OutToMakefile, $self,
116	<	\&Arch_End,$self);
117	<	$switch->addtag($parse,"INCLUDE_PATH",
118	<	\&IncludePath_Start,$self,
119	<	\&OutToMakefile, $self,
120	<	"",$self);
121	<	return $switch;
122	<	}
123	<
124	<	sub GenerateMakefile {
125	<	my $self=shift;
126	<	my $infile=shift;
127	<	my $outfile=shift;
128	<
129	<	$self->{switch}=$self->_initswitcher();
130	<	$self->{switch}->filetoparse($infile);
184	<
185	<	# open a temporary gnumakefile to store output.
186	<	my $fh=FileHandle->new();
187	<	open ( $fh, ">$outfile") or die "Unable to open $outfile for output ".
188	<	"$!\n";
189	<	@{$self->{filehandlestack}}=($fh);
190	<
191	<	#  -- make an alias
192	<	*GNUmakefile=$fh;
193	<	if ( -e $ENV{LatestBuildFile} ) {
194	<	print GNUmakefile "include $ENV{LatestBuildFile}\n";
195	<	}
196	<	$self->{switch}->parse("makebuild"); # sort out supported tags
197	<	close GNUmakefile;
198	<	return $outfile;
199	<	}
92	>	sub _commontags
93	>	{
94	>	my $self=shift;
95	>	my $switch=shift;
96	>	my $parse=shift;
97	>
98	>	$self->verbose(">> _commontags: SW ".$switch." PARSE ".$parse." <<");
99	>
100	>	$switch->grouptag("Export",$parse);
101	>	$switch->addtag($parse,"Use",
102	>	\&Use_start,$self,
103	>	\&OutToMakefile, $self,
104	>	"", $self);
105	>	$switch->addtag($parse,"Group",
106	>	\&Group_start,$self,
107	>	\&OutToMakefile, $self,
108	>	"", $self);
109	>	$switch->grouptag("Group",$parse);
110	>	$switch->addtag($parse,"External",
111	>	\&External_StartTag,$self,
112	>	\&OutToMakefile, $self,
113	>	"", $self);
114	>	$switch->addtag($parse,"lib",
115	>	\&lib_start,$self,
116	>	\&OutToMakefile, $self,"", $self);
117	>	$switch->addtag($parse,"debuglib",
118	>	\&debuglib_start,$self,
119	>	\&OutToMakefile, $self,
120	>	"", $self);
121	>	$switch->addtag($parse,"Architecture",
122	>	\&Arch_Start,$self,
123	>	\&OutToMakefile, $self,
124	>	\&Arch_End,$self);
125	>	$switch->addtag($parse,"INCLUDE_PATH",
126	>	\&IncludePath_Start,$self,
127	>	\&OutToMakefile, $self,
128	>	"",$self);
129	>	return $switch;
130	>	}
131
132		sub ParseBuildFile {
133		my $self=shift;
#	Line 210 | Line 141 | sub ParseBuildFile {
141		else {
142		$fullfilename=$filename;
143		}
144	+
145	+	$self->verbose(">> ParseBuildFile: FN ".$fullfilename." <<");
146	+
147		$self->{path}=$path;
214	–	#print "Processing $fullfilename\n";
148		$numbins=0;
149		$self->{envnum}=0;
150		$self->{envlevel}=0;
151	<	$self->{makefile}="$self->{localtop}/$ENV{INTwork}/$self->{path}/".
151	>	$self->{currentenv}="$ENV{LOCALTOP}/$ENV{INTwork}/$self->{path}/".
152		"BuildFile.mk";
220	–	$self->{currentenv}=$self->{makefile};
153		$self->{switch}=$self->_initswitcher();
154		$self->{switch}->filetoparse($fullfilename);
155
156	<	#       $self->{switch}->{Strict_no_cr}='no';
225	<	#open a temporary gnumakefile to store output.
156	>	# open a temporary gnumakefile to store output.
157		use Utilities::AddDir;
158	<	AddDir::adddir("$self->{localtop}/$ENV{INTwork}/$self->{path}");
159	<	$ENV{LatestBuildFile}=$self->GenerateMakefile($fullfilename,
160	<	$self->{localtop}."/".$ENV{INTwork}."/".$self->{path}."/BuildFile.mk");
161	<	}
158	>	AddDir::adddir("$ENV{LOCALTOP}/$ENV{INTwork}/$self->{path}");
159	>	my $fh=FileHandle->new();
160	>	open ( $fh, ">$ENV{LOCALTOP}/$ENV{INTwork}/".$self->{path}."/BuildFile.mk"
161	>	) or die "Unable to open /$ENV{INTwork}/".$self->{path}."/BuildFile.mk $!\n";
162	>	@{$self->{filehandlestack}}=($fh);
163	>	# make an alias
164	>	*GNUmakefile=$fh;
165	>	if ( -e $ENV{LatestBuildFile} ) {
166	>	print GNUmakefile "include $ENV{LatestBuildFile}\n";
167	>	}
168
169	<	sub classname {
170	<	my $self=shift;
171	<	if ( @_ ) {
172	<	$self->{classname}=shift;
169	>	$ENV{LatestBuildFile}="$ENV{LOCALTOP}/$ENV{INTwork}/".$self->{path}."/BuildFile.mk";
170	>	$self->{switch}->parse("makebuild"); # sort out supported tags
171	>	if ( $numbins > 0 ) {
172	>	print GNUmakefile <<ENDTEXT;
173	>	ifndef BINMODE
174	>	help::
175	>	\t\@echo Generic Binary targets
176	>	\t\@echo ----------------------
177	>	endif
178	>	ENDTEXT
179	>	foreach $target ( keys %$targettypes ) {
180	>	print GNUmakefile <<ENDTEXT;
181	>	ifndef BINMODE
182	>	help::
183	>	\t\@echo $target
184	>	endif
185	>	ENDTEXT
186	>	}
187		}
188	<	return $self->{classname};
188	>	close GNUmakefile;
189		}
190
191		sub ParseBuildFile_Export {
192		my $self=shift;
193		my $filename=shift;
194	<	my $bf=BuildSystem::BuildFile->new($self->{area});
194	>
195	>	$self->verbose(">> ParseBuildFile_Export: FN ".$filename." <<");
196	>
197	>	my $bf=BuildSystem::BuildFile->new($self->{toolbox});
198		if ( defined $self->{remoteproject} ) {
199		$bf->{remoteproject}=$self->{remoteproject};
200		}
#	Line 251 | Line 205 | sub ParseBuildFile_Export {
205		sub _location {
206		my $self=shift;
207		use File::Basename;
208	<
208	>	$self->verbose(">> _location: <<");
209		return dirname($self->{switch}->filetoparse());
210		}
211
212		sub _parseexport {
213		my $self=shift;
214		my $filename=shift;
215	<
215	>	$self->verbose(">> _parseexport: FN ".$filename." <<");
216	>
217		my $switchex=ActiveDoc::SimpleDoc->new();
218		$switchex->filetoparse($filename);
219		$switchex->newparse("export");
#	Line 269 | Line 224 | sub _parseexport {
224		\&export_end_export,$self);
225		$self->_commontags($switchex,"export");
226		$switchex->allowgroup("__export","export");
272	–	#       $switchex->{Strict_no_cr}='no';
227		$self->{switch}=$switchex;
228		$switchex->parse("export"); # sort out supported tags
229		}
#	Line 277 | Line 231 | sub _parseexport {
231		sub _pushremoteproject {
232		my $self=shift;
233		my $path=shift;
234	+
235	+	$self->verbose(">> _pushremoteproject: PATH ".$path." <<");
236
237		if ( defined $self->{remoteproject} ) {
238		push @{$self->{rpstack}}, $self->{remoteproject};
#	Line 286 | Line 242 | sub _pushremoteproject {
242
243		sub _popremoteproject {
244		my $self=shift;
245	+	$self->verbose(">> _popremoteproject:  <<");
246	+
247		if ( $#{$self->{rpstack}} >=0 ) {
248		$self->{remoteproject}=pop @{$self->{rpstack}};
249		}
#	Line 296 | Line 254 | sub _popremoteproject {
254
255		sub _toolmapper {
256		my $self=shift;
257	+
258		if ( ! defined $self->{mapper} ) {
259		require BuildSystem::ToolMapper;
260		$self->{mapper}=BuildSystem::ToolMapper->new();
261		}
262	+	$self->verbose(">> _toolmapper: TM ".$self->{mapper}."<<");
263		return $self->{mapper};
264		}
265
#	Line 313 | Line 273 | sub Class_StartTag {
273		my $self=shift;
274		my $name=shift;
275		my $hashref=shift;
276	+
277	+	$self->verbose(">> Classs_StartTag: NM ".$name." <<");
278
279		if ( $self->{Arch} ) {
280		if ( defined $$hashref{'type'} ) {
281	<	$self->classname($$hashref{'type'});
281	>	$ClassName=$$hashref{'type'};
282		}
283		}
284		}
285
286	<	sub IncludePath_Start {
287	<	my $self=shift;
288	<	my $name=shift;
289	<	my $hashref=shift;
290	<
291	<	$self->{switch}->checktag( $name, $hashref, 'path');
292	<	if ( $self->{Arch} ) {
293	<	print GNUmakefile "INCLUDE+=".$self->_location()."/".
294	<	$$hashref{'path'}."\n";
295	<	}
296	<	}
297	<
298	<	#
299	<	# --- <Build class=> tag
300	<	#
339	<
340	<	#
341	<	# Parameter collection
342	<	#
343	<	sub BuildBlock_start {
344	<	my $self=shift;
345	<	my $name=shift;
346	<	my $hashref=shift;
347	<
348	<
349	<	my $blockobjid=$self->__blockobjid($hashref);
350	<
351	<	if ( $self->{Arch} ) {
352	<
353	<
354	<	# -- get any objects that match
355	<	my $inheritobj=$self->{block}->getobj($blockobjid);
356	<
357	<	# -- create an object with inherited properties
358	<	my $obj;
359	<	if ( ! defined $inheritobj ) {
360	<	# -- check we have a lookup for the class type
361	<	my $mapper=$self->_toolmapper();
362	<	if ( ! $mapper->exists($$hashref{'class'}) ) {
363	<	$self->{switch}->parseerror("Unknown class : ".
364	<	$$hashref{'class'});
365	<	}
366	<	$obj=BuildSystem::BuildClass->new();
367	<	}
368	<	else {
369	<	# -- inherit the properties from class with the same id class
370	<	$obj=$inheritobj->child();
371	<	}
372	<
373	<	# -- add changes from our tag
374	<	$obj->paramupdate($hashref);
375	<
376	<	# -- store the new object in the block
377	<	$self->{block}->setobj($obj,$blockobjid);
378	<	}
379	<	}
380	<
381	<	sub BuilderClass_buildmakefile {
382	<	my $self=shift;
383	<	my $name=shift;
384	<	my $hashref=shift;
385	<
386	<	my $blockobjid=$self->__blockobjid($hashref);
387	<
388	<	if ( $self->{Arch} ) {
389	<	# -- get the matching block object
390	<	my $blockobj=$self->{buildblock}->getobj($blockobjid);
391	<
392	<	# -- top level buildfile
393	<	my $fh=$self->{filehandlestack}[0];
394	<
395	<	# -- var initialisation
396	<	my @deftypes=();
397	<	my $buildname="";
398	<	my @types=$self->_toolmapper()->types($$hashref{'class'});
399	<
400	<	# -- error checking
401	<	if ( ! defined $blockobj->param("default") ) {
402	<	$self->error("No default build parameter defined for ".
403	<	$$hashref{'class'}." ".$$hashref{'id'});
404	<	}
405	<	if ( ! defined $blockobj->param("name") ) {
406	<	$self->error("\"name\" parameter defined for ".
407	<	$$hashref{'class'}." ".$$hashref{'id'});
408	<	}
409	<
410	<
411	<	foreach $param ( $blockobj->paramlist() ) {
412	<	# -- check for params that need special handling
413	<	if ( $param eq "default" ) {
414	<	@deftypes=split /,/, $param;
415	<	}
416	<	elsif ( $param eq "name" ) {
417	<	$buildname=$blockobj->param($param);
418	<	}
419	<	else {
420	<	# -- simple transfer of block object parameters to makefile
421	<	print $fh $param.":=".$blockobj->param($param)."\n";
422	<	}
423	<	}
424	<
425	<	# -- construct the targets in the top makefile
426	<	$self->_generatedefaulttargets($fh,$$hashref{'class'},@deftypes);
427	<	$self->_generatetypetargets($fh,$$hashref{'class'},$buildname,@types);
428	<
429	<	}
430	<	}
431	<
432	<	sub _blockobjid {
433	<	my $self=shift;
434	<	my $hashref=shift;
435	<
436	<	$self->{switch}->checktag($name,$hashref,'class');
437	<	$self->{switch}->checktag($name,$hashref,'id');
438	<	my $blockobjid="bc_".$$hashref{'class'},"_".$$hashref{'id'};
439	<
440	<	return $blockobjid;
441	<	}
442	<
443	<	sub _generatedefaulttargets {
444	<	my $self=shift;
445	<	my $fh=shift;
446	<	my $class=shift;
447	<
448	<	my @deftypes=shift;
449	<
450	<	print $fh "# -- Default type targets\n";
451	<	foreach $dtype ( @deftypes ) {
452	<	print $fh $class."::".$class."_".$dtype."\n";
453	<	}
454	<	print $fh "\n";
455	<	}
456	<
457	<	sub _generatetypetargets {
458	<	my $self=shift;
459	<	my $fh=shift;
460	<	my $class=shift;
461	<	my $name=shift;
462	<
463	<	my @types=shift;
464	<
465	<	print $fh "# -- Generic type targets\n";
466	<	foreach $type ( @types ) {
467	<	my $pattern=$class."_".$type;
468	<	my $dirname=$class."_".$type."_".$name;
469	<	my $makefile=$here."/BuildFile.mk";
470	<
471	<	# -- map to generic name for each type
472	<	print $fh "# ------ $pattern rules ---------------\n";
473	<	print $fh $class."_".$type."::".$class.
474	<	"_".$type."_$name\n\n";
475	<
476	<	print $fh "# -- Link Targets to $type directories\n";
477	<	print $fh "$dirname: make_$dirname\n";
478	<	print $fh "\t\@cd $here; \\\n";
479	<	print $fh "\t\$(MAKE) LatestBuildFile=$makefile _BuildLink_=1".
480	<	" workdir=$here ".
481	<	" -f \$(TOOL_HOME)/basics.mk datestamp \$\@; \n\n";
482	<
483	<	# -- write target to make makefile for each directory
484	<	print $fh "# -- Build target directories\n";
485	<	print $fh "make_$dirname:\n";
486	<	print $fh "\tif [ ! -e \"$makefile\" ]; then \\\n";
487	<	print $fh "\t if [ ! -d \"$here\" ]; then \\\n";
488	<	print $fh "\t  mkdir $here; \\\n";
489	<	print $fh "\t fi;\\\n";
490	<	print $fh "\t cd $dirname; \\\n";
491	<	print $fh "\t echo include ".$self->{currentenv}." > ".
492	<	"$makefile; \\\n";
493	<	print $fh "\t echo VPATH+=$self->{localtop}/".$self->{path}.
494	<	" >> $makefile; \\\n";
495	<	print $fh "\t echo buildname=$name >> $makefile;\\\n";
496	<	print $fh "\t echo ".$dirname.":".$pattern." >> $makefile;\\\n";
497	<	if ( defined (my @file=$mapper->rulesfile($class)) ) {
498	<	foreach $f ( @file ) {
499	<	print $fh "\t echo -include $f >> $makefile; \\\n";
500	<	}
501	<	}
502	<	print $fh "\tfi\n";
503	<	print $fh "\n";
504	<
505	<	# -- cleaning targets
506	<	push @targets, "clean_$dirname";
507	<	print $fh "# -- cleaning targets\n";
508	<	print $fh "clean::clean_$dirname\n";
509	<	print $fh "clean_".$dirname."::\n";
510	<	print $fh "\t\@echo cleaning $dirname\n";
511	<	print $fh "\t\@if [ -d $here ]; then \\\n";
512	<	print $fh "\tcd $here; \\\n";
513	<	print $fh "\t\$(MAKE) LatestBuildFile=$makefile workdir=".
514	<	$here." _BuildLink_=1 -f ".
515	<	"\$(TOOL_HOME)/basics.mk clean; \\\n";
516	<	print $fh "\tfi\n\n";
517	<
518	<	}
519	<	print $fh "\n";
520	<	}
286	>	sub IncludePath_Start
287	>	{
288	>	my $self=shift;
289	>	my $name=shift;
290	>	my $hashref=shift;
291	>
292	>	$self->verbose(">> IncludePath_Start: NM ".$name." <<");
293	>
294	>	$self->{switch}->checktag( $name, $hashref, 'path');
295	>	if ( $self->{Arch} )
296	>	{
297	>	print GNUmakefile "INCLUDE:=\$(filter-out ".$self->_location()."/".$$hashref{'path'}.",\$(INCLUDE))","\n";
298	>	print GNUmakefile "INCLUDE+=".$self->_location()."/".$$hashref{'path'}."\n";
299	>	}
300	>	}
301
302		#
303		# generic build tag
#	Line 527 | Line 307 | sub Build_start {
307		my $name=shift;
308		my $hashref=shift;
309
310	+	$self->verbose(">> Build_start: NM ".$name." <<");
311	+
312		$self->{switch}->checktag($name,$hashref,'class');
531	–	$self->{switch}->checktag($name,$hashref,'id');
313		if ( $self->{Arch} ) {
314
315		# -- determine the build products name
#	Line 538 | Line 319 | sub Build_start {
319		}
320		else {
321		$self->{switch}->parseerror("No name specified for build product");
541	–	#$name="\$(buildname)";
322		}
323
324		# -- check we have a lookup for the class type
#	Line 555 | Line 335 | sub Build_start {
335
336		# -- generate generic targets
337		print $fh "ifndef _BuildLink_\n";
338	<	$self->_generatedefaulttargets($fh,$$hashref{'class'},@deftypes);
559	<
338	>	print $fh "# -- Generic targets\n";
339		push @targets, $$hashref{'class'};
340	+	foreach $dtype ( @deftypes ) {
341	+	print $fh $$hashref{'class'}."::".$$hashref{'class'}."_".
342	+	$dtype."\n";
343	+	}
344	+	print $fh "\n";
345
346		# -- generate targets for each type
347		foreach $type ( @types ) {
#	Line 572 | Line 356 | sub Build_start {
356		# -- create a new directory for each type
357		push @targets, $pattern;
358		my $dirname=$$hashref{'class'}."_".$type."_".$name;
359	<	my $here="$self->{localtop}/$ENV{INTwork}/".$self->{path}.
576	<	"/".$dirname;
359	>	my $here="$ENV{LOCALTOP}/$ENV{INTwork}/".$self->{path}."/".$dirname;
360		my $makefile=$here."/BuildFile.mk";
578	–	#           AddDir::adddir($here);
361
362		# -- create link targets to the directory
363		push @targets, $dirname;
#	Line 596 | Line 378 | sub Build_start {
378		print $fh "\t cd $dirname; \\\n";
379		print $fh "\t echo include ".$self->{currentenv}." > ".
380		"$makefile; \\\n";
381	<	print $fh "\t echo VPATH+=$self->{localtop}/".$self->{path}.
381	>	print $fh "\t echo VPATH+=$ENV{LOCALTOP}/".$self->{path}.
382		" >> $makefile; \\\n";
383		print $fh "\t echo buildname=$name >> $makefile;\\\n";
384		print $fh "\t echo ".$dirname.":".$pattern." >> $makefile;\\\n";
#	Line 607 | Line 389 | sub Build_start {
389		}
390		print $fh "\tfi\n";
391		print $fh "\n";
610	–	#           print $typefile "$name :\n";
611	–	#           print $typefile "\t\$(_quietbuild_)";
612	–	#           print $typefile $mapper->template($$hashref{'class'},$type)."\n";
613	–	#           print $typefile "\t\$(_quietstamp_)";
614	–	#           print $typefile "\$(SCRAMPERL) \$(SCRAM_HOME)/src/scramdatestamp \$@.ds \$@ \$^\n";
392
393		# -- cleaning targets
394		push @targets, "clean_$dirname";
#	Line 652 | Line 429 | sub Bin_start {
429		my $tool;
430		my $filename;
431		my $objectname;
432	+
433	+	$self->verbose(">>          <<");
434
435		$self->{switch}->checktag($name,$hashref,'file');
436		if ( $self->{Arch} ) {
#	Line 662 | Line 441 | sub Bin_start {
441
442		# Create a new directory for each binary target
443		my $dirname="bin_".$$hashref{name};
444	<	AddDir::adddir("$self->{localtop}/$ENV{INTwork}/".$self->{path}."/$dirname");
444	>	AddDir::adddir("$ENV{LOCALTOP}/$ENV{INTwork}/".$self->{path}."/$dirname");
445		open (binGNUmakefile,
446	<	">$self->{localtop}/$ENV{INTwork}/".$self->{path}."/$dirname/BuildFile.mk") or die           "Unable to make $self->{localtop}/$ENV{INTwork}/$self->{path}/$dirname/".
446	>	">$ENV{LOCALTOP}/$ENV{INTwork}/".$self->{path}."/$dirname/BuildFile.mk") or die           "Unable to make $ENV{LOCALTOP}/$ENV{INTwork}/$self->{path}/$dirname/".
447		"BuildFile.mk $!\n";
448
449		# Create the link targets
#	Line 680 | Line 459 | endif
459		ifndef BINMODE
460
461		define stepdown_$$hashref{'name'}
462	<	if [ -d "$self->{localtop}/$ENV{INTwork}/$self->{path}/$dirname" ]; then \\
463	<	cd $self->{localtop}/$ENV{INTwork}/$self->{path}/$dirname; \\
464	<	\$(MAKE) BINMODE=true LatestBuildFile=$self->{localtop}/$ENV{INTwork}/$self->{path}/$dirname/BuildFile.mk workdir=\$(workdir)/$dirname -f \$(TOOL_HOME)/basics.mk datestamp \$\@; \\
462	>	if [ -d "$ENV{LOCALTOP}/$ENV{INTwork}/$self->{path}/$dirname" ]; then \\
463	>	cd $ENV{LOCALTOP}/$ENV{INTwork}/$self->{path}/$dirname; \\
464	>	\$(MAKE) BINMODE=true LatestBuildFile=$ENV{LOCALTOP}/$ENV{INTwork}/$self->{path}/$dirname/BuildFile.mk workdir=\$(workdir)/$dirname -f \$(TOOL_HOME)/basics.mk datestamp \$\@; \\
465		fi
466		endef
467
468		define stepdown2_$$hashref{'name'}
469	<	if [ -d "$self->{localtop}/$ENV{INTwork}/$self->{path}/$dirname" ]; then \\
470	<	cd $self->{localtop}/$ENV{INTwork}/$self->{path}/$dirname; \\
471	<	\$(MAKE) BINMODE=true LatestBuildFile=$self->{localtop}/$ENV{INTwork}/$self{path}/$dirname/BuildFile.mk workdir=\$(workdir)/$dirname -f \$(TOOL_HOME)/basics.mk datestamp \$\*; \\
469	>	if [ -d "$ENV{LOCALTOP}/$ENV{INTwork}/$self->{path}/$dirname" ]; then \\
470	>	cd $ENV{LOCALTOP}/$ENV{INTwork}/$self->{path}/$dirname; \\
471	>	\$(MAKE) BINMODE=true LatestBuildFile=$ENV{LOCALTOP}/$ENV{INTwork}/$self{path}/$dirname/BuildFile.mk workdir=\$(workdir)/$dirname -f \$(TOOL_HOME)/basics.mk datestamp \$\*; \\
472		fi
473
474		endef
#	Line 713 | Line 492 | ENDTEXT
492
493		# the binary specifics makefile
494		print binGNUmakefile "include ".$self->{currentenv}."\n";
495	<	print binGNUmakefile "VPATH+=".$self->{localtop}."/$self{path}\n";
495	>	print binGNUmakefile "VPATH+=$ENV{LOCALTOP}/$self{path}\n";
496
497		# alias for bin_Insure
498		print binGNUmakefile <<ENDTEXT;
#	Line 810 | Line 589 | ENDTEXT
589		close binGNUmakefile;
590		}
591
592	+	sub Module_start {
593	+	my $self=shift;
594	+	my $name=shift;
595	+	my $hashref=shift;
596	+
597	+	my $fileclass;
598	+	my @tools;
599	+	my $tool;
600	+	my $filename;
601	+	my $objectname;
602	+
603	+	$self->verbose(">> In module_start: ".$name." <<");
604	+
605	+	$self->{switch}->checktag($name,$hashref,'file');
606	+	if ( $self->{Arch} ) {
607	+	if ( ! defined $$hashref{name} ) {
608	+	($$hashref{name}=$$hashref{file})=~s/\..*//;
609	+	}
610	+	($filename=$$hashref{file})=~s/\..*//;
611	+
612	+	# Create a new directory for each module target
613	+	my $dirname="module_".$$hashref{name};
614	+	AddDir::adddir("$ENV{LOCALTOP}/$ENV{INTwork}/".$self->{path}."/$dirname");
615	+	open (moduleGNUmakefile,
616	+	">$ENV{LOCALTOP}/$ENV{INTwork}/".$self->{path}."/$dirname/BuildFile.mk") or die           "Unable to make $ENV{LOCALTOP}/$ENV{INTwork}/$self->{path}/$dirname/".
617	+	"BuildFile.mk $!\n";
618	+
619	+	# Create the link targets
620	+	$numbins++;
621	+	my $fh=$self->{filehandlestack}[0];
622	+	print $fh <<ENDTEXT;
623	+
624	+	# Link Targets to module directories
625	+	ifdef MODULEMODE
626	+	# We dont want to build a library here
627	+	override files:=
628	+	endif
629	+	ifndef MODULEMODE
630	+
631	+	BINMODE=true
632	+
633	+	define stepdown_$$hashref{'name'}
634	+	if [ -d "$ENV{LOCALTOP}/$ENV{INTwork}/$self->{path}/$dirname" ]; then \\
635	+	cd $ENV{LOCALTOP}/$ENV{INTwork}/$self->{path}/$dirname; \\
636	+	\$(MAKE) MODULEMODE=true LatestBuildFile=$ENV{LOCALTOP}/$ENV{INTwork}/$self->{path}/$dirname/BuildFile.mk workdir=\$(workdir)/$dirname -f \$(TOOL_HOME)/basics.mk datestamp \$\@; \\
637	+	fi
638	+	endef
639	+
640	+	define stepdown2_$$hashref{'name'}
641	+	if [ -d "$ENV{LOCALTOP}/$ENV{INTwork}/$self->{path}/$dirname" ]; then \\
642	+	cd $ENV{LOCALTOP}/$ENV{INTwork}/$self->{path}/$dirname; \\
643	+	\$(MAKE) MODULEMODE=true LatestBuildFile=$ENV{LOCALTOP}/$ENV{INTwork}/$self{path}/$dirname/BuildFile.mk workdir=\$(workdir)/$dirname -f \$(TOOL_HOME)/basics.mk datestamp \$\*; \\
644	+	fi
645	+
646	+	endef
647	+
648	+	module_$$hashref{'name'}_%:: dummy
649	+	\@\$(stepdown2_$$hashref{'name'})
650	+
651	+	$$hashref{'name'}_%:: dummy
652	+	\@\$(stepdown_$$hashref{'name'})
653	+
654	+	help module module_debug module_debug_local module_insure module_Insure clean $$hashref{'name'}:: dummy
655	+	\@\$(stepdown_$$hashref{'name'})
656	+
657	+	modulefiles+=$$hashref{'file'}
658	+	locmodulefiles+=$dirname/$$hashref{'file'}
659	+	endif
660	+
661	+
662	+	ENDTEXT
663	+
664	+
665	+	# the module specifics makefile
666	+	print moduleGNUmakefile "include ".$self->{currentenv}."\n";
667	+	print moduleGNUmakefile "VPATH+=$ENV{LOCALTOP}/$self{path}\n";
668	+
669	+	# alias for bin_Insure
670	+	print moduleGNUmakefile <<ENDTEXT;
671	+
672	+	module_insure:module_Insure
673	+	ifdef MAKETARGET_module_insure
674	+	MAKETARGET_$$hashref{name}_Insure=1
675	+	endif
676	+
677	+	# debuggging target
678	+	$$hashref{'name'}_echo_% :: echo_%
679	+
680	+	# help targets
681	+	help::
682	+	\t\@echo
683	+	\t\@echo Targets For $$hashref{'name'}
684	+	\t\@echo -------------------------------------
685	+	\t\@echo $$hashref{'name'}  - default build
686	+	\t\@echo module_$$hashref{'name'}_clean - executable specific cleaning
687	+	ENDTEXT
688	+
689	+	# Make generic rules for each type
690	+	$targettypes={
691	+	"module" => 'o',
692	+	"module_debug" => 'd',
693	+	"module_debug_local" => 'l_d',
694	+	"module_Insure" => 'Insure'
695	+	};
696	+	#
697	+	foreach $target ( keys %$targettypes ) {
698	+	print moduleGNUmakefile <<ENDTEXT;
699	+
700	+	# Type $target specifics
701	+	ifdef MAKETARGET_$target
702	+	MAKETARGET_$$hashref{name}_$$targettypes{$target}=1
703	+	endif
704	+	$target ::$$hashref{name}_$$targettypes{$target}
705	+
706	+	moduletargets+=$$hashref{name}_$$targettypes{$target}
707	+	help::
708	+	\t\@echo $$hashref{name}_$$targettypes{$target}
709	+	clean::
710	+	\t\@if [ -f \$(modulestore)/$$hashref{name}_$$targettypes{$target} ]; then \\
711	+	\techo Removing \$(modulestore)/$$hashref{name}; \\
712	+	\trm \$(modulestore)/$$hashref{name}_$$targettypes{$target}; \\
713	+	\tfi
714	+
715	+	ENDTEXT
716	+	($objectname=$$hashref{file})=~s/\..*/_$$targettypes{$target}\.o/;
717	+	${"objectname_$$targettypes{$target}"}=$objectname;
718	+	print moduleGNUmakefile "$objectname:$$hashref{name}.dep\n";
719	+	} # end loop
720	+	print moduleGNUmakefile "MDFLAGS= -shared -Wl,-soname,\$\@","\n";
721	+	print moduleGNUmakefile "$$hashref{name}_Insure.so:.psrc\n";
722	+	print moduleGNUmakefile "$$hashref{name}_d.so:$objectname_d\n";
723	+	print moduleGNUmakefile "\t\$(CClinkCmdDebug) \$(MDFLAGS)\n";
724	+	print moduleGNUmakefile "\t\@\$(SCRAMPERL) \$(SCRAM_HOME)/src/scramdatestamp \$\@\.ds \$\@ \$\^\n";
725	+	print moduleGNUmakefile "$$hashref{name}_l_d.so:$objectname_d\n";
726	+	print moduleGNUmakefile "\t\$(CClinkCmdDebugLocal) \$(MDFLAGS)\n";
727	+	print moduleGNUmakefile "\t\@\$(SCRAMPERL) \$(SCRAM_HOME)/src/scramdatestamp \$\@\.ds \$\@ \$\^\n";
728	+	print moduleGNUmakefile "$$hashref{name}_Insure.so:$objectname_Insure\n";
729	+	print moduleGNUmakefile "\t\$(CClinkCmdInsure) \$(MDFLAGS)\n";
730	+	print moduleGNUmakefile "\t\@\$(SCRAMPERL) \$(SCRAM_HOME)/src/scramdatestamp \$\@\.ds \$\@ \$\^\n";
731	+	print moduleGNUmakefile "$$hashref{name}_o.so:$objectname_o\n";
732	+	print moduleGNUmakefile "\t\$(CClinkCmd) \$(MDFLAGS)\n";
733	+	print moduleGNUmakefile "\t\@\$(SCRAMPERL) \$(SCRAM_HOME)/src/scramdatestamp \$\@\.ds \$\@ \$\^\n";
734	+	print moduleGNUmakefile "$$hashref{name}.dep:$$hashref{file}\n";
735	+	print moduleGNUmakefile "-include $$hashref{name}.dep\n";
736	+	print moduleGNUmakefile <<ENDTEXT;
737	+	clean::
738	+	\t\@if [ -f \$(modulestore)/lib$$hashref{name} ]; then \\
739	+	\techo Removing \$(modulestore)/lib$$hashref{name}; \\
740	+	\trm \$(modulestore)/lib$$hashref{name}; \\
741	+	\tfi
742	+
743	+
744	+	$$hashref{name}_d.so:\$(libslocal_d)
745	+	$$hashref{name}_o.so:\$(libslocal)
746	+	ifdef MCCABE_DATA_DIR
747	+	$$hashref{name}_mccabe.so: \$(libslocal_d) \$(MCCABE_DATA_DIR)/mccabeinstr/instplus.cpp
748	+	endif
749	+	$$hashref{name}_Insure.so:\$(libslocal_I)
750	+	$$hashref{name}_d:$$hashref{name}_d.so
751	+	\@cp $$hashref{name}_d.so \$(modulestore)/lib$$hashref{name}
752	+	$$hashref{name}_l_d:$$hashref{name}_l_d.so
753	+	\@cp $$hashref{name}_l_d.so \$(modulestore)/lib$$hashref{name}
754	+	$$hashref{name}_Insure:$$hashref{name}_Insure.so
755	+	\@cp $$hashref{name}_Insure.so \$(modulestore)/lib$$hashref{name}_Insure
756	+	$$hashref{name}:$$hashref{name}_d.so
757	+	\@mv $$hashref{name}_d.so \$(modulestore)/lib$$hashref{name}
758	+	$$hashref{name}_o:$$hashref{name}_o.so
759	+	\@mv $$hashref{name}_o.so \$(modulestore)/lib$$hashref{name}.so
760	+	modulefiles+=$$hashref{file}
761	+	ENDTEXT
762	+	}
763	+	close moduleGNUmakefile;
764	+	}
765	+
766	+
767		sub External_StartTag {
768		my $self=shift;
769		my $name=shift;
770		my $hashref=shift;
771	+
772	+	$self->verbose(">> External_StartTag: NM ".$name." <<");
773
774		my $tool;
775		if ( $self->{Arch} ) {
#	Line 867 | Line 823 | sub Group_start {
823		my $name=shift;
824		my $hashref=shift;
825
826	+	$self->verbose(">> Group_start: NM ".$name." <<");
827	+
828		$self->{switch}->checktag($name, $hashref, 'name');
829		if ( $self->{Arch} ) {
830		print GNUmakefile "GROUP_".$$hashref{'name'};
#	Line 877 | Line 835 | sub Group_start {
835		}
836		}
837
838	<	sub Use_start {
839	<	my $self=shift;
840	<	my $name=shift;
841	<	my $hashref=shift;
842	<	my $filename;
843	<	use Utilities::SCRAMUtils;
844	<
845	<	$self->{switch}->checktag($name, $hashref, "name");
846	<	if ( $self->{Arch} ) {
847	<	if ( exists $$hashref{'group'} ) {
848	<	print GNUmakefile "GROUP_".$$hashref{'group'}."=true\n";
849	<	}
850	<	if ( ! defined $self->{remoteproject} ) {
851	<	$filename=SCRAMUtils::checkfile(
852	<	"/$ENV{INTsrc}/$$hashref{name}/BuildFile");
853	<	}
854	<	else {
855	<	$filename=$self->{remoteproject}."/$$hashref{name}/BuildFile";
856	<	print "trying $filename\n";
857	<	if ( ! -f $filename ) { $filename=""; };
858	<	}
859	<	if ( $filename ne "" ) {
860	<	$self->ParseBuildFile_Export( $filename );
861	<	}
862	<	else {
863	<	$self->{switch}->parseerror("Unable to detect Appropriate ".
864	<	"decription file for <$name name=".$$hashref{name}.">");
865	<	}
866	<	}
838	>	sub Use_start
839	>	{
840	>	my $self=shift;
841	>	my $name=shift;
842	>	my $hashref=shift;
843	>	my $filename;
844	>	use Utilities::SCRAMUtils;
845	>
846	>	$self->verbose(">> Use_start: NM ".$name." <<");
847	>
848	>	$self->{switch}->checktag($name, $hashref, "name");
849	>	if ( $self->{Arch} )
850	>	{
851	>	if ( exists $$hashref{'group'} )
852	>	{
853	>	print GNUmakefile "GROUP_".$$hashref{'group'}."=true\n";
854	>	}
855	>	if ( ! defined $self->{remoteproject} )
856	>	{
857	>	$filename=SCRAMUtils::checkfile("/$ENV{INTsrc}/$$hashref{name}/BuildFile");
858	>	}
859	>	else
860	>	{
861	>	$filename=$self->{remoteproject}."/$$hashref{name}/BuildFile";
862	>	print "Trying $filename\n";
863	>	if ( ! -f $filename ) { $filename=""; };
864	>	}
865	>	if ( $filename ne "" )
866	>	{
867	>	$self->ParseBuildFile_Export( $filename );
868	>	}
869	>	else
870	>	{
871	>	$self->{switch}->parseerror("Unable to detect Appropriate ".
872	>	"decription file for <$name name=".$$hashref{name}.">");
873	>	}
874	>	}
875	>	}
876	>
877	>	sub CheckBuildFile {
878	>	my $self=shift;
879	>	my $classdir=shift;
880	>	my $ClassName="";
881	>	my $thisfile="$classdir/$buildfile";
882	>
883	>	if ( -e $ENV{LOCALTOP}."/".$thisfile ) {
884	>	$DefaultBuildfile="$ENV{LOCALTOP}/$thisfile";
885	>	$self->ParseBuildFile($ENV{LOCALTOP}, $classdir, $buildfile);
886	>	}
887	>	elsif ( -e $ENV{RELEASETOP}."/".$thisfile ) {
888	>	$DefaultBuildfile="$ENV{RELEASETOP}/$thisfile";
889	>	$self->ParseBuildFile($ENV{RELEASETOP}, $classdir, $buildfile);
890	>	}
891	>	$self->verbose(">> CheckBuildFile: FN ".$thisfile." CN ".$ClassName." <<");
892	>	return $ClassName;
893		}
894
895		# List association groups between <AssociateGroup> tags
#	Line 916 | Line 900 | sub AssociateGroup {
900		my $string=shift;
901		my $word;
902
903	+	$self->verbose(">> AssociateGroup: NM ".$name." ST ".$string." <<");
904	+
905		if ( $self->{Arch} ) {
906		foreach $word ( (split /\s/, $string) ){
907		chomp $word;
#	Line 932 | Line 918 | sub Arch_Start {
918		my $name=shift;
919		my $hashref=shift;
920
921	+	$self->verbose(">> Arch_Start: NM ".$name." <<");
922	+
923		$self->{switch}->checktag($name, $hashref,'name');
924		( ($ENV{SCRAM_ARCH}=~/$$hashref{name}.*/) )? ($self->{Arch}=1)
925		: ($self->{Arch}=0);
#	Line 941 | Line 929 | sub Arch_Start {
929		sub Arch_End {
930		my $self=shift;
931		my $name=shift;
932	+
933	+	$self->verbose(">> Arch_End: NM ".$name." <<");
934
935	<	pop @{$self->{ARCHBLOCK}};
935	>	pop @{$self->{ARCHBLOCK}};
936		$self->{Arch}=$self->{ARCHBLOCK}[$#{$self->{ARCHBLOCK}}];
937		}
938
#	Line 950 | Line 940 | sub Arch_End {
940		sub _CutBlock {
941		my $self=shift;
942		my $string= shift @_;
943	+
944	+	$self->verbose(">> _CutBlock: ST ".$string." <<");
945	+
946		@BlockClassA = split /\//, $string;
947		}
948
#	Line 957 | Line 950 | sub OutToMakefile {
950		my $self=shift;
951		my $name=shift;
952		my @vars=@_;
953	+
954	+	$self->verbose(">> OutToMakefile: <<");
955
956		if ( $self->{Arch} ) {
957	+	$self->verbose(">> CONT: ".$#vars." lines <<");
958		print GNUmakefile @vars;
959		}
960		}
#	Line 966 | Line 962 | sub OutToMakefile {
962		sub OutToScreen {
963		my $name=shift;
964		my @vars=@_;
965	<
965	>
966		if ( $self->{Arch} ) {
967		print @vars;
968		}
#	Line 976 | Line 972 | sub setBlockClassPath {
972		my $name=shift;
973		my $hashref=shift;
974
975	+	$self->verbose(">> setBlockClassPath: NM ".$name." <<");
976	+
977		$self->{switch}->checktag($name, $hashref, 'path');
978		$self->{BlockClassPath}=$self->{BlockClassPath}.":".$$hashref{path};
979		$self->_CutBlock($$hashref{path});
#	Line 983 | Line 981 | sub setBlockClassPath {
981
982		sub BlockClassPath {
983		my $self=shift;
984	+
985	+	$self->verbose(">> BlockClassPath: <<");
986	+
987		return $self->{BlockClassPath};
988		}
989
#	Line 991 | Line 992 | sub export_start_export {
992		my $name=shift;
993		my $hashref=shift;
994
995	+	$self->verbose(">> export_start_export: NM ".$name." <<");
996	+
997		$self->{switch}->opengroup("__export");
998		}
999
#	Line 999 | Line 1002 | sub export_start {
1002		my $name=shift;
1003		my $hashref=shift;
1004
1005	+	$self->verbose(">> export_start: NM ".$name." <<");
1006	+
1007		$self->{switch}->opengroup("__export");
1008		if ( exists $$hashref{autoexport} ) {
1009		print GNUmakefile "scram_autoexport=".$$hashref{autoexport}."\n";
#	Line 1015 | Line 1020 | sub export_start {
1020
1021		sub export_end_export {
1022		my $self=shift;
1023	+	$self->verbose(">> export_end_export: <<");
1024		$self->{switch}->closegroup("__export");
1025		}
1026
1027		sub export_end {
1028		my $self=shift;
1029	+	$self->verbose(">> export_end: <<");
1030		$self->{switch}->closegroup("__export");
1031		print GNUmakefile "endif\n";
1032		}
#	Line 1027 | Line 1034 | sub export_end {
1034		#
1035		# Standard lib tag
1036		#
1037	<	sub lib_start {
1038	<	my $self=shift;
1039	<	my $name=shift;
1040	<	my $hashref=shift;
1037	>	sub lib_start
1038	>	{
1039	>	my $self=shift;
1040	>	my $name=shift;
1041	>	my $hashref=shift;
1042	>
1043	>	$self->verbose(">> lib_start: NM ".$name." <<");
1044	>
1045	>	$self->{switch}->checktag($name, $hashref, 'name');
1046	>
1047	>	if ( $self->{Arch} )
1048	>	{
1049	>	print GNUmakefile "lib+=$$hashref{name}\n";
1050	>	}
1051	>	}
1052
1053	<	$self->{switch}->checktag($name, $hashref, 'name');
1054	<	if ( $self->{Arch} ) {
1055	<	print GNUmakefile "lib+=$$hashref{name}\n";
1056	<	}
1057	<	}
1053	>	# Standard debug lib tag
1054	>	#
1055	>	sub debuglib_start
1056	>	{
1057	>	my $self=shift;
1058	>	my $name=shift;
1059	>	my $hashref=shift;
1060	>
1061	>	$self->verbose(">> debuglib_start: NM ".$name." <<");
1062	>	$self->{switch}->checktag($name, $hashref, 'name');
1063	>
1064	>	if ( $self->{Arch} )
1065	>	{
1066	>	print GNUmakefile "debuglib+=$$hashref{name}\n";
1067	>	}
1068	>	}
1069
1070		#
1071		# libtype specification
#	Line 1045 | Line 1074 | sub LibType_Start {
1074		my $self=shift;
1075		my $name=shift;
1076		my $hashref=shift;
1077	<
1077	>
1078	>	$self->verbose(">> LibType_Start: NM ".$name." <<");
1079	>
1080		if ( $self->{Arch} ) {
1081		if ( defined $self->{libtype_conext} ) {
1082		$self->{switch}->parseerror("<$name> tag cannot be specified".
#	Line 1078 | Line 1109 | sub LibType_text {
1109		my $self=shift;
1110		my $name=shift;
1111		my $string=shift;
1112	+	$self->verbose(">> LibType_text: NM ".$name." <<");
1113
1114	<	if ( $self->{Arch} ) {
1114	>	if ( $self->{Arch} ) {
1115		$string=~s/\n/ /g;
1116		print GNUmakefile "libmsg::\n\t\@echo Library info: ";
1117		print GNUmakefile $string;
#	Line 1091 | Line 1123 | sub LibType_end {
1123		my $self=shift;
1124		my $name=shift;
1125
1126	+	$self->verbose(">> LibType_end: NM ".$name." <<");
1127	+
1128		undef $self->{libtype_conext};
1129		}
1130
#	Line 1099 | Line 1133 | sub Environment_start {
1133		my $name=shift;
1134		my $hashref=shift;
1135
1136	+	$self->verbose(">> Environment_start: NM ".$name." <<");
1137	+
1138		if ( $self->{Arch} ) {
1139		$self->{envnum}++;
1140
1141		# open a new Environment File
1142	<	my $envfile="$self->{localtop}/$ENV{INTwork}/$self->{path}/Env_".
1142	>	my $envfile="$ENV{LOCALTOP}/$ENV{INTwork}/$self->{path}/Env_".
1143		$self->{envnum}.".mk";
1144		use FileHandle;
1145		my $fh=FileHandle->new();
#	Line 1113 | Line 1149 | sub Environment_start {
1149
1150		# include the approprate environment file
1151		if ( $self->{envlevel} == 0 ) {
1152	<	print GNUmakefile "include $self->{localtop}/$ENV{INTwork}/".
1152	>	print GNUmakefile "include $ENV{LOCALTOP}/$ENV{INTwork}/".
1153		$self->{path}."/BuildFile.mk\n";
1154		}
1155		else {
1156	<	print GNUmakefile "include $self->{localtop}/$ENV{INTwork}/".
1156	>	print GNUmakefile "include $ENV{LOCALTOP}/$ENV{INTwork}/".
1157		$self->{path}."/Env_".$self->{Envlevels}[$self->{envlevel}].".mk\n";
1158		}
1159		$self->{envlevel}++;
1160		$self->{Envlevels}[$self->{envlevel}]=$self->{envnum};
1161	<	$self->{currentenv}="$self->{localtop}/$ENV{INTwork}/$self->{path}/Env_$self->{envnum}.mk";
1161	>	$self->{currentenv}="$ENV{LOCALTOP}/$ENV{INTwork}/$self->{path}/Env_$self->{envnum}.mk";
1162		}
1163		}
1164
#	Line 1130 | Line 1166 | sub Environment_end {
1166		my $self=shift;
1167		my $fd;
1168
1169	+	$self->verbose(">> Environment_end: NM ".$name." <<");
1170	+
1171		if ( $self->{Arch} ) {
1172		$self->{envlevel}--;
1173		if ( $self->{envlevel} < 0 ) {
#	Line 1142 | Line 1180 | sub Environment_end {
1180		close $fd;
1181		*GNUmakefile=$self->{filehandlestack}[$#{$self->{filehandlestack}}];
1182		if ( $self->{envlevel} < 1 ) {
1183	<	$self->{currentenv}="$self->{localtop}/$ENV{INTwork}/$self->{path}/".
1183	>	$self->{currentenv}="$ENV{LOCALTOP}/$ENV{INTwork}/$self->{path}/".
1184		"BuildFile.mk";
1185		}
1186		else {
1187		$self->{currentenv}=
1188	<	$self->{localtop}."/$ENV{INTwork}/$self->{path}/Env_".
1188	>	"$ENV{LOCALTOP}/$ENV{INTwork}/$self->{path}/Env_".
1189		$self->{Envlevels}[$self->{envlevel}];
1190		}
1191		}
1192		}
1193
1194		sub Store_start {
1195	<	my $self=shift;
1196	<	my $name=shift;
1195	>	my $self=shift;
1196	>	my $name=shift;
1197		my $hashref=shift;
1198
1199	<	if ( $self->{Arch} ) {
1162	<	$self->{switch}->checktag( $name, $hashref, 'name' );
1163	<
1164	<	# -- store creation
1165	<	my $dir=$$hashref{'name'};
1166	<	AddDir::adddir($self->{area}->location()."/".$dir);
1167	<	if ( exists $$hashref{'type'} ) {
1168	<	# -- architecture specific store
1169	<	if ( $$hashref{'type'}=~/^arch/i ) {
1170	<	$dir=$dir."/".$ENV{SCRAM_ARCH};
1171	<	AddDir::adddir($self->{area}->location()."/".$dir);
1172	<	}
1173	<	else {
1174	<	$self->parseerror("Unknown type in <$name> tag");
1175	<	}
1176	<	}
1177	<
1178	<	# -- set make variables for the store
1179	<	print GNUmakefile "SCRAMSTORENAME_".$$hashref{'name'}.":=".$dir."\n";
1180	<	print GNUmakefile "SCRAMSTORE_".$$hashref{'name'}.":=".
1181	<	$self->{localtop}."/".$dir."\n";
1182	<	print GNUmakefile "VPATH+=".$self->{localtop}
1183	<	."/".$dir.":".$self->{releasetop}."/".$dir."\n";
1184	<	}
1185	<	}
1186	<
1187	<	sub DropDown {
1188	<	my $self=shift;
1189	<	my $name=shift;
1190	<	my $hashref=shift;
1199	>	$self->verbose(">> Store_start: NM ".$name." <<");
1200
1201		if ( $self->{Arch} ) {
1202	<	# - default values must always be specified
1203	<	$self->{switch}->checktag( $name, $hashref, 'defaults' );
1204	<	my @blockdirs=split /,/ , $$hashref{'defaults'};
1205	<	$self->{block}->defaultblocks(@blockdirs);
1206	<	}
1202	>	$self->{switch}->checktag( $name, $hashref, 'name' );
1203	>
1204	>	# -- store creation
1205	>	my $dir=$$hashref{'name'};
1206	>	AddDir::adddir($ENV{LOCALTOP}."/".$dir);
1207	>	if ( exists $$hashref{'type'} ) {
1208	>	# -- architecture specific store
1209	>	if ( $$hashref{'type'}=~/^arch/i ) {
1210	>	$dir=$dir."/".$ENV{SCRAM_ARCH};
1211	>	AddDir::adddir($ENV{LOCALTOP}."/".$dir);
1212	>	}
1213	>	else {
1214	>	$self->parseerror("Unknown type in <$name> tag");
1215	>	}
1216	>	}
1217	>
1218	>	# -- set make variables for the store
1219	>	print GNUmakefile "SCRAMSTORENAME_".$$hashref{'name'}.":=".$dir."\n";
1220	>	print GNUmakefile "SCRAMSTORE_".$$hashref{'name'}.":=".
1221	>	$ENV{LOCALTOP}."/".$dir."\n";
1222	>	print GNUmakefile "VPATH+=".$ENV{LOCALTOP}
1223	>	."/".$dir.":".$ENV{RELEASETOP}."/".$dir."\n";
1224	>	}
1225		}

Diff Legend

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