Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(cli): native image boot to repl #1271

Merged
merged 1 commit into from
Mar 9, 2025
Merged

fix(cli): native image boot to repl #1271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions packages/cli/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ val enableFfm = hostIsLinux && System.getProperty("os.arch") != "aarch64"
val enableEmbeddedResources = false
val enableResourceFilter = false
val enableAuxCache = false
val enableAuxCacheTrace = true
val enableAuxCacheTrace = false
val enableJpms = false
val enableConscrypt = false
val enableBouncycastle = false
Expand Down Expand Up @@ -1121,7 +1121,6 @@ val commonNativeArgs = listOfNotNull(
"-H:ExcludeResources=elide/stream/.*\\.proto",
"-H:ExcludeResources=elide/page/.*\\.proto",
"-H:ExcludeResources=elide/vfs/.*\\.proto",
"-H:ExcludeResources=org/jline/.*",
"-H:ExcludeResources=logback.xml",
"-H:ExcludeResources=META-INF/native/libsqlite.*",
"-H:ExcludeResources=lib/linux-x86_64/libbrotli.so",
Expand Down
14 changes: 13 additions & 1 deletion ...i/src/main/resources/META-INF/native-image/dev/elide/elide-cli/reachability-metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2918,7 +2918,15 @@
],
"resources": [
{
"glob": "sun/util/logging/resources/logging_en.properties"
"glob": "org/jline/utils/*.caps"
},
{
"glob": "sun/util/logging/resources/logging_en.properties",
"module": "java.logging"
},
{
"glob": "sun/util/logging/resources/logging_en_US.properties",
"module": "java.logging"
},
{
"glob": "META-INF/maven/org.jline/jline-native/pom.properties"
Expand Down Expand Up @@ -3097,6 +3105,10 @@
"name": "com.sun.tools.javac.resources.compiler",
"locales": ["en"]
},
{
"name": "sun.util.logging.resources.logging",
"locales": ["en", "en-US"]
},
{
"name": "sun.tools.jar.resources.jar",
"locales": ["en"]
Expand Down
6 changes: 5 additions & 1 deletion packages/graalvm/src/main/kotlin/elide/runtime/core/internals/graalvm/GraalVMEngine.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,12 +244,16 @@ import org.graalvm.polyglot.HostAccess as PolyglotHostAccess
/** Whether to emit trace messages for aux cache usage. */
private val traceCache = System.getProperty("elide.traceCache", "false") == "true"

/** Whether to use the auxiliary engine cache. */
private val enableAuxCache = System.getProperty("elide.auxCache", "false") == "true"

/** Whether the auxiliary cache is actually enabled. */
private val useAuxCache = (
ENABLE_AUX_CACHE &&
enableAuxCache &&
System.getProperty("elide.test") != "true" &&
System.getProperty("ELIDE_TEST") != "true" &&
System.getProperty("elide.vm.engine.preinitialize") != "false" && // manual killswitch
System.getProperty("elide.vm.engine.preinitialize") != "false" && // manual kill-switch
ImageInfo.inImageCode() &&
!ImageInfo.isSharedLibrary() &&
!Platform.includedIn(Platform.WINDOWS::class.java) // disabled on windows - not supported
Expand Down
Loading