Use XSLT to transform component .plist file

Author: alexeysemenyukoracle

src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPkgPackager.java

@@ -27,8 +27,8 @@
 
 import static jdk.jpackage.internal.util.PathUtils.normalizedAbsolutePathString;
 
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
-import java.io.PrintWriter;
 import java.io.UncheckedIOException;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -44,6 +44,10 @@
 import java.util.stream.Stream;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamWriter;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
 import jdk.internal.util.Architecture;
 import jdk.internal.util.OSVersion;
 import jdk.jpackage.internal.PackagingPipeline.PackageTaskID;
@@ -53,6 +57,7 @@
 import jdk.jpackage.internal.model.MacPkgPackage;
 import jdk.jpackage.internal.model.Package;
 import jdk.jpackage.internal.model.PackagerException;
+import jdk.jpackage.internal.resources.ResourceLocator;
 import jdk.jpackage.internal.util.XmlUtils;
 
 record MacPkgPackager(MacPkgPackage pkg, BuildEnv env, Optional<Services> services, Path outputDir) {
@@ -457,29 +462,13 @@ private void prepareConfigFiles() throws IOException {
     }
 
     private void patchCPLFile(Path cpl) throws IOException {
-        String cplData = Files.readString(cpl);
-        String[] lines = cplData.split("\n");
-        try (PrintWriter out = new PrintWriter(Files.newBufferedWriter(cpl))) {
-            int skip = 0;
-            // Used to skip Java.runtime bundle, since
-            // pkgbuild with --root will find two bundles app and Java runtime.
-            // We cannot generate component proprty list when using
-            // --component argument.
-            for (int i = 0; i < lines.length; i++) {
-                if (lines[i].trim().equals("<key>BundleIsRelocatable</key>")) {
-                    out.println(lines[i]);
-                    out.println("<false/>");
-                    i++;
-                } else if (lines[i].trim().equals("<key>ChildBundles</key>")) {
-                    ++skip;
-                } else if ((skip > 0) && lines[i].trim().equals("</array>")) {
-                    --skip;
-                } else {
-                    if (skip == 0) {
-                        out.println(lines[i]);
-                    }
-                }
-            }
+        try (final var xsltResource = ResourceLocator.class.getResourceAsStream("adjust-component-plist.xsl")) {
+            final var srcXml = new StreamSource(new ByteArrayInputStream(Files.readAllBytes(cpl)));
+            final var dstXml = new StreamResult(cpl.toFile());
+            final var xslt = TransformerFactory.newInstance().newTransformer(new StreamSource(xsltResource));
+            xslt.transform(srcXml, dstXml);
+        } catch (TransformerException ex) {
+            throw new RuntimeException(ex);
         }
     }
 

src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/resources/adjust-component-plist.xsl

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+-->
+
+<!--
+  This stylesheet adjusts .plist file produced by `/usr/bin/pkgbuild &#45;&#45;analyze`.
+-->
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+  <!--
+    Make bundle NOT-relocatable
+  -->
+  <xsl:template match="true[preceding-sibling::key[1] = 'BundleIsRelocatable']">
+    <false/>
+  </xsl:template>
+
+  <!--
+    Remove `ChildBundles` key with value
+  -->
+  <xsl:template match="key[. = 'ChildBundles']|array[preceding-sibling::key[1] = 'ChildBundles']"/>
+
+  <!--
+    Identity transform
+  -->
+  <xsl:template match="@*|node()">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()"/>
+    </xsl:copy>
+  </xsl:template>
+
+</xsl:stylesheet>