Updated Branches: refs/heads/master b7548c4d8 -> 7c5ed8921
Re-arranged constants to be dependent order. Project: http://git-wip-us.apache.org/repos/asf/lucy/repo Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/7c5ed892 Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/7c5ed892 Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/7c5ed892 Branch: refs/heads/master Commit: 7c5ed8921f78e10ccbbd45f4f629384a5241750c Parents: a41d805 Author: Logan Bell <[email protected]> Authored: Sat Feb 9 23:51:17 2013 -0800 Committer: Logan Bell <[email protected]> Committed: Sat Feb 9 23:51:17 2013 -0800 ---------------------------------------------------------------------- clownfish/compiler/ruby/Rakefile | 4 ++-- clownfish/runtime/ruby/Rakefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucy/blob/7c5ed892/clownfish/compiler/ruby/Rakefile ---------------------------------------------------------------------- diff --git a/clownfish/compiler/ruby/Rakefile b/clownfish/compiler/ruby/Rakefile index b7f9620..0811396 100644 --- a/clownfish/compiler/ruby/Rakefile +++ b/clownfish/compiler/ruby/Rakefile @@ -25,16 +25,16 @@ def exe_path(*args) end BASE_PATH = '..' +COMMON_SOURCE_DIR = File.join(BASE_PATH, "common") CHARMONIZER_C = File.join(COMMON_SOURCE_DIR, 'charmonizer.c') CHARMONIZER_EXE_PATH = File.absolute_path(exe_path('charmonizer')) CHARMONIZER_ORIG_DIR = File.absolute_path( File.join( BASE_PATH, '..', '..', 'charmonizer' ) ) CHARMONY_H_PATH = 'charmony.h' CHARMONY_RB_PATH = 'Charmony.rb' -CLOWNFISH_INCLUDE_DIR = File.join(CLOWNFISH_RUBY_DIR,'..','include') CLOWNFISH_RUBY_DIR = File.absolute_path('.') +CLOWNFISH_INCLUDE_DIR = File.join(CLOWNFISH_RUBY_DIR,'..','include') CLOWNFISH_RUNTIME = File.join('..','..','runtime','ruby') CLOWNFISH_SRC_DIR = File.join(CLOWNFISH_RUBY_DIR,'..','src') -COMMON_SOURCE_DIR = File.join(BASE_PATH, "common") LEMON_SRC_DIR = File.join('..','..','..','lemon') RUBY_EXT_CFC = File.join('.','ext','Clownfish') http://git-wip-us.apache.org/repos/asf/lucy/blob/7c5ed892/clownfish/runtime/ruby/Rakefile ---------------------------------------------------------------------- diff --git a/clownfish/runtime/ruby/Rakefile b/clownfish/runtime/ruby/Rakefile index 712a60c..4869aab 100644 --- a/clownfish/runtime/ruby/Rakefile +++ b/clownfish/runtime/ruby/Rakefile @@ -22,14 +22,14 @@ def exe_path(*args) end BASE_PATH = '..' -CFC_BUILD = File.join( CFC_DIR, 'Build' ); CFC_DIR = File.join( BASE_PATH, '..', 'compiler', 'ruby' ); +CFC_BUILD = File.join( CFC_DIR, 'Build' ); +COMMON_SOURCE_DIR = File.join(BASE_PATH, "common") CHARMONIZER_C = File.join(COMMON_SOURCE_DIR, 'charmonizer.c') CHARMONIZER_EXE_PATH = File.absolute_path(exe_path('charmonizer')) CHARMONIZER_ORIG_DIR = File.absolute_path( File.join( BASE_PATH, '..', '..', 'charmonizer' ) ) CHARMONY_H_PATH = 'charmony.h' CHARMONY_RB_PATH = 'Charmony.rb' -COMMON_SOURCE_DIR = File.join(BASE_PATH, "common") CORE_SOURCE_DIR = File.absolute_path( BASE_PATH, 'core' ); LIB_DIR = 'lib';
