diff --git a/releng.wtpbuilder/components/jst-sdk/dependency.xml b/releng.wtpbuilder/components/jst-sdk/dependency.xml index ec790b98ddaecac694cb0e8f3b948b1b3bd21870..27699fdbd0de5e0ba1d54b4e05f0a01e73d3f943 100644 --- a/releng.wtpbuilder/components/jst-sdk/dependency.xml +++ b/releng.wtpbuilder/components/jst-sdk/dependency.xml @@ -13,6 +13,9 @@ <target name="get"> + <!-- read in this properties, just so we can make sure our requested pre-reqs are defined via {groupId}.url--> + <property + file="${dependency.properties}"/> <mkdir dir="${buildDirectory}/maps/${env.RELENG}/maps" /> <antcall target="getAndInstall"> @@ -23,6 +26,22 @@ name="base.install.dir" value="${buildDirectory}/maps/${env.RELENG}/maps/" /> </antcall> + + + <property + name="pde.builder.path" + value="${env.BASE_BUILDERS}/${eclipse.builder.version}/${eclipse.builder}" /> + <echo + level="debug" + message="pde.builder.path: ${pde.builder.path}" /> + <echo + level="debug" + message="eclipse.builder.version: ${eclipse.builder.version}" /> + <echo + level="debug" + message="eclipse.builder: ${eclipse.builder}" /> + + <antcall target="getAndInstall"> <param name="groupId" @@ -73,7 +92,7 @@ </target> - <target name="getAndInstall"> + <target name="getAndInstall" if="${groupId}.url"> <ant antfile="${dependencyTargets}" target="checkDependency"> diff --git a/releng.wtpbuilder/components/jst.tests/dependency.xml b/releng.wtpbuilder/components/jst.tests/dependency.xml index 6a8291cec42fce1e424aa2bc0f439da1d7edd525..88eabbe2053e0c618dc009496f00bd054034ed77 100644 --- a/releng.wtpbuilder/components/jst.tests/dependency.xml +++ b/releng.wtpbuilder/components/jst.tests/dependency.xml @@ -14,6 +14,9 @@ <target name="get"> + <!-- read in this properties, just so we can make sure our requested pre-reqs are defined via {groupId}.url--> + <property + file="${dependency.properties}"/> <mkdir dir="${buildDirectory}/maps/${env.RELENG}/maps" /> <antcall target="getAndInstall"> @@ -24,6 +27,22 @@ name="base.install.dir" value="${buildDirectory}/maps/${env.RELENG}/maps/" /> </antcall> + + + <property + name="pde.builder.path" + value="${env.BASE_BUILDERS}/${eclipse.builder.version}/${eclipse.builder}" /> + <echo + level="debug" + message="pde.builder.path: ${pde.builder.path}" /> + <echo + level="debug" + message="eclipse.builder.version: ${eclipse.builder.version}" /> + <echo + level="debug" + message="eclipse.builder: ${eclipse.builder}" /> + + <antcall target="getAndInstall"> <param name="groupId" @@ -67,7 +86,7 @@ </target> - <target name="getAndInstall"> + <target name="getAndInstall" if="${groupId}.url"> <ant antfile="${dependencyTargets}" target="checkDependency"> diff --git a/releng.wtpbuilder/components/jst/dependency.xml b/releng.wtpbuilder/components/jst/dependency.xml index 029021722b27b1f134ccb57dfcc49ffe8cf3ed17..bf43e46763bee0e45d6bf070bdc7dc7bd3ec5628 100644 --- a/releng.wtpbuilder/components/jst/dependency.xml +++ b/releng.wtpbuilder/components/jst/dependency.xml @@ -14,6 +14,11 @@ <target name="get"> + <!-- read in this properties, just so we can make sure our requested pre-reqs are defined via {groupId}.url--> + <property + file="${dependency.properties}"/> + + <mkdir dir="${buildDirectory}/maps/${env.RELENG}/maps" /> <antcall target="getAndInstall"> <param @@ -87,7 +92,7 @@ </target> - <target name="getAndInstall"> + <target name="getAndInstall" if="${groupId}.url"> <ant antfile="${dependencyTargets}" target="checkDependency">