Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 260cae0df7d7
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 214dea5ba2f6
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Apr 21, 2015

  1. [Truffle] Added 'ruby_version' key to RbConfig::CONFIG.

    @nirvdrum
    nirvdrum committed Apr 21, 2015
    Copy the full SHA
    8e040f6 View commit details

  2. Updated RbConfig::CONFIG['ruby_version'] to match MRI.

    @nirvdrum
    nirvdrum committed Apr 21, 2015
    Copy the full SHA
    214dea5 View commit details
Showing with 2 additions and 1 deletion.
  1. +1 −1 core/src/main/java/org/jruby/ext/rbconfig/RbConfigLibrary.java
  2. +1 −0 truffle/src/main/ruby/core/config.rb
2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/ext/rbconfig/RbConfigLibrary.java
View file
Original file line number Diff line number Diff line change
@@ -230,7 +230,7 @@ public void load(Ruby runtime, boolean wrap) {
setConfig(configHash, "MAJOR", versionParts[0]);
setConfig(configHash, "MINOR", versionParts[1]);
setConfig(configHash, "TEENY", versionParts[2]);
setConfig(configHash, "ruby_version", versionParts[0] + '.' + versionParts[1]);
setConfig(configHash, "ruby_version", versionParts[0] + '.' + versionParts[1] + ".0");
// Rubygems is too specific on host cpu so until we have real need lets default to universal
//setConfig(configHash, "arch", System.getProperty("os.arch") + "-java" + System.getProperty("java.specification.version"));
setConfig(configHash, "arch", "universal-java" + System.getProperty("java.specification.version"));
1 change: 1 addition & 0 deletions truffle/src/main/ruby/core/config.rb
View file
Original file line number Diff line number Diff line change
@@ -13,5 +13,6 @@ module RbConfig
'host_os' => File::ALT_SEPARATOR.nil? ? 'unknown' : 'mswin32',
'exeext' => '',
'EXEEXT' => 'rubytruffle',
'ruby_version' => '2.2.0'
}
end