[Truffle] Allow .su files to be called .so and move some things aroun…

…d so that openssl.so and .rb can be in the same directory.
jruby · Jul 5, 2016 · 8d10af1 · 8d10af1
1 parent 092e032
commit 8d10af1
Showing 5 changed files with 16 additions and 7 deletions.
diff --git a/lib/ruby/truffle/openssl/openssl.rb b/lib/ruby/truffle/openssl/openssl.rb
@@ -10,8 +10,7 @@
   (See the file 'LICENCE'.)
 =end
 
-#require 'openssl.so'
-require 'openssl/openssl'
+require 'openssl.so'
 
 require 'openssl/bn'
 require 'openssl/pkey'

diff --git a/lib/ruby/truffle/truffle/openssl.rb b/lib/ruby/truffle/truffle/openssl.rb
diff --git a/truffle/src/main/c/openssl/.jruby-cext-build.yml b/truffle/src/main/c/openssl/.jruby-cext-build.yml
@@ -1,2 +1,2 @@
 src: ./*.c
-out: ../../../../../lib/ruby/truffle/openssl/openssl/openssl.su
+out: ../../../../../lib/ruby/truffle/openssl/openssl.su
diff --git a/truffle/src/main/java/org/jruby/truffle/language/loader/FeatureLoader.java b/truffle/src/main/java/org/jruby/truffle/language/loader/FeatureLoader.java
@@ -70,10 +70,20 @@ public String findFeature(String feature) {
     }
 
     private String findFeatureWithAndWithoutExtension(String path) {
-        final String asCExt = findFeatureWithExactPath(path + RubyLanguage.CEXT_EXTENSION);
+        if (path.endsWith(".so")) {
+            final String base = path.substring(0, path.length() - 3);
 
-        if (asCExt != null) {
-            return asCExt;
+            final String asSO = findFeatureWithExactPath(base + RubyLanguage.CEXT_EXTENSION);
+
+            if (asSO != null) {
+                return asSO;
+            }
+        }
+
+        final String asSU = findFeatureWithExactPath(path + RubyLanguage.CEXT_EXTENSION);
+
+        if (asSU != null) {
+            return asSU;
         }
 
         final String withExtension = findFeatureWithExactPath(path + RubyLanguage.EXTENSION);

diff --git a/truffle/src/main/ruby/core/post.rb b/truffle/src/main/ruby/core/post.rb
@@ -63,6 +63,7 @@ def self.const_exists?(mod, name, inherit = true)
 $LOAD_PATH.push home + '/lib/ruby/truffle/rubysl/rubysl-webrick/lib'
 $LOAD_PATH.push home + '/lib/ruby/truffle/shims'
 $LOAD_PATH.push home + '/lib/ruby/truffle/truffle'
+#$LOAD_PATH.push home + '/lib/ruby/truffle/openssl'
 
 # We defined Psych at the top level because several things depend on its name.
 # Here we fix that up and put it back into Truffle.