[Truffle] Store core files under jruby-truffle in the jar to avoid po…

…lluting top-level directory in shaded jars.
jruby · Aug 28, 2015 · 9f1d4cb · 9f1d4cb
1 parent 961f6ee
commit 9f1d4cb
Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/core/src/main/java/org/jruby/util/cli/Options.java b/core/src/main/java/org/jruby/util/cli/Options.java
@@ -125,7 +125,7 @@ public class Options {
     public static final Option<Boolean> IR_WRITING_DEBUG     = bool(IR, "ir.writing.debug", false, "Debug writing JRuby IR file.");
     public static final Option<String>  IR_INLINE_COMPILER_PASSES = string(IR, "ir.inline_passes", "Specify comma delimeted list of passes to run after inlining a method.");
 
-    public static final Option<String> TRUFFLE_CORE_LOAD_PATH = string(TRUFFLE, "truffle.core.load_path", "truffle:/", "Directory to load the Truffle core library from.");
+    public static final Option<String> TRUFFLE_CORE_LOAD_PATH = string(TRUFFLE, "truffle.core.load_path", "truffle:/jruby-truffle", "Directory to load the Truffle core library from.");
 
     public static final Option<Integer> TRUFFLE_DISPATCH_POLYMORPHIC_MAX = integer(TRUFFLE, "truffle.dispatch.polymorphic.max", 8, "Maximum size of a polymorphic call site cache.");
     public static final Option<Integer> TRUFFLE_ARRAYS_UNINITIALIZED_SIZE = integer(TRUFFLE, "truffle.arrays.uninitialized_size", 32, "How large an array to allocate when we have no other information to go on.");

diff --git a/truffle/pom.rb b/truffle/pom.rb
@@ -55,6 +55,7 @@
     resource do
       directory 'src/main/ruby'
       includes '**/*rb'
+      target_path '${project.build.directory}/classes/jruby-truffle'
     end
   end
 

diff --git a/truffle/pom.xml b/truffle/pom.xml
@@ -44,6 +44,7 @@ DO NOT MODIFIY - GENERATED CODE
     <defaultGoal>package</defaultGoal>
     <resources>
       <resource>
+        <targetPath>${project.build.directory}/classes/jruby-truffle</targetPath>
         <directory>src/main/ruby</directory>
         <includes>
           <include>**/*rb</include>