diff --git a/phoenicis-dist/src/scripts/phoenicis-create-package.sh b/phoenicis-dist/src/scripts/phoenicis-create-package.sh index ceffe6df3f6..debcff6699e 100755 --- a/phoenicis-dist/src/scripts/phoenicis-create-package.sh +++ b/phoenicis-dist/src/scripts/phoenicis-create-package.sh @@ -24,19 +24,21 @@ PHOENICIS_OPERATING_SYSTEM="$(uname)" if [ "$PHOENICIS_OPERATING_SYSTEM" == "Darwin" ]; then PHOENICIS_APPTITLE="Phoenicis PlayOnMac" JPACKAGER_OS="osx" + JAR_RELATIVE_PATH="../Java" fi if [ "$PHOENICIS_OPERATING_SYSTEM" == "Linux" ]; then PHOENICIS_APPTITLE="Phoenicis PlayOnLinux" JPACKAGER_OS="linux" + JAR_RELATIVE_PATH="/usr/share/phoenicis/app" fi PHOENICIS_TARGET="$SCRIPT_PATH/../../target" PHOENICIS_JPACKAGER="$SCRIPT_PATH/../../target/jpackager" PHOENICIS_RESOURCES="$SCRIPT_PATH/../resources" -PHOENICIS_MODULES="jdk.crypto.ec,java.base,javafx.base,javafx.web,javafx.media,javafx.graphics,javafx.controls,java.naming,java.sql,java.scripting,jdk.scripting.nashorn" -PHOENICIS_JPACKAGER_ARGUMENTS=("-i" "$PHOENICIS_TARGET/lib" "--main-jar" "phoenicis-javafx-$VERSION.jar" "-n" "$PHOENICIS_APPTITLE" "--output" "$PHOENICIS_TARGET/packages/" "--add-modules" "$PHOENICIS_MODULES" "-p" "$PHOENICIS_TARGET/lib/" "--version" "$VERSION") - +PHOENICIS_MODULES="jdk.crypto.ec,java.base,javafx.base,javafx.web,javafx.media,javafx.graphics,javafx.controls,java.naming,java.sql,java.scripting,jdk.scripting.nashorn,jdk.internal.vm.ci,org.graalvm.truffle" +PHOENICIS_RUNTIME_OPTIONS="-XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI --upgrade-module-path=$JAR_RELATIVE_PATH/compiler.jar" +PHOENICIS_JPACKAGER_ARGUMENTS=("-i" "$PHOENICIS_TARGET/lib" "--main-jar" "phoenicis-javafx-$VERSION.jar" "-n" "$PHOENICIS_APPTITLE" "--output" "$PHOENICIS_TARGET/packages/" "--add-modules" "$PHOENICIS_MODULES" "-p" "$PHOENICIS_TARGET/lib/" "--version" "$VERSION" "--jvm-args" "$PHOENICIS_RUNTIME_OPTIONS") _download_jpackager() { mkdir -p "$PHOENICIS_JPACKAGER" diff --git a/phoenicis-scripts/src/main/java/org/phoenicis/scripts/engine/implementation/PolyglotScriptEngine.java b/phoenicis-scripts/src/main/java/org/phoenicis/scripts/engine/implementation/PolyglotScriptEngine.java index 318f4badda0..69406983fca 100644 --- a/phoenicis-scripts/src/main/java/org/phoenicis/scripts/engine/implementation/PolyglotScriptEngine.java +++ b/phoenicis-scripts/src/main/java/org/phoenicis/scripts/engine/implementation/PolyglotScriptEngine.java @@ -42,6 +42,7 @@ public PolyglotScriptEngine(String language, Map options) { this.errorHandlers = new ArrayList<>(); this.language = language; this.context = Context.newBuilder(language) + .allowExperimentalOptions(true) .options(options).allowHostAccess(true).build(); } diff --git a/phoenicis-tools/pom.xml b/phoenicis-tools/pom.xml index 3fd03949128..c09c29b0eb4 100644 --- a/phoenicis-tools/pom.xml +++ b/phoenicis-tools/pom.xml @@ -115,6 +115,11 @@ bcprov-jdk15on org.bouncycastle + + + jackson-core + com.fasterxml.jackson.core +