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

Comparing COMP/SCRAM/src/BuildSystem/BuildFile.pm (file contents):
Revision 1.1.2.6 by williamc, Fri Apr 14 14:15:23 2000 UTC vs.
Revision 1.1.2.10 by williamc, Fri May 26 08:35:59 2000 UTC

# Line 23 | Line 23 | sub new {
23          bless $self, $class;
24          $self->{toolbox}=shift;
25          $self->{Arch}=1;
26 <        push @{$self->{ARCHBLOCK}}, $Arch;
26 >        push @{$self->{ARCHBLOCK}}, $self->{Arch};
27          return $self;
28   }
29  
# Line 126 | Line 126 | sub ParseBuildFile {
126          use Utilities::AddDir;
127          AddDir::adddir("$ENV{LOCALTOP}/$ENV{INTwork}/$self->{path}");
128          my $fh=FileHandle->new();
129 <        open ( $fh, ">$ENV{LOCALTOP}/$ENV{INTwork}/$self->{path}/BuildFile.mk"
130 <          ) or die 'Unable to open /$ENV{INTwork}/$self->{path}/BuildFile.mk $!\n';
129 >        open ( $fh, ">$ENV{LOCALTOP}/$ENV{INTwork}/".$self->{path}."/BuildFile.mk"
130 >          ) or die 'Unable to open /$ENV{INTwork}/".$self->{path}."/BuildFile.mk $!\n';
131          @{$self->{filehandlestack}}=($fh);
132          # make an alias
133          *GNUmakefile=$fh;
# Line 136 | Line 136 | sub ParseBuildFile {
136          }
137   #       print "writing to :\n".
138   #               "$ENV{LOCALTOP}/$ENV{INTwork}/$self->{path}/BuildFile.mk\n";
139 <        $ENV{LatestBuildFile}="$ENV{LOCALTOP}/$ENV{INTwork}/$self->{path}/BuildFile.mk";
139 >        $ENV{LatestBuildFile}="$ENV{LOCALTOP}/$ENV{INTwork}/".$self->{path}."/BuildFile.mk";
140          $self->{switch}->parse("makebuild"); # sort out supported tags
141          if ( $numbins > 0 ) {
142           print GNUmakefile <<ENDTEXT;
# Line 492 | Line 492 | sub Use_start {
492          
493          $self->{switch}->checktag($name, $hashref, "name");
494          if ( $self->{Arch} ) {
495 +        if ( exists $$hashref{'group'} ) {
496 +          print GNUmakefile "GROUP_".$$hashref{'group'}."=true\n";
497 +        }
498          if ( ! defined $self->{remoteproject} ) {
499            $filename=SCRAMUtils::checkfile(
500                  "/$ENV{INTsrc}/$$hashref{name}/BuildFile");
# Line 550 | Line 553 | sub Arch_Start {
553          my $name=shift;
554          my $hashref=shift;
555  
556 <        $toolswitch->checktag($name, $hashref,'name');
556 >        $self->{switch}->checktag($name, $hashref,'name');
557          ( ($ENV{SCRAM_ARCH}=~/$$hashref{name}.*/) )? ($self->{Arch}=1)
558                                                  : ($self->{Arch}=0);
559          push @{$self->{ARCHBLOCK}}, $self->{Arch};

Diff Legend

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