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.4 by williamc, Tue Sep 12 13:01:39 2000 UTC vs.
Revision 1.25 by sashby, Mon Nov 11 17:28:56 2002 UTC

# Line 2 | Line 2
2   #
3   # Interface
4   # ---------
5 < # new(ConfigArea)
5 > # new(toolbox)
6   # ParseBuildFile($base,$path,$file)
7   # ParseBuildFileExport(filename)
8   # BlockClassPath() : Return the class path
9   # ignore()      : return 1 if directory should be ignored 0 otherwise
10  
11   package BuildSystem::BuildFile;
12 + use Utilities::Verbose;
13   use ActiveDoc::SimpleDoc;
14   use BuildSystem::ToolBox;
15   require 5.004;
16 + @ISA=qw(Utilities::Verbose);
17  
18   BEGIN {
19   $buildfile="BuildFile";
# Line 21 | Line 23 | sub new {
23          my $class=shift;
24          my $self={};
25          bless $self, $class;
26 <        $self->{area}=shift;
25 <        $self->{toolbox}=$self->{area}->toolbox();
26 >        $self->{toolbox}=shift;
27          $self->{Arch}=1;
28          push @{$self->{ARCHBLOCK}}, $self->{Arch};
29          return $self;
# Line 30 | Line 31 | sub new {
31  
32   sub ignore {
33          my $self=shift;
34 +        $self->verbose(">> ignore......<<");
35 +        
36          return (defined $self->{ignore})?$self->{ignore}:0;
37   }
38  
# Line 37 | Line 40 | sub _initswitcher {
40          my $self=shift;
41          my $switch=ActiveDoc::SimpleDoc->new();
42          my $parse="makebuild";
43 +        $self->verbose(">> _initswitcher: <<");
44          $switch->newparse($parse);
45          $switch->addignoretags($parse);
46          $self->_commontags($switch,$parse);
# Line 49 | Line 53 | sub _initswitcher {
53                                          \&Bin_start,$self,
54                                          \&OutToScreen, $self,
55                                          "", $self);
56 +        $switch->addtag($parse,"Module",
57 +                                        \&Module_start,$self,
58 +                                        \&OutToScreen, $self,
59 +                                        "", $self);
60 +
61 +        $switch->addtag($parse,"ProductStore",
62 +                                        \&Store_start,$self,
63 +                                        "", $self,
64 +                                        "", $self);
65          $switch->addtag($parse,"LibType",
66                                          \&LibType_Start,$self,
67                                          \&LibType_text, $self,
# Line 76 | Line 89 | sub _initswitcher {
89          return $switch;
90   }
91  
92 < sub _commontags {
93 <        my $self=shift;
94 <        my $switch=shift;
95 <        my $parse=shift;
96 <
97 <        $switch->grouptag("Export",$parse);
98 <        $switch->addtag($parse,"Use",\&Use_start,$self,
99 <                                               \&OutToMakefile, $self,
100 <                                                "", $self);
101 <        $switch->addtag($parse,"Group",\&Group_start,$self,
102 <                                               \&OutToMakefile, $self,
103 <                                                "", $self);
104 <        $switch->grouptag("Group",$parse);
105 <        $switch->addtag($parse,"External",
106 <                                        \&External_StartTag,$self,
107 <                                        \&OutToMakefile, $self,
108 <                                        "", $self);
109 <        $switch->addtag($parse,"lib",
110 <                                        \&lib_start,$self,
111 <                                        \&OutToMakefile, $self,
112 <                                        "", $self);
113 <        $switch->addtag($parse,"Architecture",
114 <                                        \&Arch_Start,$self,
115 <                                        \&OutToMakefile, $self,
116 <                                        \&Arch_End,$self);
117 <        $switch->addtag($parse,"INCLUDE_PATH",
118 <                                        \&IncludePath_Start,$self,
119 <                                        \&OutToMakefile, $self,
120 <                                        "",$self);
121 <        return $switch;
122 < }
123 <
124 < sub GenerateMakefile {
125 <        my $self=shift;
126 <        my $infile=shift;
127 <        my $outfile=shift;
128 <
129 <        $self->{switch}=$self->_initswitcher();
130 <        $self->{switch}->filetoparse($infile);
131 <
132 <        # open a temporary gnumakefile to store output.
133 <        my $fh=FileHandle->new();
134 <        open ( $fh, ">$outfile") or die "Unable to open $outfile for output ".
122 <                                                                "$!\n";
123 <        @{$self->{filehandlestack}}=($fh);
124 <
125 <        #  -- make an alias
126 <        *GNUmakefile=$fh;
127 <        if ( -e $ENV{LatestBuildFile} ) {
128 <          print GNUmakefile "include $ENV{LatestBuildFile}\n";
129 <        }
130 <        $ENV{LatestBuildFile}=$outfile;
131 <        $self->{switch}->parse("makebuild"); # sort out supported tags
132 <        close GNUmakefile;
133 < }
92 > sub _commontags
93 >   {
94 >   my $self=shift;
95 >   my $switch=shift;
96 >   my $parse=shift;
97 >  
98 >   $self->verbose(">> _commontags: SW ".$switch." PARSE ".$parse." <<");
99 >  
100 >   $switch->grouptag("Export",$parse);
101 >   $switch->addtag($parse,"Use",
102 >                   \&Use_start,$self,
103 >                   \&OutToMakefile, $self,
104 >                   "", $self);
105 >   $switch->addtag($parse,"Group",
106 >                   \&Group_start,$self,
107 >                   \&OutToMakefile, $self,
108 >                   "", $self);
109 >   $switch->grouptag("Group",$parse);
110 >   $switch->addtag($parse,"External",
111 >                   \&External_StartTag,$self,
112 >                   \&OutToMakefile, $self,
113 >                   "", $self);
114 >   $switch->addtag($parse,"lib",
115 >                   \&lib_start,$self,
116 >                   \&OutToMakefile, $self,"", $self);
117 >   $switch->addtag($parse,"debuglib",
118 >                   \&debuglib_start,$self,
119 >                   \&OutToMakefile, $self,
120 >                   "", $self);
121 >   $switch->addtag($parse,"Architecture",
122 >                   \&Arch_Start,$self,
123 >                   \&OutToMakefile, $self,
124 >                   \&Arch_End,$self);
125 >   $switch->addtag($parse,"INCLUDE_PATH",
126 >                   \&IncludePath_Start,$self,
127 >                   \&OutToMakefile, $self,
128 >                   "",$self);
129 >   $switch->addtag($parse,"CompilerMap",
130 >                   \&CompilerMap_Start,$self,
131 >                   \&OutToMakefile, $self,
132 >                   "",$self);
133 >   return $switch;
134 >   }
135  
136   sub ParseBuildFile {
137          my $self=shift;
# Line 144 | Line 145 | sub ParseBuildFile {
145          else {
146           $fullfilename=$filename;
147          }
148 +
149 +        $self->verbose(">> ParseBuildFile: FN ".$fullfilename." <<");
150 +        
151          $self->{path}=$path;
148        #print "Processing $fullfilename\n";
152          $numbins=0;
153          $self->{envnum}=0;
154          $self->{envlevel}=0;
# Line 154 | Line 157 | sub ParseBuildFile {
157          $self->{switch}=$self->_initswitcher();
158          $self->{switch}->filetoparse($fullfilename);
159  
160 < #       $self->{switch}->{Strict_no_cr}='no';
158 <        #open a temporary gnumakefile to store output.
160 >        # open a temporary gnumakefile to store output.
161          use Utilities::AddDir;
162          AddDir::adddir("$ENV{LOCALTOP}/$ENV{INTwork}/$self->{path}");
163          my $fh=FileHandle->new();
164          open ( $fh, ">$ENV{LOCALTOP}/$ENV{INTwork}/".$self->{path}."/BuildFile.mk"
165 <          ) or die 'Unable to open /$ENV{INTwork}/".$self->{path}."/BuildFile.mk $!\n';
165 >          ) or die "Unable to open /$ENV{INTwork}/".$self->{path}."/BuildFile.mk $!\n";
166          @{$self->{filehandlestack}}=($fh);
167          # make an alias
168          *GNUmakefile=$fh;
169          if ( -e $ENV{LatestBuildFile} ) {
170            print GNUmakefile "include $ENV{LatestBuildFile}\n";
171          }
172 < #       print "writing to :\n".
171 < #               "$ENV{LOCALTOP}/$ENV{INTwork}/$self->{path}/BuildFile.mk\n";
172 >
173          $ENV{LatestBuildFile}="$ENV{LOCALTOP}/$ENV{INTwork}/".$self->{path}."/BuildFile.mk";
174          $self->{switch}->parse("makebuild"); # sort out supported tags
175          if ( $numbins > 0 ) {
# Line 194 | Line 195 | ENDTEXT
195   sub ParseBuildFile_Export {
196          my $self=shift;
197          my $filename=shift;
198 <        my $bf=BuildSystem::BuildFile->new($self->{area});
198 >
199 >        $self->verbose(">> ParseBuildFile_Export: FN ".$filename." <<");
200 >        
201 >        my $bf=BuildSystem::BuildFile->new($self->{toolbox});
202          if ( defined $self->{remoteproject} ) {
203             $bf->{remoteproject}=$self->{remoteproject};
204          }
# Line 205 | Line 209 | sub ParseBuildFile_Export {
209   sub _location {
210          my $self=shift;
211          use File::Basename;
212 <
212 >        $self->verbose(">> _location: <<");
213          return dirname($self->{switch}->filetoparse());
214   }
215  
216   sub _parseexport {
217          my $self=shift;
218          my $filename=shift;
219 <
219 >        $self->verbose(">> _parseexport: FN ".$filename." <<");
220 >        
221          my $switchex=ActiveDoc::SimpleDoc->new();
222          $switchex->filetoparse($filename);
223          $switchex->newparse("export");
# Line 223 | Line 228 | sub _parseexport {
228                                          \&export_end_export,$self);
229          $self->_commontags($switchex,"export");
230          $switchex->allowgroup("__export","export");
226 #       $switchex->{Strict_no_cr}='no';
231          $self->{switch}=$switchex;
232          $switchex->parse("export"); # sort out supported tags
233   }
# Line 231 | Line 235 | sub _parseexport {
235   sub _pushremoteproject {
236          my $self=shift;
237          my $path=shift;
238 +
239 +        $self->verbose(">> _pushremoteproject: PATH ".$path." <<");
240          
241          if ( defined $self->{remoteproject} ) {
242            push @{$self->{rpstack}}, $self->{remoteproject};
# Line 240 | Line 246 | sub _pushremoteproject {
246  
247   sub _popremoteproject {
248          my $self=shift;
249 +        $self->verbose(">> _popremoteproject:  <<");
250 +        
251          if ( $#{$self->{rpstack}} >=0 ) {
252            $self->{remoteproject}=pop @{$self->{rpstack}};
253          }
# Line 250 | Line 258 | sub _popremoteproject {
258  
259   sub _toolmapper {
260          my $self=shift;
261 +
262          if ( ! defined $self->{mapper} ) {
263             require BuildSystem::ToolMapper;
264             $self->{mapper}=BuildSystem::ToolMapper->new();
265          }
266 +        $self->verbose(">> _toolmapper: TM ".$self->{mapper}."<<");
267          return $self->{mapper};
268   }
269  
# Line 267 | Line 277 | sub Class_StartTag {
277          my $self=shift;
278          my $name=shift;
279          my $hashref=shift;
280 +
281 +        $self->verbose(">> Classs_StartTag: NM ".$name." <<");
282          
283          if ( $self->{Arch} ) {
284           if ( defined $$hashref{'type'} ) {
# Line 275 | Line 287 | sub Class_StartTag {
287          }
288   }
289  
290 < sub IncludePath_Start {
291 <        my $self=shift;
292 <        my $name=shift;
293 <        my $hashref=shift;
294 <
295 <        $self->{switch}->checktag( $name, $hashref, 'path');
296 <        if ( $self->{Arch} ) {
297 <          print GNUmakefile "INCLUDE+=".$self->_location()."/".
298 <                                                $$hashref{'path'}."\n";
299 <        }
300 < }
290 > sub IncludePath_Start
291 >   {
292 >   my $self=shift;
293 >   my $name=shift;
294 >   my $hashref=shift;
295 >  
296 >   $self->verbose(">> IncludePath_Start: NM ".$name." <<");
297 >  
298 >   $self->{switch}->checktag( $name, $hashref, 'path');
299 >   if ( $self->{Arch} )
300 >      {
301 >      print GNUmakefile "INCLUDE+=".$self->_location()."/".$$hashref{'path'}."\n";
302 >      }
303 >   }
304  
305   #
306   # generic build tag
# Line 295 | Line 310 | sub Build_start {
310          my $name=shift;
311          my $hashref=shift;
312  
313 +        $self->verbose(">> Build_start: NM ".$name." <<");
314 +        
315          $self->{switch}->checktag($name,$hashref,'class');
316          if ( $self->{Arch} ) {
317  
# Line 305 | Line 322 | sub Build_start {
322            }
323            else {
324              $self->{switch}->parseerror("No name specified for build product");
308            #$name="\$(buildname)";
325            }
326  
327            # -- check we have a lookup for the class type
# Line 345 | Line 361 | sub Build_start {
361              my $dirname=$$hashref{'class'}."_".$type."_".$name;
362              my $here="$ENV{LOCALTOP}/$ENV{INTwork}/".$self->{path}."/".$dirname;
363              my $makefile=$here."/BuildFile.mk";
348 #           AddDir::adddir($here);
364  
365              # -- create link targets to the directory
366              push @targets, $dirname;
# Line 377 | Line 392 | sub Build_start {
392              }
393              print $fh "\tfi\n";
394              print $fh "\n";
380 #           print $typefile "$name :\n";
381 #           print $typefile "\t\$(_quietbuild_)";
382 #           print $typefile $mapper->template($$hashref{'class'},$type)."\n";
383 #           print $typefile "\t\$(_quietstamp_)";
384 #           print $typefile "$(SCRAMPERL) $(SCRAM_HOME)/src/scramdatestamp \$@.ds \$@ \$^\n";
395  
396              # -- cleaning targets
397              push @targets, "clean_$dirname";
# Line 422 | Line 432 | sub Bin_start {
432          my $tool;
433          my $filename;
434          my $objectname;
435 +
436 +        $self->verbose(">>          <<");
437          
438          $self->{switch}->checktag($name,$hashref,'file');
439          if ( $self->{Arch} ) {
# Line 539 | Line 551 | ENDTEXT
551          print binGNUmakefile "$$hashref{name}_Insure.exe:.psrc\n";
552          print binGNUmakefile "$$hashref{name}_d.exe:$objectname_d\n";
553          print binGNUmakefile "\t\$(CClinkCmdDebug)\n";
554 <        print binGNUmakefile "\t\@\$(SCRAMPERL) $(SCRAM_HOME)/src/scramdatestamp \$\@\.ds \$\@ \$\^\n";
554 >        print binGNUmakefile "\t\@\$(SCRAMPERL) \$(SCRAM_HOME)/src/scramdatestamp \$\@\.ds \$\@ \$\^\n";
555          print binGNUmakefile "$$hashref{name}_l_d.exe:$objectname_d\n";
556          print binGNUmakefile "\t\$(CClinkCmdDebugLocal)\n";
557 <        print binGNUmakefile "\t\@\$(SCRAMPERL) $(SCRAM_HOME)/src/scramdatestamp \$\@\.ds \$\@ \$\^\n";
557 >        print binGNUmakefile "\t\@\$(SCRAMPERL) \$(SCRAM_HOME)/src/scramdatestamp \$\@\.ds \$\@ \$\^\n";
558          print binGNUmakefile "$$hashref{name}_Insure.exe:$objectname_Insure\n";
559          print binGNUmakefile "\t\$(CClinkCmdInsure)\n";
560 <        print binGNUmakefile "\t\@\$(SCRAMPERL) $(SCRAM_HOME)/src/scramdatestamp \$\@\.ds \$\@ \$\^\n";
560 >        print binGNUmakefile "\t\@\$(SCRAMPERL) \$(SCRAM_HOME)/src/scramdatestamp \$\@\.ds \$\@ \$\^\n";
561          print binGNUmakefile "$$hashref{name}_o.exe:$objectname_o\n";
562          print binGNUmakefile "\t\$(CClinkCmd)\n";
563 <        print binGNUmakefile "\t\@\$(SCRAMPERL) $(SCRAM_HOME)/src/scramdatestamp \$\@\.ds \$\@ \$\^\n";
563 >        print binGNUmakefile "\t\@\$(SCRAMPERL) \$(SCRAM_HOME)/src/scramdatestamp \$\@\.ds \$\@ \$\^\n";
564          print binGNUmakefile "$$hashref{name}.dep:$$hashref{file}\n";
565          print binGNUmakefile "-include $$hashref{name}.dep\n";
566   print binGNUmakefile <<ENDTEXT;
# Line 580 | Line 592 | ENDTEXT
592          close binGNUmakefile;
593   }
594  
595 + sub Module_start {
596 +        my $self=shift;
597 +        my $name=shift;
598 +        my $hashref=shift;
599 +
600 +        my $fileclass;
601 +        my @tools;
602 +        my $tool;
603 +        my $filename;
604 +        my $objectname;
605 +
606 +        $self->verbose(">> In module_start: ".$name." <<");
607 +        
608 +        $self->{switch}->checktag($name,$hashref,'file');
609 +        if ( $self->{Arch} ) {
610 +        if ( ! defined $$hashref{name} ) {
611 +                ($$hashref{name}=$$hashref{file})=~s/\..*//;
612 +        }
613 +        ($filename=$$hashref{file})=~s/\..*//;
614 +
615 +        # Create a new directory for each module target
616 +        my $dirname="module_".$$hashref{name};
617 +        AddDir::adddir("$ENV{LOCALTOP}/$ENV{INTwork}/".$self->{path}."/$dirname");
618 +        open (moduleGNUmakefile,
619 +           ">$ENV{LOCALTOP}/$ENV{INTwork}/".$self->{path}."/$dirname/BuildFile.mk") or die           "Unable to make $ENV{LOCALTOP}/$ENV{INTwork}/$self->{path}/$dirname/".
620 +           "BuildFile.mk $!\n";
621 +
622 +        # Create the link targets
623 +        $numbins++;
624 +        my $fh=$self->{filehandlestack}[0];
625 +        print $fh <<ENDTEXT;
626 +
627 + # Link Targets to module directories
628 + ifdef MODULEMODE
629 + # We dont want to build a library here
630 + override files:=
631 + endif
632 + ifndef MODULEMODE
633 +
634 + BINMODE=true
635 +  
636 + define stepdown_$$hashref{'name'}
637 + if [ -d "$ENV{LOCALTOP}/$ENV{INTwork}/$self->{path}/$dirname" ]; then \\
638 + cd $ENV{LOCALTOP}/$ENV{INTwork}/$self->{path}/$dirname; \\
639 + \$(MAKE) MODULEMODE=true LatestBuildFile=$ENV{LOCALTOP}/$ENV{INTwork}/$self->{path}/$dirname/BuildFile.mk workdir=\$(workdir)/$dirname -f \$(TOOL_HOME)/basics.mk datestamp \$\@; \\
640 + fi
641 + endef
642 +
643 + define stepdown2_$$hashref{'name'}
644 + if [ -d "$ENV{LOCALTOP}/$ENV{INTwork}/$self->{path}/$dirname" ]; then \\
645 + cd $ENV{LOCALTOP}/$ENV{INTwork}/$self->{path}/$dirname; \\
646 + \$(MAKE) MODULEMODE=true LatestBuildFile=$ENV{LOCALTOP}/$ENV{INTwork}/$self{path}/$dirname/BuildFile.mk workdir=\$(workdir)/$dirname -f \$(TOOL_HOME)/basics.mk datestamp \$\*; \\
647 + fi
648 +
649 + endef
650 +
651 + module_$$hashref{'name'}_%:: dummy
652 +        \@\$(stepdown2_$$hashref{'name'})
653 +
654 + $$hashref{'name'}_%:: dummy
655 +        \@\$(stepdown_$$hashref{'name'})
656 +
657 + help module module_debug module_debug_local module_insure module_Insure clean $$hashref{'name'}:: dummy
658 +        \@\$(stepdown_$$hashref{'name'})
659 +
660 + modulefiles+=$$hashref{'file'}
661 + locmodulefiles+=$dirname/$$hashref{'file'}
662 + endif
663 +
664 +
665 + ENDTEXT
666 +
667 +
668 + # the module specifics makefile
669 +        print moduleGNUmakefile "include ".$self->{currentenv}."\n";
670 +        print moduleGNUmakefile "VPATH+=$ENV{LOCALTOP}/$self{path}\n";
671 +
672 + # alias for bin_Insure
673 +        print moduleGNUmakefile <<ENDTEXT;
674 +
675 + module_insure:module_Insure
676 + ifdef MAKETARGET_module_insure
677 + MAKETARGET_$$hashref{name}_Insure=1
678 + endif
679 +
680 + # debuggging target
681 + $$hashref{'name'}_echo_% :: echo_%
682 +
683 + # help targets
684 + help::
685 + \t\@echo  
686 + \t\@echo Targets For $$hashref{'name'}
687 + \t\@echo -------------------------------------
688 + \t\@echo $$hashref{'name'}  - default build
689 + \t\@echo module_$$hashref{'name'}_clean - executable specific cleaning
690 + ENDTEXT
691 +
692 + # Make generic rules for each type
693 +        $targettypes={
694 +                "module" => 'o',
695 +                "module_debug" => 'd',
696 +                "module_debug_local" => 'l_d',
697 +                "module_Insure" => 'Insure'
698 +        };
699 +        #
700 +        foreach $target ( keys %$targettypes ) {
701 +          print moduleGNUmakefile <<ENDTEXT;
702 +
703 + # Type $target specifics
704 + ifdef MAKETARGET_$target
705 + MAKETARGET_$$hashref{name}_$$targettypes{$target}=1
706 + endif
707 + $target ::$$hashref{name}_$$targettypes{$target}
708 +
709 + moduletargets+=$$hashref{name}_$$targettypes{$target}
710 + help::
711 + \t\@echo $$hashref{name}_$$targettypes{$target}
712 + clean::
713 + \t\@if [ -f \$(modulestore)/$$hashref{name}_$$targettypes{$target} ]; then \\
714 + \techo Removing \$(modulestore)/$$hashref{name}; \\
715 + \trm \$(modulestore)/$$hashref{name}_$$targettypes{$target}; \\
716 + \tfi
717 +
718 + ENDTEXT
719 +          ($objectname=$$hashref{file})=~s/\..*/_$$targettypes{$target}\.o/;
720 +          ${"objectname_$$targettypes{$target}"}=$objectname;
721 +          print moduleGNUmakefile "$objectname:$$hashref{name}.dep\n";
722 +        } # end loop
723 +        print moduleGNUmakefile "MDFLAGS= -shared -Wl,-soname,\$\@","\n";
724 +        print moduleGNUmakefile "$$hashref{name}_Insure.so:.psrc\n";
725 +        print moduleGNUmakefile "$$hashref{name}_d.so:$objectname_d\n";
726 +        print moduleGNUmakefile "\t\$(CClinkCmdDebug) \$(MDFLAGS)\n";
727 +        print moduleGNUmakefile "\t\@\$(SCRAMPERL) \$(SCRAM_HOME)/src/scramdatestamp \$\@\.ds \$\@ \$\^\n";
728 +        print moduleGNUmakefile "$$hashref{name}_l_d.so:$objectname_d\n";
729 +        print moduleGNUmakefile "\t\$(CClinkCmdDebugLocal) \$(MDFLAGS)\n";
730 +        print moduleGNUmakefile "\t\@\$(SCRAMPERL) \$(SCRAM_HOME)/src/scramdatestamp \$\@\.ds \$\@ \$\^\n";
731 +        print moduleGNUmakefile "$$hashref{name}_Insure.so:$objectname_Insure\n";
732 +        print moduleGNUmakefile "\t\$(CClinkCmdInsure) \$(MDFLAGS)\n";
733 +        print moduleGNUmakefile "\t\@\$(SCRAMPERL) \$(SCRAM_HOME)/src/scramdatestamp \$\@\.ds \$\@ \$\^\n";
734 +        print moduleGNUmakefile "$$hashref{name}_o.so:$objectname_o\n";
735 +        print moduleGNUmakefile "\t\$(CClinkCmd) \$(MDFLAGS)\n";
736 +        print moduleGNUmakefile "\t\@\$(SCRAMPERL) \$(SCRAM_HOME)/src/scramdatestamp \$\@\.ds \$\@ \$\^\n";
737 +        print moduleGNUmakefile "$$hashref{name}.dep:$$hashref{file}\n";
738 +        print moduleGNUmakefile "-include $$hashref{name}.dep\n";
739 + print moduleGNUmakefile <<ENDTEXT;
740 + clean::
741 + \t\@if [ -f \$(modulestore)/lib$$hashref{name} ]; then \\
742 + \techo Removing \$(modulestore)/lib$$hashref{name}; \\
743 + \trm \$(modulestore)/lib$$hashref{name}; \\
744 + \tfi
745 +
746 +  
747 + $$hashref{name}_d.so:\$(libslocal_d)
748 + $$hashref{name}_o.so:\$(libslocal)
749 + ifdef MCCABE_DATA_DIR
750 + $$hashref{name}_mccabe.so: \$(libslocal_d) \$(MCCABE_DATA_DIR)/mccabeinstr/instplus.cpp
751 + endif
752 + $$hashref{name}_Insure.so:\$(libslocal_I)
753 + $$hashref{name}_d:$$hashref{name}_d.so
754 +        \@cp $$hashref{name}_d.so \$(modulestore)/lib$$hashref{name}
755 + $$hashref{name}_l_d:$$hashref{name}_l_d.so
756 +        \@cp $$hashref{name}_l_d.so \$(modulestore)/lib$$hashref{name}
757 + $$hashref{name}_Insure:$$hashref{name}_Insure.so
758 +        \@cp $$hashref{name}_Insure.so \$(modulestore)/lib$$hashref{name}_Insure
759 + $$hashref{name}:$$hashref{name}_d.so
760 +        \@mv $$hashref{name}_d.so \$(modulestore)/lib$$hashref{name}
761 + $$hashref{name}_o:$$hashref{name}_o.so
762 +        \@mv $$hashref{name}_o.so \$(modulestore)/lib$$hashref{name}.so
763 + modulefiles+=$$hashref{file}
764 + ENDTEXT
765 +        }
766 +        close moduleGNUmakefile;
767 + }
768 +
769 +
770   sub External_StartTag {
771          my $self=shift;
772          my $name=shift;
773          my $hashref=shift;
774 +
775 +        $self->verbose(">> External_StartTag: NM ".$name." <<");
776          
777          my $tool;
778          if ( $self->{Arch} ) {
# Line 637 | Line 826 | sub Group_start {
826          my $name=shift;
827          my $hashref=shift;
828          
829 +        $self->verbose(">> Group_start: NM ".$name." <<");
830 +        
831          $self->{switch}->checktag($name, $hashref, 'name');
832          if ( $self->{Arch} ) {
833          print GNUmakefile "GROUP_".$$hashref{'name'};
# Line 647 | Line 838 | sub Group_start {
838          }
839   }      
840  
841 < sub Use_start {
842 <        my $self=shift;
843 <        my $name=shift;
844 <        my $hashref=shift;
845 <        my $filename;
846 <        use Utilities::SCRAMUtils;
847 <        
848 <        $self->{switch}->checktag($name, $hashref, "name");
849 <        if ( $self->{Arch} ) {
850 <        if ( exists $$hashref{'group'} ) {
851 <          print GNUmakefile "GROUP_".$$hashref{'group'}."=true\n";
852 <        }
853 <        if ( ! defined $self->{remoteproject} ) {
854 <          $filename=SCRAMUtils::checkfile(
855 <                "/$ENV{INTsrc}/$$hashref{name}/BuildFile");
856 <        }
857 <        else {
858 <          $filename=$self->{remoteproject}."/$$hashref{name}/BuildFile";
859 <        print "trying $filename\n";
860 <          if ( ! -f $filename ) { $filename=""; };
861 <        }
862 <        if ( $filename ne "" ) {
863 <          $self->ParseBuildFile_Export( $filename );
864 <        }
865 <        else {
866 <           $self->{switch}->parseerror("Unable to detect Appropriate ".
867 <                "decription file for <$name name=".$$hashref{name}.">");
868 <        }
869 <        }
870 < }
841 > sub Use_start
842 >   {
843 >   my $self=shift;
844 >   my $name=shift;
845 >   my $hashref=shift;
846 >   my $filename;
847 >   use Utilities::SCRAMUtils;
848 >
849 >   $self->verbose(">> Use_start: NM ".$name." <<");
850 >  
851 >   $self->{switch}->checktag($name, $hashref, "name");
852 >   if ( $self->{Arch} )
853 >      {
854 >      if ( exists $$hashref{'group'} )
855 >         {
856 >         print GNUmakefile "GROUP_".$$hashref{'group'}."=true\n";
857 >         }
858 >      if ( ! defined $self->{remoteproject} )
859 >         {
860 >         $filename=SCRAMUtils::checkfile("/$ENV{INTsrc}/$$hashref{name}/BuildFile");
861 >         }
862 >      else
863 >         {
864 >         $filename=$self->{remoteproject}."/$$hashref{name}/BuildFile";
865 >         # Not sure how useful this statement is, so I'll remove it for now:
866 >         # print STDERR "Trying $filename\n";
867 >         if ( ! -f $filename ) { $filename=""; };
868 >         }
869 >      if ( $filename ne "" )
870 >         {
871 >         $self->ParseBuildFile_Export( $filename );
872 >         }
873 >      else
874 >         {
875 >         $self->{switch}->parseerror("Unable to detect Appropriate ".
876 >                                     "decription file for <$name name=".$$hashref{name}.">");
877 >         }
878 >      }
879 >   }
880  
881   sub CheckBuildFile {
882           my $self=shift;
883           my $classdir=shift;
884           my $ClassName="";
885           my $thisfile="$classdir/$buildfile";
886 <
886 >        
887           if ( -e $ENV{LOCALTOP}."/".$thisfile ) {
888              $DefaultBuildfile="$ENV{LOCALTOP}/$thisfile";
889              $self->ParseBuildFile($ENV{LOCALTOP}, $classdir, $buildfile);
# Line 692 | Line 892 | sub CheckBuildFile {
892              $DefaultBuildfile="$ENV{RELEASETOP}/$thisfile";
893              $self->ParseBuildFile($ENV{RELEASETOP}, $classdir, $buildfile);
894           }
895 +         $self->verbose(">> CheckBuildFile: FN ".$thisfile." CN ".$ClassName." <<");
896           return $ClassName;
897   }
898  
# Line 703 | Line 904 | sub AssociateGroup {
904          my $string=shift;
905          my $word;
906  
907 +        $self->verbose(">> AssociateGroup: NM ".$name." ST ".$string." <<");
908 +        
909          if ( $self->{Arch} ) {
910          foreach $word ( (split /\s/, $string) ){
911                  chomp $word;
# Line 714 | Line 917 | sub AssociateGroup {
917          }
918   }
919  
920 < sub Arch_Start {
921 <        my $self=shift;
922 <        my $name=shift;
923 <        my $hashref=shift;
924 <
925 <        $self->{switch}->checktag($name, $hashref,'name');
926 <        ( ($ENV{SCRAM_ARCH}=~/$$hashref{name}.*/) )? ($self->{Arch}=1)
927 <                                                : ($self->{Arch}=0);
928 <        push @{$self->{ARCHBLOCK}}, $self->{Arch};
929 < }
920 > sub Arch_Start
921 >   {
922 >   my $self=shift;
923 >   my $name=shift;
924 >   my $hashref=shift;
925 >  
926 >   $self->verbose(">> Arch_Start: NM ".$name." <<");
927 >  
928 >   $self->{switch}->checktag($name, $hashref,'name');
929 >  
930 > #   if ($ENV{SCRAM_ARCH} =~ /$$hashref{name}$/)
931 >   if ( $$hashref{name} eq $ENV{SCRAM_ARCH} )
932 >      {
933 > #      print "HASHREFNAME= ",$$hashref{name},"\n";     # The tag read from BuildFile
934 > #      print "Scram arch()? ",$ENV{SCRAM_ARCH},"\n";   # Also SCRAM_ARCH
935 >      $self->{Arch}=1;
936 >      }
937 >   else
938 >      {
939 >      $self->{Arch}=0;
940 >      }
941 > #   ( ($ENV{SCRAM_ARCH}=~/$$hashref{name}.*/) )? ($self->{Arch}=1)
942 > #      : ($self->{Arch}=0);
943 >  
944 >   $self->verbose(($self->{Arch}?"OK":"skipping")." ".$$hashref{name});
945 >   push @{$self->{ARCHBLOCK}}, $self->{Arch};
946 >   }
947  
948   sub Arch_End {
949          my $self=shift;
950          my $name=shift;
951 +        
952 +        $self->verbose(">> Arch_End: NM ".$name." <<");
953  
954 <        pop @{$self->{ARCHBLOCK}};
954 >        pop @{$self->{ARCHBLOCK}};
955          $self->{Arch}=$self->{ARCHBLOCK}[$#{$self->{ARCHBLOCK}}];
956   }
957  
# Line 737 | Line 959 | sub Arch_End {
959   sub _CutBlock {
960      my $self=shift;
961      my $string= shift @_;
962 +
963 +    $self->verbose(">> _CutBlock: ST ".$string." <<");
964 +    
965      @BlockClassA = split /\//, $string;
966   }
967  
# Line 744 | Line 969 | sub OutToMakefile {
969          my $self=shift;
970          my $name=shift;
971          my @vars=@_;
972 +        
973 +        $self->verbose(">> OutToMakefile: <<");
974  
975          if ( $self->{Arch} ) {
976 +          $self->verbose(">> CONT: ".$#vars." lines <<");
977            print GNUmakefile @vars;
978          }
979   }
# Line 753 | Line 981 | sub OutToMakefile {
981   sub OutToScreen {
982          my $name=shift;
983          my @vars=@_;
984 <
984 >        
985          if ( $self->{Arch} ) {
986            print @vars;
987          }
# Line 763 | Line 991 | sub setBlockClassPath {
991          my $name=shift;
992          my $hashref=shift;
993  
994 +        $self->verbose(">> setBlockClassPath: NM ".$name." <<");
995 +        
996          $self->{switch}->checktag($name, $hashref, 'path');
997          $self->{BlockClassPath}=$self->{BlockClassPath}.":".$$hashref{path};
998          $self->_CutBlock($$hashref{path});
# Line 770 | Line 1000 | sub setBlockClassPath {
1000  
1001   sub BlockClassPath {
1002          my $self=shift;
1003 +
1004 +        $self->verbose(">> BlockClassPath: <<");
1005 +
1006          return $self->{BlockClassPath};
1007   }
1008  
# Line 778 | Line 1011 | sub export_start_export {
1011          my $name=shift;
1012          my $hashref=shift;
1013  
1014 +        $self->verbose(">> export_start_export: NM ".$name." <<");
1015 +        
1016          $self->{switch}->opengroup("__export");
1017   }
1018  
# Line 786 | Line 1021 | sub export_start {
1021          my $name=shift;
1022          my $hashref=shift;
1023  
1024 +        $self->verbose(">> export_start: NM ".$name." <<");
1025 +        
1026          $self->{switch}->opengroup("__export");
1027          if ( exists $$hashref{autoexport} ) {
1028            print GNUmakefile "scram_autoexport=".$$hashref{autoexport}."\n";
# Line 802 | Line 1039 | sub export_start {
1039  
1040   sub export_end_export {
1041          my $self=shift;
1042 +        $self->verbose(">> export_end_export: <<");
1043          $self->{switch}->closegroup("__export");
1044   }
1045  
1046   sub export_end {
1047          my $self=shift;
1048 +        $self->verbose(">> export_end: <<");
1049          $self->{switch}->closegroup("__export");
1050          print GNUmakefile "endif\n";
1051   }
# Line 814 | Line 1053 | sub export_end {
1053   #
1054   # Standard lib tag
1055   #
1056 < sub lib_start {
1057 <        my $self=shift;
1058 <        my $name=shift;
1059 <        my $hashref=shift;
1056 > sub lib_start
1057 >   {
1058 >   my $self=shift;
1059 >   my $name=shift;
1060 >   my $hashref=shift;
1061 >  
1062 >   $self->verbose(">> lib_start: NM ".$name." <<");
1063 >  
1064 >   $self->{switch}->checktag($name, $hashref, 'name');
1065 >
1066 >   if ( $self->{Arch} )
1067 >      {
1068 >      print GNUmakefile "lib+=$$hashref{name}\n";
1069 >      }
1070 >   }
1071  
1072 <        $self->{switch}->checktag($name, $hashref, 'name');
1073 <        if ( $self->{Arch} ) {
1074 <           print GNUmakefile "lib+=$$hashref{name}\n";
1075 <        }
1076 < }
1072 > # Standard debug lib tag
1073 > #
1074 > sub debuglib_start
1075 >   {
1076 >   my $self=shift;
1077 >   my $name=shift;
1078 >   my $hashref=shift;
1079 >  
1080 >   $self->verbose(">> debuglib_start: NM ".$name." <<");
1081 >   $self->{switch}->checktag($name, $hashref, 'name');
1082 >
1083 >   if ( $self->{Arch} )
1084 >      {
1085 >      print GNUmakefile "debuglib+=$$hashref{name}\n";
1086 >      }
1087 >   }
1088  
1089   #
1090   # libtype specification
# Line 832 | Line 1093 | sub LibType_Start {
1093          my $self=shift;
1094          my $name=shift;
1095          my $hashref=shift;
1096 <
1096 >        
1097 >        $self->verbose(">> LibType_Start: NM ".$name." <<");
1098 >        
1099          if ( $self->{Arch} ) {
1100          if ( defined $self->{libtype_conext} ) {
1101            $self->{switch}->parseerror("<$name> tag cannot be specified".
# Line 865 | Line 1128 | sub LibType_text {
1128          my $self=shift;
1129          my $name=shift;
1130          my $string=shift;
1131 +        $self->verbose(">> LibType_text: NM ".$name." <<");
1132  
1133 <        if ( $self->{Arch} ) {
1133 >        if ( $self->{Arch} ) {
1134            $string=~s/\n/ /g;
1135            print GNUmakefile "libmsg::\n\t\@echo Library info: ";
1136            print GNUmakefile $string;
# Line 878 | Line 1142 | sub LibType_end {
1142          my $self=shift;
1143          my $name=shift;
1144  
1145 +        $self->verbose(">> LibType_end: NM ".$name." <<");
1146 +
1147          undef $self->{libtype_conext};
1148   }
1149  
# Line 886 | Line 1152 | sub Environment_start {
1152          my $name=shift;
1153          my $hashref=shift;
1154  
1155 +        $self->verbose(">> Environment_start: NM ".$name." <<");
1156 +        
1157          if ( $self->{Arch} ) {
1158            $self->{envnum}++;
1159  
# Line 917 | Line 1185 | sub Environment_end {
1185          my $self=shift;
1186          my $fd;
1187  
1188 +        $self->verbose(">> Environment_end: NM ".$name." <<");
1189 +
1190          if ( $self->{Arch} ) {
1191            $self->{envlevel}--;
1192            if ( $self->{envlevel} < 0 ) {
# Line 939 | Line 1209 | sub Environment_end {
1209            }
1210          }
1211   }
1212 +
1213 + sub Store_start {
1214 +        my $self=shift;
1215 +        my $name=shift;
1216 +        my $hashref=shift;
1217 +
1218 +        $self->verbose(">> Store_start: NM ".$name." <<");
1219 +
1220 +        if ( $self->{Arch} ) {
1221 +          $self->{switch}->checktag( $name, $hashref, 'name' );
1222 +
1223 +          # -- store creation
1224 +          my $dir=$$hashref{'name'};
1225 +          AddDir::adddir($ENV{LOCALTOP}."/".$dir);
1226 +          if ( exists $$hashref{'type'} ) {
1227 +            # -- architecture specific store
1228 +            if ( $$hashref{'type'}=~/^arch/i ) {
1229 +                $dir=$dir."/".$ENV{SCRAM_ARCH};
1230 +                AddDir::adddir($ENV{LOCALTOP}."/".$dir);
1231 +            }
1232 +            else {
1233 +                $self->parseerror("Unknown type in <$name> tag");
1234 +            }
1235 +          }
1236 +
1237 +          # -- set make variables for the store
1238 +          print GNUmakefile "SCRAMSTORENAME_".$$hashref{'name'}.":=".$dir."\n";
1239 +          print GNUmakefile "SCRAMSTORE_".$$hashref{'name'}.":=".
1240 +                                        $ENV{LOCALTOP}."/".$dir."\n";
1241 +          print GNUmakefile "VPATH+=".$ENV{LOCALTOP}
1242 +                        ."/".$dir.":".$ENV{RELEASETOP}."/".$dir."\n";
1243 +        }
1244 + }
1245 +
1246 + sub CompilerMap_Start
1247 +   {
1248 +   ###############################################################
1249 +   # CompilerMap_Start                                           #
1250 +   ###############################################################
1251 +   # modified : Fri Oct  4 15:08:39 2002 / SFA                   #
1252 +   # params   :                                                  #
1253 +   #          :                                                  #
1254 +   #          :                                                  #
1255 +   #          :                                                  #
1256 +   # function : Create a map between a SUBARCH and specific      #
1257 +   #          : compiler and version.                            #
1258 +   #          :                                                  #
1259 +   #          :                                                  #
1260 +   ###############################################################
1261 +   my $self=shift;
1262 +   my $name=shift;
1263 +   my $hashref=shift;
1264 +   ## Not working yet !!!!##
1265 +   $self->verbose(">> CompilerMap_Start: NM ".$name." <<");
1266 +   # We can only map compilers to already-defined architectures, so
1267 +   # we check for 'Arch':
1268 + #   if ( $self->{Arch} )
1269 + #      {
1270 + #      my @tagnames=keys %{$hashref};
1271 + #      my @tagvalues=values %{$hashref};
1272 +      
1273 + #      foreach my $tag ( @tagnames )
1274 + #        {
1275 + #         $self->{switch}->checktag($name,$hashref,$tag);
1276 + #         print GNUmakefile $tag."=".$$hashref{$tag}."\n";
1277 +
1278 + #        if ( defined $$hashref{'version'} )
1279 + #           {
1280 + #           print GNUmakefile "_V_".$$hashref{'version'};
1281 + #           }
1282 + #        print GNUmakefile "=true\n";
1283 + #         }
1284 + #        $self->{switch}->checktag($name,$hashref,'ref');
1285 +
1286 + #       # -- oo toolbox stuff
1287 + #       # - get the appropriate tool object
1288 + #       $$hashref{'ref'}=~tr[A-Z][a-z];
1289 + #       if ( ! exists $$hashref{'version'} ) {
1290 + #        $tool=$self->{toolbox}->gettool($$hashref{'ref'});
1291 + #       }
1292 + #       else {
1293 + #        $tool=$self->{toolbox}->gettool($$hashref{'ref'},$$hashref{'version'});
1294 + #       }
1295 + #       if ( ! defined $tool ) {
1296 + #         $self->{switch}->parseerror("Unknown Tool Specified ("
1297 + #                                                       .$$hashref{'ref'}.")");
1298 + #       }
1299 +
1300 + #       # -- old fashioned GNUmakefile stuff
1301 + #       print GNUmakefile $$hashref{'ref'};
1302 + #       if ( defined $$hashref{'version'} ) {
1303 + #               print GNUmakefile "_V_".$$hashref{'version'};
1304 + #       }
1305 + #       print GNUmakefile "=true\n";
1306 +        
1307 + #       # -- Sub system also specified?
1308 + #       if ( exists $$hashref{'use'} ) {
1309 + #          # -- look for a buildfile
1310 + #          my @paths=$tool->getfeature("INCLUDE");
1311 + #          my $file="";
1312 + #          my ($path,$testfile);
1313 + #          foreach $path ( @paths ) {
1314 + #            $testfile=$path."/".$$hashref{'use'}."/BuildFile" ;
1315 + #            if ( -f $testfile ) {
1316 + #               $file=$testfile;
1317 + #               $self->_pushremoteproject($path);
1318 + #            }
1319 + #          }
1320 + #          if ( $file eq "" ) {
1321 + #            $self->{switch}->parseerror("Unable to find SubSystem $testfile");
1322 + #          }
1323 + #          $self->ParseBuildFile_Export($file);
1324 + #          $self->_popremoteproject();
1325 + #        }
1326 + #      }
1327 + #   else
1328 + #      {
1329 + #      return;
1330 + #      }
1331 +   }
1332 +
1333 +

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines