diff options
| author | mattn <[email protected]> | 2013-01-10 10:04:07 +0900 |
|---|---|---|
| committer | mattn <[email protected]> | 2013-01-10 10:04:07 +0900 |
| commit | ee0f73a46a17411f6dfc88163bf5d76241932a48 (patch) | |
| tree | 00c9c8bd8346598b6f2e2e0a608f376197f656c8 /tasks | |
| parent | ef4b0c6cd3442598169dad9e6861d3c2db271f58 (diff) | |
| parent | 5804e7682ecbd59c1a9cea56c9ad008cff206713 (diff) | |
| download | mruby-ee0f73a46a17411f6dfc88163bf5d76241932a48.tar.gz mruby-ee0f73a46a17411f6dfc88163bf5d76241932a48.zip | |
Merge branch 'master' of https://github.com/mruby/mruby
Diffstat (limited to 'tasks')
| -rw-r--r-- | tasks/libmruby.rake | 2 | ||||
| -rw-r--r-- | tasks/mruby_build.rake | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/tasks/libmruby.rake b/tasks/libmruby.rake index 1c68aa5e4..9f5cc555a 100644 --- a/tasks/libmruby.rake +++ b/tasks/libmruby.rake @@ -1,5 +1,5 @@ MRuby.each_target do file "#{build_dir}/lib/libmruby.a" => libmruby.flatten do |t| - archive t.name, 'r', t.prerequisites + archive t.name, 'rs', t.prerequisites end end diff --git a/tasks/mruby_build.rake b/tasks/mruby_build.rake index d5dc075c3..de9e556b4 100644 --- a/tasks/mruby_build.rake +++ b/tasks/mruby_build.rake @@ -3,11 +3,11 @@ module MRuby attr_accessor :build def targets - @targets ||= [] + @targets ||= {} end def each_target(&block) - @targets.each do |target| + @targets.each do |key, target| target.instance_eval(&block) end end @@ -22,6 +22,7 @@ module MRuby attr_writer :cxx, :cxxflags attr_writer :objcc, :objcflags attr_writer :asm, :asmflags + attr_accessor :bins attr_accessor :gperf, :yacc attr_accessor :cat, :git attr_reader :root, :gems @@ -38,9 +39,11 @@ module MRuby @yacc, @gperf = 'bison', 'gperf' @cat, @git = 'cat', 'git' + @bins = %w(mruby mrbc mirb) + @gems, @libmruby = [], [] - MRuby.targets << self + MRuby.targets[name.to_s] = self MRuby.build = self instance_eval(&block) end |