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

Comparing COMP/SCRAM/src/BuildFile.pm (file contents):
Revision 1.21.2.7 by williamc, Tue Sep 7 10:09:39 1999 UTC vs.
Revision 1.21.2.17 by williamc, Fri Sep 17 13:10:43 1999 UTC

# Line 46 | Line 46 | sub ParseBuildFile {
46                  'Architecture' => \&OutToMakefile,
47                  'LibType_StartTag' => \&LibType_Start,
48                  'LibType_EndTag' => 'none',
49 <                'LibType' => 'none'
49 >                #'LibType' => \&OutToScreen
50 >                'LibType' => \&LibType_text
51          };
52          use Utilities::Switcher;
53          $switch=Switcher->new($SupportedTags, $fullfilename);
# Line 75 | Line 76 | sub ParseBuildFile_Export {
76                  'export_StartTag' => \&export_start,
77                  'export_EndTag' => \&export_end,
78                  'lib_StartTag' => \&lib_start_export,
79 +                'External_StartTag' => \&Ext_start_export,
80                  'lib' => 'none'
81          };
82          use Utilities::Switcher;
# Line 156 | Line 158 | sub Bin_start {
158          ($objectname_Insure=$$hashref{file})=~s/\..*/_Insure\.o/;
159          print GNUmakefile "bin:$$hashref{name}_o\n";
160          print GNUmakefile "bin_debug:$$hashref{name}_d\n";
161 +        print GNUmakefile "bin_debug_local:$$hashref{name}_d_l\n";
162          print GNUmakefile "bin_insure:$$hashref{name}_Insure\n";
163   #       print GNUmakefile ".INTERMEDIATE::$$hashref{name}_d.exe\n";
164   #       print GNUmakefile ".INTERMEDIATE::$$hashref{name}_Insure.exe\n";
# Line 163 | Line 166 | sub Bin_start {
166          print GNUmakefile "$$hashref{name}_Insure:.psrc\n";
167          print GNUmakefile "$$hashref{name}_d.exe:$objectname_d\n";
168          print GNUmakefile "\t\$(CClinkCmdDebug)\n";
169 +        print GNUmakefile "$$hashref{name}_d_l.exe:$objectname_d\n";
170 +        print GNUmakefile "\t\$(CClinkCmdDebugLocal)\n";
171          print GNUmakefile "$$hashref{name}_Insure.exe:$objectname_Insure\n";
172          print GNUmakefile "\t\$(CClinkCmdInsure)\n";
173          print GNUmakefile "$$hashref{name}.exe:$objectname\n";
# Line 182 | Line 187 | endif
187   $$hashref{name}_Insure.exe:\$(libslocal_I)
188   $$hashref{name}_d:$$hashref{name}_d.exe
189          \@cp $$hashref{name}_d.exe \$(binarystore)/$$hashref{name}
190 + $$hashref{name}_d_l:$$hashref{name}_d_l.exe
191 +        \@cp $$hashref{name}_d_l.exe \$(binarystore)/$$hashref{name}
192   $$hashref{name}_Insure:$$hashref{name}_Insure.exe
193          \@cp $$hashref{name}_Insure.exe \$(binarystore)/$$hashref{name}_Insure
194   $$hashref{name}:$$hashref{name}_d.exe
# Line 194 | Line 201 | ENDTEXT
201          }
202   }
203  
204 + sub Ext_start_export {
205 +        my $name=shift;
206 +        my @vars=@_;
207 +        my $hashref;
208 +        
209 +        $hashref=$switch->SetupValueHash(\@vars);
210 +        if ( $Arch ) {
211 +         if ( $switchex->context('export') ) {
212 +          $$hashref{'ref'}=~tr[A-Z][a-z];
213 +          print GNUmakefile $$hashref{'ref'};
214 +          if ( defined $$hashref{'version'} ) {
215 +                print GNUmakefile "_V_".$$hashref{'version'};
216 +          }
217 +          print GNUmakefile "=true\n";
218 +         }
219 +        }
220 + }
221 +
222   sub External_StartTag {
223          my $name=shift;
224          my @vars=@_;
# Line 335 | Line 360 | sub OutToMakefile {
360          my $name=shift;
361          my @vars=@_;
362  
363 <        print GNUmakefile @vars;
363 >        if ( $Arch ) {
364 >          print GNUmakefile @vars;
365 >        }
366 > }
367 > sub OutToScreen {
368 >        my $name=shift;
369 >        my @vars=@_;
370 >
371 >        if ( $Arch ) {
372 >          print @vars;
373 >        }
374   }
375   sub setBlockClassPath {
376          my $name=shift;
# Line 399 | Line 434 | sub LibType_Start {
434          my @vars=@_;
435          my $hashref;
436  
437 +        if ( $Arch ) {
438          $hashref=$switch->SetupValueHash( \@vars );
439          $switch->checkparam($hashref, $name, 'type');
440          
# Line 407 | Line 443 | sub LibType_Start {
443          if ( $$hashref{'type'}=~/^archive/i ) {
444            print GNUmakefile "LibArchive=true\n";
445          }
446 <        elsif ($$hashref{'type'}=~/debugarchive/i ) {
446 >        elsif ($$hashref{'type'}=~/debug_archive/i ) {
447            print GNUmakefile "LibDebugArchive=true\n";
448          }
449 +        elsif ($$hashref{'type'}=~/debug_shared/i ) {
450 +          print GNUmakefile "LibDebugShared=true\n";
451 +        }
452          elsif ($$hashref{'type'}=~/shared/i ) {
453            print GNUmakefile 'LibShared=true'."\n";
454          }
416        elsif ($$hashref{'type'}=~/debugshared/i ) {
417          print GNUmakefile "LibDebugShared=true\n";
418        }
455          print GNUmakefile "\n";
456 +        }
457   }
458 + sub LibType_text {
459 +        my $name=shift;
460 +        my @vars=@_;
461 +
462 +        if ( $Arch ) {
463 +          print GNUmakefile "libmsg::\n\t\@echo Library info: ";
464 +          print GNUmakefile @vars;
465 +          print GNUmakefile "\n";
466 +        }
467 + }
468 +

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines