lucy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nwelln...@apache.org
Subject [lucy-commits] [4/9] git commit: refs/heads/master - Switch to external Charmonizer
Date Mon, 10 Mar 2014 20:40:08 GMT
Switch to external Charmonizer

regen_charmonizer.pl now accepts a command-line argument which contains
the path to the Charmonizer tree. If this argument is missing, default
to '../charmonizer' from the Lucy root.


Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/b9965bf1
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/b9965bf1
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/b9965bf1

Branch: refs/heads/master
Commit: b9965bf197735dcee8a90bf174362fabfdbea635
Parents: f304458
Author: Nick Wellnhofer <wellnhofer@aevum.de>
Authored: Mon Mar 10 21:20:01 2014 +0100
Committer: Nick Wellnhofer <wellnhofer@aevum.de>
Committed: Mon Mar 10 21:22:41 2014 +0100

----------------------------------------------------------------------
 devel/bin/regen_charmonizer.pl | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucy/blob/b9965bf1/devel/bin/regen_charmonizer.pl
----------------------------------------------------------------------
diff --git a/devel/bin/regen_charmonizer.pl b/devel/bin/regen_charmonizer.pl
index 1e42dd3..53e4f2a 100755
--- a/devel/bin/regen_charmonizer.pl
+++ b/devel/bin/regen_charmonizer.pl
@@ -24,8 +24,19 @@ use File::Spec::Functions qw( catdir catfile updir );
 # Execute from the root of the Lucy repository.
 chdir catdir( $Bin, updir(), updir() );
 
-my $CHAZ_DIR = 'charmonizer';
+my $CHAZ_DIR;
+
+if (@ARGV > 0) {
+    $CHAZ_DIR = $ARGV[0];
+}
+else {
+    # Assume that Charmonizer is in '../charmonizer'.
+    $CHAZ_DIR = catdir( updir(), 'charmonizer' );
+}
+
 my $MELD_EXE = catfile( $CHAZ_DIR, 'buildbin', 'meld.pl' );
+die("Couldn't find meld.pl at $MELD_EXE")
+    if !-e $MELD_EXE;
 
 # Clownfish compiler.
 {


Mime
View raw message