Skip to content

Commit 3cdad6e

Browse files
committed
Extracted native lib dir conforms to the hierarchy naming convention
1 parent fc325f2 commit 3cdad6e

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

project/StdBits.scala

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,9 @@ object StdBits {
124124
)
125125
.value
126126
val extractPrefix = "nu/pattern/opencv"
127+
128+
// Make sure that the native libs in the `lib` directory complies with
129+
// `org.enso.interpreter.runtime.NativeLibraryFinder`
127130
def renameFunc(entryName: String): Option[String] = {
128131
val strippedEntryName = entryName.substring(extractPrefix.length + 1)
129132
if (
@@ -135,11 +138,15 @@ object StdBits {
135138
} else {
136139
Some(
137140
strippedEntryName
138-
.replace("osx", "macos")
139-
.replace("x86_64", "amd64")
141+
.replace("linux/x86_64", "amd64/linux")
142+
.replace("windows/x86_64", "amd64/windows")
143+
.replace("windows/x86_32", "x86_32/windows")
144+
.replace("osx/ARMv8", "ARMv8/macos")
145+
.replace("osx/x86_64", "amd64/macos")
140146
)
141147
}
142148
}
149+
143150
val logger = streams.value.log
144151
val openCvJar = JPMSUtils
145152
.filterModulesFromUpdate(

0 commit comments

Comments
 (0)