ViewVC Help

View File | Revision Log | Show Annotations | Root Listing

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

Comparing COMP/SCRAM/src/BuildSystem/ToolManager.pm (file contents):
Revision 1.18 by muzaffar, Tue Nov 6 14:13:49 2007 UTC vs.
Revision 1.19 by muzaffar, Fri Dec 14 09:03:47 2007 UTC

#	Line 18 | Line 18 | use BuildSystem::ToolParser;
18		use Utilities::AddDir;
19		use URL::URLhandler;
20		use Utilities::Verbose;
21	+	use SCRAM::MsgLog;
22
23		@ISA=qw(BuildSystem::ToolCache Utilities::Verbose);
24		@EXPORT_OK=qw( );
#	Line 148 | Line 149 | sub setupalltools()
149		}
150		else
151		{
152	<	print $localtool," already set up.","\n",if ($ENV{SCRAM_DEBUG});
152	>	scramlogmsg($localtool," already set up.","\n"),if ($ENV{SCRAM_DEBUG});
153		}
154		}
155		}
#	Line 161 | Line 162 | sub setupalltools()
162		}
163		}
164
165	<	print "\n";
165	>	scramlogmsg("\n");
166		}
167
168		sub coresetup()
#	Line 170 | Line 171 | sub coresetup()
171		my ($toolname, $toolversion, $toolfile, $force) = @_;
172		my ($toolcheck, $toolparser);
173
174	<	print "\n";
174	<	print $::bold."Setting up ",$toolname," version ",$toolversion,":  ".$::normal,"\n";
174	>	scramlogmsg("\n",$::bold."Setting up ",$toolname," version ",$toolversion,":  ".$::normal,"\n");
175
176		# New ToolParser object for this tool if there isn't one already.
177		# Look in array of raw tools to see if this tool has a ToolParser object:
#	Line 365 | Line 365 | sub setupself()
365
366		if ( -f $filename )
367		{
368	<	print "\n";
369	<	print $::bold."Setting up SELF:".$::normal,"\n";
368	>	scramlogmsg("\n",$::bold."Setting up SELF:".$::normal,"\n");
369		# Self file exists so process it:
370		$selfparser = BuildSystem::ToolParser->new();
371		$selfparser->filehead ('<?xml version="1.0" encoding="UTF-8" standalone="yes"?><doc type="BuildSystem::ToolDoc" version="1.0">');
#	Line 375 | Line 374 | sub setupself()
374
375		# Next, set up the tool:
376		$store = $selfparser->processrawtool($self->interactive());
377	<
377	>
378		# If we are in a developer area, also add RELEASETOP paths:
379		if (exists($ENV{RELEASETOP}))
380		{
#	Line 385 | Line 384 | sub setupself()
384
385		# Store the ToolData object in the cache:
386		$self->storeincache($selfparser->toolname(),$store);
387	<	print "\n";
387	>	scramlogmsg("\n");
388		}
389		else
390		{
391	+	scramlogdump();
392		print "\n";
393		print "SCRAM: No file config/Self.xml...nothing to do.";
394		print "\n";

Diff Legend

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