Skip to content

Commit ffe39ce

Browse files
committed
Rename the JNI Prism/YARP bindings library to libyarpbindings
1 parent a664c9c commit ffe39ce

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

mx.truffleruby/suite.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@
219219
"ldflags": ["-pthread"],
220220
},
221221

222-
"org.prism.libyarp": {
222+
"org.prism.libprism": {
223223
"class": "YARPNativeProject",
224224
"dir": "src/main/c/yarp",
225225
# "makeTarget": "all-no-debug", # Can use this to build without asserts
@@ -230,15 +230,15 @@
230230
"org.truffleruby.yarp.bindings": {
231231
"dir": "src/main/c/yarp_bindings",
232232
"native": "shared_lib",
233-
"deliverable": "yarp",
233+
"deliverable": "yarpbindings",
234234
"buildDependencies": [
235-
"org.prism.libyarp", # libprism.a
235+
"org.prism.libprism", # libprism.a
236236
"org.prism", # for the generated JNI header file
237237
],
238238
"use_jdk_headers": True, # the generated JNI header includes jni.h
239-
"cflags": ["-g", "-Wall", "-Werror", "-pthread", "-I<path:org.prism.libyarp>/include"],
239+
"cflags": ["-g", "-Wall", "-Werror", "-pthread", "-I<path:org.prism.libprism>/include"],
240240
"ldflags": ["-pthread"],
241-
"ldlibs": ["<path:org.prism.libyarp>/build/libprism.a"],
241+
"ldlibs": ["<path:org.prism.libprism>/build/libprism.a"],
242242
"description": "JNI bindings for YARP"
243243
},
244244

src/main/java/org/truffleruby/debug/TruffleDebugNodes.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ Object printBacktrace() {
256256

257257
private static byte[] yarpSerialize(RubyLanguage language, byte[] source) {
258258
// TODO: load it once during context initialization (when YARP is used as the main parser)
259-
Parser.loadLibrary(language.getRubyHome() + "/lib/libyarp" + Platform.LIB_SUFFIX);
259+
Parser.loadLibrary(language.getRubyHome() + "/lib/libyarpbindings" + Platform.LIB_SUFFIX);
260260
return Parser.parseAndSerialize(source);
261261
}
262262

src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@ public static org.prism.Nodes.Node parseToYARPAST(RubyContext context, RubyLangu
409409

410410
// YARP begin
411411
byte[] sourceBytes = rubySource.getBytes();
412-
org.prism.Parser.loadLibrary(language.getRubyHome() + "/lib/libyarp" + Platform.LIB_SUFFIX);
412+
org.prism.Parser.loadLibrary(language.getRubyHome() + "/lib/libyarpbindings" + Platform.LIB_SUFFIX);
413413
byte[] serializedBytes = Parser.parseAndSerialize(sourceBytes);
414414

415415
var yarpSource = createYARPSource(sourceBytes, rubySource);

0 commit comments

Comments
 (0)