[GR-61363] Shade CapnProto Runtime.

PullRequest: graal/20506

Author: cstancu

substratevm/mx.substratevm/mx_substratevm.py

@@ -1231,6 +1231,7 @@ def native_image_context_run(func, func_args=None, config=None, build_if_missing
         'substratevm:SVM_CONFIGURE',
         'substratevm:OBJECTFILE',
         'substratevm:POINTSTO',
+        'substratevm:SVM_CAPNPROTO_RUNTIME',
         'substratevm:NATIVE_IMAGE_BASE',
     ] + (['substratevm:SVM_FOREIGN'] if mx_sdk_vm.base_jdk().javaCompliance >= '22' else []),
     support_distributions=['substratevm:SVM_GRAALVM_SUPPORT'],
@@ -2529,5 +2530,7 @@ def capnp_compile(args):
                 f.write('@SuppressWarnings("all")\n')
             if 'public static final class Schemas {' in line:
                 break
-            f.write(line)
+            # Replace org.capnproto with com.oracle.svm.shaded.org.capnproto in generated code
+            shaded = line.replace("org.capnproto", "com.oracle.svm.shaded.org.capnproto")
+            f.write(shaded)
         f.write('}\n')

substratevm/mx.substratevm/suite.py

@@ -205,6 +205,7 @@
 
         "CAPNPROTO_RUNTIME": {
             "digest" : "sha512:94a7776511c344da60a1acdc346c133522a43c239d067d0d5d86c21291e0252a19bd4fa74e4b1d3a93e75dadd41af6557a5d118a1584e39d34c092485ce065b2",
+            "sourceDigest" : "sha512:a458654e16c4a723508130dfd33d2d410a1d346949fc2f8203b3188f78c01c1850b334394f654536652f9ea6d73b8ce0d308d46f877a944208c3a248249fba77",
             "maven" : {
                 "groupId" : "org.capnproto",
                 "artifactId" : "runtime",
@@ -254,6 +255,32 @@
             "jacoco" : "include",
         },
 
+        # Shade Cap'n Proto Runtime
+        "com.oracle.svm.shaded.org.capnproto": {
+            "subDir" : "src",
+            "sourceDirs" : ["src"],
+            "javaCompliance" : "17+",
+            "spotbugsIgnoresGenerated" : True,
+            "shadedDependencies" : [
+                "CAPNPROTO_RUNTIME",
+            ],
+            "class" : "ShadedLibraryProject",
+            "shade" : {
+                "packages" : {
+                    "org.capnproto" : "com.oracle.svm.shaded.org.capnproto",
+                },
+                "exclude" : [
+                    "META-INF/MANIFEST.MF",
+                    "**/package.html",
+                ],
+            },
+            "description" : "Capn Proto Runtime library shaded for Native Image.",
+            "forceJavac" : "true",
+            "javac.lint.overrides" : "none",
+            "jacoco" : "exclude",
+            "graalCompilerSourceEdition": "ignore",
+        },
+
         # This shaded ASM project is just a quickfix.
         # Eventually, we should migrate to the Classfile API [JDK-8294982] (GR-61102).
         "com.oracle.svm.shaded.org.objectweb.asm": {
@@ -579,7 +606,6 @@
             "sourceDirs": ["src"],
             "dependencies": [
                 "com.oracle.svm.common",
-                "CAPNPROTO_RUNTIME"
             ],
             "requires" : [
                 "jdk.internal.vm.ci"
@@ -685,6 +711,7 @@
                 "com.oracle.objectfile",
                 "com.oracle.graal.reachability",
                 "com.oracle.svm.core.graal.amd64",
+                "com.oracle.svm.shaded.org.capnproto",
                 "SVM_CONFIGURE",
             ],
             "requires" : [
@@ -1681,6 +1708,7 @@
                 "sdk:NATIVEIMAGE",
                 "OBJECTFILE",
                 "POINTSTO",
+                "SVM_CAPNPROTO_RUNTIME",
                 "compiler:GRAAL",
                 "NATIVE_IMAGE_BASE",
                 "SVM_CONFIGURE",
@@ -1778,9 +1806,6 @@
                     "java.management": [
                         "sun.management",
                     ],
-                    "org.graalvm.nativeimage.pointsto": [
-                        "org.capnproto"
-                    ]
                 },
             },
             "noMavenJavadoc": True,
@@ -1789,6 +1814,27 @@
             },
         },
 
