Skip to content

Commit

Permalink
[Truffle] Move Truffle's core Ruby files to the Truffle jar.
Browse files Browse the repository at this point in the history
  • Loading branch information
chrisseaton committed Feb 4, 2015
1 parent f140b23 commit 8105ed9
Show file tree
Hide file tree
Showing 64 changed files with 14 additions and 1 deletion.
5 changes: 5 additions & 0 deletions truffle/pom.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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|
Expand Down
8 changes: 8 additions & 0 deletions truffle/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
File renamed without changes.

0 comments on commit 8105ed9

Please sign in to comment.