X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Futils%2FmkdependHS%2FmkdependHS.prl;h=b68cb08322d0530680e9f82471462913551a8eaf;hb=438596897ebbe25a07e1c82085cfbc5bdb00f09e;hp=fe86282159b80994258ee1df4e9c9a819bf7ed02;hpb=9c9316b3516a43541ce1e1ecb0fe407235c2a65a;p=ghc-hetmet.git diff --git a/ghc/utils/mkdependHS/mkdependHS.prl b/ghc/utils/mkdependHS/mkdependHS.prl index fe86282..b68cb08 100644 --- a/ghc/utils/mkdependHS/mkdependHS.prl +++ b/ghc/utils/mkdependHS/mkdependHS.prl @@ -3,7 +3,7 @@ # # RAWCPP TMPDIR TOP_PWD # libdir libexecdir datadir INSTALLING -# PROJECTVERSION SED +# SED # # tries to work like mkdependC - capable of dealing with: # @@ -35,6 +35,7 @@ mkdependHS-specific options (not between --'s): -w No warnings -f blah Use "blah" as the makefile, rather than "makefile" or "Makefile". + -cpp Wash the input files through cpp(1). -o Use as the "object file" suffix ( default: o) -s Make extra dependencies for files with suffix ; thus, "-o hc -s _a" will @@ -49,7 +50,7 @@ mkdependHS-specific options (not between --'s): don't generate any dependencies on modules therein. -Xdirs same as --exclude-directory --include-prelude - Regard prelude library as unstable, i.e., generate dependencies + Regard prelude libraries as unstable, i.e., generate dependencies on prelude modules. This option is normally only used by the various system libraries. If a -syslib option is used, dependencies will also be generated on the library's interfaces. @@ -66,6 +67,7 @@ $Warnings = 1; # 1 => warn about duplicate interface files $Dashdashes_seen = 0; $Cpp = ${RAWCPP}; +$Cpp_flag_set = 0; # 1 => run cpp over input files. if ( $ENV{'TMPDIR'} ) { # where to make tmp file names $Tmp_prefix = $ENV{'TMPDIR'} . "/mkdependHS$$"; @@ -77,7 +79,6 @@ if ( $ENV{'TMPDIR'} ) { # where to make tmp file names $TopPwd = "${TOP_PWD}"; $InstLibDirGhc = "${libdir}"; $InstLibExecDirGhc = "${libexecdir}"; -$InstHsLibDirGhc = "${libdir}/hslibs"; $InstDataDirGhc = "${datadir}"; $Unlit = ($INSTALLING) ? "${InstLibExecDirGhc}/unlit" @@ -87,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 = int ( ${PROJECTVERSION} * 100 ); $Import_dirs = '.'; %Syslibs = (); @@ -100,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(); @@ -108,20 +114,13 @@ 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 # set up array of ignored modules local(@dirs) = ($INSTALLING) ? - ("$InstLibDirGhc/imports") - : ("$TopPwd/ghc/lib/ghc", - "$TopPwd/ghc/lib/required", - "$TopPwd/ghc/lib/glaExts", - "$TopPwd/ghc/lib/concurrent"); + ("$InstLibDirGhc/imports/std") + : ("$TopPwd/ghc/lib/std"); if (!$Include_prelude) { push(@Ignore_dirs, @dirs); } else { @@ -129,13 +128,18 @@ if (!$Include_prelude) { } foreach $lib ( @Syslibs ) { - local($dir) = - ($INSTALLING) ? "${InstHsLibDirGhc}/${lib}/imports" - : "${TopPwd}/hslibs/${lib}/src"; + local($dir); + + if ( $lib eq 'win32' && ! $INSTALLING ) { + $dir = "${TopPwd}/hslibs/${lib}/src"; + } else { + $dir = ($INSTALLING) ? "${InstLibDirGhc}/imports/${lib}" + : "${TopPwd}/ghc/lib/${lib}"; + } if (!$Include_prelude) { push(@Ignore_dirs,$dir); } else { - push(@Import_dirs, @dirs); + push(@Import_dirs, $dir); } } @@ -158,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 @@ -186,26 +185,26 @@ 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"; } } -# OK, mangle the Makefile -unlink("$Makefile.bak"); - # -# If no output file exist as yet, create one. +# Create backup version of output file. # -if ( ! -f $Makefile.bak ) { - system("touch $Makefile.bak"); -} -if ( -f $Makefile ) { +if ( ! -f $Makefile ) { + # truncate() may not be implemented, so we + # play it safe here. + local(*TRUNC); + open(TRUNC,"> $Makefile.bak") && close(TRUNC); +} else { rename($Makefile,"$Makefile.bak"); } # now copy Makefile.bak into Makefile, rm'ing old dependencies @@ -222,7 +221,7 @@ while ($_ && $_ ne $End_magic_str) { # delete 'til End_magic_str $_ = ; } # insert dependencies -print $Begin_magic_str, @Depend_lines, $End_magic_str || die "Failed to write out dependencies ($!)"; +print "\n$Begin_magic_str", @Depend_lines, $End_magic_str || die "Failed to write out dependencies ($!)"; while () { # copy the rest through print $_ || die "Failed to write out dependencies ($!)"; @@ -240,12 +239,20 @@ sub mangle_command_line_args { } elsif ( /^-D(.*)/ ) { # recognized wherever they occur push(@Defines, $_); - } elsif ( /^-i(.*)/ ) { # ditto - $Import_dirs .= ":$1"; + } elsif ( /^-cpp$/ ) { # recognized wherever they occur + $Cpp_flag_set =1; + } elsif ( /^-i$/ ) { + $Import_dirs = ''; # import path cleared! + } elsif ( /^-i(.*)/ ) { + $Import_dirs = "$1:$Import_dirs"; } elsif ( /^-I/ ) { $Include_dirs .= " $_"; } elsif ( /^-syslib$/ ) { push(@Syslibs, &grab_arg_arg($_,'')); + } elsif ( /^-fglasgow-exts$/ ) { + push(@Syslibs, 'exts'); + } elsif ( /^-concurrent$/ ) { + push(@Syslibs, 'concurrent'); } elsif ($Dashdashes_seen != 1) { # not between -- ... -- if ( /^-v$/ ) { $Verbose++; @@ -264,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"); @@ -283,10 +290,16 @@ sub mangle_command_line_args { } else { push(@Src_files, $_); } - - } elsif ($Dashdashes_seen == 1) { # where we ignore unknown options - push(@Src_files, $_) if ! /^-/; - } + } + # Removed support for picking up plausible source file + # names inside the ghc options chunk of the command + # line. It failed to deal with `option-value' stuff present + # on some invocations of ghc (e.g., "-ohi foo.baz"). + # -- sof 12/97 + # + # } elsif ($Dashdashes_seen == 1) { + # push(@Src_files, $_) if ! /^-/; + # } } @File_suffix = sort (@File_suffix); } @@ -341,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'; } @@ -351,21 +364,39 @@ sub preprocess_import_dirs { sub slurp_file_for_imports { local($file_to_read, $orig_src_file) = @_; - local($follow_file); + local($follow_file,$read_from_file); + local($cleanup)=0; local($last_seen_dir) = $orig_src_file; $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 # behind to indicate the dependency on _them_ - print STDERR "${SED} -e '/^# *include/{p;s/^# *include/!include/;};s/'\\''//g;s/\"//g' $file_to_read | $Cpp $Include_dirs -I$last_seen_dir @Defines |\n" if $Verbose; + 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", $orig_src_file, 'cpp'); + $read_from_file="${file_to_read}.i"; + $cleanup=1; + } else { + $read_from_file="${file_to_read}"; + $open_cmd = $file_to_read; + } + print STDERR "$open_cmd\n" if $Verbose; - open(SRCFILE, "${SED} -e '/^# *include/{p;s/^# *include/!include/;};s/'\\''//g;s/\"//g' $file_to_read | $Cpp $Include_dirs -I$last_seen_dir @Defines |") - || die "$Pgm: Can't open $file_to_read: $!\n"; + open(SRCFILE, $read_from_file) || die "$Pgm: Can't open $file_to_read: $!\n"; while () { # @@ -382,6 +413,13 @@ sub slurp_file_for_imports { &process_dependency($todo,$source,$modname); } close(SRCFILE) || exit(1); + # remove temporary file, if any. + if ($cleanup) { + # truncate() may not be implemented, so we + # play it safe here. + local(*TRUNC); + open(TRUNC,"> $read_from_file") && close(TRUNC); + } } # @@ -390,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 = @@ -562,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; @@ -570,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;