Mercurial > hg > graal-jvmci-8
comparison 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 |
comparison
equal
deleted
inserted
replaced
13640:bfe7a8c8c3c6 | 13645:497fada09efb |
---|---|
115 loadPath.push(context.makeString(path)); | 115 loadPath.push(context.makeString(path)); |
116 } | 116 } |
117 } | 117 } |
118 | 118 |
119 if (context.getConfiguration().getStandardLibrary().endsWith(".jar")) { | 119 if (context.getConfiguration().getStandardLibrary().endsWith(".jar")) { |
120 String version = null; | 120 /* |
121 | 121 * Use the 1.9 library, even though we're emulating 2.1, as there are some bugs running |
122 switch (configurationBuilder.getRubyVersion()) { | 122 * the 2.1 library at the moment. |
123 case RUBY_18: | 123 */ |
124 version = "1.8"; | 124 loadPath.push(context.makeString("jar:file:" + context.getConfiguration().getStandardLibrary() + "!/META-INF/jruby.home/lib/ruby/1.9")); |
125 break; | |
126 case RUBY_19: | |
127 version = "1.9"; | |
128 break; | |
129 case RUBY_20: | |
130 version = "2.0"; | |
131 break; | |
132 case RUBY_21: | |
133 version = "2.0"; | |
134 break; | |
135 } | |
136 | |
137 loadPath.push(context.makeString("jar:file:" + context.getConfiguration().getStandardLibrary() + "!/META-INF/jruby.home/lib/ruby/" + version)); | |
138 | |
139 } else { | 125 } else { |
140 loadPath.push(context.makeString(context.getConfiguration().getStandardLibrary())); | 126 loadPath.push(context.makeString(context.getConfiguration().getStandardLibrary())); |
141 } | 127 } |
142 | 128 |
143 // Pre-required modules | 129 // Pre-required modules |