Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikaël Barbero2015-03-10 13:13:53 +0000
committerPascal Rapicault2015-03-31 16:25:46 +0000
commitba4064011537911322510cc4494ff4ad6be5d6f7 (patch)
tree815394644f49bee0ed4605e227a102d00bca637d
parent0302bbe1dba98b527458abde5b20a26abf9eb6bb (diff)
downloadrt.equinox.framework-ba4064011537911322510cc4494ff4ad6be5d6f7.tar.gz
rt.equinox.framework-ba4064011537911322510cc4494ff4ad6be5d6f7.tar.xz
rt.equinox.framework-ba4064011537911322510cc4494ff4ad6be5d6f7.zip
Split to retrieve OS, WS and ARCH
Change-Id: Idd24ac2a008bfc193ccaf9a5a5538b4874ad1295 Signed-off-by: Mikäel Barbero <mikael@eclipse.org>
-rw-r--r--features/org.eclipse.equinox.executable.feature/library/carbon/build.xml45
1 files changed, 44 insertions, 1 deletions
diff --git a/features/org.eclipse.equinox.executable.feature/library/carbon/build.xml b/features/org.eclipse.equinox.executable.feature/library/carbon/build.xml
index 990298e64..9561ac508 100644
--- a/features/org.eclipse.equinox.executable.feature/library/carbon/build.xml
+++ b/features/org.eclipse.equinox.executable.feature/library/carbon/build.xml
@@ -3,9 +3,52 @@
<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>
+
<exec dir="." executable="sh">
<arg line="${basedir}/build.sh"/>
<arg line="install"/>
+ <arg line="${WS_ARG}"/>
+ <arg line="${OS_ARG}"/>
+ <arg line="${ARCH_ARG}"/>
</exec>
</target>
@@ -17,4 +60,4 @@
</exec>
</target>
-</project> \ No newline at end of file
+</project>

Back to the top