Rename the JNI Prism/YARP bindings library to libyarpbindings

oracle · Nov 15, 2023 · ffe39ce · ffe39ce
1 parent a664c9c
commit ffe39ce
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/mx.truffleruby/suite.py b/mx.truffleruby/suite.py
@@ -219,7 +219,7 @@
             "ldflags": ["-pthread"],
         },
 
-        "org.prism.libyarp": {
+        "org.prism.libprism": {
             "class": "YARPNativeProject",
             "dir": "src/main/c/yarp",
             # "makeTarget": "all-no-debug", # Can use this to build without asserts
@@ -230,15 +230,15 @@
         "org.truffleruby.yarp.bindings": {
             "dir": "src/main/c/yarp_bindings",
             "native": "shared_lib",
-            "deliverable": "yarp",
+            "deliverable": "yarpbindings",
             "buildDependencies": [
-                "org.prism.libyarp", # libprism.a
+                "org.prism.libprism", # libprism.a
                 "org.prism", # for the generated JNI header file
             ],
             "use_jdk_headers": True, # the generated JNI header includes jni.h
-            "cflags": ["-g", "-Wall", "-Werror", "-pthread", "-I<path:org.prism.libyarp>/include"],
+            "cflags": ["-g", "-Wall", "-Werror", "-pthread", "-I<path:org.prism.libprism>/include"],
             "ldflags": ["-pthread"],
-            "ldlibs": ["<path:org.prism.libyarp>/build/libprism.a"],
+            "ldlibs": ["<path:org.prism.libprism>/build/libprism.a"],
             "description": "JNI bindings for YARP"
         },
 

diff --git a/src/main/java/org/truffleruby/debug/TruffleDebugNodes.java b/src/main/java/org/truffleruby/debug/TruffleDebugNodes.java
@@ -256,7 +256,7 @@ Object printBacktrace() {
 
     private static byte[] yarpSerialize(RubyLanguage language, byte[] source) {
         // TODO: load it once during context initialization (when YARP is used as the main parser)
-        Parser.loadLibrary(language.getRubyHome() + "/lib/libyarp" + Platform.LIB_SUFFIX);
+        Parser.loadLibrary(language.getRubyHome() + "/lib/libyarpbindings" + Platform.LIB_SUFFIX);
         return Parser.parseAndSerialize(source);
     }
 

diff --git a/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java b/src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java
@@ -409,7 +409,7 @@ public static org.prism.Nodes.Node parseToYARPAST(RubyContext context, RubyLangu
 
         // YARP begin
         byte[] sourceBytes = rubySource.getBytes();
-        org.prism.Parser.loadLibrary(language.getRubyHome() + "/lib/libyarp" + Platform.LIB_SUFFIX);
+        org.prism.Parser.loadLibrary(language.getRubyHome() + "/lib/libyarpbindings" + Platform.LIB_SUFFIX);
         byte[] serializedBytes = Parser.parseAndSerialize(sourceBytes);
 
         var yarpSource = createYARPSource(sourceBytes, rubySource);