+        "SVM_CAPNPROTO_RUNTIME" : {
+            "subDir" : "src",
+            "description" : "Capn Proto Runtime shaded module.",
+            "sourceDirs" : ["src"],
+            "javaCompliance" : "17+",
+            "dependencies" : [
+                "com.oracle.svm.shaded.org.capnproto",
+            ],
+             "moduleInfo" : {
+                "name" : "org.graalvm.nativeimage.shaded.capnproto",
+                 "exports" : [
+                    "com.oracle.svm.shaded.org.capnproto",
+                 ]
+            },
+            "allowsJavadocWarnings" : True,
+            "noMavenJavadoc": True,
+            "maven": {
+                "tag": ["default", "public"],
+            },
+        },
+
         "JVMTI_AGENT_BASE": {
             "subDir": "src",
             "description": "Base framework for creating a JVMTI agent.",
@@ -2235,7 +2281,6 @@
                 "NATIVE_IMAGE_BASE",
             ],
             "exclude": [
-                # "CAPNPROTO_RUNTIME",
             ],
             "moduleInfo" : {
               "name" : "org.graalvm.nativeimage.pointsto",

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/imagelayer/HostedImageLayerBuildingSupport.java

@@ -32,8 +32,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.capnproto.ReaderOptions;
-import org.capnproto.Serialize;
+import com.oracle.svm.shaded.org.capnproto.ReaderOptions;
+import com.oracle.svm.shaded.org.capnproto.Serialize;
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.nativeimage.ImageSingletons;
 

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/imagelayer/SVMImageLayerLoader.java

@@ -54,12 +54,12 @@
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
-import org.capnproto.ListReader;
-import org.capnproto.PrimitiveList;
-import org.capnproto.StructList;
-import org.capnproto.StructReader;
-import org.capnproto.Text;
-import org.capnproto.TextList;
+import com.oracle.svm.shaded.org.capnproto.ListReader;
+import com.oracle.svm.shaded.org.capnproto.PrimitiveList;
+import com.oracle.svm.shaded.org.capnproto.StructList;
+import com.oracle.svm.shaded.org.capnproto.StructReader;
+import com.oracle.svm.shaded.org.capnproto.Text;
+import com.oracle.svm.shaded.org.capnproto.TextList;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.c.function.CEntryPoint;
 import org.graalvm.nativeimage.impl.CEntryPointLiteralCodePointer;

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/imagelayer/SVMImageLayerSingletonLoader.java

@@ -36,7 +36,7 @@
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
-import org.capnproto.Text;
+import com.oracle.svm.shaded.org.capnproto.Text;
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.UnmodifiableEconomicMap;
 

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/imagelayer/SVMImageLayerWriter.java

@@ -67,15 +67,15 @@
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
-import org.capnproto.ListBuilder;
-import org.capnproto.MessageBuilder;
-import org.capnproto.PrimitiveList;
-import org.capnproto.Serialize;
-import org.capnproto.StructBuilder;
-import org.capnproto.StructList;
-import org.capnproto.Text;
-import org.capnproto.TextList;
-import org.capnproto.Void;
+import com.oracle.svm.shaded.org.capnproto.ListBuilder;
+import com.oracle.svm.shaded.org.capnproto.MessageBuilder;
+import com.oracle.svm.shaded.org.capnproto.PrimitiveList;
+import com.oracle.svm.shaded.org.capnproto.Serialize;
+import com.oracle.svm.shaded.org.capnproto.StructBuilder;
+import com.oracle.svm.shaded.org.capnproto.StructList;
+import com.oracle.svm.shaded.org.capnproto.Text;
+import com.oracle.svm.shaded.org.capnproto.TextList;
+import com.oracle.svm.shaded.org.capnproto.Void;
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.MapCursor;
 import org.graalvm.nativeimage.AnnotationAccess;