From d34c4c45f5761467fe2d9cb1dfe92a1c0612a8e8 Mon Sep 17 00:00:00 2001 From: Davide D'Agostino Date: Thu, 20 Dec 2012 22:51:07 -0800 Subject: Allow COMPILE_MODE to be changed from ENV --- Rakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Rakefile b/Rakefile index 5986f2fc4..697d3e9ea 100644 --- a/Rakefile +++ b/Rakefile @@ -18,7 +18,7 @@ ENABLE_GEMS = ENV['ENABLE_GEMS'] == 'true' ACTIVE_GEMS = File.join(File.dirname(__FILE__), 'mrbgems', 'GEMS.active') # default compile option -COMPILE_MODE = :debug +COMPILE_MODE = ENV['COMPILE_MODE'] || :debug ############################## -- cgit v1.2.3 From bd7cf2f251509ef184e707a766a111c4ea057335 Mon Sep 17 00:00:00 2001 From: Davide D'Agostino Date: Thu, 20 Dec 2012 23:16:31 -0800 Subject: Allow ACTIVE_GEMS to be changed from ENV --- Rakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Rakefile b/Rakefile index 697d3e9ea..5fcad4e54 100644 --- a/Rakefile +++ b/Rakefile @@ -15,7 +15,7 @@ MRUBY_ROOT = ENV['MRUBY_ROOT'] || File.expand_path(File.dirname(__FILE__)) ENABLE_GEMS = ENV['ENABLE_GEMS'] == 'true' # the default file which contains the active GEMs -ACTIVE_GEMS = File.join(File.dirname(__FILE__), 'mrbgems', 'GEMS.active') +ACTIVE_GEMS = ENV['ACTIVE_GEMS'] || File.expand_path('../mrbgems/GEMS.active', __FILE__) # default compile option COMPILE_MODE = ENV['COMPILE_MODE'] || :debug -- cgit v1.2.3 From 706d77bf987f3cb3f833f3deca3836fb73c1c8f9 Mon Sep 17 00:00:00 2001 From: Davide D'Agostino Date: Thu, 20 Dec 2012 23:18:31 -0800 Subject: Reuse code for paths --- Rakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Rakefile b/Rakefile index 5fcad4e54..0eb128135 100644 --- a/Rakefile +++ b/Rakefile @@ -15,7 +15,7 @@ MRUBY_ROOT = ENV['MRUBY_ROOT'] || File.expand_path(File.dirname(__FILE__)) ENABLE_GEMS = ENV['ENABLE_GEMS'] == 'true' # the default file which contains the active GEMs -ACTIVE_GEMS = ENV['ACTIVE_GEMS'] || File.expand_path('../mrbgems/GEMS.active', __FILE__) +ACTIVE_GEMS = ENV['ACTIVE_GEMS'] || File.join(MRUBY_ROOT, '/mrbgems/GEMS.active') # default compile option COMPILE_MODE = ENV['COMPILE_MODE'] || :debug -- cgit v1.2.3