From 18b78c9be044d9915e9653fa5f4d106037133f9c Mon Sep 17 00:00:00 2001
From: Stephan Herrmann <stephan.herrmann@berlin.de>
Date: Thu, 16 Jan 2025 19:01:38 +0100
Subject: [PATCH] [24] Try building the java24 patch on JDT infra

- reconcile requirements of metadata generation
  - update the feature jar with feature.properties & license.html
  - only use binary input to generate checksums
  - use a new output directory to please the metadata generator
- add JCP disclaimer to license

Fixes https://github.com/eclipse-jdt/eclipse.jdt.core/issues/3244
---
 org.eclipse.jdt.releng/patchbuild/build.sh    | 43 +++++++------------
 .../patchbuild/patchMatchVersion.xml          |  4 +-
 .../feature.properties                        |  4 ++
 3 files changed, 21 insertions(+), 30 deletions(-)

diff --git a/org.eclipse.jdt.releng/patchbuild/build.sh b/org.eclipse.jdt.releng/patchbuild/build.sh
index 98f5677..bcdbc45 100755
--- a/org.eclipse.jdt.releng/patchbuild/build.sh
+++ b/org.eclipse.jdt.releng/patchbuild/build.sh
@@ -74,47 +74,34 @@ ls -lR buildRepo
 	
 cd ${BASE}
 
-
-# use feature jar to create artifacts.xml with checksums:
-cd work/features
-mv org.eclipse.jdt.java24patch ..
-# add signing here:
-cp ${BASE}/work/buildRepo/features/org.eclipse.jdt.java24patch_* .
+# update the generated feature jar with two files missed during the above build:
+cd src/org.eclipse.jdt.java24patch
+jar -uf ${BASE}/work/buildRepo/features/org.eclipse.jdt.java24patch_* feature.properties license.html
+# add signing of the feature jar here
 cd -
 
-
+# add general metadata (from buildRepo to buildRepo2):
 ${BASE}/eclipse/eclipse -nosplash -application org.eclipse.equinox.p2.publisher.FeaturesAndBundlesPublisher \
-	-artifactRepository file:${BASE}/work/buildRepo \
-	-metadataRepository file:${BASE}/work/buildRepo \
-	-source ${BASE}/work
-
-# restore exploded feature to generated content.xml with property substitutions:
-rm work/org.eclipse.jdt.java24patch_*.jar
-mv work/org.eclipse.jdt.java24patch work/features
-cd work/features/org.eclipse.jdt.java24patch
-unzip -o ${BASE}/work/buildRepo/features/org.eclipse.jdt.java24patch_* feature.xml
-ls -l
-cd -
+	-artifactRepository file:${BASE}/work/buildRepo2 \
+	-metadataRepository file:${BASE}/work/buildRepo2 \
+	-source ${BASE}/work/buildRepo
 
-${BASE}/eclipse/eclipse -nosplash -application org.eclipse.equinox.p2.publisher.FeaturesAndBundlesPublisher \
-	-metadataRepository file:${BASE}/work/buildRepo \
-	-source ${BASE}/work
-ls -l work/buildRepo
+ls -l work/buildRepo2
 
-# finally create category metadata
+# add category metadata
 ${BASE}/eclipse/eclipse -nosplash -application org.eclipse.equinox.p2.publisher.CategoryPublisher \
-	-metadataRepository file:${BASE}/work/buildRepo \
+	-metadataRepository file:${BASE}/work/buildRepo2 \
 	-categoryDefinition file:${BASE}/src/category.xml 
-ls -l work/buildRepo
+ls -l work/buildRepo2
 
-cd work/buildRepo
+cd work/buildRepo2
 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
-ant -f ${BASE}/patchMatchVersion.xml -DpatchFeatureVersionRange="${JDT_VERSION_RANGE}" -DBASE=${BASE}
-ls -l work/buildRepo
+ant -f ${BASE}/patchMatchVersion.xml -DpatchFeatureVersionRange="${JDT_VERSION_RANGE}" -DBASE=${BASE} -DREPODIR=${BASE}/work/buildRepo2
+ls -l
 
 
 jar cf content.jar content.xml
diff --git a/org.eclipse.jdt.releng/patchbuild/patchMatchVersion.xml b/org.eclipse.jdt.releng/patchbuild/patchMatchVersion.xml
index 42e641b..3b9ebf1 100644
--- a/org.eclipse.jdt.releng/patchbuild/patchMatchVersion.xml
+++ b/org.eclipse.jdt.releng/patchbuild/patchMatchVersion.xml
@@ -1,13 +1,13 @@
 <project name="patchMetadata" default="main">
 
     <target name="main">
-        <echo message="Patching metadata in ${BASE}/work/buildRepo to relax version requirement of our patch feature"/>
+        <echo message="Patching metadata in ${REPODIR} 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">
+        <xslt basedir="${REPODIR}" destdir="${REPODIR}" 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"/>
diff --git a/org.eclipse.jdt.releng/patchbuild/src/org.eclipse.jdt.java24patch/feature.properties b/org.eclipse.jdt.releng/patchbuild/src/org.eclipse.jdt.java24patch/feature.properties
index befb771..083834e 100644
--- a/org.eclipse.jdt.releng/patchbuild/src/org.eclipse.jdt.java24patch/feature.properties
+++ b/org.eclipse.jdt.releng/patchbuild/src/org.eclipse.jdt.java24patch/feature.properties
@@ -37,6 +37,10 @@ https://www.eclipse.org/legal/epl-2.0/\n\
 \n\
 SPDX-License-Identifier: EPL-2.0\n\
 \n\
+This is an implementation of an early-draft specification developed under the Java\n\
+Community Process (JCP) and is made available for testing and evaluation purposes\n\
+only. The code is not compatible with any specification of the JCP.\n\
+\n\
 Contributors:\n\
     IBM Corporation and others - initial API and implementation\n
 ################ end of copyright property ####################################