You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by lo...@apache.org on 2013/02/10 08:54:06 UTC
[lucy-commits] [2/8] git commit: refs/heads/master - Fixed compile errors by
including CLOWNFISH_RUNTIME
Fixed compile errors by including CLOWNFISH_RUNTIME
Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/6de595f3
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/6de595f3
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/6de595f3
Branch: refs/heads/master
Commit: 6de595f3fe7c440502a0c34602831e56d4429cc4
Parents: b9f1b6d
Author: Logan Bell <lo...@gmail.com>
Authored: Sat Feb 9 15:03:58 2013 -0800
Committer: Logan Bell <lo...@gmail.com>
Committed: Sat Feb 9 15:47:57 2013 -0800
----------------------------------------------------------------------
clownfish/compiler/ruby/Rakefile | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy/blob/6de595f3/clownfish/compiler/ruby/Rakefile
----------------------------------------------------------------------
diff --git a/clownfish/compiler/ruby/Rakefile b/clownfish/compiler/ruby/Rakefile
index de41f95..656406a 100644
--- a/clownfish/compiler/ruby/Rakefile
+++ b/clownfish/compiler/ruby/Rakefile
@@ -21,8 +21,9 @@ def rbconfig
end
CLOWNFISH_RUBY_DIR = File.absolute_path('.')
-CLOWNFISH_INCLUDE_DIR = File.join('..','include')
-CLOWNFISH_SRC_DIR = File.join('..','src')
+CLOWNFISH_INCLUDE_DIR = File.join(CLOWNFISH_RUBY_DIR,'..','include')
+CLOWNFISH_SRC_DIR = File.join(CLOWNFISH_RUBY_DIR,'..','src')
+CLOWNFISH_RUNTIME = File.join('..','..','runtime','ruby')
LEMON_SRC_DIR = File.join('..','..','..','lemon')
RUBY_EXT_CFC = File.join('.','ext','Clownfish')
@@ -116,7 +117,7 @@ def extra_ccflags
if defined?(rbconfig["CFLAGS"])
ccflags += rbconfig['CFLAGS'] + ' '
end
-
+
if ENV.has_key?('CFLAGS')
ccflags += ENV['CFLAGS']
end
@@ -143,7 +144,7 @@ def extra_ccflags
end
def includes
- return "-I#{CLOWNFISH_INCLUDE_DIR} -I#{CLOWNFISH_SRC_DIR}"
+ return "-I#{CLOWNFISH_INCLUDE_DIR} -I#{CLOWNFISH_SRC_DIR} -I#{CLOWNFISH_RUNTIME}"
end
def make_command