ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/COMP/SCRAM/src/Scram/ScramFunctions.pm
(Generate patch)

Comparing COMP/SCRAM/src/Scram/ScramFunctions.pm (file contents):
Revision 1.1.2.3 by williamc, Fri Aug 11 10:54:14 2000 UTC vs.
Revision 1.1.2.6 by williamc, Mon Aug 21 18:41:52 2000 UTC

# Line 17 | Line 17
17   # scramprojectdb()              : return the scram project DB object
18   # areatoolbox(ConfigArea) : return the toolbox of the specified area
19   # setuptoolsinarea($area[,$toolname[,$toolversion[,toolfile]) : setup
20 + # arch()                : get/set the architecture string
21  
22   package Scram::ScramFunctions;
23   use URL::URLcache;
# Line 47 | Line 48 | sub project {
48          require Configuration::BootStrapProject;
49          my $bs=Configuration::BootStrapProject->
50                          new($self->globalcache(),$installarea);
51 +        $self->verbose("BootStrapping $url");
52          my $area=$bs->boot($url,$areaname);
53 +        if ( ! defined $area ) {
54 +                $self->error("Unable to create project area");
55 +        }
56 +        $area->archname($self->arch());
57  
58          # -- download all tool description files
59          my $req=$self->arearequirements($area);
# Line 105 | Line 111 | sub satellite {
111  
112          # -- create satellite
113          my $area=$relarea->satellite($installarea,$areaname);
114 +        $area->archname($self->arch());
115 +
116 +        # -- copy setup info - deprecated by toolbox copy method
117 +        #$relarea->copysetup($area->location());
118  
119 <        # -- copy setup info
120 <        $relarea->copysetup($area->location());
119 >        # -- copy toolbox
120 >        my $rtb=$self->areatoolbox($relarea);
121 >        my $tb=$self->areatoolbox($area);
122 >        $rtb->copytools($tb);
123  
124          # -- copy configuration directory
125          if ( ! -d $area->location()."/".$area->configurationdir() ) {
# Line 167 | Line 179 | sub scramprojectdb {
179          }
180          return $self->{scramprojectsdb};
181   }
182 <
182 >
183   sub areatoolbox {
184          my $self=shift;
185          my $area=shift;
# Line 192 | Line 204 | sub arearequirements {
204            require BuildSystem::Requirements;
205            my $doc=$area->requirementsdoc();
206            my $cache=$area->cache();
207 +          my $db=$area->objectstore();
208            $self->{requirements}{$name}=
209 <                BuildSystem::Requirements->new($doc,$cache);
209 >                BuildSystem::Requirements->new("file:".$doc,$cache,$db);
210            $self->{requirements}{$name}->verbosity($self->verbosity());
211            $self->verbose("Requirements Doc (".$self->{requirements}{$name}.
212                                    ") for area :\n $name\n initiated from $doc");
# Line 204 | Line 217 | sub arearequirements {
217          return $self->{requirements}{$name};
218   }
219  
220 + sub arch {
221 +        my $self=shift;
222 +
223 +        @_?$self->{arch}=shift
224 +          :$self->{arch};
225 + }
226 +
227   # -------------- Support Routines ------------------------------
228  
229  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines