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: c5ac1f4d031e
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 76524c8486a2
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Jun 1, 2015

  1. Updated RUBY_COPYRIGHT for 2015.

    @nirvdrum
    nirvdrum committed Jun 1, 2015
    Copy the full SHA
    a36dc5f View commit details

  2. [Truffle] All builtin_constants specs now pass.

    @nirvdrum
    nirvdrum committed Jun 1, 2015
    Copy the full SHA
    76524c8 View commit details
2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/util/cli/OutputStrings.java
View file
Original file line number Diff line number Diff line change
@@ -130,6 +130,6 @@ public static String getVersionString() {
}

public static String getCopyrightString() {
return "JRuby - Copyright (C) 2001-2014 The JRuby Community (and contribs)";
return "JRuby - Copyright (C) 2001-2015 The JRuby Community (and contribs)";
}
}
2 changes: 0 additions & 2 deletions spec/truffle/tags/core/builtin_constants/builtin_constants_tags.txt
View file

This file was deleted.

2 changes: 2 additions & 0 deletions truffle/src/main/java/org/jruby/truffle/runtime/core/CoreLibrary.java
View file
Original file line number Diff line number Diff line change
@@ -484,10 +484,12 @@ private void initializeConstants() {
objectClass.setConstant(node, "RUBY_VERSION", StringNodes.createString(stringClass, Constants.RUBY_VERSION));
objectClass.setConstant(node, "JRUBY_VERSION", StringNodes.createString(stringClass, Constants.VERSION));
objectClass.setConstant(node, "RUBY_PATCHLEVEL", Constants.RUBY_PATCHLEVEL);
objectClass.setConstant(node, "RUBY_REVISION", Constants.RUBY_REVISION);
objectClass.setConstant(node, "RUBY_ENGINE", StringNodes.createString(stringClass, Constants.ENGINE + "+truffle"));
objectClass.setConstant(node, "RUBY_PLATFORM", StringNodes.createString(stringClass, Constants.PLATFORM));
objectClass.setConstant(node, "RUBY_RELEASE_DATE", StringNodes.createString(stringClass, Constants.COMPILE_DATE));
objectClass.setConstant(node, "RUBY_DESCRIPTION", StringNodes.createString(stringClass, OutputStrings.getVersionString()));
objectClass.setConstant(node, "RUBY_COPYRIGHT", StringNodes.createString(stringClass, OutputStrings.getCopyrightString()));

// BasicObject knows itself
basicObjectClass.setConstant(node, "BasicObject", basicObjectClass);