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.13 by williamc, Mon Mar 13 10:23:19 2000 UTC vs.
Revision 1.23 by sashby, Fri Dec 10 13:41:40 2004 UTC

#	Line 1 | Line 1
1		#
2		# ConfigArea.pm
3		#
4	<	# Originally Written by Christopher Williams
4	>	# Written by Christopher Williams
5		#
6		# Description
7		# -----------
8		# creates and manages a configuration area
9		#
10	<	# Options
10	>	# Notes
11		# -------
12	<	# ConfigArea_location
13	<	# ConfigArea_name
12	>	# Persistency - remember to call the save method to make changes persistent
13		#
14		# Interface
15		# ---------
16	<	# new(ActiveConfig)             : A new ConfigArea object
17	<	# setup()                       : setup the configuration area
18	<	# location([dir])               : set/return the location of the area
19	<	# version([version])            : set/return the version of the area
20	<	# name([name])                  : set/return the name of the area
21	<	# store(location)               : store data in file location
22	<	# restore(location)             : restore data from file location
23	<	# meta()                        : return a description string of the area
24	<	# addconfigitem(url)            : add a new item to the area
25	<	# storeconfigobject(confiItemobj) : store a ready made ConfigItem in the local
27	<	#                                       area
28	<	# configitem(@keys)             : return a list of fig items that match
29	<	#                                 the keys - all if left blank
30	<	# parentstore()                 : set/return the parent ObjectStore
31	<	# basearea(ConfigArea)          : Set/Get the base area
32	<	# freebase()                    : Remove any link to a base area
33	<	# bootstrapfromlocation([location]): bootstrap the object based on location.
34	<	#                                 no location specified - cwd used
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	<	# defaultdirname()              : return the default directory name string
29	<	# copy(location)                : make a copy of the current area at the
30	<	#                                 specified location - defaults to cwd/default
31	<	#                                 if not specified . ConfigArea_name,
32	<	#                                 ConfigArea_location also override .
33	<	#                                 Return an object representing the area
34	<	# satellite()                   : make a satellite area based on $self
35	<	# arch([archobj])               : Set/get the architecture object
36	<	# structure(name)               : return the object corresponding to the
37	<	#                                 structure name
38	<	# structurelist()               : return list of structure objectS
39	<	# downloadtotop(dir,url)        : download the url to a dir in the config area
40	<	#
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
48		package Configuration::ConfigArea;
52	–	use ActiveDoc::ActiveDoc;
49		require 5.004;
50	+	use URL::URLcache;
51		use Utilities::AddDir;
52	+	use Utilities::Verbose;
53		use ObjectUtilities::ObjectStore;
56	–	use Configuration::ConfigStore;
57	–	use Configuration::ActiveDoc_arch;
54		use Cwd;
55	<	@ISA=qw(Configuration::ActiveDoc_arch ObjectUtilities::StorableObject);
55	>	@ISA=qw(Utilities::Verbose);
56
57	<	sub init {
58	<	my $self=shift;
59	<
60	<	$self->newparse("init");
65	<	$self->newparse("download");
66	<	$self->newparse("setup");
67	<	$self->newparse("setup_tools");
68	<	$self->addarchtags("setup_tools");
69	<	$self->addarchtags("setup");
70	<	$self->addtag("init","project",\&Project_Start,$self,
71	<	\&Project_text,$self,"", $self );
72	<	$self->addurltags("download");
73	<	$self->addtag("download","download",\&Download_Start,$self,
74	<	"", $self, "",$self);
75	<	$self->addtag("download","use",\&Use_download_Start,$self,
76	<	"", $self, "",$self);
77	<	$self->addurltags("setup");
78	<	$self->addurltags("setup_tools");
79	<	$self->addtag("setup_tools","use",\&Use_Start,$self, "", $self, "",$self);
80	<	$self->addtag("setup","structure",\&Structure_Start,$self,
81	<	"", $self, "",$self);
57	>	sub new {
58	>	my $class=shift;
59	>	my $self={};
60	>	bless $self, $class;
61
62		# data init
63	<	$self->{admindir}=".SCRAM";
63	>	$self->{admindir}=".SCRAM";
64	>	$self->{cachedir}="cache";
65	>	$self->{dbdir}="ObjectDB";
66	>	$self->{tbupdate}=0;
67	>	undef $self->{linkarea};
68	>
69	>	return $self;
70		}
71
72	<	sub basearea {
72	>	sub cache {
73		my $self=shift;
74
90	–	my $area;
75		if ( @_ ) {
76	<	$area=shift;
93	<	$self->config()->store($area,"BaseArea");
76	>	$self->{cache}=shift;
77		}
78	<	else {
79	<	($area)=$self->config()->find("BaseArea");
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 $area;
87	>	return $self->{cache};
88		}
89
90	<	sub freebase {
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	>
98	>	sub toolcachename
99	>	{
100	>	my $self=shift;
101	>	return ($self->location()."/".$self->{admindir}."/".$ENV{SCRAM_ARCH}."/ToolCache.db");
102	>	}
103	>
104	>	sub projectcachename
105	>	{
106	>	my $self=shift;
107	>	return ($self->location()."/".$self->{admindir}."/".$ENV{SCRAM_ARCH}."/ProjectCache.db");
108	>	}
109	>
110	>	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 {
119		my $self=shift;
120	<	$self->config()->delete("BaseArea");
120	>	my $loc=$self->location()."/".$self->{admindir}."/".$self->{cachedir};
121	>	$self->{cache}=URL::URLcache->new($loc);
122	>	return $self->{cache};
123		}
124
125	<	sub defaultdirname {
125	>	sub _newobjectstore {
126		my $self=shift;
127	<	my $name=$self->name();
128	<	my $vers=$self->version();
129	<	$vers=~s/^$name\_//;
111	<	$name=$name."_".$vers;
112	<	return $name;
127	>	my $loc=$self->location()."/".$self->{admindir}."/".$self->{dbdir};
128	>	$self->{dbstore}=ObjectUtilities::ObjectStore->new($loc);
129	>	return $self->{dbstore};
130		}
131
132	<
116	<	sub setup {
132	>	sub objectstore {
133		my $self=shift;
134
135	<	# --- find out the location - default is cwd
136	<	my $location=$self->option("ConfigArea_location");
121	<	if ( ! defined $location ) {
122	<	$location=cwd();
123	<	}
124	<	elsif ( $location!~/^\// ) {
125	<	$location=cwd()."/".$location;
135	>	if ( @_ ) {
136	>	$self->{dbstore}=shift;
137		}
138	<
139	<	# --- find area directory name , default name projectname_version
140	<	my $name=$self->option("ConfigArea_name");
141	<	if ( ! defined $name ) {
142	<	$name=$self->defaultdirname();
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	<	$self->location($location."/".$name);
134	<
135	<	# make a new store handler
136	<	$self->_setupstore();
137	<
138	<	# --- download everything first
139	<	$self->parse("download");
140	<
141	<	# --- and parse the setup file
142	<	$self->parse("setup");
143	<	$self->parse("setup_tools");
144	<
145	<	# --- store bootstrap info
146	<	$self->store($self->location()."/".$self->{admindir}."/ConfigArea.dat");
147	<
148	<	# --- store self in original database
149	<	$self->parentconfig()->store($self,"ConfigArea",$self->name(),
150	<	$self->version());
147	>	return $self->{dbstore}
148		}
149
150	<	sub structure {
150	>	sub name {
151		my $self=shift;
152	<	my $vr=shift;
153	<	return $self->{structures}{$vr};
152	>	@_?$self->{name}=shift
153	>	:$self->{name};
154		}
155
156	<	sub structurelist {
156	>	sub version {
157		my $self=shift;
158	<	return ( keys %{$self->{structures}} );
158	>	@_?$self->{version}=shift
159	>	:$self->{version};
160		}
161
162	<	sub _setupstore {
162	>	sub setup {
163		my $self=shift;
164	+	my $location=shift;
165	+	my $areaname;
166
167	<	# --- make a new ConfigStore at the location and add it to the db list
168	<	my $ad=Configuration::ConfigStore->new($self->location().
169	<	"/".$self->{admindir}, $self->arch());
170	<
171	<	$self->parentconfig($self->config());
172	<	#        $self->config(Configuration::ConfigureStore->new());
173	<	#        $self->config()->db("local",$ad);
174	<	#        $self->config()->db("parent",$self->parentconfig());
175	<	#        $self->config()->policy("cache","local");
176	<	$self->config($ad);
177	<	$self->config()->basedoc($self->parentconfig()->basedoc());
178	<	}
179	<
180	<	sub bootstrapfromlocation {
181	<	my $self=shift;
167	>	# -- check we have a project name and version
168	>	my $name=$self->name();
169	>	my $vers=$self->version();
170
171	<	if ( ! defined $self->location(@_) ) {
172	<	$self->error("Unable to locate the top of local configuration area");
171	>	if ( ( ! defined $name ) && ( ! defined $version )) {
172	>	$self->error("Set ConfigArea name and version before setup");
173		}
174	<	$self->verbose("Found top ".$self->location());
175	<	$self->_setupstore();
176	<	my $infofile=$self->location()."/".$self->{admindir}."/ConfigArea.dat";
177	<	if ( -e $infofile ) {
190	<	$self->restore($infofile);
174	>
175	>	# -- check arguments and set location
176	>	if ( ! defined $location ) {
177	>	$self->error("ConfigArea: Cannot setup new area without a location");
178		}
179	<	else {
180	<	$self->error("Area corrupted - cannot find $infofile");
179	>	if ( @_ ) {
180	>	$areaname=shift;
181		}
182	+	if ( (! defined $areaname) || ( $areaname eq "" ) ) {
183	+	# -- make up a name from the project name and version
184	+	$vers=~s/^$name\_//;
185	+	$areaname=$name."_".$vers;
186	+	}
187	+	my $arealoc=$location."/".$areaname;
188	+	my $workloc=$arealoc."/".$self->{admindir};
189	+	$self->verbose("Building at $arealoc");
190	+	$self->location($arealoc);
191	+
192	+	# -- create top level structure and work area
193	+	AddDir::adddir($workloc);
194	+
195	+	# -- add a cache
196	+	$self->_newcache();
197	+
198	+	# -- add an Objectstore
199	+	$self->_newobjectstore();
200	+
201	+	# -- Save Environment File
202	+	$self->_SaveEnvFile();
203	+
204		}
205
206	<	sub parentconfig {
206	>	sub configurationdir {
207		my $self=shift;
208	<	@_?$self->{parentconfig}=shift
209	<	:$self->{parentconfig};
208	>	if ( @_ ) {
209	>	$self->{configurationdir}=shift;
210	>	}
211	>	return (defined $self->{configurationdir})?$self->{configurationdir}:undef;
212		}
213
214	<	sub store {
214	>	sub sourcedir {
215		my $self=shift;
216	<	my $location=shift;
217	<
218	<	my $fh=$self->openfile(">".$location);
219	<	$self->savevar($fh,"location", $self->location());
209	<	$self->savevar($fh,"url", $self->url());
210	<	$self->savevar($fh,"name", $self->name());
211	<	$self->savevar($fh,"version", $self->version());
212	<	$fh->close();
213	<
214	<	$self->_storestructures();
216	>	if ( @_ ) {
217	>	$self->{sourcedir}=shift;
218	>	}
219	>	return (defined $self->{sourcedir})?$self->{sourcedir}:undef;
220		}
221
222	<	sub satellite {
222	>	sub toolbox {
223		my $self=shift;
224	<	my $newarea=$self->copy(@_);
225	<	$newarea->_makesatellites();
226	<	return $newarea;
224	>	if ( ! defined $self->{toolbox} ) {
225	>	$self->{toolbox}=BuildSystem::ToolBox->new($self, $ENV{SCRAM_ARCH});
226	>	}
227	>	return $self->{toolbox};
228		}
229
230	<	sub copy {
230	>	sub toolboxversion {
231		my $self=shift;
232	<	use File::Basename;
233	<	# create the area
232	>	if ( @_ ) {
233	>	$self->{toolboxversion}=shift;
234	>	}
235	>	return (defined $self->{toolboxversion})?$self->{toolboxversion}:undef;
236	>	}
237
238	<	my $destination;
238	>	sub requirementsdoc {
239	>	my $self=shift;
240		if ( @_ ) {
241	<	$destination=shift;
241	>	$self->{reqdoc}=shift;
242	>	}
243	>	if ( defined $self->{reqdoc} ) {
244	>	return $self->location()."/".$self->{reqdoc};
245		}
246		else {
247	<	my($location,$name)=$self->_defaultoptions();
235	<	$destination=$location."/".$name
247	>	return undef;
248		}
237	–	#AddDir::adddir(dirname($destination)."/".$self->{admindir});
238	–	#AddDir::adddir($destination."/".$self->{admindir});
239	–
240	–	# copy across the admin dir
241	–	$temp=$self->location()."/".$self->{admindir};
242	–	AddDir::copydir($temp,"$destination/".$self->{admindir});
243	–	# create a new object based on the new area
244	–	my $newarea=ref($self)->new($self->parentconfig());
245	–	$newarea->bootstrapfromlocation($destination);
246	–	# save it with the new location info
247	–	$newarea->store($self->location()."/".$self->{admindir}.
248	–	"/ConfigArea.dat");
249	–	return $newarea;
249		}
250
251	<	sub restore {
251	>	sub scramversion {
252		my $self=shift;
253	<	my $location=shift;
254	<
255	<	my $fh=$self->openfile("<".$location);
256	<	my $varhash={};
257	<	$self->restorevars($fh,$varhash);
258	<	if ( ! defined $self->location() ) {
259	<	$self->location($$varhash{"location"});
260	<	}
261	<	$self->_setupstore();
262	<	$self->url($$varhash{"url"});
263	<	$self->name($$varhash{"name"});
264	<	$self->version($$varhash{"version"});
265	<	$fh->close();
266	<
268	<	$self->_restorestructures();
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	>	}
265	>	}
266	>	return $self->{scramversion};
267		}
268
269	<	sub name {
270	<	my $self=shift;
269	>	sub sitename
270	>	{
271	>	###############################################################
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;
307	>
308	>	# Close the file (be tidy!);
309	>	close($sitefile);
310	>	# Return:
311	>	return $self->{sitename};
312	>	}
313
274	–	@_?$self->{name}=shift
275	–	:$self->{name};
276	–	}
314
315	<	sub version {
315	>	sub bootstrapfromlocation {
316		my $self=shift;
317
318	<	@_?$self->{version}=shift
319	<	:$self->{version};
318	>	my $rv=0;
319	>
320	>	my $location;
321	>	if ( ! defined ($location=$self->searchlocation(@_)) ) {
322	>	$rv=1;
323	>	$self->verbose("Unable to locate the top of local configuration area");
324	>	}
325	>	else {
326	>	$self->location($location);
327	>	$self->verbose("Found top ".$self->location());
328	>	$self->_LoadEnvFile();
329	>	}
330	>	return $rv;
331		}
332
333		sub location {
#	Line 297 | Line 345 | sub location {
345
346		sub searchlocation {
347		my $self=shift;
348	<
348	>
349		#start search in current directory if not specified
350		my $thispath;
351	<	@_?$thispath=shift
352	<	:$thispath=cwd();
353	<
351	>	if ( @_ ) {
352	>	$thispath=shift
353	>	}
354	>	else {
355	>	$thispath=cwd();
356	>	}
357	>
358		my $rv=0;
359
360	+	# chop off any files - we only want dirs
361	+	if ( -f $thispath ) {
362	+	$thispath=~s/(.*)\/.*/$1/;
363	+	}
364		Sloop:{
365		do {
366	<	#         print "Searching $thispath\n";
366	>	$self->verbose("Searching $thispath");
367		if ( -e "$thispath/".$self->{admindir} ) {
368	<	#           print "Found\n";
368	>	$self->verbose("Found\n");
369		$rv=1;
370		last Sloop;
371		}
372		} while ( ($thispath=~s/(.*)\/.*/$1/)=~/./ ) };
373	<
373	>
374		return $rv?$thispath:undef;
375		}
376
377	<	sub meta {
377	>	sub archname {
378		my $self=shift;
379	<
380	<	my $string=$self->name()." ".$self->version()." located at :\n  ".
381	<	$self->location;
379	>	if ( @_ ) {
380	>	$self->{archname}=shift;
381	>	}
382	>	return $self->{archname};
383		}
384
385	<	sub configitem {
385	>	sub archdir {
386		my $self=shift;
387	<
388	<	return ($self->config()->find("ConfigItem",@_));
387	>	if ( @_ ) {
388	>	$self->{archdir}=shift;
389	>	}
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	>	}
400	>	return $self->{archdir};
401		}
402
403	<	sub addconfigitem {
403	>	sub satellite {
404		my $self=shift;
336	–	my $url=shift;
405
406	<	my $docref=$self->activatedoc($url);
407	<	# Set up the document
408	<	$docref->setup();
409	<	$docref->save();
410	<	#       $self->config()->storepolicy("local");
411	<	}
406	>	# -- create the sat object
407	>	my $sat=Configuration::ConfigArea->new();
408	>	$sat->name($self->name());
409	>	$sat->version($self->version());
410	>	$sat->requirementsdoc($self->{reqdoc});
411	>	$sat->configurationdir($self->configurationdir());
412	>	$sat->sourcedir($self->sourcedir());
413	>	$sat->toolboxversion($self->toolboxversion());
414	>	$sat->setup(@_);
415	>
416	>	# -- copy across the cache and ObjectStore
417	>	# -- make sure we dont try building new caches in release areas
418	>	my $rcache=$self->cache();
419	>	if ( defined $rcache ) {
420	>	copy($rcache->location(),$sat->cache()->location());
421	>	}
422	>
423	>	# -- make sure we dont try building new objectstores in release areas
424	>	my $rostore=$self->objectstore();
425	>	if ( defined $rostore ) {
426	>	copy($rostore->location(),$sat->objectstore()->location());
427	>	}
428
429	<	sub storeconfigobject {
430	<	my $self=shift;
431	<	my $obj=shift;
432	<	$obj->save($self->config());
429	>	# and make sure in reinitialises
430	>	undef ($sat->{cache});
431	>
432	>	# -- link it to this area
433	>	$sat->linkarea($self);
434	>
435	>	# -- save it
436	>	$sat->save();
437	>
438	>	return $sat;
439		}
440
441	<	sub downloadtotop {
441	>	sub copy {
442		my $self=shift;
443	<	my $url=shift;
444	<	my $dir=shift;
445	<
446	<	# only download once
447	<	if ( ! -e $self->location()."/".$dir ) {
358	<	$self->{urlhandler}->download($url,$self->location()."/".$dir);
359	<	}
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 _makesatellites {
450	>	sub align {
451		my $self=shift;
452	<	foreach $st ( values %{$self->{structures}} ) {
453	<	$st->setupsatellite()
454	<	}
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 _storestructures {
478	>	sub copysetup {
479		my $self=shift;
480	<	foreach $struct ( values %{$self->{structures}} ) {
481	<	$self->config()->store($struct, "Structures", $struct->name());
480	>	my $dest=shift;
481	>
482	>	my $rv=1;
483	>	# copy across the admin dir
484	>	my $temp=$self->location()."/".$self->{admindir}."/".$self->arch();
485	>	my $temp2=$dest."/".$self->{admindir}."/".$self->arch();
486	>	if ( $temp ne $temp2 ) {
487	>	if ( -d $temp ) {
488	>	AddDir::copydir($temp,$temp2);
489	>	$rv=0;
490	>	}
491		}
492	+	return $rv;
493		}
494
495	<	sub _restorestructures {
495	>	sub copyenv {
496		my $self=shift;
497	<	my @strs=$self->config()->find("Structures");
498	<	foreach $struct ( @strs ) {
499	<	$struct->parent($self);
500	<	$self->{structures}{$struct->name()}=$struct;
497	>	my $hashref=shift;
498	>
499	>	foreach $elem ( keys %{$self->{ENV}} ) {
500	>	$$hashref{$elem}=$self->{ENV}{$elem};
501		}
502		}
503
504	<	sub _defaultoptions {
504	>	sub arch {
505		my $self=shift;
506	<	my $name;
388	<	my $location;
389	<
390	<	# --- find out the location - default is cwd
391	<	$location=$self->option("ConfigArea_location");
392	<	if ( ! defined $location ) {
393	<	$location=cwd();
394	<	}
395	<	elsif ( $location!~/^\// ) {
396	<	$location=cwd()."/".$location;
397	<	}
398	<
399	<	# --- find area directory name , default name projectname_version
400	<	$name=$self->option("ConfigArea_name");
401	<	if ( ! defined $name ) {
402	<	$name=$self->defaultdirname();
403	<	}
404	<	return ($location,$name);
506	>	return $ENV{SCRAM_ARCH};
507		}
406	–	# -------------- Tags ---------------------------------
407	–	# -- init parse
408	–	sub Project_Start {
409	–	my $self=shift;
410	–	my $name=shift;
411	–	my $hashref=shift;
508
509	<	$self->checktag($name,$hashref,'name');
510	<	$self->checktag($name,$hashref,'version');
509	>	sub linkto {
510	>	my $self=shift;
511	>	my $location=shift;
512
513	<	$self->name($$hashref{'name'});
514	<	$self->version($$hashref{'version'});
513	>	if ( -d $location ) {
514	>	my $area=Configuration::ConfigArea->new();
515	>	$area->bootstrapfromlocation($location);
516	>	$self->linkarea($area);
517	>	}
518	>	else {
519	>	$self->error("ConfigArea : Unable to link to non existing directory ".
520	>	$location);
521	>	}
522		}
523
524	<
421	<	sub Project_text {
524	>	sub unlinkarea {
525		my $self=shift;
526	<	my $name=shift;
527	<	my $string=shift;
528	<
426	<	print $string;
526	>	undef $self->{linkarea};
527	>	$self->{linkarea}=undef;
528	>	$self->save();
529		}
530
531	<	# ---- download parse
430	<
431	<	sub Download_Start {
531	>	sub linkarea {
532		my $self=shift;
533	<	my $name=shift;
534	<	my $hashref=shift;
535	<
436	<	$self->checktag($name,$hashref,'url');
437	<	$self->checktag($name,$hashref,'location');
438	<	if ( $$hashref{'location'}!~/^\w/ ) {
439	<	$self->parseerror("location must start with an".
440	<	" alphanumeric character");
533	>	my $area=shift;
534	>	if ( defined $area ) {
535	>	$self->{linkarea}=$area;
536		}
537	<	print "Downloading .... ".$$hashref{'url'}."\n";
538	<	$self->downloadtotop($$hashref{'url'},$$hashref{'location'});
537	>	return (defined $self->{linkarea} && $self->{linkarea} ne "")?
538	>	$self->{linkarea}:undef;
539		}
540
541	<	sub Use_download_Start {
541	>	sub save {
542		my $self=shift;
543	<	my $name=shift;
449	<	my $hashref=shift;
450	<
451	<	$self->checktag($name,$hashref,'url');
452	<	print "Downloading .... ".$$hashref{'url'}."\n";
453	<	$self->getfile($$hashref{'url'});
543	>	$self->_SaveEnvFile();
544		}
545
546	<	# --- setup parse
546	>	# ---- support routines
547
548	<	sub Structure_Start {
548	>	sub _SaveEnvFile {
549		my $self=shift;
550	<	my $name=shift;
551	<	my $hashref=shift;
552	<
553	<	$self->checktag($name,$hashref,'name');
554	<	if ( !(( exists $$hashref{'type'}) || ( exists $$hashref{'url'})) ) {
555	<	$self->parseerror("No url or type given in <$name> tag");
556	<	}
557	<	if ( ! exists $self->{structures}{$$hashref{'name'}} ) {
558	<	if ( exists $$hashref{'type'}) {
559	<	# create a new object of the specified type
560	<	eval "require $$hashref{'type'} ";
561	<	if  ( $@ ) {
562	<	$self->parseerror("Unable to instantiate type=".
563	<	$$hashref{'type'}." in <$name> .".$@);
564	<	}
565	<	$self->{structures}{$$hashref{'name'}}=
566	<	$$hashref{'type'}->new($self->config());
477	<	$self->{structures}{$$hashref{'name'}}->name($$hashref{'name'});
478	<	$self->{structures}{$$hashref{'name'}}->parent($self);
479	<	$self->{structures}{$$hashref{'name'}}->vars($hashref);
480	<	$self->{structures}{$$hashref{'name'}}->arch($self->arch());
481	<	}
482	<	else { # its an activedoc
483	<	$self->{structures}{$$hashref{'name'}}=
484	<	$self->activatedoc($$hashref{'url'});
550	>	use FileHandle;
551	>	my $fh=FileHandle->new();
552	>	open ( $fh, ">".$self->location()."/".$self->{admindir}."/".
553	>	"Environment" ) or
554	>	$self->error("Cannot Open Environment file to Save ("
555	>	.$self->location().")\n $!");
556	>
557	>	print $fh "SCRAM_PROJECTNAME=".$self->name()."\n";
558	>	print $fh "SCRAM_PROJECTVERSION=".$self->version()."\n";
559	>	print $fh "SCRAM_CONFIGDIR=".$self->configurationdir()."\n";
560	>	print $fh "SCRAM_SOURCEDIR=".$self->sourcedir()."\n";
561	>	print $fh "SCRAM_ProjReqsDoc=".$self->{reqdoc}."\n";
562	>	print $fh "SCRAM_TOOLBOXVERSION=".$self->{toolboxversion}."\n";
563	>	if ( defined $self->linkarea() ) {
564	>	my $area=$self->linkarea()->location();
565	>	if ( $area ne "" ) {
566	>	print $fh "RELEASETOP=".$area."\n";
567		}
486	–	$self->{structures}{$$hashref{'name'}}->setupbase();
487	–	}
488	–	else {
489	–	$self->parseerror("Multiply defined Structure - ".
490	–	$$hashref{'name'});
568		}
569	+	undef $fh;
570		}
571
494	–	sub Use_Start {
495	–	my $self=shift;
496	–	my $name=shift;
497	–	my $hashref=shift;
498	–
499	–	$self->checktag($name,$hashref,'url');
500	–	$self->addconfigitem($$hashref{'url'});
501	–	}
572
573	+	sub _LoadEnvFile
574	+	{
575	+	my $self=shift;
576	+
577	+	use FileHandle;
578	+	my $fh=FileHandle->new();
579	+	open ( $fh, "<".$self->location()."/".$self->{admindir}."/".
580	+	"Environment" ) or
581	+	$self->error("Cannot find Environment file. Area Corrupted? ("
582	+	.$self->location().")\n $!");
583	+	while ( <$fh> )
584	+	{
585	+	chomp;
586	+	next if /^#/;
587	+	next if /^\s*$/ ;
588	+	($name, $value)=split /=/;
589	+	eval "\$self->{ENV}{${name}}=\"$value\"";
590	+	}
591	+	undef $fh;
592	+
593	+	# -- set internal variables appropriately
594	+	if ( defined $self->{ENV}{"SCRAM_PROJECTNAME"} )
595	+	{
596	+	$self->name($self->{ENV}{"SCRAM_PROJECTNAME"});
597	+	}
598	+	if ( defined $self->{ENV}{"SCRAM_PROJECTVERSION"} )
599	+	{
600	+	$self->version($self->{ENV}{"SCRAM_PROJECTVERSION"});
601	+	}
602	+	if ( defined $self->{ENV}{"SCRAM_CONFIGDIR"} )
603	+	{
604	+	$self->configurationdir($self->{ENV}{"SCRAM_CONFIGDIR"});
605	+	}
606	+	if ( defined $self->{ENV}{"SCRAM_SOURCEDIR"} )
607	+	{
608	+	$self->sourcedir($self->{ENV}{"SCRAM_SOURCEDIR"});
609	+	}
610	+	if ( defined $self->{ENV}{"SCRAM_ProjReqsDoc"} )
611	+	{
612	+	$self->requirementsdoc($self->{ENV}{"SCRAM_ProjReqsDoc"});
613	+	}
614	+	if ( defined $self->{ENV}{"SCRAM_TOOLBOXVERSION"} )
615	+	{
616	+	$self->toolboxversion($self->{ENV}{"SCRAM_TOOLBOXVERSION"});
617	+	}
618	+
619	+	if ( ( defined $self->{ENV}{"RELEASETOP"} ) &&
620	+	($self->{ENV}{"RELEASETOP"} ne $self->location()))
621	+	{
622	+	$self->linkto($self->{ENV}{"RELEASETOP"});
623	+	}
624	+	}

Diff Legend

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