Add build-time configuration for nativeimage

ajalt · Aug 15, 2024 · 22d90ce · 22d90ce
1 parent 4fdc96b
commit 22d90ce
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/...tlin/com/github/ajalt/mordant/terminal/terminalinterface/TerminalInterface.ffm.windows.kt b/...tlin/com/github/ajalt/mordant/terminal/terminalinterface/TerminalInterface.ffm.windows.kt
@@ -3,7 +3,7 @@ package com.github.ajalt.mordant.terminal.terminalinterface
 import com.github.ajalt.mordant.rendering.Size
 import java.lang.foreign.*
 
-internal object WinLayouts {
+private object WinLayouts {
     val HANDLE: AddressLayout = Layouts.POINTER
     val WORD: ValueLayout.OfShort = ValueLayout.JAVA_SHORT
     val DWORD: ValueLayout.OfInt = Layouts.INT

diff --git a/...A-INF/native-image/com.github.ajalt.mordant/mordant-jvm-graal-ffi/native-image.properties b/...A-INF/native-image/com.github.ajalt.mordant/mordant-jvm-graal-ffi/native-image.properties
@@ -1,3 +1,11 @@
 Args = -H:+UnlockExperimentalVMOptions \
        -H:ResourceConfigurationResources=${.}/resource-config.json \
-       -H:ReflectionConfigurationResources=${.}/reflection-config.json
+       -H:ReflectionConfigurationResources=${.}/reflection-config.json \
+       --initialize-at-build-time=com.github.ajalt.mordant.terminal.terminalinterface.TerminalInterfacePosix$Companion \
+       --initialize-at-build-time=com.github.ajalt.mordant.terminal.terminalinterface.TerminalInterfacePosix$TermiosConstants \
+       --initialize-at-build-time=com.github.ajalt.mordant.terminal.terminalinterface.TerminalInterfaceProviderNativeImage \
+       --initialize-at-build-time=com.github.ajalt.mordant.terminal.terminalinterface.TerminalInterfaceNativeImageLinux \
+       --initialize-at-build-time=com.github.ajalt.mordant.terminal.terminalinterface.TerminalInterfaceNativeImageMacos \
+       --initialize-at-build-time=com.github.ajalt.mordant.terminal.terminalinterface.TerminalInterfaceNativeImageWindows \
+       --initialize-at-build-time=com.github.ajalt.mordant.internal.MppInternal_jvmKt \
+       --initialize-at-build-time=com.github.ajalt.mordant.internal.MppInternalKt
diff --git a/test/graalvm/src/test/kotlin/GraalSmokeTest.kt b/test/graalvm/src/test/kotlin/GraalSmokeTest.kt
@@ -20,13 +20,12 @@ import kotlin.test.fail
  * They just make sure nothing crashes; the actual output is verified in the normal test suite.
  */
 class GraalSmokeTest {
+    // It would be nice to have more graal-specific assertions, but the nativeTest task actually
+    // runs all the tests twice, the first time on regular JVM to detect tests, then a second time
+    // on native. So any assertions about environment would have to handle that.
     @Test
     fun `terminal detection test`() {
-        val name = Terminal().terminalInterface::class.simpleName
-        val assertion = name!!.startsWith("TerminalInterfaceNativeImage")
-        if (!assertion) {
-            fail("Incorrect terminal interface: $name")
-        }
+        Terminal()
     }
 
     @Test