Skip to content

Commit

Permalink
Use the new fragment-host timestamp provider
Browse files Browse the repository at this point in the history
Currently there are some  special configuration in the poms using ant
scripts that want to ensure that swt host and fragements use the same
build qualifier.

This now uses the new fragment-host timestamp provider to ensure this
instead so we are able to get rid of this.
  • Loading branch information
laeubi committed Mar 11, 2024
1 parent 8071962 commit d80b326
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 63 deletions.
50 changes: 7 additions & 43 deletions binaries/pom.xml
Expand Up @@ -51,6 +51,13 @@
<addSourceFolders>true</addSourceFolders>
</configuration>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-packaging-plugin</artifactId>
<configuration>
<timestampProvider>fragment-host</timestampProvider>
</configuration>
</plugin>
</plugins>
</build>

Expand All @@ -64,20 +71,6 @@
</activation>
<build>
<plugins>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<configuration>
<filesets>
<fileset>
<directory>src</directory>
<includes>
<include>**/*</include>
</includes>
<followSymlinks>false</followSymlinks>
</fileset>
</filesets>
</configuration>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
Expand All @@ -91,38 +84,9 @@
</dependency-resolution>
</configuration>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-packaging-plugin</artifactId>
<executions>
<execution>
<id>default-build-qualifier</id>
<phase>initialize</phase> <!-- Postpone default-build-qualifier execution from packaging's default-bindings until the qualifier was read below.-->
<goals>
<goal>build-qualifier</goal>
</goals>
<configuration>
<forceContextQualifier>${swtBuildQualifier}</forceContextQualifier>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>read-build-qualifier</id>
<phase>validate</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target> <!-- Read git qualifier of 'org.eclipse.swt' project. -->
<loadfile property="swtBuildQualifier" srcFile="${swtMainProject}/target/swtBuildQualifier.txt"/>
</target>
<exportAntProperties>true</exportAntProperties>
</configuration>
</execution>
<execution>
<id>build-native-binaries</id>
<phase>process-resources</phase>
Expand Down
18 changes: 0 additions & 18 deletions bundles/org.eclipse.swt/pom.xml
Expand Up @@ -30,24 +30,6 @@

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>write-build-qualifier</id>
<phase>generate-resources</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target> <!-- Write computed qualifier to file so that the native fragments can read it as their qualifier. -->
<echo file="${project.build.directory}/swtBuildQualifier.txt" message="${buildQualifier}" />
</target>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
Expand Down
2 changes: 0 additions & 2 deletions pom.xml
Expand Up @@ -69,7 +69,6 @@
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<version>${tycho.version}</version>
<configuration>
<dependency-resolution>
<profileProperties>
Expand Down Expand Up @@ -134,7 +133,6 @@
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<version>${tycho.version}</version>
<configuration>
<environments>
<environment>
Expand Down

0 comments on commit d80b326

Please sign in to comment.