Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMat Booth2018-05-23 13:50:45 +0000
committerAlexander Kurtakov2018-06-06 12:07:47 +0000
commit6276787184cca0e010e08f14e24d646ca184a1e6 (patch)
tree77b61fbd07a9d76e6d617b88eaf226d71f82bbda /launcher-binary-parent
parentcad00f5ab24013ffdc97c23a3eff7e9fe23cb48b (diff)
downloadrt.equinox.framework-6276787184cca0e010e08f14e24d646ca184a1e6.tar.gz
rt.equinox.framework-6276787184cca0e010e08f14e24d646ca184a1e6.tar.xz
rt.equinox.framework-6276787184cca0e010e08f14e24d646ca184a1e6.zip
Bug 386377 - Native launcher not built during first build
Change where the build.xml is invoked for building the native parts during a maven build. Previously, because the build.xml was invoked from the feature, and the reactor orders the build of the native fragments *before* the feature, it means the fragments do not include the freshly built native parts. Invoke it instead from the fragments themselves by moving the profile to the launcher-binary-parent pom. This way the native parts are guaranteed to be built in time to be included in the fragments. Change-Id: I0f9004cb10427cdd6a84bdf94cbbf10263f5267f Signed-off-by: Mat Booth <mat.booth@redhat.com>
Diffstat (limited to 'launcher-binary-parent')
-rw-r--r--launcher-binary-parent/pom.xml52
1 files changed, 51 insertions, 1 deletions
diff --git a/launcher-binary-parent/pom.xml b/launcher-binary-parent/pom.xml
index f5edf7399..4b5e75972 100644
--- a/launcher-binary-parent/pom.xml
+++ b/launcher-binary-parent/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2012 Eclipse Foundation.
+ Copyright (c) 2012, 2018 Eclipse Foundation and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Distribution License v1.0
which accompanies this distribution, and is available at
@@ -79,4 +79,54 @@
</plugin>
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <!--
+ This profile is enabled when the "native" system property is defined.
+ If the "ws.os.arch" triplet given in the "native" system property matches
+ the "ws", "os" and "arch" properties set by the current fragment, then the
+ ant script will trigger the build of the native parts for that fragment.
+ -->
+ <id>build-natives</id>
+ <activation>
+ <property>
+ <name>native</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>compile-launcher-natives</id>
+ <phase>generate-resources</phase>
+ <configuration>
+ <target>
+ <ant dir="../../features/org.eclipse.equinox.executable.feature/library/${ws}/" target="build_eclipse"/>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>clean-launcher-natives</id>
+ <phase>clean</phase>
+ <configuration>
+ <target>
+ <ant dir="../../features/org.eclipse.equinox.executable.feature/library/${ws}/" target="clean"/>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>

Back to the top