Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Updated rubinius-code gems.
  • Loading branch information
brixen committed Jan 29, 2016
1 parent 74a7dbd commit 90c9577
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 26 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Expand Up @@ -6,4 +6,4 @@ gem "redcard", "~> 1.0"
gem "daedalus-core", "~> 0.1"
gem "rubinius-bridge", "~> 1.0"

gem "rubinius-build_tools", "~> 2.0"
gem "rubinius-code", "~> 3"
2 changes: 1 addition & 1 deletion Gemfile.installed
Expand Up @@ -5,7 +5,7 @@ gem "bundler", "~> 1.7"
gem "redcard", "~> 1.0"
gem "daedalus-core", "~> 0.1"

gem "rubinius-build_tools", "~> 2.0"
gem "rubinius-code", "~> 3"
gem "rubinius-developer_tools", "~> 2.0"

gem "rubysl", "~> 2.2"
Expand Down
26 changes: 14 additions & 12 deletions Gemfile.lock
Expand Up @@ -4,19 +4,21 @@ GEM
daedalus-core (0.5.0)
rake (10.5.0)
redcard (1.1.0)
rubinius-ast (2.4.0)
rubinius-ast (3.0)
rubinius-bridge (1.1.0)
redcard (~> 1.0)
rubinius-build_tools (2.0.0)
rubinius-ast (~> 2.0)
rubinius-compiler (~> 2.0)
rubinius-melbourne (~> 2.0)
rubinius-processor (~> 2.0)
rubinius-toolset (~> 2.0)
rubinius-compiler (2.3.1)
rubinius-melbourne (2.3.1.0)
rubinius-processor (2.3.0)
rubinius-toolset (2.3.1)
rubinius-code (3.0)
rubinius-ast (~> 3)
rubinius-compiler (~> 3)
rubinius-instructions (~> 3)
rubinius-melbourne (~> 3)
rubinius-processor (~> 3)
rubinius-toolset (~> 3)
rubinius-compiler (3.0)
rubinius-instructions (3.0)
rubinius-melbourne (3.0)
rubinius-processor (3.0)
rubinius-toolset (3.0)

PLATFORMS
ruby
Expand All @@ -26,7 +28,7 @@ DEPENDENCIES
rake (~> 10.0)
redcard (~> 1.0)
rubinius-bridge (~> 1.0)
rubinius-build_tools (~> 2.0)
rubinius-code (~> 3)

BUNDLED WITH
1.11.2
15 changes: 8 additions & 7 deletions gems_list.txt
Expand Up @@ -9,17 +9,18 @@ rake-10.5.0.gem
rb-readline-0.5.3.gem
rdoc-4.2.1.gem
redcard-1.1.0.gem
rubinius-ast-2.4.0.gem
rubinius-ast-3.0.gem
rubinius-bridge-1.1.0.gem
rubinius-build_tools-2.0.0.gem
rubinius-compiler-2.3.1.gem
rubinius-code-3.0.gem
rubinius-compiler-3.0.gem
rubinius-coverage-2.0.3.gem
rubinius-debugger-2.2.1.gem
rubinius-developer_tools-2.0.0.gem
rubinius-melbourne-2.3.1.0.gem
rubinius-processor-2.3.0.gem
rubinius-instructions-3.0.gem
rubinius-melbourne-3.0.gem
rubinius-processor-3.0.gem
rubinius-profiler-2.0.2.gem
rubinius-toolset-2.3.1.gem
rubinius-toolset-3.0.gem
rubysl-2.2.0.gem
rubysl-abbrev-2.0.4.gem
rubysl-base64-2.0.0.gem
Expand Down Expand Up @@ -70,9 +71,9 @@ rubysl-net-smtp-2.0.1.gem
rubysl-net-telnet-2.0.0.gem
rubysl-nkf-2.0.1.gem
rubysl-observer-2.0.0.gem
rubysl-open-uri-2.0.0.gem
rubysl-open3-2.0.0.gem
rubysl-openssl-2.8.0.gem
rubysl-open-uri-2.0.0.gem
rubysl-optparse-2.0.1.gem
rubysl-ostruct-2.1.0.gem
rubysl-pathname-2.1.0.gem
Expand Down
8 changes: 4 additions & 4 deletions kernel/delta/code_loader.rb
Expand Up @@ -131,12 +131,12 @@ def load_compiler
$LOAD_PATH.unshift dir
end

require_compiled "rubinius/toolset"
require_compiled "rubinius/code/toolset"

Rubinius::ToolSets.create :runtime do
require_compiled "rubinius/melbourne"
require_compiled "rubinius/processor"
require_compiled "rubinius/compiler"
require_compiled "rubinius/code/melbourne"
require_compiled "rubinius/code/processor"
require_compiled "rubinius/code/compiler"
require_compiled "rubinius/code/ast"
end
rescue Object => e
Expand Down
2 changes: 1 addition & 1 deletion rakelib/gems.rake
Expand Up @@ -22,7 +22,7 @@ namespace :gems do

task :melbourne do
prefix = "#{BUILD_CONFIG[:build_prefix]}#{BUILD_CONFIG[:runtimedir]}"
path = Dir["#{prefix}/gems/rubinius-melbourne-*/ext/rubinius/melbourne"].first
path = Dir["#{prefix}/gems/rubinius-melbourne-*/ext/rubinius/code/melbourne"].first
Dir.chdir path do
begin
ENV["RBX_RUN_COMPILED"] = "1"
Expand Down

0 comments on commit 90c9577

Please sign in to comment.