[Truffle] Move Truffle's core Ruby files to the Truffle jar.

jruby · Feb 4, 2015 · 8105ed9 · 8105ed9
1 parent f140b23
commit 8105ed9
Show file tree

Hide file tree

Showing 64 changed files with 14 additions and 1 deletion.
diff --git a/truffle/pom.rb b/truffle/pom.rb
@@ -44,6 +44,11 @@
 
   build do
     default_goal 'package'
+
+    resource do
+      directory 'src/main/ruby'
+      includes '**/*rb'
+    end
   end
 
   [ :dist, :'jruby-jars', :all, :release ].each do |name|

diff --git a/truffle/pom.xml b/truffle/pom.xml
@@ -35,6 +35,14 @@
   </dependencies>
   <build>
     <defaultGoal>package</defaultGoal>
+    <resources>
+      <resource>
+        <directory>src/main/ruby</directory>
+        <includes>
+          <include>**/*rb</include>
+        </includes>
+      </resource>
+    </resources>
     <plugins>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/core/CoreLibrary.java b/truffle/src/main/java/org/jruby/truffle/runtime/core/CoreLibrary.java
@@ -446,7 +446,7 @@ public void loadRubyCore(String fileName) {
     }
 
     public InputStream getRubyCoreInputStream(String fileName) {
-        final LoadServiceResource resource = context.getRuntime().getLoadService().getClassPathResource(context.getRuntime().getJRubyClassLoader(), fileName);
+        final LoadServiceResource resource = context.getRuntime().getLoadService().getClassPathResource(getClass().getClassLoader(), fileName);
 
         if (resource == null) {
             throw new RuntimeException("couldn't load Truffle core library " + fileName);

diff --git a/core/src/main/ruby/jruby/truffle/core.rb → truffle/src/main/ruby/jruby/truffle/core.rb b/core/src/main/ruby/jruby/truffle/core.rb → truffle/src/main/ruby/jruby/truffle/core.rb
diff --git a/...src/main/ruby/jruby/truffle/core/array.rb → ...src/main/ruby/jruby/truffle/core/array.rb b/...src/main/ruby/jruby/truffle/core/array.rb → ...src/main/ruby/jruby/truffle/core/array.rb
diff --git a/...rc/main/ruby/jruby/truffle/core/config.rb → ...rc/main/ruby/jruby/truffle/core/config.rb b/...rc/main/ruby/jruby/truffle/core/config.rb → ...rc/main/ruby/jruby/truffle/core/config.rb
diff --git a/...rc/main/ruby/jruby/truffle/core/fixnum.rb → ...rc/main/ruby/jruby/truffle/core/fixnum.rb b/...rc/main/ruby/jruby/truffle/core/fixnum.rb → ...rc/main/ruby/jruby/truffle/core/fixnum.rb
diff --git a/...src/main/ruby/jruby/truffle/core/float.rb → ...src/main/ruby/jruby/truffle/core/float.rb b/...src/main/ruby/jruby/truffle/core/float.rb → ...src/main/ruby/jruby/truffle/core/float.rb
diff --git a/.../src/main/ruby/jruby/truffle/core/hash.rb → .../src/main/ruby/jruby/truffle/core/hash.rb b/.../src/main/ruby/jruby/truffle/core/hash.rb → .../src/main/ruby/jruby/truffle/core/hash.rb
diff --git a/...rc/main/ruby/jruby/truffle/core/kernel.rb → ...rc/main/ruby/jruby/truffle/core/kernel.rb b/...rc/main/ruby/jruby/truffle/core/kernel.rb → ...rc/main/ruby/jruby/truffle/core/kernel.rb
diff --git a/.../src/main/ruby/jruby/truffle/core/main.rb → .../src/main/ruby/jruby/truffle/core/main.rb b/.../src/main/ruby/jruby/truffle/core/main.rb → .../src/main/ruby/jruby/truffle/core/main.rb
diff --git a/.../src/main/ruby/jruby/truffle/core/math.rb → .../src/main/ruby/jruby/truffle/core/math.rb b/.../src/main/ruby/jruby/truffle/core/math.rb → .../src/main/ruby/jruby/truffle/core/math.rb
diff --git a/...rc/main/ruby/jruby/truffle/core/method.rb → ...rc/main/ruby/jruby/truffle/core/method.rb b/...rc/main/ruby/jruby/truffle/core/method.rb → ...rc/main/ruby/jruby/truffle/core/method.rb
diff --git a/...rc/main/ruby/jruby/truffle/core/module.rb → ...rc/main/ruby/jruby/truffle/core/module.rb b/...rc/main/ruby/jruby/truffle/core/module.rb → ...rc/main/ruby/jruby/truffle/core/module.rb
diff --git a/...uby/jruby/truffle/core/rubinius/README.md → ...uby/jruby/truffle/core/rubinius/README.md b/...uby/jruby/truffle/core/rubinius/README.md → ...uby/jruby/truffle/core/rubinius/README.md
diff --git a/.../truffle/core/rubinius/api/compat/type.rb → .../truffle/core/rubinius/api/compat/type.rb b/.../truffle/core/rubinius/api/compat/type.rb → .../truffle/core/rubinius/api/compat/type.rb
diff --git a/...core/rubinius/api/kernel/common/thread.rb → ...core/rubinius/api/kernel/common/thread.rb b/...core/rubinius/api/kernel/common/thread.rb → ...core/rubinius/api/kernel/common/thread.rb
diff --git a/...e/core/rubinius/api/kernel/common/type.rb → ...e/core/rubinius/api/kernel/common/type.rb b/...e/core/rubinius/api/kernel/common/type.rb → ...e/core/rubinius/api/kernel/common/type.rb
diff --git a/...le/core/rubinius/api/shims/lookuptable.rb → ...le/core/rubinius/api/shims/lookuptable.rb b/...le/core/rubinius/api/shims/lookuptable.rb → ...le/core/rubinius/api/shims/lookuptable.rb
diff --git a/...ruffle/core/rubinius/api/shims/metrics.rb → ...ruffle/core/rubinius/api/shims/metrics.rb b/...ruffle/core/rubinius/api/shims/metrics.rb → ...ruffle/core/rubinius/api/shims/metrics.rb
diff --git a/...uffle/core/rubinius/api/shims/rubinius.rb → ...uffle/core/rubinius/api/shims/rubinius.rb b/...uffle/core/rubinius/api/shims/rubinius.rb → ...uffle/core/rubinius/api/shims/rubinius.rb
diff --git a/...truffle/core/rubinius/api/shims/thread.rb → ...truffle/core/rubinius/api/shims/thread.rb b/...truffle/core/rubinius/api/shims/thread.rb → ...truffle/core/rubinius/api/shims/thread.rb
diff --git a/...ffle/core/rubinius/api/shims/undefined.rb → ...ffle/core/rubinius/api/shims/undefined.rb b/...ffle/core/rubinius/api/shims/undefined.rb → ...ffle/core/rubinius/api/shims/undefined.rb
diff --git a/...rubinius/kernel/bootstrap/basic_object.rb → ...rubinius/kernel/bootstrap/basic_object.rb b/...rubinius/kernel/bootstrap/basic_object.rb → ...rubinius/kernel/bootstrap/basic_object.rb
diff --git a/...e/core/rubinius/kernel/bootstrap/false.rb → ...e/core/rubinius/kernel/bootstrap/false.rb b/...e/core/rubinius/kernel/bootstrap/false.rb → ...e/core/rubinius/kernel/bootstrap/false.rb
diff --git a/...ffle/core/rubinius/kernel/bootstrap/gc.rb → ...ffle/core/rubinius/kernel/bootstrap/gc.rb b/...ffle/core/rubinius/kernel/bootstrap/gc.rb → ...ffle/core/rubinius/kernel/bootstrap/gc.rb
diff --git a/.../core/rubinius/kernel/bootstrap/kernel.rb → .../core/rubinius/kernel/bootstrap/kernel.rb b/.../core/rubinius/kernel/bootstrap/kernel.rb → .../core/rubinius/kernel/bootstrap/kernel.rb
diff --git a/...fle/core/rubinius/kernel/bootstrap/nil.rb → ...fle/core/rubinius/kernel/bootstrap/nil.rb b/...fle/core/rubinius/kernel/bootstrap/nil.rb → ...fle/core/rubinius/kernel/bootstrap/nil.rb
diff --git a/.../core/rubinius/kernel/bootstrap/regexp.rb → .../core/rubinius/kernel/bootstrap/regexp.rb b/.../core/rubinius/kernel/bootstrap/regexp.rb → .../core/rubinius/kernel/bootstrap/regexp.rb
diff --git a/.../core/rubinius/kernel/bootstrap/string.rb → .../core/rubinius/kernel/bootstrap/string.rb b/.../core/rubinius/kernel/bootstrap/string.rb → .../core/rubinius/kernel/bootstrap/string.rb
diff --git a/.../core/rubinius/kernel/bootstrap/symbol.rb → .../core/rubinius/kernel/bootstrap/symbol.rb b/.../core/rubinius/kernel/bootstrap/symbol.rb → .../core/rubinius/kernel/bootstrap/symbol.rb
diff --git a/...le/core/rubinius/kernel/bootstrap/time.rb → ...le/core/rubinius/kernel/bootstrap/time.rb b/...le/core/rubinius/kernel/bootstrap/time.rb → ...le/core/rubinius/kernel/bootstrap/time.rb
diff --git a/...le/core/rubinius/kernel/bootstrap/true.rb → ...le/core/rubinius/kernel/bootstrap/true.rb b/...le/core/rubinius/kernel/bootstrap/true.rb → ...le/core/rubinius/kernel/bootstrap/true.rb
diff --git a/...le/core/rubinius/kernel/bootstrap/type.rb → ...le/core/rubinius/kernel/bootstrap/type.rb b/...le/core/rubinius/kernel/bootstrap/type.rb → ...le/core/rubinius/kernel/bootstrap/type.rb
diff --git a/...ffle/core/rubinius/kernel/common/array.rb → ...ffle/core/rubinius/kernel/common/array.rb b/...ffle/core/rubinius/kernel/common/array.rb → ...ffle/core/rubinius/kernel/common/array.rb
diff --git a/...le/core/rubinius/kernel/common/complex.rb → ...le/core/rubinius/kernel/common/complex.rb b/...le/core/rubinius/kernel/common/complex.rb → ...le/core/rubinius/kernel/common/complex.rb
diff --git a/...core/rubinius/kernel/common/enumerable.rb → ...core/rubinius/kernel/common/enumerable.rb b/...core/rubinius/kernel/common/enumerable.rb → ...core/rubinius/kernel/common/enumerable.rb
diff --git a/...core/rubinius/kernel/common/enumerator.rb → ...core/rubinius/kernel/common/enumerator.rb b/...core/rubinius/kernel/common/enumerator.rb → ...core/rubinius/kernel/common/enumerator.rb
diff --git a/.../core/rubinius/kernel/common/exception.rb → .../core/rubinius/kernel/common/exception.rb b/.../core/rubinius/kernel/common/exception.rb → .../core/rubinius/kernel/common/exception.rb
diff --git a/...ffle/core/rubinius/kernel/common/false.rb → ...ffle/core/rubinius/kernel/common/false.rb b/...ffle/core/rubinius/kernel/common/false.rb → ...ffle/core/rubinius/kernel/common/false.rb
diff --git a/...fle/core/rubinius/kernel/common/fixnum.rb → ...fle/core/rubinius/kernel/common/fixnum.rb b/...fle/core/rubinius/kernel/common/fixnum.rb → ...fle/core/rubinius/kernel/common/fixnum.rb
diff --git a/...ffle/core/rubinius/kernel/common/float.rb → ...ffle/core/rubinius/kernel/common/float.rb b/...ffle/core/rubinius/kernel/common/float.rb → ...ffle/core/rubinius/kernel/common/float.rb
diff --git a/...truffle/core/rubinius/kernel/common/gc.rb → ...truffle/core/rubinius/kernel/common/gc.rb b/...truffle/core/rubinius/kernel/common/gc.rb → ...truffle/core/rubinius/kernel/common/gc.rb
diff --git a/.../core/rubinius/kernel/common/immediate.rb → .../core/rubinius/kernel/common/immediate.rb b/.../core/rubinius/kernel/common/immediate.rb → .../core/rubinius/kernel/common/immediate.rb
diff --git a/...le/core/rubinius/kernel/common/integer.rb → ...le/core/rubinius/kernel/common/integer.rb b/...le/core/rubinius/kernel/common/integer.rb → ...le/core/rubinius/kernel/common/integer.rb
diff --git a/...fle/core/rubinius/kernel/common/kernel.rb → ...fle/core/rubinius/kernel/common/kernel.rb b/...fle/core/rubinius/kernel/common/kernel.rb → ...fle/core/rubinius/kernel/common/kernel.rb
diff --git a/...uffle/core/rubinius/kernel/common/main.rb → ...uffle/core/rubinius/kernel/common/main.rb b/...uffle/core/rubinius/kernel/common/main.rb → ...uffle/core/rubinius/kernel/common/main.rb
diff --git a/...le/core/rubinius/kernel/common/marshal.rb → ...le/core/rubinius/kernel/common/marshal.rb b/...le/core/rubinius/kernel/common/marshal.rb → ...le/core/rubinius/kernel/common/marshal.rb
diff --git a/...ffle/core/rubinius/kernel/common/mutex.rb → ...ffle/core/rubinius/kernel/common/mutex.rb b/...ffle/core/rubinius/kernel/common/mutex.rb → ...ffle/core/rubinius/kernel/common/mutex.rb
diff --git a/...ruffle/core/rubinius/kernel/common/nil.rb → ...ruffle/core/rubinius/kernel/common/nil.rb b/...ruffle/core/rubinius/kernel/common/nil.rb → ...ruffle/core/rubinius/kernel/common/nil.rb
diff --git a/...le/core/rubinius/kernel/common/numeric.rb → ...le/core/rubinius/kernel/common/numeric.rb b/...le/core/rubinius/kernel/common/numeric.rb → ...le/core/rubinius/kernel/common/numeric.rb
diff --git a/...re/rubinius/kernel/common/object_space.rb → ...re/rubinius/kernel/common/object_space.rb b/...re/rubinius/kernel/common/object_space.rb → ...re/rubinius/kernel/common/object_space.rb
diff --git a/...e/core/rubinius/kernel/common/rational.rb → ...e/core/rubinius/kernel/common/rational.rb b/...e/core/rubinius/kernel/common/rational.rb → ...e/core/rubinius/kernel/common/rational.rb
diff --git a/...fle/core/rubinius/kernel/common/regexp.rb → ...fle/core/rubinius/kernel/common/regexp.rb b/...fle/core/rubinius/kernel/common/regexp.rb → ...fle/core/rubinius/kernel/common/regexp.rb
diff --git a/...fle/core/rubinius/kernel/common/string.rb → ...fle/core/rubinius/kernel/common/string.rb b/...fle/core/rubinius/kernel/common/string.rb → ...fle/core/rubinius/kernel/common/string.rb
diff --git a/...fle/core/rubinius/kernel/common/struct.rb → ...fle/core/rubinius/kernel/common/struct.rb b/...fle/core/rubinius/kernel/common/struct.rb → ...fle/core/rubinius/kernel/common/struct.rb
diff --git a/...uffle/core/rubinius/kernel/common/time.rb → ...uffle/core/rubinius/kernel/common/time.rb b/...uffle/core/rubinius/kernel/common/time.rb → ...uffle/core/rubinius/kernel/common/time.rb
diff --git a/...uffle/core/rubinius/kernel/common/true.rb → ...uffle/core/rubinius/kernel/common/true.rb b/...uffle/core/rubinius/kernel/common/true.rb → ...uffle/core/rubinius/kernel/common/true.rb
diff --git a/...uffle/core/rubinius/kernel/common/type.rb → ...uffle/core/rubinius/kernel/common/type.rb b/...uffle/core/rubinius/kernel/common/type.rb → ...uffle/core/rubinius/kernel/common/type.rb
diff --git a/.../core/rubinius/kernel/common/undefined.rb → .../core/rubinius/kernel/common/undefined.rb b/.../core/rubinius/kernel/common/undefined.rb → .../core/rubinius/kernel/common/undefined.rb
diff --git a/...src/main/ruby/jruby/truffle/core/shims.rb → ...src/main/ruby/jruby/truffle/core/shims.rb b/...src/main/ruby/jruby/truffle/core/shims.rb → ...src/main/ruby/jruby/truffle/core/shims.rb
diff --git a/...rc/main/ruby/jruby/truffle/core/string.rb → ...rc/main/ruby/jruby/truffle/core/string.rb b/...rc/main/ruby/jruby/truffle/core/string.rb → ...rc/main/ruby/jruby/truffle/core/string.rb
diff --git a/...rc/main/ruby/jruby/truffle/core/thread.rb → ...rc/main/ruby/jruby/truffle/core/thread.rb b/...rc/main/ruby/jruby/truffle/core/thread.rb → ...rc/main/ruby/jruby/truffle/core/thread.rb
diff --git a/...ruby/jruby/truffle/core/unbound_method.rb → ...ruby/jruby/truffle/core/unbound_method.rb b/...ruby/jruby/truffle/core/unbound_method.rb → ...ruby/jruby/truffle/core/unbound_method.rb