Skip to content

Fix localization filenames and preserve signature of swt.jar #2007

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 13, 2025
Merged

Fix localization filenames and preserve signature of swt.jar #2007

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 21 additions & 11 deletions binaries/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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">
Expand Down
1 change: 1 addition & 0 deletions bundles/org.eclipse.swt/forceQualifierUpdate.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Loading