Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 19 additions & 9 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -1816,10 +1816,14 @@ lazy val `ydoc-server` = project
Test / fork := true,
commands += WithDebugCommand.withDebug,
Compile / moduleDependencies ++=
GraalVM.modules ++ GraalVM.jsPkgs ++ GraalVM.chromeInspectorPkgs ++ helidon ++ logbackPkg ++ slf4jApi,
GraalVM.modules ++ GraalVM.jsPkgs ++ GraalVM.chromeInspectorPkgs ++ helidon ++ slf4jApi,
Compile / internalModuleDependencies := Seq(
(`syntax-rust-definition` / Compile / exportedModule).value,
(`ydoc-polyfill` / Compile / exportedModule).value
(`ydoc-polyfill` / Compile / exportedModule).value,
(`engine-common` / Compile / exportedModule).value,
(`persistance` / Compile / exportedModule).value,
(`jvm-channel` / Compile / exportedModule).value,
(`jvm-interop` / Compile / exportedModule).value
),
libraryDependencies ++= slf4jApi ++ Seq(
"org.graalvm.truffle" % "truffle-api" % graalMavenPackagesVersion % "provided",
Expand Down Expand Up @@ -1892,15 +1896,22 @@ lazy val `ydoc-server` = project
)
)
.getOrElse(Seq())
val mpp =
(Compile / modulePath).value ++ Seq((Compile / packageBin).value)
val mp = mpp.map(_.getAbsolutePath)
NativeImage
.buildNativeImage(
"org.enso.ydoc.server",
staticOnLinux = false,
additionalOptions = cLibraryOpts,
targetDir = engineDistributionRoot.value / "component",
mainClass = Some("org.enso.ydoc.server.Main"),
symlink = false,
shared = true
staticOnLinux = false,
additionalOptions = cLibraryOpts,
targetDir = engineDistributionRoot.value / "component",
modulePath = mp,
mainModule = Some("org.enso.ydoc.server"),
mainClass = Some("org.enso.ydoc.server.Main"),
initializeAtRuntime = Seq("io.helidon.webclient.api.LoomClient"),
symlink = false,
shared = true,
useCp = false
)
}.value,
buildNativeImage := Def.taskDyn {
Expand All @@ -1914,7 +1925,6 @@ lazy val `ydoc-server` = project
}.value
)
.dependsOn(`jvm-interop`)
.dependsOn(`logging-service-logback`)
.dependsOn(`ydoc-polyfill`)

lazy val `ydoc-server-registration` = project
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"jni" : [
{
"type": "org.enso.jvm.channel.Channel",
"methods": [
{
"name": "createJvmPeerChannel",
"parameterTypes": ["long", "long", "long", "java.lang.String"]
},
{
"name": "handleJvmMessage",
"parameterTypes": ["long", "long", "long", "long"]
}
]
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Args=-H:ReachabilityMetadataResources=META-INF/native-image/org/enso/jvm/channel/jni.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Args=-H:ReflectionConfigurationResources=META-INF/native-image/org/enso/jvm/interop/reflect.json
1 change: 1 addition & 0 deletions lib/java/ydoc-server/src/main/java/module-info.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
requires org.graalvm.polyglot;
requires org.slf4j;
requires static org.graalvm.nativeimage;
requires static org.enso.jvm.interop;

// need for hosted JVM access
opens org.enso.ydoc.server;
Expand Down
3 changes: 2 additions & 1 deletion project/GraalVM.scala
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,8 @@ object GraalVM {
Seq(
"org.graalvm.js" % "js-language" % version,
"org.graalvm.regex" % "regex" % version,
"org.graalvm.shadowed" % "icu4j" % version
"org.graalvm.shadowed" % "icu4j" % version,
"org.graalvm.shadowed" % "xz" % version
)

val chromeInspectorPkgs = Seq(
Expand Down
19 changes: 14 additions & 5 deletions project/NativeImage.scala
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,8 @@ object NativeImage {
addModules: Seq[String] = Seq.empty,
verbose: Boolean = false,
symlink: Boolean = true,
shared: Boolean = false
shared: Boolean = false,
useCp: Boolean = true
): Def.Initialize[Task[Unit]] = Def
.task {
val log = state.value.log
Expand Down Expand Up @@ -197,11 +198,19 @@ object NativeImage {
val ourCp = (Runtime / fullClasspath).value
val auxCp = additionalCp.value
val fullCp = ourCp.map(_.data.getAbsolutePath) ++ auxCp
val cpStr = fullCp.mkString(File.pathSeparator)
log.debug("Class-path: " + cpStr)

val mp = if (modulePath.nonEmpty) {
Seq("--module-path", modulePath.mkString(File.pathSeparator))
val mpStr = modulePath.mkString(File.pathSeparator)
log.debug("Module-path: " + mpStr)
Seq("--module-path", mpStr)
} else {
Seq()
}

val cpOpt = if (useCp) {
val cpStr = fullCp.mkString(File.pathSeparator)
log.debug("Class-path: " + cpStr)
Seq("-cp", cpStr)
} else {
Seq()
}
Expand Down Expand Up @@ -235,7 +244,7 @@ object NativeImage {
mp ++
addModulesOpt ++
sharedOpt ++
Seq("-cp", cpStr) ++
cpOpt ++
staticParameters ++
configs ++
Seq("--no-fallback") ++
Expand Down
Loading