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 /features/org.eclipse.equinox.executable.feature/library/cocoa/build.xml
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 'features/org.eclipse.equinox.executable.feature/library/cocoa/build.xml')
-rw-r--r--features/org.eclipse.equinox.executable.feature/library/cocoa/build.xml53
1 files changed, 8 insertions, 45 deletions
diff --git a/features/org.eclipse.equinox.executable.feature/library/cocoa/build.xml b/features/org.eclipse.equinox.executable.feature/library/cocoa/build.xml
index 9561ac508..f57423062 100644
--- a/features/org.eclipse.equinox.executable.feature/library/cocoa/build.xml
+++ b/features/org.eclipse.equinox.executable.feature/library/cocoa/build.xml
@@ -1,58 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<project default="build_eclipse" basedir=".">
-<target name="build_eclipse">
-
- <loadresource property="WS">
- <string value="${native}"/>
- <filterchain>
- <tokenfilter>
- <replaceregex pattern="([A-Za-z0-9_]+)\.([A-Za-z0-9_]+)\.([A-Za-z0-9_]+)" replace="\1"/>
- </tokenfilter>
- </filterchain>
- </loadresource>
-
- <condition property="WS_ARG" value="-ws ${WS}" else="">
- <isset property="native" />
- </condition>
-
- <loadresource property="OS">
- <string value="${native}"/>
- <filterchain>
- <tokenfilter>
- <replaceregex pattern="([A-Za-z0-9_]+)\.([A-Za-z0-9_]+)\.([A-Za-z0-9_]+)" replace="\2"/>
- </tokenfilter>
- </filterchain>
- </loadresource>
-
- <condition property="OS_ARG" value="-os ${OS}" else="">
- <isset property="native" />
- </condition>
-
- <loadresource property="ARCH">
- <string value="${native}"/>
- <filterchain>
- <tokenfilter>
- <replaceregex pattern="([A-Za-z0-9_]+)\.([A-Za-z0-9_]+)\.([A-Za-z0-9_]+)" replace="\3"/>
- </tokenfilter>
- </filterchain>
- </loadresource>
-
- <condition property="ARCH_ARG" value="-arch ${ARCH}" else="">
- <isset property="native" />
- </condition>
+<condition property="build-natives">
+ <matches pattern="^${ws}.${os}.${arch}$" string="${native}"/>
+</condition>
+<target name="build_eclipse" if="build-natives">
<exec dir="." executable="sh">
<arg line="${basedir}/build.sh"/>
<arg line="install"/>
- <arg line="${WS_ARG}"/>
- <arg line="${OS_ARG}"/>
- <arg line="${ARCH_ARG}"/>
+ <arg line="-ws ${ws}"/>
+ <arg line="-os ${os}"/>
+ <arg line="-arch ${arch}"/>
</exec>
</target>
-<target name="clean">
+<target name="clean" if="build-natives">
<tstamp/>
<exec dir="." executable="sh">
<arg line="${basedir}/build.sh"/>

Back to the top