From b00bc5fc93b98d8d899365e630a5f30b26241dbf Mon Sep 17 00:00:00 2001
From: Ed Merks <ed.merks@gmail.com>
Date: Tue, 23 Jul 2024 11:22:17 +0200
Subject: [PATCH] Ensure that org.eclipse.birt.build.ant.PackTask filters out
 CODESIGN.*

- Simplify the runtime build to avoid building a temporary jar that's
subsequently filtered.

https://github.com/eclipse-birt/birt/issues/1819
---
 build/birt-packages/birt-runtime/build.xml                | 8 +-------
 .../src/org/eclipse/birt/build/ant/PackTask.java          | 3 ++-
 build/org.eclipse.birt.releng/BIRT.setup                  | 2 +-
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/build/birt-packages/birt-runtime/build.xml b/build/birt-packages/birt-runtime/build.xml
index 50d6acf00d9..76aeb526f54 100644
--- a/build/birt-packages/birt-runtime/build.xml
+++ b/build/birt-packages/birt-runtime/build.xml
@@ -80,7 +80,7 @@
     </copy>
     <!-- create org.eclipse.birt.runtime.jar -->
     <buildJar basedir="${TARGET_DIR}/org.eclipse.birt.runtime"
-              output="${STAGE_DIR}/ReportEngine/lib/tmp.birt.runtime.jar">
+              output="${STAGE_DIR}/ReportEngine/lib/org.eclipse.birt.runtime_${BIRT_VERSION}.jar">
       <manifest>
         <attribute name="Bundle-Version" value="${BIRT_VERSION}"/>
         <attribute name="Bundle-Name" value="BIRT Runtime SDK"/>
@@ -89,12 +89,6 @@
         <attribute name="Manifest-Version" value="1.0"/>
       </manifest>
     </buildJar>
-    <!-- it's surprisingly hard to keep eclipse-jarsigner-plugin off jars -->
-    <zip destfile="${STAGE_DIR}/ReportEngine/lib/org.eclipse.birt.runtime_${BIRT_VERSION}.jar">
-        <zipfileset src="${STAGE_DIR}/ReportEngine/lib/tmp.birt.runtime.jar"
-                    excludes="META-INF/ECLIPSE_.*"/>
-    </zip>
-    <delete file="${STAGE_DIR}/ReportEngine/lib/tmp.birt.runtime.jar"/>
   </target>
   <target name="build-webviewer">
     <copy todir="${STAGE_DIR}/WebViewerExample/WEB-INF/lib">
diff --git a/build/org.eclipse.birt.build/src/org/eclipse/birt/build/ant/PackTask.java b/build/org.eclipse.birt.build/src/org/eclipse/birt/build/ant/PackTask.java
index 11c7605bf9c..b3833a3e528 100644
--- a/build/org.eclipse.birt.build/src/org/eclipse/birt/build/ant/PackTask.java
+++ b/build/org.eclipse.birt.build/src/org/eclipse/birt/build/ant/PackTask.java
@@ -182,7 +182,8 @@ public boolean accept(File dir, String fileName) {
 
 	private static Filter DEFAULT_FILTER = new Filter(new String[] {},
 			new String[] { "plugin\\..*", "fragment\\..*", "(.*\\.jar/)?META-INF/MANIFEST\\.MF",
-					"(.*\\.jar/)?META-INF/ECLIPSEF\\..*", "(.*\\.jar/)?META-INF/eclipse\\.inf", "about\\..*",
+					"(.*\\.jar/)?META-INF/(ECLIPSEF|ECLIPSE_|CODESIGN)\\..*", "(.*\\.jar/)?META-INF/eclipse\\.inf",
+					"about\\..*",
 					"about_files/.*" });
 
 	public Filter createFilter(BundleItem bundleItem) {
diff --git a/build/org.eclipse.birt.releng/BIRT.setup b/build/org.eclipse.birt.releng/BIRT.setup
index ef098a5447e..6add223b60b 100644
--- a/build/org.eclipse.birt.releng/BIRT.setup
+++ b/build/org.eclipse.birt.releng/BIRT.setup
@@ -386,7 +386,7 @@
             project="org.eclipse.birt"/>
         <operand
             xsi:type="predicates:NamePredicate"
-            pattern=".*releng.*|org\.eclipse\.birt\.target|org\.eclipse\.birt\.api|birt-charts|birt-publish|birt-runtime|birt-charts"/>
+            pattern=".*releng.*|org\.eclipse\.birt\.target|org\.eclipse\.birt\.api|birt-charts|birt-publish|birt-runtime|birt-charts|org.eclipse.birt.build"/>
       </predicate>
     </workingSet>
     <workingSet