Native image builds running correctly again.

include all of webroot in native image
Peergos · Mar 29, 2024 · 04247be · 04247be
1 parent eca9e7c
commit 04247be
Show file tree

Hide file tree

Showing 7 changed files with 1,109 additions and 114 deletions.
diff --git a/native-build/BuildNativeImage.java b/native-build/BuildNativeImage.java
@@ -26,10 +26,10 @@ public static void main(String[] a) throws Exception {
         // run native-image
         runCommand(nativeImage.get().toString() + " " + 
                    "-H:+UnlockExperimentalVMOptions " +
-                   "-H:EnableURLProtocols=http " +
-                   "-H:EnableURLProtocols=https " +
-                   "-H:IncludeResources='./webroot/.*' " +
-                   "-H:+ReportUnsupportedElementsAtRuntime " +
+                   "--enable-http " +
+                   "--enable-https " +
+                   "-H:ConfigurationFileDirectories=META-INF/native-image " +
+                   "--report-unsupported-elements-at-runtime " +
                    "--initialize-at-build-time=org.sqlite.util.ProcessRunner " +
                    "--no-fallback " +
                    "-jar Peergos.jar peergos");

diff --git a/native-build/META-INF/native-image/jni-config.json b/native-build/META-INF/native-image/jni-config.json
@@ -1,57 +1,55 @@
 [
-    {
-        "name":"org.sqlite.core.DB",
-        "allDeclaredMethods":true,
-        "allPublicMethods": true,
-        "allDeclaredFields":true,
-        "methods":[{"name":"<init>","parameterTypes":["java.lang.String", "java.lang.String", "org.sqlite.SQLiteConfig"] }]
-    },
-    {
-        "name":"org.sqlite.core.NativeDB",
-        "allDeclaredMethods":true,
-        "allPublicMethods": true,
-        "allDeclaredFields":true,
-        "methods":[{"name":"<init>","parameterTypes":["java.lang.String", "java.lang.String", "org.sqlite.SQLiteConfig"] }]
-    },
-    {
-        "name":"org.sqlite.BusyHandler",
-        "allDeclaredMethods":true,
-        "allPublicMethods": true,
-        "allDeclaredFields":true,
-        "methods":[{"name":"<init>","parameterTypes":[] }]
-    },
-    {
-        "name":"org.sqlite.Function",
-        "allDeclaredMethods":true,
-        "allPublicMethods": true,
-        "allDeclaredFields":true,
-        "methods":[{"name":"<init>","parameterTypes":[] }]
-    },
-    {
-        "name":"org.sqlite.ProgressHandler",
-        "allDeclaredMethods":true,
-        "allPublicMethods": true,
-        "allDeclaredFields":true,
-        "methods":[{"name":"<init>","parameterTypes":[] }]
-    },
-    {
-        "name":"org.sqlite.Function$Aggregate",
-        "allDeclaredMethods":true,
-        "allPublicMethods": true,
-        "allDeclaredFields":true,
-        "methods":[{"name":"<init>","parameterTypes":[] }]
-    },
-    {
-        "name":"org.sqlite.Function$Window",
-        "allDeclaredMethods":true,
-        "allPublicMethods": true,
-        "allDeclaredFields":true,
-        "methods":[{"name":"<init>","parameterTypes":[] }]
-    },
-    {
-        "name":"org.sqlite.core.DB$ProgressObserver",
-        "allDeclaredMethods":true,
-        "allPublicMethods": true,
-        "allDeclaredFields":true
-    }
+{
+  "name":"[Z"
+},
+{
+  "name":"java.lang.Boolean",
+  "methods":[{"name":"getBoolean","parameterTypes":["java.lang.String"] }]
+},
+{
+  "name":"java.lang.Throwable",
+  "methods":[{"name":"toString","parameterTypes":[] }]
+},
+{
+  "name":"org.sqlite.BusyHandler",
+  "methods":[{"name":"callback","parameterTypes":["int"] }]
+},
+{
+  "name":"org.sqlite.Collation",
+  "methods":[{"name":"xCompare","parameterTypes":["java.lang.String","java.lang.String"] }]
+},
+{
+  "name":"org.sqlite.Function",
+  "fields":[{"name":"args"}, {"name":"context"}, {"name":"value"}],
+  "methods":[{"name":"xFunc","parameterTypes":[] }]
+},
+{
+  "name":"org.sqlite.Function$Aggregate",
+  "methods":[{"name":"clone","parameterTypes":[] }, {"name":"xFinal","parameterTypes":[] }, {"name":"xStep","parameterTypes":[] }]
+},
+{
+  "name":"org.sqlite.Function$Window",
+  "methods":[{"name":"xInverse","parameterTypes":[] }, {"name":"xValue","parameterTypes":[] }]
+},
+{
+  "name":"org.sqlite.ProgressHandler",
+  "methods":[{"name":"progress","parameterTypes":[] }]
+},
+{
+  "name":"org.sqlite.core.DB",
+  "methods":[{"name":"onCommit","parameterTypes":["boolean"] }, {"name":"onUpdate","parameterTypes":["int","java.lang.String","java.lang.String","long"] }, {"name":"throwex","parameterTypes":[] }, {"name":"throwex","parameterTypes":["int"] }]
+},
+{
+  "name":"org.sqlite.core.DB$ProgressObserver",
+  "methods":[{"name":"progress","parameterTypes":["int","int"] }]
+},
+{
+  "name":"org.sqlite.core.NativeDB",
+  "fields":[{"name":"busyHandler"}, {"name":"commitListener"}, {"name":"pointer"}, {"name":"progressHandler"}, {"name":"updateListener"}],
+  "methods":[{"name":"stringToUtf8ByteArray","parameterTypes":["java.lang.String"] }, {"name":"throwex","parameterTypes":["java.lang.String"] }]
+},
+{
+  "name":"peergos.server.Main",
+  "methods":[{"name":"main","parameterTypes":["java.lang.String[]"] }]
+}
 ]
diff --git a/native-build/META-INF/native-image/predefined-classes-config.json b/native-build/META-INF/native-image/predefined-classes-config.json
@@ -0,0 +1,8 @@
+[
+  {
+    "type":"agent-extracted",
+    "classes":[
+    ]
+  }
+]
+