[Truffle] Fixed path to built ruby.jar in CI.

jruby · Nov 30, 2016 · 3204907 · 3204907
1 parent 357f40d
commit 3204907
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/truffle/src/main/java/org/jruby/truffle/aot/RootedFileVisitor.java b/truffle/src/main/java/org/jruby/truffle/aot/RootedFileVisitor.java
@@ -35,20 +35,20 @@ static String rubyJarPath() {
         String svmJarPath = RootedFileVisitor.class.getProtectionDomain().getCodeSource().getLocation().getFile();
         String parentDir = new File(svmJarPath).getParent();
 
-        try {
-            // First try reading in the primary Ruby binary suite JAR.
-            File ret = new File(parentDir + "/../mx.imports/binary/jruby/mxbuild/dists/ruby.jar");
+        final String[] paths = new String[] { parentDir + "/../mx.imports/binary/jruby/mxbuild/dists/ruby.jar", parentDir + "/../../../jruby/mxbuild/dists/ruby.jar", parentDir + "/../../../main/mxbuild/dists/ruby.jar" };
 
+        for (String path : paths) {
+            final File ret = new File(path);
             if (ret.exists()) {
-                return ret.getCanonicalPath();
-            } else {
-                // Fallback to the locally built source suite JAR.
-                return new File(parentDir + "/../../../jruby/mxbuild/dists/ruby.jar").getCanonicalPath();
+                try {
+                    return ret.getCanonicalPath();
+                } catch (IOException e) {
+                    return null;
+                }
             }
-
-        } catch (IOException e) {
-            return null;
         }
+
+        return null;
     }
 
     static void visitEachFileOnClassPath(RootedFileVisitor<Path> visitor) {