Mercurial > hg > graal-jvmci-8
diff graal/com.oracle.truffle.ruby.shell/src/com/oracle/truffle/ruby/shell/Shell.java @ 13645:497fada09efb
Ruby: remove versioning.
author | Chris Seaton <chris.seaton@oracle.com> |
---|---|
date | Wed, 15 Jan 2014 19:27:27 +0000 |
parents | 0fbee3eb71f0 |
children | 3f27e57439ed |
line wrap: on
line diff
--- a/graal/com.oracle.truffle.ruby.shell/src/com/oracle/truffle/ruby/shell/Shell.java Wed Jan 15 15:11:47 2014 +0100 +++ b/graal/com.oracle.truffle.ruby.shell/src/com/oracle/truffle/ruby/shell/Shell.java Wed Jan 15 19:27:27 2014 +0000 @@ -117,25 +117,11 @@ } if (context.getConfiguration().getStandardLibrary().endsWith(".jar")) { - String version = null; - - switch (configurationBuilder.getRubyVersion()) { - case RUBY_18: - version = "1.8"; - break; - case RUBY_19: - version = "1.9"; - break; - case RUBY_20: - version = "2.0"; - break; - case RUBY_21: - version = "2.0"; - break; - } - - loadPath.push(context.makeString("jar:file:" + context.getConfiguration().getStandardLibrary() + "!/META-INF/jruby.home/lib/ruby/" + version)); - + /* + * Use the 1.9 library, even though we're emulating 2.1, as there are some bugs running + * the 2.1 library at the moment. + */ + loadPath.push(context.makeString("jar:file:" + context.getConfiguration().getStandardLibrary() + "!/META-INF/jruby.home/lib/ruby/1.9")); } else { loadPath.push(context.makeString(context.getConfiguration().getStandardLibrary())); }