summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Overholt2011-07-27 15:49:53 (EDT)
committerSami Wagiaalla2011-10-04 11:27:31 (EDT)
commitfb5967e7c41e2883cc7e6e7ddf59718da5ea0253 (patch)
tree194e03a247659b07e0836240e298fa4b47bb6e06
parent8e5e751bb21adbd4d2756d720a6ffdb5018f23ea (diff)
downloadorg.eclipse.linuxtools.eclipse-build-fb5967e7c41e2883cc7e6e7ddf59718da5ea0253.zip
org.eclipse.linuxtools.eclipse-build-fb5967e7c41e2883cc7e6e7ddf59718da5ea0253.tar.gz
org.eclipse.linuxtools.eclipse-build-fb5967e7c41e2883cc7e6e7ddf59718da5ea0253.tar.bz2
Compute PDE Build JAR path in its own task
This way, the property pointing to the PDE Build JAR can be re-used. Use this property when building EMF and the SDK tests.
-rw-r--r--eclipse-build/build.xml22
1 files changed, 12 insertions, 10 deletions
diff --git a/eclipse-build/build.xml b/eclipse-build/build.xml
index ae8134a..65e53e0 100644
--- a/eclipse-build/build.xml
+++ b/eclipse-build/build.xml
@@ -469,8 +469,18 @@
</condition>
</target>
-->
+
+ <target name="setPDEBuildPath" depends="provision.sdk">
+ <path id="pdebuilddir.id">
+ <dirset dir="${provisionDir}/plugins">
+ <include name="org.eclipse.pde.build_*" />
+ </dirset>
+ </path>
+
+ <property name="pdebuilddir" refid="pdebuilddir.id" />
+ </target>
- <target name="buildEMF" depends="unpackEMF" unless="buildEMF.complete">
+ <target name="buildEMF" depends="unpackEMF,setPDEBuildPath" unless="buildEMF.complete">
<exec executable="${provisionDir}/eclipse">
<arg line="-nosplash " />
@@ -501,15 +511,7 @@
<echo file="buildEMF-stamp" />
</target>
- <target name="buildTests" depends="provision.sdk,applyTestPatches" unless="testsbuild.complete">
-
- <path id="pdebuilddir.id">
- <dirset dir="${provisionDir}/plugins">
- <include name="org.eclipse.pde.build_*" />
- </dirset>
- </path>
-
- <property name="pdebuilddir" refid="pdebuilddir.id" />
+ <target name="buildTests" depends="provision.sdk,applyTestPatches,setPDEBuildPath" unless="testsbuild.complete">
<!-- Test framework -->
<exec executable="${provisionDir}/eclipse">