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 by williamc, Tue May 30 11:52:05 2000 UTC vs.
Revision 1.1.2.7.2.2.2.1.2.2 by williamc, Tue Oct 31 13:05:04 2000 UTC

# Line 21 | Line 21 | sub new {
21          my $self={};
22          bless $self,$class;
23          $self->{toolbox}=shift;
24 –        #$self->init();
24          return $self;
25   }
26  
28 – sub init {
29 –        my $self=shift;
30 –        $self->{toolbox}=BuildSystem::ToolBox->new($ENV{LOCALTOP});
31 – }
32 –
27   sub _generateexternals {
28          my $self=shift;
29          my $outfile=shift;
# Line 57 | Line 51 | sub _generateexternals {
51  
52            # -- print out tool/ version info
53            my ($tool,$toolobj,$f,$val,$version);
54 <          foreach $toolpair ( $self->{toolbox}->tools() ) {
55 <            $tool=$$toolpair[0];
62 <            $version=$$toolpair[1];
54 >          foreach $tool ( $self->{toolbox}->tools() ) {
55 >            $version=$self->{toolbox}->defaultversion($tool);
56              # default versions
57              print $fout "ifdef $tool\n".$tool."_V_".$version."=true\nendif\n";
58 <            $toolobj=$self->{toolbox}->gettool($tool,$version);
59 <            # -- externals
60 <            @deps=$toolobj->getfeature("_externals");
61 <            foreach $d ( @deps ) {
58 >            # -- set up the different version  -- externals
59 >            foreach $version ( $self->{toolbox}->versions($tool) ) {
60 >             $toolobj=$self->{toolbox}->gettool($tool,$version);
61 >             @deps=$toolobj->getfeature("_externals");
62 >             foreach $d ( @deps ) {
63                $d=~tr[A-Z][a-z];
64                print $fout "ifdef ".$tool."_V_".$version."\n $d=true\nendif\n";
65 <            }
66 <            # -- tool info
67 <            print $fout "ifdef ".$tool."_V_".$version."\n";
68 <            foreach $f ( $toolobj->features() ) {
65 >             }
66 >             # -- tool info
67 >             print $fout "ifdef ".$tool."_V_".$version."\n";
68 >             foreach $f ( $toolobj->features() ) {
69                foreach $val ( $toolobj->getfeature($f) ) {
70                  print $fout "\t".$f." += ".$val."\n";
71                }
72 +             }
73 +             print $fout "endif\n";
74              }
79 –            print $fout "endif\n";
75            }
76            # some addittional processing of specific vars
77            print $fout 'INCLUDEPATH+=$(addprefix -I,$(INCLUDE))'."\n";
# Line 165 | Line 160 | sub BuildSetup {
160        if ( $word=~/.*=.*/ ) { # if we have an assignment it cant be a target
161           $targetnumber--;
162        }
163 +      elsif ( $word=~/^-/ ) {
164 +         $targetnumber--;
165 +      }
166        else {
167          $ENV{"MAKETARGET_".$word}=$word;
168        }

Diff Legend

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