ViewVC Help

View File | Revision Log | Show Annotations | Root Listing

root/cvsroot/COMP/SCRAM/src/Scram/ScramFunctions.pm

Comparing COMP/SCRAM/src/Scram/ScramFunctions.pm (file contents):
Revision 1.11 by sashby, Wed May 30 12:47:01 2001 UTC vs.
Revision 1.12 by sashby, Tue Jun 12 16:02:56 2001 UTC

#	Line 241 | Line 241 | sub addareatoDB {
241		$self->scramprojectdb()->addarea($tagname,$version,$area);
242		}
243
244	<	sub spawnversion {
245	<	my $self=shift;
246	<	my $version=shift;
244	>	sub spawnversion
245	>	{
246	>	my $self=shift;
247	>	my $version=shift;
248	>	my $rv=0;
249	>
250	>	my $thisversion=$self->getversion();
251
252	<	my $rv=0;
253	<	my $thisversion=$self->getversion();
254	<	if ( defined $version ) {
255	<	if ( $version ne $thisversion ) {
256	<	# first try to use the correct version
257	<	if ( -d $self->{scram_top}."/".$version ) {
258	<	$ENV{SCRAM_HOME}=$self->{scram_top}."/".$version;
259	<	$ENV{TOOL_HOME}="$ENV{SCRAM_HOME}/src";
260	<	$self->verbose("Spawning SCRAM version $version");
261	<	my $rv=system("scram", @_)/256;
262	<	exit $rv;
263	<	}
264	<	else { # if not then simply warn
265	<	print "******* Warning : scram version inconsistent ********\n";
266	<	print "This version: $thisversion; Required version: $version\n";
267	<	print "*****************************************************\n";
268	<	print "\n";
269	<	}
270	<	}
271	<	}
272	<	else {
273	<	$self->error("Undefined value for version requested");
274	<	$rv=1;
275	<	}
276	<	return $rv;
277	<	}
252	>	if ( defined $version )
253	>	{
254	>	if ( $version ne $thisversion )
255	>	{
256	>	# first try to use the correct version
257	>	if ( -d $self->{scram_top}."/".$version )
258	>	{
259	>	$ENV{SCRAM_HOME}=$self->{scram_top}."/".$version;
260	>	$ENV{TOOL_HOME}="$ENV{SCRAM_HOME}/src";
261	>	$self->verbose("Spawning SCRAM version $version");
262	>	my $rv=system("scram", @_)/256;
263	>	exit $rv;
264	>	}
265	>	else
266	>	{ # if not then simply warn
267	>	print "******* Warning : scram version inconsistent ********\n";
268	>	print "This version: $thisversion; Required version: $version\n";
269	>	print "*****************************************************\n";
270	>	print "\n";
271	>	}
272	>	}
273	>	}
274	>	else
275	>	{
276	>	$self->error("Undefined value for version requested");
277	>	$rv=1;
278	>	}
279	>	return $rv;
280	>	}
281
282		sub globalcache {
283		my $self=shift;

Diff Legend

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