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.16 by sashby, Wed Nov 7 19:49:38 2001 UTC vs.
Revision 1.18 by sashby, Thu Nov 15 21:18:16 2001 UTC

#	Line 82 | Line 82 | sub project {
82		return $area;
83		}
84
85	<	sub setuptoolsinarea {
86	<	my $self=shift;
87	<	my $area=shift;
85	>	sub setuptoolsinarea
86	>	{
87	>	my $self=shift;
88	>	my $area=shift;
89
90	<	# -- initialise
91	<	print "Initialising setup procedure......","\n";
92	<	$self->_allprojectinitsearcher();
93	<
94	<	# -- create a new toolbox object
95	<	my $toolbox=$self->areatoolbox($area);
96	<	$toolbox->searcher($self->_allprojectinitsearcher());
97	<
98	<	if ( @_ ) {
99	<	# -- specific tool specified
100	<	if ( my $rv=$toolbox->toolsetup(@_) ) {
101	<	if ( $rv eq 1 ) {
102	<	print "Unknown tool $toolname @ARGV\n";
103	<	exit 1;
104	<	}
105	<	}
106	<	}
107	<	else {
108	<	# -- setup all tools specified in the requirements doc
109	<	my $reqs=$self->arearequirements($area);
110	<	$self->verbose("Setup ToolBox from Requirements doc ($reqs)");
111	<	$reqs->setup($toolbox);
112	<	}
113	<	}
90	>	# -- initialise
91	>	print "Initialising setup procedure......","\n";
92	>	$self->_allprojectinitsearcher();
93	>
94	>	# -- create a new toolbox object
95	>	my $toolbox=$self->areatoolbox($area);
96	>	$toolbox->searcher($self->_allprojectinitsearcher());
97	>
98	>	if ( @_ )
99	>	{
100	>	# -- specific tool specified
101	>	if ( my $rv=$toolbox->toolsetup(@_) )
102	>	{
103	>	if ( $rv eq 1 )
104	>	{
105	>	print "Unknown tool $toolname @ARGV\n";
106	>	exit 1;
107	>	}
108	>	}
109	>	}
110	>	else
111	>	{
112	>	# -- setup all tools specified in the requirements doc
113	>	print "Going to set up all tools....","\n\n";
114	>	my $reqs=$self->arearequirements($area);
115	>	$self->verbose("Setup ToolBox from Requirements doc ($reqs)");
116	>	# reqs is a BuildSystem::Requirements object:
117	>	$reqs->setup($toolbox);
118	>	}
119	>	}
120
121		sub satellite {
122		my $self=shift;
#	Line 294 | Line 301 | sub spawnversion
301		$ENV{SCRAM_HOME}=$self->{scram_top}."/".$version;
302		$ENV{TOOL_HOME}="$ENV{SCRAM_HOME}/src";
303		$self->verbose("Spawning SCRAM version $version");
304	<	#print "######### SCRAM version control: ";
298	<	#print "ARGS: ",@_,"\n\n";
304	>
305		my $rv=system("scram", @_)/256;
306		exit $rv;
307		}

Diff Legend

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