[project @ 1998-12-02 13:17:09 by simonm]

[ghc-hetmet.git] / ghc / utils / mkdependHS / mkdependHS.prl

diff --git a/ghc/utils/mkdependHS/mkdependHS.prl b/ghc/utils/mkdependHS/mkdependHS.prl
index 7cf7266..b68cb08 100644 (file)
--- a/ghc/utils/mkdependHS/mkdependHS.prl
+++ b/ghc/utils/mkdependHS/mkdependHS.prl
@@ -3,7 +3,7 @@
 #
 #  RAWCPP TMPDIR TOP_PWD
 #  libdir libexecdir datadir INSTALLING
-#  ProjectVersionInt SED 
+#  SED 
 #
 # tries to work like mkdependC - capable of dealing with:
 #
@@ -88,7 +88,6 @@ $Begin_magic_str = "# DO NOT DELETE: Beginning of Haskell dependencies\n";
 $End_magic_str = "# DO NOT DELETE: End of Haskell dependencies\n";
 @Obj_suffix =  ("o");
 @File_suffix = ();
-$ghc_version_info = ${ProjectVersionInt};
 
 $Import_dirs = '.';
 %Syslibs = ();
@@ -101,6 +100,12 @@ $Include_dirs = '-I.';
 $Makefile = '';
 @Src_files = ();
 $Include_prelude = 0;
+@Defines = ();
+
+# Delete temp. file if script is halted.
+sub quit_upon_signal { print STDERR "Deleting $Tmp_prefix.hs .. \n"; unlink "$Tmp_prefix.hs"; }
+$SIG{'INT'}  = 'quit_upon_signal';
+$SIG{'QUIT'} = 'quit_upon_signal';
 
 &mangle_command_line_args();
 
@@ -109,10 +114,6 @@ if ( $Status ) {
     exit(1);
 }
 
-push(@Defines,
-     ( #OLD: "-D__HASKELL1__=$Haskell_1",
-      "-D__GLASGOW_HASKELL__=$ghc_version_info"));
-
 @Import_dirs  = split(/:/,$Import_dirs);
 @Include_dirs = split(/\s+/,$Include_dirs); # still has -I's in it
 
@@ -161,11 +162,6 @@ print STDERR "Include_dirs=@Include_dirs\n" if $Verbose;
 
 @Depend_lines = ();
 
-# Delete temp. file if script is halted.
-sub quit_upon_signal { print STDERR "Deleting $Tmp_prefix.hs .. \n"; unlink "$Tmp_prefix.hs"; }
-$SIG{'INT'}  = 'quit_upon_signal';
-$SIG{'QUIT'} = 'quit_upon_signal';
-
 foreach $sf (@Src_files) {
 
     # just like lit-inputter
@@ -189,10 +185,11 @@ foreach $sf (@Src_files) {
     } else {
        $file_to_read = "$Tmp_prefix.hs";
        local($to_do) = "$Unlit $sf $file_to_read";
-       &run_something($to_do, 'unlit');
+       &run_something($to_do, $sf, 'unlit');
     }
     &slurp_file_for_imports($file_to_read, $sf);
 
+    # Delete the temporary.
     if ( $sf =~ /\.l(hs|y)$/ ) {
        unlink "$Tmp_prefix.hs";
     }
@@ -274,7 +271,7 @@ sub mangle_command_line_args {
             
            } elsif ( /^-(x|-exclude-module=)(.*)/ ) { 
                local($thing) = &grab_arg_arg($1,$2);
-               $IgnoreMe{$thing} = 'y';
+               $IgnoreMe{$thing} = 'Y';
            } elsif ( /^-(X|-exclude-directory=)(.*)/ ) { 
                foreach $d ( split(/:/,&grab_arg_arg($1, $2)) ) {
                    push(@Ignore_dirs,"$d");
@@ -357,7 +354,7 @@ sub preprocess_import_dirs {
             next unless /(.*)\.(hi|l?hs|l?y)$/;
             #don't tag it twice or overwrite it with a diff. value
             next if $IgnoreMe{$1};
-            print STDERR "Module $d/$1.$2 will be ignored\n" if $Verbose;
+            print STDERR "Module $d will be ignored\n" if $Verbose;
 
             $IgnoreMe{$1} = 'y';
         }
@@ -374,6 +371,14 @@ sub slurp_file_for_imports {
     $last_seen_dir =~ s/\/[^\/]+$//; # strip to dir name
     $last_seen_dir = '.' if ($last_seen_dir eq $orig_src_file);
 
+    local($mod_name) = $orig_src_file;
+
+    $mod_name =~ s/.*\/([^\/]+)$/$1/g;
+    $mod_name =~ s/^([^.]+)\.(.*)$/$1/;
+
+    print STDERR "Warning: processing module $mod_name, which I was supposed to ignore.\n"
+       if ( $IgnoreMe{$mod_name} eq 'Y' && $Warnings );
+
     &process_dependency('import',0,'Prelude') if ($Include_prelude);
 
     # we mangle #include's so they will also leave something
@@ -382,7 +387,7 @@ sub slurp_file_for_imports {
     local ($open_cmd);
     if ($Cpp_flag_set) {
 #       $open_cmd = "${SED} -e '/^# *include/{p;s/^# *include/!include/;};s/'\\''//g;s/\"//g' $file_to_read | $Cpp $Include_dirs -I$last_seen_dir @Defines |";
-       &run_something("${SED} -e '/^# *include/{p;s/^# *include/!include/;};s/'\\''//g;s/\"//g' $file_to_read | $Cpp $Include_dirs -I$last_seen_dir @Defines 2>&1 > ${file_to_read}.i", 'Running cpp');
+       &run_something("${SED} -e '/^# *include/{p;s/^# *include/!include/;};s/'\\''//g;s/\"//g' $file_to_read | $Cpp $Include_dirs -I$last_seen_dir @Defines 2>&1 > ${file_to_read}.i", $orig_src_file, 'cpp');
        $read_from_file="${file_to_read}.i";
        $cleanup=1;
     } else {
@@ -423,7 +428,11 @@ sub process_dependency {
   local($todo,$source,$modname) = @_;
 
   if ($todo eq 'import') {
-    if ( $ModuleIn{$modname} ) {
+    if ( $IgnoreMe{$modname} eq 'Y' ) {
+         # user specifically asked for this module
+        # to be ignored.
+        $follow_file = '__ignore__';
+    } elsif ( $ModuleIn{$modname} ) {
         $follow_file = "$ModuleIn{$modname}/$modname.hi";
     } else { # hard way
        $follow_file =
@@ -595,7 +604,7 @@ sub find_in_Include_dirs {
 
 # out of the driver, actually
 sub run_something {
-    local($str_to_do, $tidy_name) = @_;
+    local($str_to_do, $file_to_read, $tidy_name) = @_;
 
     print STDERR "\n$tidy_name:\n\t" if $Verbose;
     print STDERR "$str_to_do\n" if $Verbose;
@@ -603,8 +612,8 @@ sub run_something {
     local($return_val) = system($str_to_do) >> 8;
 
     if ($return_val != 0) {
-       local($die_msg) = "$Pgm: execution of the $tidy_name had trouble";
-       $die_msg .= " (program not found)" if $return_val == 255;
+       local($die_msg) = "$Pgm: Running $tidy_name ( on $file_to_read ) failed";
+        $die_msg .= " program not found: $str_to_do " if $return_val == 255;
        $die_msg .= " ($!)" if $Verbose && $! != 0;
        $die_msg .= "\n";
        print STDERR $die_msg;