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

Comparing COMP/SCRAM/src/BuildSystem/BuildSetup.pm (file contents):
Revision 1.1.2.7.2.1 by williamc, Mon Aug 14 15:03:07 2000 UTC vs.
Revision 1.1.2.7.2.2.2.1.2.1 by williamc, Thu Oct 26 09:57:51 2000 UTC

# Line 27 | Line 27 | sub new {
27  
28   sub init {
29          my $self=shift;
30 <        $self->{toolbox}=BuildSystem::ToolBox->new($ENV{LOCALTOP});
30 >        $self->{toolbox}=BuildSystem::ToolBox->new($ENV{LOCALTOP},
31 >                                                        $ENV{SCRAM_ARCH});
32   }
33  
34   sub _generateexternals {
# Line 57 | Line 58 | sub _generateexternals {
58  
59            # -- print out tool/ version info
60            my ($tool,$toolobj,$f,$val,$version);
60          #foreach $toolpair ( $self->{toolbox}->tools() ) {
61            foreach $tool ( $self->{toolbox}->tools() ) {
62            #$tool=$$toolpair[0];
62              $version=$self->{toolbox}->defaultversion($tool);
63              # default versions
64              print $fout "ifdef $tool\n".$tool."_V_".$version."=true\nendif\n";
# Line 168 | Line 167 | sub BuildSetup {
167        if ( $word=~/.*=.*/ ) { # if we have an assignment it cant be a target
168           $targetnumber--;
169        }
170 +      elsif ( $word=~/^-/ ) {
171 +         $targetnumber--;
172 +      }
173        else {
174          $ENV{"MAKETARGET_".$word}=$word;
175        }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines