ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/trunk/scripts/filepp
(Generate patch)

Comparing trunk/scripts/filepp (file contents):
Revision 59 by tim, Mon Oct 11 14:51:57 2004 UTC vs.
Revision 414 by tim, Wed Mar 9 17:58:33 2005 UTC

# Line 21 | Line 21
21   #  Filename     :  $RCSfile: filepp,v $
22   #  Author       :  $Author: tim $
23   #  Maintainer   :  Darren Miller: darren@cabaret.demon.co.uk
24 < #  File version :  $Revision: 1.4 $
25 < #  Last changed :  $Date: 2004-10-11 14:51:57 $
24 > #  File version :  $Revision: 1.7 $
25 > #  Last changed :  $Date: 2005-03-09 17:58:33 $
26   #  Description  :  Main program
27   #  Licence      :  GNU copyleft
28   #
# Line 31 | Line 31 | use strict "vars";
31   package Filepp;
32  
33   use strict "vars";
34 < use strict "subs";
34 > #use strict "subs";
35   # Used to all filepp to work with any char, not just ascii,
36   # feel free to remove this if it causes you problems
37   #use bytes;
# Line 280 | Line 280 | options:
280   all other arguments are assumed to be input files
281   ";
282  
283 – # graph for dependency files
284 – my $dependencyGraph;
283  
284   # visited table
285   my %visitedTable = ();
# Line 303 | Line 301 | my $modBasenameCase = "lower";
301  
302   # case of basename of fortran 90 module
303   my $modBasenameCase = "lower";
304 +
305 + #flag for generating dependency, by default, it is off
306 + my $dependency = 0;
307 +
308 + #skip system header file
309 + my $skipSysInclude = 0;
310 +
311 + #saved command line define macro
312 + my @savedDefine;
313 +
314   ##############################################################################
315   # SetDebug - controls debugging level
316   ##############################################################################
# Line 1936 | Line 1944 | sub Include
1944          ($filename) = split(/\"/, $filename, 2);
1945      }
1946      # else assume filename given without "" or <>, naughty but allowed
1947 +    
1948 +    #if skipSysInclude option is turned on, skip current file
1949 +    if ($skipSysInclude && $sysinclude) {
1950 +        return;
1951 +    }
1952      
1953      # check for file in current directory
1954      if($sysinclude == 0) {
# Line 2220 | Line 2233 | sub Write
2233   sub Write
2234   {
2235      my $string = shift;
2236 <    #print(OUTPUT $string);
2236 >    
2237 >    if(!$dependency){
2238 >        print(OUTPUT $string);
2239 >    }
2240   }
2241  
2242  
# Line 2468 | Line 2484 | sub Use{
2484      $f90module =~ s/\s+$//;
2485      $f90module = uc($f90module);
2486      
2487 <    print " " . $objDir . GetModBasename($f90module) . "." . $modSuffix . "\\\n";
2487 >    print " " . $objDir . GetModBasename($f90module) . "." . $modSuffix . " \\\n";
2488   }
2489  
2490   ##############################################################################
# Line 2495 | Line 2511 | sub IsVisited {
2511          }
2512   }
2513  
2514 + ##############################################################################
2515 + # Clean Visited Table
2516 + ##############################################################################
2517 + sub cleanVisited {
2518 +    my $visitedFile;
2519 +    foreach $visitedFile (keys %visitedTable) {
2520 +        delete $visitedTable{$visitedFile};
2521 +    }
2522 +
2523 + }
2524 +
2525   sub AddModule {
2526          my $modulename = shift;
2527  
# Line 2515 | Line 2542 | sub printModule {
2542          my $objname;
2543          print "\n";
2544          foreach $modname (keys %parsedModList) {
2545 <                $objname = GetObjFile($parsedModList{$modname});
2545 >                $objname = GetObjFile($modname);
2546                  print $objDir . $modname  . " : " . $objDir . $objname . "\n";
2547          }
2548   }
# Line 2529 | Line 2556 | sub GetObjFile {
2556          my $filename;
2557          my $dir;
2558          my $suffix;
2559 +        
2560          ($filename, $dir, $suffix) = fileparse($fullname, '\.[^.]*');  
2561          return $filename . $objExt;
2562   }
# Line 2551 | Line 2579 | sub GetModBasename {
2579          return $modname;
2580   }
2581  
2582 + sub RestoreCommandLineDefine {
2583 +    my $macro;
2584 +    
2585 +    foreach $macro(@savedDefine) {
2586 +        Define($macro);
2587 +    }
2588 + }
2589 +
2590 + sub SaveCommandLineDefine {
2591 +    my $macro = shift;
2592 +    push @savedDefine, $macro;
2593 + }
2594   ##############################################################################
2595   # Main routine
2596   ##############################################################################
# Line 2595 | Line 2635 | while($ARGV[$i]) {
2635          }
2636          # add macro and defn to hash table
2637          Define($macro." ".$defn);
2638 +        
2639 +        #save define macro from command line
2640 +        #it will be restored when next source file is processed
2641 +        SaveCommandLineDefine($macro." ".$defn);
2642      }
2643  
2644      # Debugging turned on: -d
# Line 2725 | Line 2769 | while($ARGV[$i]) {
2769      }
2770  
2771      # Module paths: -Minclude or -M include
2772 <    elsif(substr($ARGV[$i], 0, 2) eq "-M") {
2773 <        # -M include format
2774 <        if(length($ARGV[$i]) == 2) {
2775 <            if($i+1 >= $argc) {
2776 <                Error("Argument to `-M' is missing");
2777 <            }
2778 <            AddModulePath($ARGV[++$i]);
2779 <        }
2780 <        # -Minclude format
2781 <        else {
2782 <            AddModulePath(substr($ARGV[$i], 2));
2783 <        }
2784 <    }
2772 >    #elsif(substr($ARGV[$i], 0, 2) eq "-M") {
2773 >    #   # -M include format
2774 >    #   if(length($ARGV[$i]) == 2) {
2775 >    #       if($i+1 >= $argc) {
2776 >    #           Error("Argument to `-M' is missing");
2777 >    #       }
2778 >    #       AddModulePath($ARGV[++$i]);
2779 >    #   }
2780 >    #   # -Minclude format
2781 >    #   else {
2782 >    #       AddModulePath(substr($ARGV[$i], 2));
2783 >    #   }
2784 >    #}
2785  
2786      # use module
2787 <    elsif($ARGV[$i] eq "-m") {
2788 <        if($i+1 >= $argc) {
2789 <            Error("Argument to `-m' is missing");
2790 <        }
2791 <        UseModule($ARGV[++$i]);
2787 >    #elsif($ARGV[$i] eq "-m") {
2788 >    #   if($i+1 >= $argc) {
2789 >    #       Error("Argument to `-m' is missing");
2790 >    #   }
2791 >    #   UseModule($ARGV[++$i]);
2792 >    #}
2793 >
2794 >    # make dependency
2795 >    elsif($ARGV[$i] eq "-M") {
2796 >        $dependency = 1;
2797      }
2798 <    
2798 >
2799 >    # make dependency (skip system header files)
2800 >    elsif($ARGV[$i] eq "-MM") {
2801 >        $dependency = 1;
2802 >        $skipSysInclude = 1;
2803 >    }
2804 >
2805      #case of basename of fortran module
2806      elsif($ARGV[$i] eq "-mc") {
2807          my $tempVar = lc($ARGV[++$i]);
# Line 2891 | Line 2946 | foreach $base_file (@Inputfiles) {
2946      
2947      #clean visitedTable
2948      %visitedTable = ();
2949 +    
2950 +    #clear all define
2951 +    UndefAll();
2952 +    
2953 +    #restore command line define
2954 +    RestoreCommandLineDefine();
2955 +    
2956 +    #print dependency rule
2957      print "\n";
2958 <    print $objDir . GetObjFile($base_file) . " : ";
2958 >    print $objDir . GetObjFile($base_file) . " : " . $base_file . " \\";
2959 >    print "\n";
2960 >
2961      Parse($base_file);
2962      # close output file if in overwrite mode
2963      if($overwrite) { CloseOutputFile(); }    

Diff Legend

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