Skip to content
Snippets Groups Projects
Commit 70fd2abc authored by david_williams's avatar david_williams
Browse files

294564 refactoring needed to have truly independent JSDT build

parent 72a79142
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
releng.wtpbuilder/buildtemplates/components/template/dependency.xml
+ 70
− 38
View file @ 70fd2abc
......@@ -8,36 +8,68 @@
<project
name="test"
default="get">
<property
environment="env"/>
<!-- required to get proper value of dropinsFolder -->
<property
name="prereq.eclipse"
value="@prereq.eclipse@"/>
<property
name="prereq.platform"
value="@prereq.platform@"/>
<property
name="prereq.emf"
value="@prereq.emf@"/>
<property
name="prereq.emfxsd"
value="@prereq.emfxsd@"/>
<property
name="prereq.emfvalidation"
value="@prereq.emfvalidation@"/>
<property
name="prereq.gef"
value="@prereq.gef@"/>
<property
name="prereq.dtp"
value="@prereq.dtp@"/>
<property
name="prereq.wst"
value="@prereq.wst@"/>
<property
name="prereq.jst"
value="@prereq.jst@"/>
name="keyCfgFile"
value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
<echo
level="debug"
message="keyCfgFile: ${keyCfgFile}"/>
<property
name="prereq.wtp"
value="@prereq.wtp@"/>
file="${keyCfgFile}"/>
<condition
property="getprereq.eclipse">
<istrue
value="${prereq.eclipse}"/>
</condition>
<condition
property="getprereq.platform">
<istrue
value="${prereq.platform}"/>
</condition>
<condition
property="getprereq.emf">
<istrue
value="${prereq.emf}"/>
</condition>
<condition
property="getprereq.emfxsd">
<istrue
value="${prereq.emfxsd}"/>
</condition>
<condition
property="getprereq.emfvalidation">
<istrue
value="${prereq.emfvalidation}"/>
</condition>
<condition
property="getprereq.gef">
<istrue
value="${prereq.gef}"/>
</condition>
<condition
property="getprereq.dtp">
<istrue
value="${prereq.dtp}"/>
</condition>
<condition
property="getprereq.wst">
<istrue
value="${prereq.wst}"/>
</condition>
<condition
property="getprereq.jst">
<istrue
value="${prereq.jst}"/>
</condition>
<condition
property="getprereq.wtp">
<istrue
value="${prereq.wtp}"/>
</condition>
<target
name="get">
<!--
......@@ -70,7 +102,7 @@
</target>
<target
name="prereq.eclipse"
if="prereq.eclipse">
if="getprereq.eclipse">
<antcall
target="getAndInstall">
<param
......@@ -80,7 +112,7 @@
</target>
<target
name="prereq.platform"
if="prereq.platform">
if="getprereq.platform">
<antcall
target="getAndInstall">
<param
......@@ -90,7 +122,7 @@
</target>
<target
name="prereq.emf"
if="prereq.emf">
if="getprereq.emf">
<antcall
target="getAndInstall">
<param
......@@ -100,7 +132,7 @@
</target>
<target
name="prereq.emfxsd"
if="prereq.emfxsd">
if="getprereq.emfxsd">
<antcall
target="getAndInstall">
<param
......@@ -110,7 +142,7 @@
</target>
<target
name="prereq.emfvalidation"
if="prereq.emfvalidation">
if="getprereq.emfvalidation">
<antcall
target="getAndInstall">
<param
......@@ -120,7 +152,7 @@
</target>
<target
name="prereq.gef"
if="prereq.gef">
if="getprereq.gef">
<antcall
target="getAndInstall">
<param
......@@ -130,7 +162,7 @@
</target>
<target
name="prereq.dtp"
if="prereq.dtp">
if="getprereq.dtp">
<antcall
target="getAndInstall">
<param
......@@ -140,7 +172,7 @@
</target>
<target
name="prereq.wst"
if="prereq.wst">
if="getprereq.wst">
<antcall
target="getAndInstall">
<param
......@@ -150,7 +182,7 @@
</target>
<target
name="prereq.jst"
if="prereq.jst">
if="getprereq.jst">
<antcall
target="getAndInstall">
<param
......@@ -160,7 +192,7 @@
</target>
<target
name="prereq.wtp"
if="prereq.wtp">
if="getprereq.wtp">
<antcall
target="getAndInstall">
<param
......
releng.wtpbuilder/buildtemplates/components/template_sdk/dependency.xml
+ 74
− 42
View file @ 70fd2abc
......@@ -8,36 +8,68 @@
<project
name="test"
default="get">
<property
name="prereq.eclipse"
value="@prereq.eclipse@"/>
<property
name="prereq.platform"
value="@prereq.platform@"/>
<property
name="prereq.emf"
value="@prereq.emf@"/>
<property
name="prereq.emfxsd"
value="@prereq.emfxsd@"/>
<property
name="prereq.emfvalidation"
value="@prereq.emfvalidation@"/>
<property
name="prereq.gef"
value="@prereq.gef@"/>
<property
name="prereq.dtp"
value="@prereq.dtp@"/>
<property
name="prereq.wst"
value="@prereq.wst@"/>
<property
name="prereq.jst"
value="@prereq.jst@"/>
<property
name="prereq.wtp"
value="@prereq.wtp@"/>
<property
environment="env"/>
<!-- required to get proper value of dropinsFolder -->
<property
name="keyCfgFile"
value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
<echo
level="debug"
message="keyCfgFile: ${keyCfgFile}"/>
<property
file="${keyCfgFile}"/>
<condition
property="getprereq.eclipse">
<istrue
value="${prereq.eclipse}"/>
</condition>
<condition
property="getprereq.platform">
<istrue
value="${prereq.platform}"/>
</condition>
<condition
property="getprereq.emf">
<istrue
value="${prereq.emf}"/>
</condition>
<condition
property="getprereq.emfxsd">
<istrue
value="${prereq.emfxsd}"/>
</condition>
<condition
property="getprereq.emfvalidation">
<istrue
value="${prereq.emfvalidation}"/>
</condition>
<condition
property="getprereq.gef">
<istrue
value="${prereq.gef}"/>
</condition>
<condition
property="getprereq.dtp">
<istrue
value="${prereq.dtp}"/>
</condition>
<condition
property="getprereq.wst">
<istrue
value="${prereq.wst}"/>
</condition>
<condition
property="getprereq.jst">
<istrue
value="${prereq.jst}"/>
</condition>
<condition
property="getprereq.wtp">
<istrue
value="${prereq.wtp}"/>
</condition>
<target
name="get">
<!--
......@@ -45,12 +77,12 @@
requested pre-reqs are defined, which we do later with
statements such if="${groupId}.url"
-->
<property
file="${dependency.properties}"/>
<antcall
target="prereq.eclipse"/>
<antcall
target="prereq.platform"/>
<property
file="${dependency.properties}"/>
<antcall
target="prereq.emf"/>
<antcall
......@@ -70,7 +102,7 @@
</target>
<target
name="prereq.eclipse"
if="prereq.eclipse">
if="getprereq.eclipse">
<antcall
target="getAndInstall">
<param
......@@ -80,7 +112,7 @@
</target>
<target
name="prereq.platform"
if="prereq.platform">
if="getprereq.platform">
<antcall
target="getAndInstall">
<param
......@@ -90,7 +122,7 @@
</target>
<target
name="prereq.emf"
if="prereq.emf">
if="getprereq.emf">
<antcall
target="getAndInstall">
<param
......@@ -100,7 +132,7 @@
</target>
<target
name="prereq.emfxsd"
if="prereq.emfxsd">
if="getprereq.emfxsd">
<antcall
target="getAndInstall">
<param
......@@ -110,7 +142,7 @@
</target>
<target
name="prereq.emfvalidation"
if="prereq.emfvalidation">
if="getprereq.emfvalidation">
<antcall
target="getAndInstall">
<param
......@@ -120,7 +152,7 @@
</target>
<target
name="prereq.gef"
if="prereq.gef">
if="getprereq.gef">
<antcall
target="getAndInstall">
<param
......@@ -130,7 +162,7 @@
</target>
<target
name="prereq.dtp"
if="prereq.dtp">
if="getprereq.dtp">
<antcall
target="getAndInstall">
<param
......@@ -140,7 +172,7 @@
</target>
<target
name="prereq.wst"
if="prereq.wst">
if="getprereq.wst">
<antcall
target="getAndInstall">
<param
......@@ -150,7 +182,7 @@
</target>
<target
name="prereq.jst"
if="prereq.jst">
if="getprereq.jst">
<antcall
target="getAndInstall">
<param
......@@ -160,7 +192,7 @@
</target>
<target
name="prereq.wtp"
if="prereq.wtp">
if="getprereq.wtp">
<antcall
target="getAndInstall">
<param
......
releng.wtpbuilder/buildtemplates/components/template_tests/dependency.xml
+ 74
− 12
View file @ 70fd2abc
......@@ -8,6 +8,68 @@
<project
name="test"
default="get">
<property
environment="env"/>
<!-- required to get proper value of dropinsFolder -->
<property
name="keyCfgFile"
value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
<echo
level="debug"
message="keyCfgFile: ${keyCfgFile}"/>
<property
file="${keyCfgFile}"/>
<condition
property="getprereq.eclipse">
<istrue
value="${prereq.eclipse}"/>
</condition>
<condition
property="getprereq.platform">
<istrue
value="${prereq.platform}"/>
</condition>
<condition
property="getprereq.emf">
<istrue
value="${prereq.emf}"/>
</condition>
<condition
property="getprereq.emfxsd">
<istrue
value="${prereq.emfxsd}"/>
</condition>
<condition
property="getprereq.emfvalidation">
<istrue
value="${prereq.emfvalidation}"/>
</condition>
<condition
property="getprereq.gef">
<istrue
value="${prereq.gef}"/>
</condition>
<condition
property="getprereq.dtp">
<istrue
value="${prereq.dtp}"/>
</condition>
<condition
property="getprereq.wst">
<istrue
value="${prereq.wst}"/>
</condition>
<condition
property="getprereq.jst">
<istrue
value="${prereq.jst}"/>
</condition>
<condition
property="getprereq.wtp">
<istrue
value="${prereq.wtp}"/>
</condition>
<target
name="get">
<!--
......@@ -15,12 +77,12 @@
requested pre-reqs are defined, which we do later with
statements such if="${groupId}.url"
-->
<property
file="${dependency.properties}"/>
<antcall
target="prereq.eclipse"/>
<antcall
target="prereq.platform"/>
<property
file="${dependency.properties}"/>
<antcall
target="prereq.emf"/>
<antcall
......@@ -46,7 +108,7 @@
</target>
<target
name="prereq.eclipse"
if="prereq.eclipse">
if="getprereq.eclipse">
<antcall
target="getAndInstall">
<param
......@@ -56,7 +118,7 @@
</target>
<target
name="prereq.platform"
if="prereq.platform">
if="getprereq.platform">
<antcall
target="getAndInstall">
<param
......@@ -66,7 +128,7 @@
</target>
<target
name="prereq.emf"
if="prereq.emf">
if="getprereq.emf">
<antcall
target="getAndInstall">
<param
......@@ -76,7 +138,7 @@
</target>
<target
name="prereq.emfxsd"
if="prereq.emfxsd">
if="getprereq.emfxsd">
<antcall
target="getAndInstall">
<param
......@@ -86,7 +148,7 @@
</target>
<target
name="prereq.emfvalidation"
if="prereq.emfvalidation">
if="getprereq.emfvalidation">
<antcall
target="getAndInstall">
<param
......@@ -96,7 +158,7 @@
</target>
<target
name="prereq.gef"
if="prereq.gef">
if="getprereq.gef">
<antcall
target="getAndInstall">
<param
......@@ -106,7 +168,7 @@
</target>
<target
name="prereq.dtp"
if="prereq.dtp">
if="getprereq.dtp">
<antcall
target="getAndInstall">
<param
......@@ -116,7 +178,7 @@
</target>
<target
name="prereq.wst"
if="prereq.wst">
if="getprereq.wst">
<antcall
target="getAndInstall">
<param
......@@ -126,7 +188,7 @@
</target>
<target
name="prereq.jst"
if="prereq.jst">
if="getprereq.jst">
<antcall
target="getAndInstall">
<param
......@@ -136,7 +198,7 @@
</target>
<target
name="prereq.wtp"
if="prereq.wtp">
if="getprereq.wtp">
<antcall
target="getAndInstall">
<param
......
releng.wtpbuilder/buildtemplates/distribution/template.tests/testdependency.xml
+ 70
− 42
View file @ 70fd2abc
......@@ -19,38 +19,64 @@
message="keyCfgFile: ${keyCfgFile}"/>
<property
file="${keyCfgFile}"/>
<property
name="prereq.eclipse"
value="@prereq.eclipse@"/>
<property
name="prereq.platform"
value="@prereq.platform@"/>
<property
name="prereq.emf"
value="@prereq.emf@"/>
<property
name="prereq.emfxsd"
value="@prereq.emfxsd@"/>
<property
name="prereq.emfvalidation"
value="@prereq.emfvalidation@"/>
<property
name="prereq.gef"
value="@prereq.gef@"/>
<property
name="prereq.dtp"
value="@prereq.dtp@"/>
<property
name="prereq.wst"
value="@prereq.wst@"/>
<property
name="prereq.jst"
value="@prereq.jst@"/>
<property
name="prereq.wtp"
value="@prereq.wtp@"/>
<condition
property="getprereq.eclipse">
<istrue
value="${prereq.eclipse}"/>
</condition>
<condition
property="getprereq.platform">
<istrue
value="${prereq.platform}"/>
</condition>
<condition
property="getprereq.emf">
<istrue
value="${prereq.emf}"/>
</condition>
<condition
property="getprereq.emfxsd">
<istrue
value="${prereq.emfxsd}"/>
</condition>
<condition
property="getprereq.emfvalidation">
<istrue
value="${prereq.emfvalidation}"/>
</condition>
<condition
property="getprereq.gef">
<istrue
value="${prereq.gef}"/>
</condition>
<condition
property="getprereq.dtp">
<istrue
value="${prereq.dtp}"/>
</condition>
<condition
property="getprereq.wst">
<istrue
value="${prereq.wst}"/>
</condition>
<condition
property="getprereq.jst">
<istrue
value="${prereq.jst}"/>
</condition>
<condition
property="getprereq.wtp">
<istrue
value="${prereq.wtp}"/>
</condition>
<target
name="get">
<!--
read in this properties, just so we can make sure our
requested pre-reqs are defined, which we do later with
statements such if="${groupId}.url"
-->
<property
file="${dependency.properties}"/>
<antcall
......@@ -84,7 +110,7 @@
</target>
<target
name="prereq.eclipse"
if="prereq.eclipse">
if="getprereq.eclipse">
<antcall
target="getAndInstallBase">
<param
......@@ -94,7 +120,7 @@
</target>
<target
name="prereq.platform"
if="prereq.platform">
if="getprereq.platform">
<antcall
target="getAndInstallBase">
<param
......@@ -104,7 +130,7 @@
</target>
<target
name="prereq.emf"
if="prereq.emf">
if="getprereq.emf">
<antcall
target="getAndInstallDropins">
<param
......@@ -114,7 +140,7 @@
</target>
<target
name="prereq.emfxsd"
if="prereq.emfxsd">
if="getprereq.emfxsd">
<antcall
target="getAndInstallDropins">
<param
......@@ -124,7 +150,7 @@
</target>
<target
name="prereq.emfvalidation"
if="prereq.emfvalidation">
if="getprereq.emfvalidation">
<antcall
target="getAndInstallDropins">
<param
......@@ -134,7 +160,7 @@
</target>
<target
name="prereq.gef"
if="prereq.gef">
if="getprereq.gef">
<antcall
target="getAndInstallDropins">
<param
......@@ -144,7 +170,7 @@
</target>
<target
name="prereq.dtp"
if="prereq.dtp">
if="getprereq.dtp">
<antcall
target="getAndInstallDropins">
<param
......@@ -154,7 +180,7 @@
</target>
<target
name="prereq.wst"
if="prereq.wst">
if="getprereq.wst">
<antcall
target="getAndInstallDropins">
<param
......@@ -164,7 +190,7 @@
</target>
<target
name="prereq.jst"
if="prereq.jst">
if="getprereq.jst">
<antcall
target="getAndInstallDropins">
<param
......@@ -174,7 +200,7 @@
</target>
<target
name="prereq.wtp"
if="prereq.wtp">
if="getprereq.wtp">
<antcall
target="getAndInstallDropins">
<param
......@@ -183,7 +209,8 @@
</antcall>
</target>
<target
name="getAndInstallBase">
name="getAndInstallBase"
if="${groupId}.url">
<ant
antfile="${dependencyTargets}"
target="checkDependency">
......@@ -203,7 +230,8 @@
</ant>
</target>
<target
name="getAndInstallDropins">
name="getAndInstallDropins"
if="${groupId}.url">
<ant
antfile="${dependencyTargets}"
target="checkDependency">
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Copyright © Eclipse Foundation, Inc. All Rights Reserved.     Privacy Policy | Terms of Use | Copyright Agent