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

Comparing COMP/SCRAM/src/Utilities/Architecture.pm (file contents):
Revision 1.2 by sashby, Fri Dec 10 13:41:43 2004 UTC vs.
Revision 1.3 by sashby, Fri Jul 1 15:23:36 2005 UTC

# Line 46 | Line 46 | sub arch()
46        : $self->{arch};
47     }
48  
49 + sub system_arch_stem()
50 +   {
51 +   my $self=shift;
52 +  
53 +   @_ ? $self->{archstem} = shift
54 +      : $self->{archstem};
55 +   }
56 +
57   # A subroutine to determine the architecture. This
58   # is done by parsing the architecture map contained as
59   # data inside SCRAM_SITE.pm and looking for an appropriate
# Line 84 | Line 92 | sub parse_architecture_map()
92              print "\n";
93              exit(1);
94              }
95 +        
96           # Store the match (only the *first* match in the case
97           # of multiple matches):
98           $self->arch($archstring);
99 +
100 +         # Also take the arch stem from the arch string. E.g. for a string
101 +         # "slc3_ia32_xxx", keep the "slc3_ia32" part:
102 +         if (my ($sysname,$cpuarch) = ($archstring =~ /(.*?)\_(.*?)\_.*?$/))
103 +            {
104 +            my $stem = $sysname."_".$cpuarch;
105 +            $self->system_arch_stem($stem);
106 +            }
107 +         else
108 +            {
109 +            # Just set the stem to be the same as the main arch string:
110 +            $self->system_arch_stem($archstring);
111 +            }
112           }
113        else
114           {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines