Use user-supplied paths verbatim in meld.
Project: http://git-wip-us.apache.org/repos/asf/lucy/repo Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/416b4bc1 Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/416b4bc1 Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/416b4bc1 Branch: refs/heads/chaz_namespacing Commit: 416b4bc1944250e323e8430c9b8818ec919903a8 Parents: 5f33d1a Author: Marvin Humphrey <[email protected]> Authored: Sun Oct 21 12:07:37 2012 -0700 Committer: Marvin Humphrey <[email protected]> Committed: Thu Nov 1 15:24:15 2012 -0700 ---------------------------------------------------------------------- charmonizer/buildbin/meld.pl | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucy/blob/416b4bc1/charmonizer/buildbin/meld.pl ---------------------------------------------------------------------- diff --git a/charmonizer/buildbin/meld.pl b/charmonizer/buildbin/meld.pl index db25eaa..7df3260 100755 --- a/charmonizer/buildbin/meld.pl +++ b/charmonizer/buildbin/meld.pl @@ -49,7 +49,12 @@ die $usage unless $outfile; $outfile = rel2abs($outfile); @user_files = split( /,/, join( ',', @user_files ) ); @probes = split( /,/, join( ',', @probes ) ); -@user_files = map { rel2abs($_) } @user_files; + +# Slurp all user files. +my %user_file_content; +for my $file (@user_files) { + $user_file_content{$file} = slurp($file); +} # Make sure we are in the charmonizer dir. chdir( catdir( $Bin, updir() ) ); @@ -125,7 +130,7 @@ for my $file (@charm_files) { # Process user specified files. for my $file (@user_files) { - my $content = slurp($file); + my $content = $user_file_content{$file}; # Comment out pound-includes for files being inlined. $content =~ s|^(#include "Charmonizer[^\n]+)\n|/* $1 */\n|msg;
