You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by ma...@apache.org on 2012/11/03 19:21:54 UTC
[lucy-commits] [9/16] git commit: refs/heads/master - Use user-supplied paths
verbatim in meld.
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/54a5afdb
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/54a5afdb
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/54a5afdb
Branch: refs/heads/master
Commit: 54a5afdb005f971d05cbf94aa06fb5304bcf583b
Parents: 7cefa31
Author: Marvin Humphrey <ma...@rectangular.com>
Authored: Sat Nov 3 11:19:36 2012 -0700
Committer: Marvin Humphrey <ma...@rectangular.com>
Committed: Sat Nov 3 11:19:36 2012 -0700
----------------------------------------------------------------------
charmonizer/buildbin/meld.pl | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy/blob/54a5afdb/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;