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 by williamc, Mon Aug 14 15:35:18 2000 UTC

# Line 57 | Line 57 | sub _generateexternals {
57  
58            # -- print out tool/ version info
59            my ($tool,$toolobj,$f,$val,$version);
60 <          foreach $toolpair ( $self->{toolbox}->tools() ) {
61 <            $tool=$$toolpair[0];
62 <            $version=$$toolpair[1];
60 >          foreach $tool ( $self->{toolbox}->tools() ) {
61 >            $version=$self->{toolbox}->defaultversion($tool);
62              # default versions
63              print $fout "ifdef $tool\n".$tool."_V_".$version."=true\nendif\n";
64 <            $toolobj=$self->{toolbox}->gettool($tool,$version);
65 <            # -- externals
66 <            @deps=$toolobj->getfeature("_externals");
67 <            foreach $d ( @deps ) {
64 >            # -- set up the different version  -- externals
65 >            foreach $version ( $self->{toolbox}->versions($tool) ) {
66 >             $toolobj=$self->{toolbox}->gettool($tool,$version);
67 >             @deps=$toolobj->getfeature("_externals");
68 >             foreach $d ( @deps ) {
69                $d=~tr[A-Z][a-z];
70                print $fout "ifdef ".$tool."_V_".$version."\n $d=true\nendif\n";
71 <            }
72 <            # -- tool info
73 <            print $fout "ifdef ".$tool."_V_".$version."\n";
74 <            foreach $f ( $toolobj->features() ) {
71 >             }
72 >             # -- tool info
73 >             print $fout "ifdef ".$tool."_V_".$version."\n";
74 >             foreach $f ( $toolobj->features() ) {
75                foreach $val ( $toolobj->getfeature($f) ) {
76                  print $fout "\t".$f." += ".$val."\n";
77                }
78 +             }
79 +             print $fout "endif\n";
80              }
79            print $fout "endif\n";
81            }
82            # some addittional processing of specific vars
83            print $fout 'INCLUDEPATH+=$(addprefix -I,$(INCLUDE))'."\n";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines