From 118ddef9e3b11cf9ad97853e2290c097c6ce0623 Mon Sep 17 00:00:00 2001
From: Stephan Herrmann <stephan.herrmann@berlin.de>
Date: Fri, 8 Nov 2024 23:49:06 +0100
Subject: [PATCH] [24] Try building the java24 patch on JDT infra

- make wget silent
- invoke xslt processor via ant

Fixes https://github.com/eclipse-jdt/eclipse.jdt.core/issues/3244
---
 org.eclipse.jdt.releng/patchbuild/build.sh    | 12 +++++++-----
 .../patchbuild/patchMatchVersion.xml          | 19 +++++++++++++++++++
 2 files changed, 26 insertions(+), 5 deletions(-)
 create mode 100644 org.eclipse.jdt.releng/patchbuild/patchMatchVersion.xml

diff --git a/org.eclipse.jdt.releng/patchbuild/build.sh b/org.eclipse.jdt.releng/patchbuild/build.sh
index db5ecda..fc5a818 100755
--- a/org.eclipse.jdt.releng/patchbuild/build.sh
+++ b/org.eclipse.jdt.releng/patchbuild/build.sh
@@ -29,7 +29,7 @@ JDT_VERSION_RANGE=${JDT_VERSION_RANGE:="[3.20.0.v${SDKTIMESTAMP},${JDT_VERSION_M
 ## Prepare eclipse for running the build:
 if [ ! -e ${SDKFILE} ]
 then
-	wget ${SDKURL}
+	wget -nv ${SDKURL}
 fi
 if [ ! -x eclipse/eclipse ]
 then
@@ -89,10 +89,12 @@ ${BASE}/eclipse/eclipse -nosplash -application org.eclipse.equinox.p2.publisher.
 
 cd work/buildRepo
 mv content.xml content-ORIG.xml
-xsltproc --nonet --nowrite \
-	--stringparam patchFeatureVersionRange "${JDT_VERSION_RANGE}" \
-	--stringparam patchFeatureIU org.eclipse.jdt.java24patch.feature.group ${BASE}/patchMatchVersion.xsl \
-	content-ORIG.xml > content.xml
+#xsltproc --nonet --nowrite \
+#	--stringparam patchFeatureVersionRange "${JDT_VERSION_RANGE}" \
+#	--stringparam patchFeatureIU org.eclipse.jdt.java24patch.feature.group ${BASE}/patchMatchVersion.xsl \
+#	content-ORIG.xml > content.xml
+ant -f ${BASE}/patchMatchVersion.xml -DpatchFeatureVersionRange="${JDT_VERSION_RANGE}" -DBASE=${BASE}
+
 
 jar cf content.jar content.xml
 jar cf artifacts.jar artifacts.xml
diff --git a/org.eclipse.jdt.releng/patchbuild/patchMatchVersion.xml b/org.eclipse.jdt.releng/patchbuild/patchMatchVersion.xml
new file mode 100644
index 0000000..42e641b
--- /dev/null
+++ b/org.eclipse.jdt.releng/patchbuild/patchMatchVersion.xml
@@ -0,0 +1,19 @@
+<project name="patchMetadata" default="main">
+
+    <target name="main">
+        <echo message="Patching metadata in ${BASE}/work/buildRepo to relax version requirement of our patch feature"/>
+
+		<!-- patch feature version in content.xml -->
+		<property name="patch-content.xsltFile" value="${BASE}/patchMatchVersion.xsl" />
+		<property name="content.origFile" value="content-ORIG.xml" />
+        <property name="content.transFile" value="content.xml" />
+        <xslt basedir="${BASE}/work/buildRepo" destdir="${BASE}/work/buildRepo" includes="${content.origFile}" style="${patch-content.xsltFile}" force="true">
+                <outputproperty name="method" value="xml"/>
+                <outputproperty name="encoding" value="UTF-8"/>
+                <outputproperty name="indent" value="yes"/>
+        		<param name="patchFeatureVersionRange" expression="${patchFeatureVersionRange}"/>
+        		<param name="patchFeatureIU" expression="org.eclipse.jdt.java25patch.feature.group"/>
+                <mapper type="glob" from="${content.origFile}" to="${content.transFile}"/>
+        </xslt>
+    </target>
+</project>