Skip to content

Commit 9c0cf66

Browse files
committed
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 eclipse-platform/eclipse.platform.releng.aggregator#2189
1 parent 3a9ee3a commit 9c0cf66

File tree

2 files changed

+22
-11
lines changed

2 files changed

+22
-11
lines changed

binaries/pom.xml

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,11 @@
7676
<artifactId>tycho-packaging-plugin</artifactId>
7777
<configuration>
7878
<timestampProvider>fragment-host</timestampProvider>
79+
<archive>
80+
<manifestEntries>
81+
<Eclipse-Version>${releaseNumberSDK}</Eclipse-Version>
82+
</manifestEntries>
83+
</archive>
7984
</configuration>
8085
</plugin>
8186
</plugins>
@@ -148,6 +153,22 @@
148153
</target>
149154
</configuration>
150155
</execution>
156+
<execution>
157+
<id>prepare-translation-files</id>
158+
<phase>process-classes</phase>
159+
<goals>
160+
<goal>run</goal>
161+
</goals>
162+
<configuration>
163+
<target>
164+
<!-- Prepare translationfiles for inclusion by renaming '*._properties' to '*.properties' -->
165+
<move todir="${project.build.outputDirectory}" failonerror="true" preservelastmodified="true">
166+
<fileset dir="${project.build.outputDirectory}" includes="**/*._properties"/>
167+
<mapper type="glob" from="*._properties" to="*.properties" />
168+
</move>
169+
</target>
170+
</configuration>
171+
</execution>
151172
<execution>
152173
<id>package-swt-download-zip</id>
153174
<phase>package</phase>
@@ -158,23 +179,12 @@
158179
<target>
159180
<property name="temp.folder" value="${project.build.directory}/swtdownload-temp" />
160181
<mkdir dir="${temp.folder}/swtdownload/" />
161-
<!-- Prepare translationfiles for inclusion -->
162-
<copy todir="${temp.folder}/@dot.src" failonerror="true" overwrite="true">
163-
<fileset dir="${swtMainProject}/Eclipse SWT/common/" includes="**/*._properties"/>
164-
<mapper type="glob" from="*._properties" to="*.properties" />
165-
</copy>
166182
<!-- Prepare nested swt.jar and src.jar -->
167183
<property name="mavenBuiltJarName" value="${project.build.directory}/org.eclipse.swt.${ws}.${os}.${arch}-${project.version}" />
168184
<copy file="${mavenBuiltJarName}.jar" tofile="${temp.folder}/swtdownload/swt.jar"/>
169-
<jar jarfile="${temp.folder}/swtdownload/swt.jar" update="true" basedir="${temp.folder}/@dot.src">
170-
<manifest>
171-
<attribute name="Eclipse-Version" value="${releaseNumberSDK}"/>
172-
</manifest>
173-
</jar>
174185
<zip zipfile="${temp.folder}/swtdownload/src.zip" duplicate="preserve">
175186
<zipfileset src="${mavenBuiltJarName}-sources.jar" includes="**/*.sh" filemode="755"/>
176187
<zipfileset src="${mavenBuiltJarName}-sources.jar" excludes="META-INF/**,OSGI-INF/**" />
177-
<fileset dir="${temp.folder}/@dot.src"/>
178188
</zip>
179189
<!--Assemple nested SWT-zip -->
180190
<zip zipfile="${project.build.directory}/swt-${buildid}-${ws}-${os}-${arch}.zip">
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
https://github.com/eclipse-platform/eclipse.platform.swt/issues/1093
22
Pick-up legal file unification in native fragments from: https://github.com/eclipse-platform/eclipse.platform.swt/pull/1144
33
https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/2595
4+
Pick-up localization file fixes in native fragments in: https://github.com/eclipse-platform/eclipse.platform.swt/pull/2007

0 commit comments

Comments
 (0)