From 2c5618bf3ce66c552d0f043720aabfc23165448f Mon Sep 17 00:00:00 2001
From: Hannes Wellmann <wellmann.hannes1@gmx.net>
Date: Sun, 13 Apr 2025 08:19:55 +0200
Subject: [PATCH] Fix localization filenames and preserve signature of swt.jar

In the SWT fragment jars published in the Eclipse p2-repository the
localization files had the wrong names, which are used at dev-time to
avoid localization when launching SWT from a development environment.

Furthermore the 'swt.jar' is now not modified anymore before adding it
to the assembly for the download-page, which ensures intact signatures.

Fixes https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/2189
---
 binaries/pom.xml                              | 32 ++++++++++++-------
 .../org.eclipse.swt/forceQualifierUpdate.txt  |  1 +
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/binaries/pom.xml b/binaries/pom.xml
index d24acd6edee..743ed32629c 100644
--- a/binaries/pom.xml
+++ b/binaries/pom.xml
@@ -76,6 +76,11 @@
 				<artifactId>tycho-packaging-plugin</artifactId>
 				<configuration>
 					<timestampProvider>fragment-host</timestampProvider>
+					<archive>
+						<manifestEntries>
+							<Eclipse-Version>${releaseNumberSDK}</Eclipse-Version>
+						</manifestEntries>
+					</archive>
 				</configuration>
 			</plugin>
 		</plugins>
@@ -148,6 +153,22 @@
 									</target>
 								</configuration>
 							</execution>
+							<execution>
+								<id>prepare-translation-files</id>
+								<phase>process-classes</phase>
+								<goals>
+									<goal>run</goal>
+								</goals>
+								<configuration>
+									<target>
+										<!-- Prepare translationfiles for inclusion by renaming '*._properties' to '*.properties' -->
+										<move todir="${project.build.outputDirectory}" failonerror="true" preservelastmodified="true">
+											<fileset dir="${project.build.outputDirectory}" includes="**/*._properties"/>
+											<mapper type="glob" from="*._properties" to="*.properties" />
+										</move>
+									</target>
+								</configuration>
+							</execution>
 							<execution>
 								<id>package-swt-download-zip</id>
 								<phase>package</phase>
@@ -158,23 +179,12 @@
 									<target>
 										<property name="temp.folder" value="${project.build.directory}/swtdownload-temp" />
 										<mkdir dir="${temp.folder}/swtdownload/" />
-										<!-- Prepare translationfiles for inclusion -->
-										<copy todir="${temp.folder}/@dot.src" failonerror="true" overwrite="true">
-											<fileset dir="${swtMainProject}/Eclipse SWT/common/" includes="**/*._properties"/>
-											<mapper type="glob" from="*._properties" to="*.properties" />
-										</copy>
 										<!-- Prepare nested swt.jar and src.jar -->
 										<property name="mavenBuiltJarName" value="${project.build.directory}/org.eclipse.swt.${ws}.${os}.${arch}-${project.version}" />
 										<copy file="${mavenBuiltJarName}.jar" tofile="${temp.folder}/swtdownload/swt.jar"/>
-										<jar jarfile="${temp.folder}/swtdownload/swt.jar" update="true" basedir="${temp.folder}/@dot.src">
-											<manifest>
-												<attribute name="Eclipse-Version" value="${releaseNumberSDK}"/>
-											</manifest>
-										</jar>
 										<zip zipfile="${temp.folder}/swtdownload/src.zip" duplicate="preserve">
 											<zipfileset src="${mavenBuiltJarName}-sources.jar" includes="**/*.sh" filemode="755"/>
 											<zipfileset src="${mavenBuiltJarName}-sources.jar" excludes="META-INF/**,OSGI-INF/**" />
-											<fileset dir="${temp.folder}/@dot.src"/>
 										</zip>
 										<!--Assemple nested SWT-zip -->
 										<zip zipfile="${project.build.directory}/swt-${buildid}-${ws}-${os}-${arch}.zip">
diff --git a/bundles/org.eclipse.swt/forceQualifierUpdate.txt b/bundles/org.eclipse.swt/forceQualifierUpdate.txt
index 75249a0ccb8..07d7b4dfdbe 100644
--- a/bundles/org.eclipse.swt/forceQualifierUpdate.txt
+++ b/bundles/org.eclipse.swt/forceQualifierUpdate.txt
@@ -1,3 +1,4 @@
 https://github.com/eclipse-platform/eclipse.platform.swt/issues/1093
 Pick-up legal file unification in native fragments from: https://github.com/eclipse-platform/eclipse.platform.swt/pull/1144
 https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/2595
+Pick-up localization file fixes in native fragments in: https://github.com/eclipse-platform/eclipse.platform.swt/pull/2007