ViewVC Help

View File | Revision Log | Show Annotations | Root Listing

root/cvsroot/COMP/SCRAM/src/Configuration/ConfigArea.pm

Comparing COMP/SCRAM/src/Configuration/ConfigArea.pm (file contents):
Revision 1.24 by sashby, Wed Feb 2 11:10:17 2005 UTC vs.
Revision 1.37 by muzaffar, Fri Oct 14 14:11:42 2011 UTC

#	Line 1 | Line 1
1	–	#
2	–	# ConfigArea.pm
3	–	#
4	–	# Written by Christopher Williams
5	–	#
6	–	# Description
7	–	# -----------
8	–	# creates and manages a configuration area
9	–	#
10	–	# Notes
11	–	# -------
12	–	# Persistency - remember to call the save method to make changes persistent
13	–	#
14	–	# Interface
15	–	# ---------
16	–	# new()                         : A new ConfigArea object
17	–	# name()                        : get/set project name
18	–	# setup(dir[,areaname])         : setup a fresh area in dir
19	–	# satellite(dir[,areaname])     : setup a satellite area in dir
20	–	# version()                     : get/set project version
21	–	# location([dir])               : set/return the location of the work area
22	–	# bootstrapfromlocation([location]) : bootstrap the object based on location.
23	–	#                                     no location specified - cwd used
24	–	#                                     return 0 if succesful 1 otherwise
25	–	# requirementsdoc()             : get set the requirements doc
26	–	# searchlocation([startdir])    : returns the location directory. search starts
27	–	#                                 from cwd if not specified
28	–	# scramversion()                : return the scram version associated with
29	–	#                                 area
30	–	# configurationdir()            : return the location of the project
31	–	#                                 configuration directory
32	–	# copy(location)                : copy a configuration
33	–	# copysetup(location)           : copy the architecture specific tool setup
34	–	#                                 returns 0 if successful, 1 otherwise
35	–	# copyenv($ref)                 : copy the areas environment into the hashref
36	–	# toolbox()                     : return the areas toolbox object
37	–	# save()                        : save changes permanently
38	–	# linkto(location)              : link the current area to that at location
39	–	# unlinkarea()                  : destroy link (autosave)
40	–	# linkarea([ConfigArea])        : link the current area to the apec Area Object
41	–	# archname()            : get/set a string to indicate architecture
42	–	# archdir()             : return the location of the administration arch dep
43	–	#                         directory
44	–	# objectstore()         : return the objectStore object of the area
45	–	# - temporary
46	–	# align()                       : adjust hard paths to suit local loaction
47	–
1		package Configuration::ConfigArea;
2		require 5.004;
50	–	use URL::URLcache;
3		use Utilities::AddDir;
4		use Utilities::Verbose;
53	–	use ObjectUtilities::ObjectStore;
5		use Cwd;
6		@ISA=qw(Utilities::Verbose);
7
#	Line 58 | Line 9 | sub new {
9		my $class=shift;
10		my $self={};
11		bless $self, $class;
61	–
62	–	# data init
12		$self->{admindir}=".SCRAM";
13	<	$self->{cachedir}="cache";
14	<	$self->{dbdir}="ObjectDB";
66	<	$self->{tbupdate}=0;
67	<	undef $self->{linkarea};
68	<
13	>	$self->{configurationdir} = "config";
14	>	$self->archname($ENV{SCRAM_ARCH});
15		return $self;
16		}
17
72	–	sub cache {
73	–	my $self=shift;
74	–
75	–	if ( @_ ) {
76	–	$self->{cache}=shift;
77	–	}
78	–	if ( ! defined $self->{cache} ) {
79	–	my $loc=$self->location()."/".$self->{admindir}."/".$self->{cachedir};
80	–	if ( -e $loc  ) {
81	–	$self->{cache}=URL::URLcache->new($loc);
82	–	}
83	–	else {
84	–	$self->{cache}=undef;
85	–	}
86	–	}
87	–	return $self->{cache};
88	–	}
89	–
90	–	# Tool and project cache info:
91	–	sub cacheinfo
92	–	{
93	–	my $self=shift;
94	–	print "\n","<ConfigArea> cacheinfo: ToolCache = ",$self->{toolcachefile},
95	–	", ProjectCache = ",$self->{projectcachefile},"\n";
96	–	}
97	–
18		sub toolcachename
19		{
20		my $self=shift;
21	<	return ($self->location()."/".$self->{admindir}."/".$ENV{SCRAM_ARCH}."/ToolCache.db");
21	>	return ($self->archdir()."/ToolCache.db.gz");
22		}
23
24		sub projectcachename
25		{
26		my $self=shift;
27	<	return ($self->location()."/".$self->{admindir}."/".$ENV{SCRAM_ARCH}."/ProjectCache.db");
27	>	return ($self->archdir()."/ProjectCache.db.gz");
28		}
29
30	<	sub _tbupdate
111	<	{
112	<	# Update toolbox relative to new RequirementsDoc:
113	<	my $self=shift;
114	<	@_?$self->{tbupdate}=shift
115	<	:$self->{tbupdate};
116	<	}
117	<
118	<	sub _newcache {
30	>	sub symlinks {
31		my $self=shift;
32	<	my $loc=$self->location()."/".$self->{admindir}."/".$self->{cachedir};
33	<	$self->{cache}=URL::URLcache->new($loc);
122	<	return $self->{cache};
32	>	if (@_) {$self->{symlinks}=shift;}
33	>	return $self->{symlinks};
34		}
35
36	<	sub _newobjectstore {
37	<	my $self=shift;
38	<	my $loc=$self->location()."/".$self->{admindir}."/".$self->{dbdir};
39	<	$self->{dbstore}=ObjectUtilities::ObjectStore->new($loc);
40	<	return $self->{dbstore};
36	>	sub calchksum {
37	>	my $self=shift;
38	>	my $dir=$self->location()."/".$self->configurationdir();
39	>	push @INC,$dir;
40	>	require SCRAM::Plugins::ProjectChkSum;
41	>	my $sum=&SCRAM::Plugins::ProjectChkSum::chksum($dir);
42	>	pop @INC;
43	>	return $sum;
44		}
45
46	<	sub objectstore {
46	>	sub configchksum {
47		my $self=shift;
48	<
49	<	if ( @_ ) {
136	<	$self->{dbstore}=shift;
137	<	}
138	<	if ( ! defined $self->{dbstore} ) {
139	<	my $loc=$self->location()."/".$self->{admindir}."/".$self->{dbdir};
140	<	if ( -e $loc ) {
141	<	$self->{dbstore}=ObjectUtilities::ObjectStore->new($loc);
142	<	}
143	<	else {
144	<	$self->{dbstore}=undef;
145	<	}
146	<	}
147	<	return $self->{dbstore}
48	>	if (@_) {$self->{configchksum}=shift;}
49	>	return $self->{configchksum};
50		}
51
52	+
53		sub name {
54		my $self=shift;
55		@_?$self->{name}=shift
#	Line 162 | Line 65 | sub version {
65		sub setup {
66		my $self=shift;
67		my $location=shift;
68	<	my $areaname;
69	<
70	<	# -- check we have a project name and version
168	<	my $name=$self->name();
169	<	my $vers=$self->version();
170	<
171	<	if ( ( ! defined $name ) && ( ! defined $version )) {
172	<	$self->error("Set ConfigArea name and version before setup");
173	<	}
174	<
175	<	# -- check arguments and set location
176	<	if ( ! defined $location ) {
177	<	$self->error("ConfigArea: Cannot setup new area without a location");
178	<	}
179	<	if ( @_ ) {
180	<	$areaname=shift;
181	<	}
68	>	my $areaname=shift  || undef;
69	>	my $symlinks=shift  || 0;
70	>	my $locarea = shift || undef;
71		if ( (! defined $areaname) || ( $areaname eq "" ) ) {
72	<	# -- make up a name from the project name and version
184	<	$vers=~s/^$name\_//;
185	<	$areaname=$name."_".$vers;
72	>	$areaname=$self->version();
73		}
74	<	my $arealoc=$location."/".$areaname;
75	<	my $workloc=$arealoc."/".$self->{admindir};
76	<	$self->verbose("Building at $arealoc");
77	<	$self->location($arealoc);
78	<
79	<	# -- create top level structure and work area
80	<	AddDir::adddir($workloc);
81	<
82	<	# -- add a cache
83	<	$self->_newcache();
84	<
85	<	# -- add an Objectstore
86	<	$self->_newobjectstore();
87	<
88	<	# -- Save Environment File
89	<	$self->_SaveEnvFile();
90	<
74	>	$self->location($location."/".$areaname);
75	>	$self->symlinks($symlinks);
76	>	if ($self->configchksum() ne "")
77	>	{
78	>	if ((!-defined $locarea) && (-f "${location}/${areaname}/".$self->admindir()."/Environment"))
79	>	{
80	>	$locarea=Configuration::ConfigArea->new();
81	>	$locarea->bootstrapfromlocation("${location}/${areaname}");
82	>	}
83	>	if ((defined $locarea) && ($locarea->configchksum() != $self->configchksum()))
84	>	{
85	>	print "ERROR: Can not setup your current working area for SCRAM_ARCH:$ENV{SCRAM_ARCH}.\n",
86	>	"Your current development area ${location}/${areaname}\n",
87	>	"is using a different ${areaname}/config then the one used for\n",
88	>	$self->releasetop(),".\n";
89	>	exit 1;
90	>	}
91	>	}
92	>	Utilities::AddDir::adddir($self->archdir());
93		}
94
95		sub configurationdir {
#	Line 219 | Line 108 | sub sourcedir {
108		return (defined $self->{sourcedir})?$self->{sourcedir}:undef;
109		}
110
111	<	sub toolbox {
223	<	my $self=shift;
224	<	if ( ! defined $self->{toolbox} ) {
225	<	$self->{toolbox}=BuildSystem::ToolBox->new($self, $ENV{SCRAM_ARCH});
226	<	}
227	<	return $self->{toolbox};
228	<	}
229	<
230	<	sub toolboxversion {
231	<	my $self=shift;
232	<	if ( @_ ) {
233	<	$self->{toolboxversion}=shift;
234	<	}
235	<	return (defined $self->{toolboxversion})?$self->{toolboxversion}:undef;
236	<	}
237	<
238	<	sub requirementsdoc {
111	>	sub releasetop {
112		my $self=shift;
113		if ( @_ ) {
114	<	$self->{reqdoc}=shift;
242	<	}
243	<	if ( defined $self->{reqdoc} ) {
244	<	return $self->location()."/".$self->{reqdoc};
245	<	}
246	<	else {
247	<	return undef;
248	<	}
249	<	}
250	<
251	<	sub scramversion {
252	<	my $self=shift;
253	<	if ( ! defined $self->{scramversion} ) {
254	<	my $filename=$self->location()."/".$self->configurationdir()."/".
255	<	"scram_version";
256	<	if ( -f $filename ) {
257	<	use FileHandle;
258	<	$fh=FileHandle->new();
259	<	open ($fh, "<".$filename);
260	<	my $version=<$fh>;
261	<	chomp $version;
262	<	$self->{scramversion}=$version;
263	<	undef $fh;
264	<	}
114	>	$self->{releasetop}=shift;
115		}
116	<	return $self->{scramversion};
116	>	return (defined $self->{releasetop})?$self->{releasetop}:undef;
117		}
118
119	<	sub sitename
119	>	sub admindir()
120		{
121	<	###############################################################
272	<	# sitename()                                                  #
273	<	###############################################################
274	<	# modified : Mon Dec  3 15:45:35 2001 / SFA                   #
275	<	# params   :                                                  #
276	<	#          :                                                  #
277	<	#          :                                                  #
278	<	#          :                                                  #
279	<	# function : Read the site name from config/site/sitename and #
280	<	#          : export it.                                       #
281	<	#          :                                                  #
282	<	#          :                                                  #
283	<	###############################################################
284	<	my $self = shift;
285	<	my $sitefile = $self->location()."/".$self->configurationdir()."/site/sitename";
286	<
287	<	$self->{sitename} = 'CERN'; # Use CERN as the default site name
288	<
289	<	use FileHandle;
290	<	my $sitefh = FileHandle->new();
291	<
292	<	# Be verbose and print file we're going to read:
293	<	$self->verbose(">> Going to try to get sitename from: ".$sitefile." ");
294	<
295	<	# See if we can read from the file. If not, just
296	<	# use default site name:
297	<	open($sitefh,"<".$sitefile) ||
298	<	do
299	<	{
300	<	$self->verbose(">> Unable to read a site name definition file. Using \'CERN\' as the site name.");
301	<	return $self->{sitename};
302	<	};
303	<
304	<	$sitename = <$sitefh>;
305	<	chomp($sitename);
306	<	$self->{sitename} = $sitename;
121	>	my $self=shift;
122
123	<	# Close the file (be tidy!);
124	<	close($sitefile);
310	<	# Return:
311	<	return $self->{sitename};
123	>	@_ ? $self->{admindir} = shift
124	>	: $self->{admindir};
125		}
126
314	–
127		sub bootstrapfromlocation {
128		my $self=shift;
129	<
129	>	my $location = $self->searchlocation(shift);
130		my $rv=0;
131	<
320	<	my $location;
321	<	if ( ! defined ($location=$self->searchlocation(@_)) ) {
131	>	if ( ! defined $location) {
132		$rv=1;
323	–	$self->verbose("Unable to locate the top of local configuration area");
133		}
134		else {
135		$self->location($location);
327	–	$self->verbose("Found top ".$self->location());
136		$self->_LoadEnvFile();
137		}
138		return $rv;
#	Line 335 | Line 143 | sub location {
143
144		if ( @_ ) {
145		$self->{location}=shift;
146	+	$self->archname($ENV{SCRAM_ARCH});
147		}
148		elsif ( ! defined $self->{location} ) {
149		# try and find the release location
150		$self->{location}=$self->searchlocation();
151	+	if (defined $self->{location})
152	+	{
153	+	$self->archname($ENV{SCRAM_ARCH});
154	+	}
155		}
156		return  $self->{location};
157		}
#	Line 377 | Line 190 | sub searchlocation {
190		sub archname {
191		my $self=shift;
192		if ( @_ ) {
193	<	$self->{archname}=shift;
193	>	if (defined $self->{location}) {
194	>	$self->archdir($self->{location}."/".$self->{admindir}."/".$ENV{SCRAM_ARCH});
195	>	}
196		}
197	<	return $self->{archname};
197	>	return $ENV{SCRAM_ARCH};
198		}
199
200		sub archdir {
#	Line 387 | Line 202 | sub archdir {
202		if ( @_ ) {
203		$self->{archdir}=shift;
204		}
390	–	if ( ! defined $self->{archdir} ) {
391	–	if ( defined $self->{archname} ) {
392	–	$self->{archdir}=$self->location()."/".$self->{admindir}."/".
393	–	$self->{archname};
394	–	}
395	–	else {
396	–	$self->error("ConfigArea : cannot create arch directory - ".
397	–	"architecture name not set")
398	–	}
399	–	}
205		return $self->{archdir};
206		}
207
208		sub satellite {
209		my $self=shift;
210	<
406	<	# -- create the sat object
210	>	my $relloc = $self->location();
211		my $sat=Configuration::ConfigArea->new();
212		$sat->name($self->name());
213		$sat->version($self->version());
410	–	$sat->requirementsdoc($self->{reqdoc});
214		$sat->configurationdir($self->configurationdir());
215		$sat->sourcedir($self->sourcedir());
216	<	$sat->toolboxversion($self->toolboxversion());
216	>	$sat->releasetop($relloc);
217	>	$sat->configchksum($self->configchksum());
218		$sat->setup(@_);
219	<
220	<	# -- copy across the cache and ObjectStore
221	<	# -- make sure we dont try building new caches in release areas
222	<	my $rcache=$self->cache();
223	<	if ( defined $rcache ) {
224	<	copy($rcache->location(),$sat->cache()->location());
225	<	}
226	<
227	<	# -- make sure we dont try building new objectstores in release areas
228	<	my $rostore=$self->objectstore();
229	<	if ( defined $rostore ) {
230	<	copy($rostore->location(),$sat->objectstore()->location());
231	<	}
232	<
233	<	# and make sure in reinitialises
234	<	undef ($sat->{cache});
235	<
236	<	# -- link it to this area
433	<	$sat->linkarea($self);
434	<
435	<	# -- save it
436	<	$sat->save();
437	<
219	>	$self->copywithskip($self->archdir(),$sat->archdir(),["InstalledTools","ProjectCache.db.gz","RuntimeCache.db.gz","DirCache.db.gz","MakeData/DirCache","MakeData/DirCache.mk","MakeData/src.mk"]);
220	>	$envfile = $sat->archdir()."/Environment";
221	>	open ( $fh, "> $envfile" ) or  $sat->error("Cannot Open \"$envfile\" file to Save\n $!");
222	>	print $fh "RELEASETOP=$relloc\n";
223	>	close($fh);
224	>	my $devconf = $sat->location()."/".$sat->configurationdir();
225	>	my $relconf = $self->location()."/".$self->configurationdir();
226	>	if (!-d $devconf)
227	>	{
228	>	$self->copywithskip($relconf,$devconf,['toolbox']);
229	>	}
230	>	$envfile = $sat->location()."/".$self->{admindir}."/Environment";
231	>	if (! -f $envfile)
232	>	{
233	>	$sat->save ();
234	>	}
235	>	Utilities::AddDir::copydir("${relconf}/toolbox/$ENV{SCRAM_ARCH}","${devconf}/toolbox/$ENV{SCRAM_ARCH}");
236	>	Utilities::AddDir::adddir ($sat->location()."/".$sat->sourcedir());
237		return $sat;
238		}
239
441	–	sub copy {
442	–	my $self=shift;
443	–	my $destination=shift;
444	–
445	–	# copy across the admin dir
446	–	my $temp=$self->location()."/".$self->{admindir};
447	–	AddDir::copydir($temp,"$destination/".$self->{admindir});
448	–	}
449	–
450	–	sub align {
451	–	my $self=shift;
452	–	use File::Copy;
453	–
454	–	$self->_LoadEnvFile();
455	–	my $Envfile=$self->location()."/".$self->{admindir}."/Environment";
456	–	my $tmpEnvfile=$Envfile.".bak";
457	–	my $rel=$self->{ENV}{RELEASETOP};
458	–	my $local=$self->location();
459	–
460	–	rename( $Envfile, $tmpEnvfile );
461	–	use FileHandle;
462	–	my $fh=FileHandle->new();
463	–	my $fout=FileHandle->new();
464	–	open ( $fh, "<".$tmpEnvfile ) or
465	–	$self->error("Cannot find Environment file. Area Corrupted? ("
466	–	.$self->location().")\n $!");
467	–	open ( $fout, ">".$Envfile ) or
468	–	$self->error("Cannot find Environment file. Area Corrupted? ("
469	–	.$self->location().")\n $!");
470	–	while ( <$fh> ) {
471	–	$_=~s/\Q$rel\L/$local/g;
472	–	print $fout $_;
473	–	}
474	–	undef $fh;
475	–	undef $fout;
476	–	}
477	–
478	–	sub copysetup {
479	–	my $self=shift;
480	–	my $dest=shift;
481	–	my $rv=1;
482	–	# copy across the admin dir
483	–	my $temp=$self->location()."/".$self->{admindir}."/".$self->arch();
484	–	my $temp2=$dest."/".$self->{admindir}."/".$self->arch();
485	–	if ( $temp ne $temp2 ) {
486	–	if ( -d $temp ) {
487	–	AddDir::copydir($temp,$temp2);
488	–	$rv=0;
489	–	}
490	–	}
491	–	return $rv;
492	–	}
493	–
240		sub copywithskip {
241		my $self=shift;
242	<	my $dest=shift;
243	<	my ($filetoskip)=@_;
242	>	my $src=shift;
243	>	my $des=shift;
244	>	my $filetoskip=shift || [];
245		my $rv=1;
246	<	# copy across the admin dir
247	<	my $temp=$self->location()."/".$self->{admindir}."/".$self->arch();
248	<	my $temp2=$dest."/".$self->{admindir}."/".$self->arch();
249	<	if ( $temp ne $temp2 ) {
250	<	if ( -d $temp ) {
251	<	AddDir::copydirwithskip($temp,$temp2,$filetoskip);
252	<	$rv=0;
253	<	}
254	<	}
246	>	if ( $src ne $des )
247	>	{
248	>	if ( -d $src )
249	>	{
250	>	my $fs=[];
251	>	foreach my $f (@$filetoskip) {push @$fs,"${src}/${f}";}
252	>	Utilities::AddDir::copydirwithskip($src,$des,$fs);
253	>	$rv=0;
254	>	}
255	>	}
256		return $rv;
257		}
258
#	Line 522 | Line 270 | sub arch {
270		return $ENV{SCRAM_ARCH};
271		}
272
525	–	sub linkto {
526	–	my $self=shift;
527	–	my $location=shift;
528	–
529	–	if ( -d $location ) {
530	–	my $area=Configuration::ConfigArea->new();
531	–	$area->bootstrapfromlocation($location);
532	–	$self->linkarea($area);
533	–	}
534	–	else {
535	–	$self->error("ConfigArea : Unable to link to non existing directory ".
536	–	$location);
537	–	}
538	–	}
539	–
540	–	sub unlinkarea {
541	–	my $self=shift;
542	–	undef $self->{linkarea};
543	–	$self->{linkarea}=undef;
544	–	$self->save();
545	–	}
546	–
547	–	sub linkarea {
548	–	my $self=shift;
549	–	my $area=shift;
550	–	if ( defined $area ) {
551	–	$self->{linkarea}=$area;
552	–	}
553	–	return (defined $self->{linkarea} && $self->{linkarea} ne "")?
554	–	$self->{linkarea}:undef;
555	–	}
556	–
273		sub save {
274		my $self=shift;
275		$self->_SaveEnvFile();
#	Line 561 | Line 277 | sub save {
277
278		# ---- support routines
279
280	<	sub _SaveEnvFile {
281	<	my $self=shift;
282	<	use FileHandle;
283	<	my $fh=FileHandle->new();
284	<	open ( $fh, ">".$self->location()."/".$self->{admindir}."/".
285	<	"Environment" ) or
286	<	$self->error("Cannot Open Environment file to Save ("
571	<	.$self->location().")\n $!");
280	>	sub _SaveEnvFile
281	>	{
282	>	my $self=shift;
283	>
284	>	my $fh;
285	>	my $envfile = $self->location()."/".$self->{admindir}."/Environment";
286	>	open ( $fh, "> $envfile" ) or  $self->error("Cannot Open \"$envfile\" file to Save\n $!");
287
288	<	print $fh "SCRAM_PROJECTNAME=".$self->name()."\n";
289	<	print $fh "SCRAM_PROJECTVERSION=".$self->version()."\n";
290	<	print $fh "SCRAM_CONFIGDIR=".$self->configurationdir()."\n";
291	<	print $fh "SCRAM_SOURCEDIR=".$self->sourcedir()."\n";
292	<	print $fh "SCRAM_ProjReqsDoc=".$self->{reqdoc}."\n";
293	<	print $fh "SCRAM_TOOLBOXVERSION=".$self->{toolboxversion}."\n";
294	<	if ( defined $self->linkarea() ) {
295	<	my $area=$self->linkarea()->location();
296	<	if ( $area ne "" ) {
297	<	print $fh "RELEASETOP=".$area."\n";
298	<	}
299	<	}
585	<	undef $fh;
586	<	}
587	<
288	>	print $fh "SCRAM_PROJECTNAME=".$self->name()."\n";
289	>	print $fh "SCRAM_PROJECTVERSION=".$self->version()."\n";
290	>	print $fh "SCRAM_CONFIGDIR=".$self->configurationdir()."\n";
291	>	print $fh "SCRAM_SOURCEDIR=".$self->sourcedir()."\n";
292	>	print $fh "SCRAM_SYMLINKS=",$self->symlinks(),"\n";
293	>	print $fh "SCRAM_CONFIGCHKSUM=",$self->configchksum(),"\n";
294	>	close($fh);
295	>
296	>	# Set the default permissions (-rw-r--r--):
297	>	my $filemode = 0644;
298	>	chmod $filemode, $self->location()."/".$self->{admindir}."/Environment";
299	>	}
300
301		sub _LoadEnvFile
302		{
303		my $self=shift;
304
305	<	use FileHandle;
306	<	my $fh=FileHandle->new();
307	<	open ( $fh, "<".$self->location()."/".$self->{admindir}."/".
596	<	"Environment" ) or
597	<	$self->error("Cannot find Environment file. Area Corrupted? ("
598	<	.$self->location().")\n $!");
305	>	my $fh;
306	>	my $envfile = $self->location()."/".$self->{admindir}."/Environment";
307	>	open ( $fh, "< $envfile" ) or $self->error("Cannot open \"$envfile\" file for reading.\n $!");
308		while ( <$fh> )
309		{
310		chomp;
#	Line 604 | Line 313 | sub _LoadEnvFile
313		($name, $value)=split /=/;
314		eval "\$self->{ENV}{${name}}=\"$value\"";
315		}
316	<	undef $fh;
316	>	close($fh);
317	>	$envfile = $self->archdir()."/Environment";
318	>	if (-f $envfile)
319	>	{
320	>	open ( $fh, "< $envfile" ) or $self->error("Cannot open \"$envfile\" file for reading.\n $!");
321	>	while ( <$fh> )
322	>	{
323	>	chomp;
324	>	next if /^#/;
325	>	next if /^\s*$/ ;
326	>	($name, $value)=split /=/;
327	>	eval "\$self->{ENV}{${name}}=\"$value\"";
328	>	}
329	>	close($fh);
330	>	}
331
332		# -- set internal variables appropriately
333		if ( defined $self->{ENV}{"SCRAM_PROJECTNAME"} )
334		{
335		$self->name($self->{ENV}{"SCRAM_PROJECTNAME"});
336		}
337	+	if ( defined $self->{ENV}{"SCRAM_SYMLINKS"} )
338	+	{
339	+	$self->symlinks($self->{ENV}{"SCRAM_SYMLINKS"});
340	+	}
341	+	if ( defined $self->{ENV}{"SCRAM_CONFIGCHKSUM"} )
342	+	{
343	+	$self->configchksum($self->{ENV}{"SCRAM_CONFIGCHKSUM"});
344	+	}
345		if ( defined $self->{ENV}{"SCRAM_PROJECTVERSION"} )
346		{
347		$self->version($self->{ENV}{"SCRAM_PROJECTVERSION"});
#	Line 623 | Line 354 | sub _LoadEnvFile
354		{
355		$self->sourcedir($self->{ENV}{"SCRAM_SOURCEDIR"});
356		}
357	<	if ( defined $self->{ENV}{"SCRAM_ProjReqsDoc"} )
627	<	{
628	<	$self->requirementsdoc($self->{ENV}{"SCRAM_ProjReqsDoc"});
629	<	}
630	<	if ( defined $self->{ENV}{"SCRAM_TOOLBOXVERSION"} )
631	<	{
632	<	$self->toolboxversion($self->{ENV}{"SCRAM_TOOLBOXVERSION"});
633	<	}
634	<
635	<	if ( ( defined $self->{ENV}{"RELEASETOP"} ) &&
636	<	($self->{ENV}{"RELEASETOP"} ne $self->location()))
357	>	if ( defined $self->{ENV}{"RELEASETOP"} )
358		{
359	<	$self->linkto($self->{ENV}{"RELEASETOP"});
359	>	$self->releasetop($self->{ENV}{"RELEASETOP"});
360		}
361		}
362	+	1;

Diff Legend

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