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.4 by williamc, Mon Aug 14 12:09:03 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 48 | Line 49 | sub project {
49          my $bs=Configuration::BootStrapProject->
50                          new($self->globalcache(),$installarea);
51          my $area=$bs->boot($url,$areaname);
52 +        $area->archname($self->arch());
53  
54          # -- download all tool description files
55          my $req=$self->arearequirements($area);
# Line 105 | Line 107 | sub satellite {
107  
108          # -- create satellite
109          my $area=$relarea->satellite($installarea,$areaname);
110 +        $area->archname($self->arch());
111  
112 <        # -- copy setup info
113 <        $relarea->copysetup($area->location());
112 >        # -- copy setup info - deprecated by toolbox copy method
113 >        #$relarea->copysetup($area->location());
114 >
115 >        # -- copy toolbox
116 >        my $rtb=$self->areatoolbox($relarea);
117 >        my $tb=$self->areatoolbox($area);
118 >        $rtb->copytools($tb);
119  
120          # -- copy configuration directory
121          if ( ! -d $area->location()."/".$area->configurationdir() ) {
# Line 204 | Line 212 | sub arearequirements {
212          return $self->{requirements}{$name};
213   }
214  
215 + sub arch {
216 +        my $self=shift;
217 +
218 +        @_?$self->{arch}=shift
219 +          :$self->{arch};
220 + }
221 +
222   # -------------- Support Routines ------------------------------
223  
224  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines