From 46c4526e3329719769e1f6893387062d0bb968b6 Mon Sep 17 00:00:00 2001
From: Andrey Loskutov <loskutov@gmx.de>
Date: Fri, 18 Jul 2025 09:40:19 +0200
Subject: [PATCH] Revert "[Build] Restore compressed content.xml for platform
 repository"

This reverts commit c15c95578cefed05792fb28875a5665a70800ec7.

Fixes https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/3188
---
 cje-production/promotion/promoteSites.sh      | 82 +++++++++++++++++++
 .../eclipse.platform.repository/category.xml  |  5 --
 .../cp-content.xsl                            | 51 ++++++++++++
 .../eclipse.platform.repository/pom.xml       | 68 +++++++++++++++
 4 files changed, 201 insertions(+), 5 deletions(-)
 create mode 100644 eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/cp-content.xsl

diff --git a/cje-production/promotion/promoteSites.sh b/cje-production/promotion/promoteSites.sh
index dd63ef5e1a7..75f6ef1f798 100755
--- a/cje-production/promotion/promoteSites.sh
+++ b/cje-production/promotion/promoteSites.sh
@@ -235,6 +235,87 @@ function addRepoProperties ()
   ${ECLIPSE_EXE} --launcher.suppressErrors -nosplash -consolelog -debug -data ${devworkspace} -application ${APP_NAME} -vmargs ${MIRRORS_URL_ARG} -Dp2ArtifactRepositoryName="${ART_REPO_NAME}" -Dp2MetadataRepositoryName="${CON_REPO_NAME}" ${ART_REPO_ARG} ${CON_REPO_ARG}
 }
 
+function createXZ
+{
+  BUILDMACHINE_SITE=$1
+
+  CONTENT_JAR_FILE="${BUILDMACHINE_SITE}/content.jar"
+  if [[ ! -e "${CONTENT_JAR_FILE}" ]]
+  then
+    echo -e "\n\tERROR: content.jar file did not exist at ${BUILDMACHINE_SITE}."
+    return 1
+  fi
+  ARTIFACTS_JAR_FILE="${BUILDMACHINE_SITE}/artifacts.jar"
+  if [[ ! -e "${ARTIFACTS_JAR_FILE}" ]]
+  then
+    echo -e "\n\tERROR: artifacts.jar file did not exist at ${BUILDMACHINE_SITE}."
+    return 1
+  fi
+
+  # Notice we overwrite the XML files, if they already exists.
+  unzip -q -o "${CONTENT_JAR_FILE}" -d "${BUILDMACHINE_SITE}"
+  RC=$?
+  if [[ $RC != 0 ]]
+  then
+    echo "ERROR: could not unzip ${CONTENT_JAR_FILE}."
+    return $RC
+  fi
+  # Notice we overwrite the XML files, if they already exists.
+  unzip -q -o "${ARTIFACTS_JAR_FILE}" -d "${BUILDMACHINE_SITE}"
+  RC=$?
+  if [[ $RC != 0 ]]
+  then
+    echo "ERROR: could not unzip ${ARTIFACTS_JAR_FILE}."
+    return $RC
+  fi
+
+  CONTENT_XML_FILE="${BUILDMACHINE_SITE}/content.xml"
+  ARTIFACTS_XML_FILE="${BUILDMACHINE_SITE}/artifacts.xml"
+  # We will check the content.xml and artifacts.xml files really exists. In some strange world, the jars could contain something else.
+  if [[ ! -e "${CONTENT_XML_FILE}" || ! -e "${ARTIFACTS_XML_FILE}" ]]
+  then
+    echo -e "\n\tERROR: content.xml or artifacts.xml file did not exist as expected at ${BUILDMACHINE_SITE}."
+    return 1
+  fi
+
+  # finally, compress them, using "extra effort"
+  # Notice we use "force" to over write any existing file, presumably there from a previous run?
+  XZ_EXE=$(which xz)
+  if [[ $? != 0 || -z "${XZ_EXE}" ]]
+  then
+    echo -e "\n\tERROR: xz executable did not exist."
+    return 1
+  fi
+  echo -e "\n\tXZ compression of ${CONTENT_XML_FILE} ... "
+  $XZ_EXE -e --force "${CONTENT_XML_FILE}"
+  RC=$?
+  if [[ $RC != 0 ]]
+  then
+    echo "ERROR: could not compress, using $XZ_EXE -e ${CONTENT_XML_FILE}."
+    return $RC
+  fi
+
+  echo -e "\tXZ compression of ${ARTIFACTS_XML_FILE} ... "
+  $XZ_EXE -e --force "${ARTIFACTS_XML_FILE}"
+  RC=$?
+  if [[ $RC != 0 ]]
+  then
+    echo "ERROR: could not compress, using $XZ_EXE -e ${ARTIFACTS_XML_FILE}."
+    return $RC
+  fi
+
+
+  # Notice we just write over any existing p2.index file.
+  # May want to make backup of this and other files, for production use.
+  P2_INDEX_FILE="${BUILDMACHINE_SITE}/p2.index"
+  echo "version=1" > "${P2_INDEX_FILE}"
+  echo "metadata.repository.factory.order= content.xml.xz,content.xml,!" >> "${P2_INDEX_FILE}"
+  echo "artifact.repository.factory.order= artifacts.xml.xz,artifacts.xml,!" >> "${P2_INDEX_FILE}"
+  echo -e "\tCreated ${P2_INDEX_FILE}"
+
+  return 0
+}
+
 DROP_ID=$(echo $DROP_ID|tr -d ' ')
 
 if [[ -z "${DROP_ID}" ]]
@@ -589,6 +670,7 @@ then
   pushd ${LOCAL_REPO}
     BUILDMACHINE_SITE=${LOCAL_REPO}/${REPO_ID}
     addRepoProperties ${BUILDMACHINE_SITE} ${REPO_SITE_SEGMENT} ${DL_DROP_ID}
+    createXZ ${BUILDMACHINE_SITE}
     mv ${REPO_ID} ${DL_DROP_ID}
     scp -r ${LOCAL_REPO}/${DL_DROP_ID} genie.releng@projects-storage.eclipse.org:/home/data/httpd/download.eclipse.org/eclipse/updates/${REPO_SITE_SEGMENT}
   popd
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/category.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/category.xml
index ae58db427d5..c1ea6f0c83b 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/category.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/category.xml
@@ -19,9 +19,4 @@
    <bundle id="jakarta.inject.jakarta.inject-api" version="1.0.5"/>
    <bundle id="org.eclipse.equinox.slf4j"/>
    <bundle id="org.eclipse.debug.terminal"/>
-   <iu>
-     <query> 
-       <expression type="match">id == 'org.eclipse.equinox.executable'</expression>
-     </query>
-   </iu>
 </site>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/cp-content.xsl b/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/cp-content.xsl
new file mode 100644
index 00000000000..8d710812c2d
--- /dev/null
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/cp-content.xsl
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<xsl:stylesheet
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  version="1.0">
+  <xsl:output
+    omit-xml-declaration="yes"
+    indent="yes" />
+  <xsl:strip-space elements="*" />
+  <xsl:template match="/repository/units">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()" />
+      <xsl:copy-of select="unit[@id='org.eclipse.equinox.executable.feature.group']" />
+    </xsl:copy>
+  </xsl:template>
+  <xsl:template match="/repository/units/unit[@id='org.eclipse.equinox.executable.feature.group']/@id">
+    <xsl:attribute name="id">
+      <xsl:value-of select="'org.eclipse.equinox.executable'" />
+    </xsl:attribute>
+  </xsl:template>
+  <xsl:template
+    match="/repository/units/unit[@id='org.eclipse.equinox.executable.feature.group']/provides/provided[@name='org.eclipse.equinox.executable.feature.group']/@name">
+    <xsl:attribute name="name">
+      <xsl:value-of select="'org.eclipse.equinox.executable'" />
+    </xsl:attribute>
+  </xsl:template>
+  <xsl:template match="/repository/units/unit[@id='org.eclipse.equinox.executable.feature.group']/update/@id">
+    <xsl:attribute name="id">
+      <xsl:value-of select="'org.eclipse.equinox.executable'" />
+    </xsl:attribute>
+  </xsl:template>
+  <xsl:template
+    match="/repository/units/unit[@id='org.eclipse.equinox.executable.feature.group']/properties/property[@name='df_LT.featureName']">
+    <xsl:copy>
+      <xsl:attribute name="name">
+          <xsl:value-of select="'df_LT.featureName'" />
+    </xsl:attribute>
+      <xsl:attribute name="value">
+          <xsl:value-of select="'Eclipse Platform Launcher Executables for Multi-Architecture Builds'" />
+    </xsl:attribute>
+    </xsl:copy>
+  </xsl:template>
+  <xsl:template
+    match="/repository/units/unit[@id='org.eclipse.equinox.executable.feature.group']/requires/required[starts-with(@name, 'org.eclipse.equinox.executable_root')]" />
+  <xsl:template match="@*|node()">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()">
+        <!--xsl:sort select="@id|@name"/ -->
+      </xsl:apply-templates>
+    </xsl:copy>
+  </xsl:template>
+</xsl:stylesheet>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/pom.xml
index 48373f14049..8ee1e88db99 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/pom.xml
@@ -52,6 +52,74 @@
           <includeAllSources>true</includeAllSources>
         </configuration>
       </plugin>
+      <plugin>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>unpack-content-jar</id>
+            <phase>package</phase>
+            <configuration>
+              <target>
+                <unjar
+                  src="target/repository/content.jar"
+                  dest="target/repository" />
+                <delete file="target/repository/content.jar" />
+                <delete file="target/repository/content.xml.xz" />
+              </target>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>xml-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>generate-extra-iu</id>
+            <phase>package</phase>
+            <goals>
+              <goal>transform</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <transformationSets>
+            <transformationSet>
+              <dir>target/repository</dir>
+              <includes>
+                <include>content.xml</include>
+              </includes>
+              <stylesheet>cp-content.xsl</stylesheet>
+            </transformationSet>
+          </transformationSets>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-resources-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>copy-extra-iu</id>
+            <phase>package</phase>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${basedir}/target/repository</outputDirectory>
+              <resources>
+                <resource>
+                  <directory>${basedir}/target/generated-resources/xml/xslt</directory>
+                  <includes>
+                    <include>content.xml</include>
+                  </includes>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.eclipse.tycho.extras</groupId>
         <artifactId>tycho-p2-extras-plugin</artifactId>