Skip to content
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

[Build] Unify 'natives' ant-script invocation into the binaries-parent #24

Merged
merged 1 commit into from
Dec 8, 2022
Merged

[Build] Unify 'natives' ant-script invocation into the binaries-parent #24

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
40 changes: 35 additions & 5 deletions bundles/binaries-parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
forceContextQualifier gets updated during build input process using
ant script <SWT source repo>/bundles/org.eclipse.swt/buildInternal.xml
-->

<forceContextQualifier>v20221207-0524</forceContextQualifier>
<buildid>${buildId}</buildid>
</properties>

<build>
Expand Down Expand Up @@ -66,28 +66,47 @@
<execution>
<id>normal</id>
<phase>initialize</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<property name="copy.src.dir" value="src" />
<ant antfile="../binaries-parent/build.xml" target="copy.${ws}.src" />
</target>
</configuration>
</execution>
<execution>
<id>natives</id>
<phase>process-resources</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<!-- See https://stackoverflow.com/a/53227117 and http://ant-contrib.sourceforge.net/tasks/tasks/index.html -->
<taskdef resource="net/sf/antcontrib/antlib.xml" />
<if>
<equals arg1="${native}" arg2="${ws}.${os}.${arch}" />
<then>
<ant antfile="../binaries-parent/build.xml" target="build_libraries" />
</then>
</if>
</target>
</configuration>
</execution>
<execution>
<id>swtdownload</id>
<phase>package</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<property name="eclipse.version" value="${releaseNumberSDK}" />
<ant antfile="../binaries-parent/build.xml" target="swtdownload"/>
<ant antfile="../binaries-parent/build.xml" target="swtdownload" />
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
<dependencies>
Expand All @@ -106,6 +125,17 @@
<artifactId>ant-apache-bsf</artifactId>
<version>1.10.12</version>
</dependency>
<dependency>
<groupId>ant-contrib</groupId>
<artifactId>ant-contrib</artifactId>
<version>1.0b3</version>
<exclusions>
<exclusion>
<groupId>ant</groupId>
<artifactId>ant</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</plugin>
</plugins>
Expand Down
35 changes: 0 additions & 35 deletions bundles/org.eclipse.swt.cocoa.macosx.aarch64/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,42 +28,7 @@
<os>macosx</os>
<ws>cocoa</ws>
<arch>aarch64</arch>
<buildid>${buildId}</buildid>
<targets></targets>
</properties>

<!-- This has to be here. Profiles are not inheritable. -->
<profiles>
<profile>
<id>build-natives</id>
<activation>
<property>
<!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( -->
<name>native</name>
<value>cocoa.macosx.aarch64</value>
</property>
</activation>
<build>
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>natives</id>
<phase>process-resources</phase>
<configuration>
<target>
<ant antfile="../binaries-parent/build.xml" target="build_libraries"/>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
35 changes: 0 additions & 35 deletions bundles/org.eclipse.swt.cocoa.macosx.x86_64/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,42 +28,7 @@
<os>macosx</os>
<ws>cocoa</ws>
<arch>x86_64</arch>
<buildid>${buildId}</buildid>
<targets></targets>
</properties>

<!-- This has to be here. Profiles are not inheritable. -->
<profiles>
<profile>
<id>build-natives</id>
<activation>
<property>
<!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( -->
<name>native</name>
<value>cocoa.macosx.x86_64</value>
</property>
</activation>
<build>
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>natives</id>
<phase>process-resources</phase>
<configuration>
<target>
<ant antfile="../binaries-parent/build.xml" target="build_libraries"/>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
35 changes: 0 additions & 35 deletions bundles/org.eclipse.swt.gtk.linux.aarch64/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,42 +28,7 @@
<os>linux</os>
<ws>gtk</ws>
<arch>aarch64</arch>
<buildid>${buildId}</buildid>
<targets>install</targets>
</properties>

<!-- This has to be here. Profiles are not inheritable. -->
<profiles>
<profile>
<id>build-natives</id>
<activation>
<property>
<!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( -->
<name>native</name>
<value>gtk.linux.aarch64</value>
</property>
</activation>
<build>
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>natives</id>
<phase>process-resources</phase>
<configuration>
<target>
<ant antfile="../binaries-parent/build.xml" target="build_libraries"/>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
35 changes: 0 additions & 35 deletions bundles/org.eclipse.swt.gtk.linux.loongarch64/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,42 +28,7 @@
<os>linux</os>
<ws>gtk</ws>
<arch>loongarch64</arch>
<buildid>${buildId}</buildid>
<targets>install</targets>
</properties>

<!-- This has to be here. Profiles are not inheritable. -->
<profiles>
<profile>
<id>build-natives</id>
<activation>
<property>
<!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( -->
<name>native</name>
<value>gtk.linux.loongarch64</value>
</property>
</activation>
<build>
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>natives</id>
<phase>process-resources</phase>
<configuration>
<target>
<ant antfile="../binaries-parent/build.xml" target="build_libraries"/>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
35 changes: 0 additions & 35 deletions bundles/org.eclipse.swt.gtk.linux.ppc64le/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,42 +28,7 @@
<os>linux</os>
<ws>gtk</ws>
<arch>ppc64le</arch>
<buildid>${buildId}</buildid>
<targets>install</targets>
</properties>

<!-- This has to be here. Profiles are not inheritable. -->
<profiles>
<profile>
<id>build-natives</id>
<activation>
<property>
<!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( -->
<name>native</name>
<value>gtk.linux.ppc64le</value>
</property>
</activation>
<build>
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>natives</id>
<phase>process-resources</phase>
<configuration>
<target>
<ant antfile="../binaries-parent/build.xml" target="build_libraries"/>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
35 changes: 0 additions & 35 deletions bundles/org.eclipse.swt.gtk.linux.x86_64/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,42 +28,7 @@
<os>linux</os>
<ws>gtk</ws>
<arch>x86_64</arch>
<buildid>${buildId}</buildid>
<targets>install</targets>
</properties>

<!-- This has to be here. Profiles are not inheritable. -->
<profiles>
<profile>
<id>build-natives</id>
<activation>
<property>
<!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( -->
<name>native</name>
<value>gtk.linux.x86_64</value>
</property>
</activation>
<build>
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>natives</id>
<phase>process-resources</phase>
<configuration>
<target>
<ant antfile="../binaries-parent/build.xml" target="build_libraries"/>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
35 changes: 0 additions & 35 deletions bundles/org.eclipse.swt.win32.win32.x86_64/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,42 +28,7 @@
<os>win32</os>
<ws>win32</ws>
<arch>x86_64</arch>
<buildid>${buildId}</buildid>
<targets>x86_64 all install</targets>
</properties>

<!-- This has to be here. Profiles are not inheritable. -->
<profiles>
<profile>
<id>build-natives</id>
<activation>
<property>
<!-- This has to be hardcoded. Profiles are not allowed to use pom defined properties :-( -->
<name>native</name>
<value>win32.win32.x86_64</value>
</property>
</activation>
<build>
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>natives</id>
<phase>process-resources</phase>
<configuration>
<target>
<ant antfile="../binaries-parent/build.xml" target="build_libraries"/>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>