ViewVC Help

View File | Revision Log | Show Annotations | Root Listing

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

Comparing COMP/SCRAM/src/BuildSystem/ToolDoc.pm (file contents):
Revision 1.3 by williamc, Mon Oct 23 12:56:03 2000 UTC vs.
Revision 1.10 by sashby, Tue Feb 19 17:43:28 2002 UTC

#	Line 28 | Line 28 | sub new {
28		bless $self, $class;
29		$self->{cache}=shift;
30		$self->{mydoctype}="BuildSystem::ToolDoc";
31	<	$self->{mydocversion}="1.0";
31	>	$self->{mydocversion}="1.1";
32		$self->init();
33		return $self;
34		}
#	Line 36 | Line 36 | sub new {
36		sub init {
37		my $self=shift;
38		$self->{switch}=ActiveDoc::SimpleDoc->new();
39	+	$self->{switch}->newparse("setupinit");
40	+	$self->{switch}->addtag("setupinit","Tool",\&Tool_Start, $self,
41	+	"", $self,
42	+	\&Tool_End, $self);
43	+	$self->{switch}->addtag("setupinit", "Architecture",
44	+	\&Arch_Start,$self,
45	+	"", $self,
46	+	\&Arch_End,$self);
47	+	$self->{switch}->addtag("setupinit","Environment",
48	+	\&Environment_init, $self,
49	+	"", $self,
50	+	"", $self);
51	+	$self->{switch}->grouptag("Tool","setupinit");
52	+
53		$self->{switch}->newparse("setup");
54		$self->{switch}->addtag("setup","Tool",\&Tool_Start, $self,
55		"", $self,
#	Line 53 | Line 67 | sub init {
67		\&Environment_Start, $self,
68		\&Env_text, $self,
69		\&Environment_End, $self);
70	+	$self->{switch}->addtag("setup","Makefile",
71	+	\&Makefile_Start, $self,
72	+	\&Makefile_text, $self,
73	+	\&Makefile_end, $self);
74		$self->{switch}->grouptag("Tool","setup");
75		$self->{switch}->addtag("setup","Architecture",
76		\&Arch_Start,$self,
#	Line 77 | Line 95 | sub tool {
95
96		sub toolsearcher {
97		my $self=shift;
98	+
99		if ( @_ ) {
100		my $searcher=shift;
101		if ( ! defined $searcher ) {
#	Line 93 | Line 112 | sub setup {
112		my $file=shift;
113		my $name=shift;
114		my $version=shift;
115	+	my $toolbox=shift;
116
117		$self->{ToolEnv}{'SCRAMtoolname'}=$name;
118		$self->{ToolEnv}{'SCRAMtoolversion'}=$version;
#	Line 105 | Line 125 | sub setup {
125		$self->{toolfound}=1;
126		# -- check the type of document - can we parse it?
127		my($doctype,$docversion)=$self->{switch}->doctype();
128	<	if ( ($doctype ne $self->{mydoctype}) ||
129	<	($self->{mydocversion} ne $docversion) ) {
128	>	if (($doctype ne $self->{mydoctype}) ||
129	>	(($self->{mydocversion} ne $docversion) && ($docversion ne "1.0")) ) {
130		$self->error("Unable to Parse Document of type $doctype $docversion".
131		"\n(Only ".$self->{mydoctype}." ". $self->{mydocversion}.")");
132		}
133	+	delete $self->{envcount};
134	+	$self->verbose("Pre-Parse");
135	+	$self->{switch}->parse("setupinit");
136	+	$self->{toolmakefile}=$toolbox->toolmakefile($name,$version);
137	+	$self->verbose("Setup Parse");
138		$self->{switch}->parse("setup");
139	+	undef $self->{toolmakefilefh};
140	+
141		return $self->{toolfound};
142		}
143
#	Line 141 | Line 168 | sub _checkdefault {
168		return 0;
169		}
170
171	<	sub _testlocation {
172	<	my $self=shift;
173	<	my $default=shift;
174	<	my $testfiles=shift;
175	<	my $OK='false';
176	<	my $file;
177	<
178	<	chomp $default;
179	<	$default=$self->_expandvars($default);
180	<	print "Trying $default .... ";
181	<	if ( -f $default ) {
182	<	$OK="true";
183	<	}
184	<	else {
185	<	my $fh=FileHandle->new();
186	<	opendir $fh,  $default or do { print "No \n"; return 0; };
187	<	($#{$testfiles}==-1) ? $OK='false' : $OK='true';
188	<	print "\n";
189	<	my @files=readdir $fh;
190	<	undef $fh;
191	<	foreach $file ( @$testfiles ) {
192	<	print "   Checking for $file .... ";
193	<	# now check that the required files are actually there
194	<	if ( ( $number = grep /\Q$file\L/, @files) == 0 ) {
195	<	$OK='false';
196	<	print "not found\n";
197	<	last;
198	<	}
199	<	print "found\n";
200	<	}
201	<	}
202	<	if ( $OK eq 'true' ) {
203	<	print "Directory Check Complete\n";
204	<	return 1
205	<	}
206	<	return 0
207	<	}
171	>	sub _testlocation
172	>	{
173	>	my $self=shift;
174	>	my $default=shift;
175	>	my $testfiles=shift;
176	>	my $OK='false';
177	>	my $file;
178	>	my $statusgood = $main::bold."OK".$main::normal;
179	>	my $statusbad = $main::bold."Not found".$main::normal;
180	>
181	>	chomp $default;
182	>	$default=$self->_expandvars($default);
183	>	$self->verbose("Testing location");
184	>
185	>	if ( -f $default )
186	>	{
187	>	$OK="true";
188	>	$self->verbose("File OK");
189	>	}
190	>	else
191	>	{
192	>	my $dh=DirHandle->new();
193	>
194	>	opendir $dh, $default or do
195	>	{
196	>	printf ("\nTrying %-s ...... >> %s <<\n",$default,$main::bold.$!.$main::normal);
197	>	return 0;
198	>	};
199	>
200	>	($#{$testfiles}==-1) ? $OK='false' : $OK='true';
201	>
202	>	my @files=readdir $dh;
203	>	undef $dh;
204	>
205	>	foreach $file ( @$testfiles )
206	>	{
207	>	# now check that the required files are actually there
208	>	if ( ( $number = grep /\Q$file\L/, @files) == 0 )
209	>	{
210	>	$OK='false';
211	>	$status = $statusbad;
212	>	last;
213	>	}
214	>	$status = $statusgood;
215	>
216	>	printf ("\t\tChecking for %-22s............ [%s]\n",$file,$status);
217	>	}
218	>	print "\n";
219	>	}
220	>
221	>	if ( $OK eq 'true' )
222	>	{
223	>	printf ("Existence check for %-30s ............ [%s]\n",$default.":",$statusgood);
224	>	return 1;
225	>	}
226	>
227	>	return 0;
228	>	}
229
230		sub _expandvars {
231		my $self=shift;
#	Line 209 | Line 257 | sub _askusermenu {
257		my $self=shift;
258		my $querystring=shift;
259		my @items=@_;
260	<
260	>
261		my $path=-1;
262	<	while ( ($path!~/^\d+$/) || ($path > $#items) || ($path < 0) ) {
262	>	my $n;
263	>	while ( ($path!~/^\d+$/) || ($path > ($#items+1)) || ($path < 1) ) {
264		for (my $i=0; $i<=$#items; $i++ ) {
265	<	print $i.") ".$items[$i]."\n";
265	>	$n=$i+1;
266	>	print $n.") ".$items[$i]."\n";
267		}
268		print "\n".$querystring;
269		$path=<STDIN>;
270		chomp $path;
271		}
272	+	$path--;
273		return $path;
274		}
275
276	<	sub _askuser {
277	<	my $self=shift;
278	<	my $querystring=shift;
279	<	my $varname=shift;
280	<
281	<	print $self->featuretext($self->{EnvContext});
282	<	for  ( ;; ) {
283	<	print "\n".$querystring." (RETURN to log as missing)\nset $varname = ";
284	<	$path=<STDIN>;
285	<	chomp $path;
286	<	if ( $path ne "" ) {
287	<	if ( defined $self->{'client'}) { # must be a location
288	<	if ( $self->_testlocation($path , "H", $Envtype{$type} )) {
289	<	return $path;
290	<	}
291	<	print "Error : ".$path." does not exist.\n";
292	<	next;
276	>	sub _askuser
277	>	{
278	>	###############################################################
279	>	# _askuser()                                                  #
280	>	###############################################################
281	>	# modified : Mon Nov 19 15:51:01 2001 / SFA                   #
282	>	# params   :                                                  #
283	>	#          :                                                  #
284	>	#          :                                                  #
285	>	#          :                                                  #
286	>	# function : Looks for valid path to tool, either using a     #
287	>	#          : default path, or by using the lookup table.      #
288	>	#          :                                                  #
289	>	#          :                                                  #
290	>	###############################################################
291	>	my $self=shift;
292	>
293	>	# First, check for interactive flag. If "on", call the original
294	>	# version of this routine:
295	>	if ( $self->{interactive} )
296	>	{
297	>	my $ipath=$self->_askuseri(@_);
298	>	return $ipath;
299	>	}
300	>
301	>	my $querystring=shift;
302	>	my $varname=shift;
303	>	my $lookupdb = $main::lookupobject;
304	>	my $type=$self->{tool}->type($varname);
305	>	my $path;
306	>	my $oldpath;
307	>	my $defaultpath = $lookupdb->lhcxxPath();
308	>
309	>	# Print the feature info:
310	>	print $self->featuretext($self->{EnvContext});
311	>
312	>	# Check if tool is listed in the lookupdb:
313	>	if ($lookupdb->checkTool(${$self->{tool}}{name}))
314	>	{
315	>	$self->verbose(">> Tool ${$self->{tool}}{name} exists in DB...");
316	>	# Check if $varname is a tag that's listed in our lookup table for this tool:
317	>	if ($lookupdb->lookupTag(${$self->{tool}}{name},$varname))
318	>	{
319	>	$self->verbose(">> Tag $varname is defined for tool ${$self->{tool}}{name}");
320	>	# Get the value for this tag:
321	>	$path = $lookupdb->lookupTag(${$self->{tool}}{name},$varname);
322		}
323	+	else
324	+	# No known tag for this tool so try the default path:
325	+	{
326	+	$path = $defaultpath;
327	+	}
328	+	}
329	+	# If the defaultpath is valid then try that:
330	+	elsif ( -d $defaultpath)
331	+	{
332	+	$path = $defaultpath;
333	+	}
334	+	# We'll have to ask the user:
335	+	else
336	+	{
337	+	# Infinite loop while there isn't a valid path:
338	+	for (;;)
339	+	{
340	+	print "\n".$querystring." (RETURN to log as missing)\nset $varname = ";
341	+	$path=<STDIN>;
342	+	chomp $path;
343	+	$oldpath=$path;
344	+
345	+	if ( $path ne "" )
346	+	{
347	+	($path)=$self->_validateparam($type,$path);
348	+	# If the path is not defined, print
349	+	# a message and repeat the prompt:
350	+	if ( ! defined $path )
351	+	{
352	+	print "Error : ".$oldpath." is not valid.\n";
353	+	next;
354	+	}
355	+	}
356	+	return $path;
357		}
358	<	else {
359	<	return $path;
358	>	}
359	>	return $path;
360	>	}
361	>
362	>
363	>	sub _askuseri
364	>	{
365	>	###############################################################
366	>	# _askuseri()                                                 #
367	>	###############################################################
368	>	# modified : Mon Nov 19 15:46:36 2001 / SFA                   #
369	>	# params   :                                                  #
370	>	#          :                                                  #
371	>	#          :                                                  #
372	>	#          :                                                  #
373	>	# function : Interactive version of askuser routine. Called   #
374	>	#          : when "-i" flag set in scramcli.                  #
375	>	#          :                                                  #
376	>	#          :                                                  #
377	>	###############################################################
378	>	my $self = shift;
379	>	my $querystring = shift;
380	>	my $varname = shift;
381	>
382	>	my $type=$self->{tool}->type($varname);
383	>	my $path;
384	>	my $oldpath;
385	>
386	>	print $self->featuretext($self->{EnvContext});
387	>
388	>	for  ( ;; )
389	>	{
390	>	print "\n".$querystring." (RETURN to log as missing)\nset $varname = ";
391	>	$path=<STDIN>;
392	>	chomp $path;
393	>	$oldpath=$path;
394	>
395	>	if ( $path ne "" )
396	>	{
397	>	($path)=$self->_validateparam($type,$path);
398	>	if ( ! defined $path )
399	>	{
400	>	print "Error : ".$oldpath." is not valid.\n";
401	>	next;
402	>	}
403		}
404	<	} #end for
405	<
404	>	return $path;
405	>	}
406	>	}
407	>
408	>
409	>	sub _validateparam {
410	>	my $self=shift;
411	>	my $type=shift;
412	>	my @params=@_;
413	>
414	>	my @newparams=();
415	>	foreach $param ( @params ) {
416	>	if ( defined $self->{'client'}) { # must be a location
417	>	if ( $self->_testlocation($param ,
418	>	[ $self->{tool}->getfeature($type)] )) {
419	>	$self->verbose("$param passed validation");
420	>	push @newparams,$param;
421	>	}
422	>	else {
423	>	$self->verbose("$param failed validation");
424	>	}
425	>	}
426	>	else {
427	>	# --- no other tests to pass so it must be OK
428	>	push @newparams,$param;
429	>	}
430	>	}
431	>	return @newparams;
432		}
433
434		#
#	Line 254 | Line 437 | sub _askuser {
437		sub _searchtools {
438		my $self=shift;
439		my $tool=shift;
440	+	my $searcher=shift;
441
442		my @tools=();
443		my $area;
444		my $rtool;
445	<	if ( defined $self->{toolboxsearcher} ) {
446	<	my $it=$self->{toolboxsearcher}->newiterator();
447	<	while ( ! $it->last()  ) {
445	>	my $it=$searcher->newiterator();
446	>
447	>	while ( ! $it->last()  ) {
448		$area=$it->next();
449		if ( defined $area ) {
450		$self->verbose("Searching for ".$tool->name()." ".
#	Line 276 | Line 460 | sub _searchtools {
460		.$rtool->version());
461		}
462		}
463	+	else {
464	+	$self->verbose("Tool Passed as Undefined");
465	+	}
466		}
467		else {
468		$self->verbose("Area passed is not defined");
469		}
283	–	}
470		}
471		return @tools;
472		}
#	Line 294 | Line 480 | sub _toolparamcopy {
480
481		my $rv=0;
482		my @params=();
483	+
484		$self->verbose("Check Other Projects for tool");
485	<	my @validtools=$self->_searchtools($tool);
486	<	if ( ! $self->interactive() ) {
487	<	if ( $#validtools >=0 ) {
485	>	my @validtools=();
486	>	if ( defined $self->{toolboxsearcher} ) {
487	>	@validtools=$self->_searchtools($tool,$self->{toolboxsearcher});
488	>	}
489	>	if ( $#validtools >=0 ) {
490	>	if ( ! $self->interactive() ) {
491		@params=$validtools[0]->getfeature($param);
492		if ( $#params >=0 ) {
493		$self->verbose("Extracting Feature $param from tool".
494		" (= @params )\n");
305	–	#$tool->setfeature($param,@params);
495		$rv=1;
496		}
497		}
#	Line 310 | Line 499 | sub _toolparamcopy {
499		return ($rv,@params);
500		}
501
502	+	sub _getparamsets {
503	+	my $self=shift;
504	+	my $tool=shift;
505	+	my $param=shift;
506	+
507	+	my @paramlist=();
508	+	my @params=();
509	+
510	+	# Check for an override of the searcher. If the
511	+	# variable SEARCHOVRD is set, we return an empty array:
512	+	if ( $ENV{'SEARCHOVRD'} eq 'true' )
513	+	{
514	+	$self->verbose("Searching for tool settings from other projects OVERRIDDEN");
515	+	# This bypasses the menu option presented to the user when there is more than one
516	+	# choice for the tool location:
517	+	return @paramlist;
518	+	}
519	+	# Otherwise we proceed as normal:
520	+	$self->verbose("Searching for parameter settings in other tools");
521	+	my @validtools=();
522	+	if ( defined $self->{toolboxsearcher} ) {
523	+	@validtools=$self->_searchtools($tool,$self->{toolboxsearcher});
524	+	}
525	+	else {
526	+	$self->verbose("No tool searcher available");
527	+	}
528	+	if ( $#validtools >=0 ) {
529	+	foreach $t ( @validtools ) {
530	+	@params=$t->getfeature($param);
531	+	if ( $#params >=0 ) {
532	+	push @paramlist, [ @params ];
533	+	$self->verbose("Found @params");
534	+	}
535	+	}
536	+	}
537	+	return @paramlist;
538	+	}
539	+
540		# -- Tag Routines
541
542		sub Client_start {
#	Line 363 | Line 590 | sub Tool_End {
590		$self->{switch}->closegroup("Toolactive");
591		}
592
593	<	sub Environment_Start {
593	>	sub Makefile_Start {
594		my $self=shift;
595	<	my $name=shift;
596	<	my $hashref=shift;
595	>	my $name=shift;
596	>	my $hashref=shift;
597
371	–	$self->{switch}->checktag($name, $hashref, 'name');
598		if ( $self->{Arch} ) {
599	<	if ( defined $self->{EnvContext} ) {
600	<	$self->parserror(" Attempted to open new <$name> context".
601	<	" without closing the previous one");
602	<	}
377	<	$self->{currentenvtext}="";
378	<	$self->{EnvContext}=$$hashref{'name'};
379	<	undef $self->{Envvalue};
380	<	if ( exists $$hashref{'type'} ) {
381	<	$$hashref{'type'}=~tr[A-Z][a-z];
382	<	$self->{tool}->type($$hashref{'name'},$$hashref{'type'});
383	<	}
384	<	if ( exists $$hashref{'value'}) {
385	<	$self->{Envvalue}=$$hashref{'value'};
386	<	}
387	<	elsif ( ! $self->interactive() ) {
388	<	# check other installed copies of the tool
389	<	my ($rv,@params)=
390	<	$self->_toolparamcopy($self->{tool},$$hashref{'name'});
391	<	if ( $rv && ($#params == 0)) { #dont use multivalued params!
392	<	# -- if default is OK as well ask user which one to choose
393	<	my $val=$params[0];
394	<	if ( $self->_checkdefault($hashref) ) {
395	<	# -- many options - just ask the user
396	<	my $expdef=$self->_expandvars($$hashref{'default'});
397	<	if ( $expdef ne $val ) {
398	<	my $in=$self->_askusermenu(
399	<	"Multiple possibilities found. Please Choose:",
400	<	($params[0],$expdef,"Other"));
401	<	if ( $in == 1 ) {
402	<	$val=$expdef;
403	<	}
404	<	elsif ( $in == 2 ) {
405	<	$val=$self->_askuser("Please Enter Value:",$$hashref{'name'});
406	<	}
407	<	}
408	<	}
409	<	$self->{Envvalue}=$val; # single val parameter
410	<	}
411	<	elsif ( defined $ENV{$$hashref{'name'}} ) {
412	<	# check the environment
413	<	$self->{Envvalue}=$ENV{$$hashref{'name'}};
414	<	}
415	<	elsif ( $self->_checkdefault($hashref) ) {
416	<	$self->{Envvalue}=$$hashref{'default'};
417	<	}
418	<	}
599	>	if ( ! defined $self->{toolmakefilefh} ) {
600	>	$self->{toolmakefilefh}=FileHandle->new();
601	>	$self->{toolmakefilefh}->open(">".$self->{toolmakefile});
602	>	}
603		}
604		}
605
606	<	sub Env_text {
606	>	sub Makefile_text {
607		my $self=shift;
608		my $name=shift;
609		my $string=shift;
610
611	<	if ( $self->{Arch} ) {
612	<	$self->{currentenvtext}=$self->{currentenvtext}.$string;
611	>	if ( $self->{Arch} ) {
612	>	print {$self->{toolmakefilefh}} $string;
613		}
614		}
615
616	<	sub Environment_End {
616	>	sub Makefile_end {
617		my $self=shift;
618	<	my $name=shift;
618	>	my $name=shift;
619	>	my $hashref=shift;
620	>
621	>	if ( $self->{Arch} ) {
622	>	print {$self->{toolmakefilefh}} "\n";
623	>	}
624	>	}
625
626	+	# -- collect number of variables of the same name - need to know how many
627	+	#    before main setup processing
628	+	sub Environment_init {
629	+	my $self=shift;
630	+	my $name=shift;
631	+	my $hashref=shift;
632	+
633	+	$self->{switch}->checktag($name, $hashref, 'name');
634		if ( $self->{Arch} ) {
635	<	if ( ! defined $self->{EnvContext} ) {
636	<	$self->{switch}->parseerror("</$name> without an opening context");
637	<	}
638	<	# - set the help text
639	<	$self->featuretext($self->{EnvContext},$self->{currentenvtext});
640	<	if ( ! defined $self->{Envvalue} ) {
641	<	$self->{Envvalue}=$self->_askuser("Please Enter the Value Below:",
642	<	$self->{EnvContext});
643	<	}
644	<	$self->{Envvalue}=$self->_expandvars($self->{Envvalue});
645	<	$self->{tool}->addfeature($self->{EnvContext}, $self->{Envvalue});
646	<	$self->{ToolEnv}{$self->{EnvContext}}=$self->{Envvalue};
647	<	undef $self->{EnvContext};
648	<	undef $self->{Envvalue};
635	>	if ( exists $self->{envcount}{$$hashref{'name'}} ) {
636	>	$self->{envcount}{$$hashref{'name'}}++;
637	>	}
638	>	else {
639	>	$self->{envcount}{$$hashref{'name'}}=0;
640	>	}
641	>	}
642	>	}
643	>
644	>	sub Environment_Start
645	>	{
646	>	my $self=shift;
647	>	my $name=shift;
648	>	my $hashref=shift;
649	>
650	>	$self->{switch}->checktag($name, $hashref, 'name');
651	>
652	>	if ( $self->{Arch} )
653	>	{
654	>	my $val=undef;
655	>	if ( defined $self->{EnvContext} )
656	>	{
657	>	$self->parserror(" Attempted to open new <$name> context".
658	>	" without closing the previous one");
659	>	}
660	>	# -- keep a counter of the number of times we see this variable
661	>	if ( exists $self->{EnvironmentCount}{$$hashref{'name'}} )
662	>	{
663	>	$self->{EnvironmentCount}{$$hashref{'name'}}++;
664	>	}
665	>	else
666	>	{
667	>	$self->{EnvironmentCount}{$$hashref{'name'}}=0;
668	>	}
669	>
670	>	$self->{currentenvtext}="";
671	>	$self->{EnvContext}=$$hashref{'name'};
672	>	undef $self->{Envvalue};
673	>
674	>	if ( exists $$hashref{'type'} )
675	>	{
676	>	$$hashref{'type'}=~tr[A-Z][a-z];
677	>	$self->{tool}->type($$hashref{'name'},$$hashref{'type'});
678	>	}
679	>	# check other installed copies of the tool
680	>	# -- construct a menu of options
681	>	my @menulist=();
682	>	# -- a value is fixed - unless interactive switch is on
683	>	if ( exists $$hashref{'value'})
684	>	{
685	>	$val=$$hashref{'value'};
686	>	if ( $self->interactive() )
687	>	{
688	>	unshift @menulist,$$hashref{'value'};
689	>	}
690	>	}
691	>	# -- add any default values to the selection
692	>	if ( ! defined $val )
693	>	{
694	>	if ( $self->_checkdefault($hashref) )
695	>	{
696	>	my $var=$self->_expandvars($$hashref{'default'});
697	>	if ( !grep { $_ eq $var }  @menulist )
698	>	{
699	>	unshift @menulist, $var;
700	>	}
701	>	}
702	>	# -- check the environment
703	>	if ( defined $ENV{$$hashref{'name'}} )
704	>	{
705	>	if ( !grep { $_ eq $ENV{$$hashref{'name'}}} @menulist )
706	>	{
707	>	unshift @menulist, $ENV{$$hashref{'name'}};
708	>	}
709	>	}
710	>	my @paramlist=$self->_getparamsets($self->{tool},
711	>	$$hashref{'name'});
712	>	foreach $p ( @paramlist )
713	>	{
714	>	# -- only add them if there are the same number of variables
715	>	if ( $#{$p} == $self->{envcount}{$$hashref{'name'}} )
716	>	{
717	>	if ( !grep {$_ eq $$p[$self->{EnvironmentCount}
718	>	{$$hashref{'name'}}] } @menulist)
719	>	{
720	>	push @menulist,$$p[$self->{EnvironmentCount}
721	>	{$$hashref{'name'}}];
722	>	}
723	>	}
724	>	else
725	>	{
726	>	$self->verbose("Ignoring tool params - not the same number".
727	>	" defined (".$#{$p}." != ".
728	>	$self->{envcount}{$$hashref{'name'}}.")");
729	>	}
730	>	}
731	>	if ( $#menulist >=0 )
732	>	{
733	>	print "Validating Values for Variable: ".$$hashref{'name'}."\n";
734	>	@menulist=$self->_validateparam($$hashref{'type'},@menulist);
735	>	}
736	>	print "\n";
737	>	# -- If theres only one option take it without asking
738	>	if ( $#menulist == 0 && ( ! $self->interactive() ))
739	>	{
740	>	$val=$menulist[0];
741	>	}
742	>	elsif ( $#menulist > 0 )
743	>	{
744	>	my $in=$self->_askusermenu(
745	>	"Multiple possibilities found for ".
746	>	$$hashref{'name'}." ( occurrance ".
747	>	($self->{EnvironmentCount}{$$hashref{'name'}}+1)." ) ".
748	>	"\nPlease Choose: ",
749	>	(@menulist,"Other"));
750	>	if ( $in <=$#menulist )
751	>	{
752	>	$val=$menulist[$in];
753	>	}
754	>	else
755	>	{
756	>	undef $val;
757	>	}
758	>	}
759	>	}
760	>	$self->{Envvalue}=$val; # single val parameter
761	>	}
762	>	}
763	>
764	>	sub Env_text {
765	>	my $self=shift;
766	>	my $name=shift;
767	>	my $string=shift;
768	>
769	>	if ( $self->{Arch} ) {
770	>	$self->{currentenvtext}=$self->{currentenvtext}.$string;
771		}
772		}
773
774	+	sub Environment_End
775	+	{
776	+	my $self=shift;
777	+	my $name=shift;
778	+
779	+	if ( $self->{Arch} )
780	+	{
781	+	if ( ! defined $self->{EnvContext} )
782	+	{
783	+	$self->{switch}->parseerror("</$name> without an opening context");
784	+	}
785	+	# - set the help text
786	+	$self->featuretext($self->{EnvContext},$self->{currentenvtext});
787	+
788	+	if ( ! defined $self->{Envvalue} )
789	+	{
790	+	$self->{Envvalue}=$self->_askuser("Please Enter the Value Below:",
791	+	$self->{EnvContext});
792	+	}
793	+
794	+	$self->{Envvalue}=$self->_expandvars($self->{Envvalue});
795	+	$self->{tool}->addfeature($self->{EnvContext}, $self->{Envvalue});
796	+	$self->{ToolEnv}{$self->{EnvContext}}=$self->{Envvalue};
797	+
798	+	# Undefine in time for next pass:
799	+	undef $self->{EnvContext};
800	+	undef $self->{Envvalue};
801	+	}
802	+	}
803	+
804		sub Lib {
805		my $self=shift;
806		my $name=shift;
#	Line 491 | Line 841 | sub Arch_End {
841		pop @{$self->{ARCHBLOCK}};
842		$self->{Arch}=$self->{ARCHBLOCK}[$#{$self->{ARCHBLOCK}}];
843		}
494	–
495	–

Diff Legend

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