[122833] Improve Test Automation
diff --git a/releng.wtpbuilder/distribution/wtp.api/build.xml b/releng.wtpbuilder/distribution/wtp.api/build.xml
index 3a347c7..69b31e4 100644
--- a/releng.wtpbuilder/distribution/wtp.api/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.api/build.xml
@@ -19,7 +19,7 @@
<target name="main">
<property file="${build.home}/releng.wtpbuilder/build.properties"/>
<property name="wtp.api" value="${build.home}/releng.wtpbuilder/distribution/wtp.api"/>
- <property name="apiRoot" value="${wtp.api}/apiRoot"/>
+ <property name="apiRoot" value="${build.home}/apiRoot"/>
<delete dir="${apiRoot}" failonerror="false"/>
<mkdir dir="${apiRoot}"/>
<antcall target="getReleng"/>
@@ -83,6 +83,12 @@
<param name="groupId" value="oagis.wsdl" />
</antcall>
<antcall target="get">
+ <param name="groupId" value="eclipse" />
+ <param name="baseos" value="win32" />
+ <param name="basews" value="win32" />
+ <param name="basearch" value="x86" />
+ </antcall>
+ <antcall target="get">
<param name="groupId" value="tptp" />
</antcall>
<mkdir dir="${apiRoot}/piagent"/>
@@ -178,10 +184,6 @@
</target>
<target name="run">
- <condition property="eclipse.file" value="${eclipse.file.linux-gtk-x86}" else="${eclipse.file.win32-win32-x86}">
- <equals arg1="${baseos}" arg2="linux"/>
- </condition>
-
<cvs
cvsRoot=":pserver:anonymous@dev.eclipse.org:/cvsroot/webtools"
package="releng.builder/tools/apitools/adopter_usages"
@@ -192,14 +194,14 @@
<mkdir dir="${apiRoot}/adopters"/>
<antcall target="runEclipseApp">
<param name="application" value="org.eclipse.wtp.releng.tools.component.core.APIRefCompatibilityScanner"/>
- <param name="vmargs" value="-Dsrc=${local.cache.dir}/${wtp-sdk},${local.cache.dir}/${eclipse.file},${local.cache.dir}/${emf.file},${local.cache.dir}/${gef.file},${local.cache.dir}/${jem.file} -Duse=${apiRoot}/releng.builder/tools/apitools/adopter_usages -DoutputDir=${apiRoot}/adopters -Xmx256M"/>
+ <param name="vmargs" value="-Dsrc=${local.cache.dir}/${wtp-sdk},${local.cache.dir}/${eclipse.file.win32-win32-x86},${local.cache.dir}/${emf.file},${local.cache.dir}/${gef.file},${local.cache.dir}/${jem.file} -Duse=${apiRoot}/releng.builder/tools/apitools/adopter_usages -DoutputDir=${apiRoot}/adopters -Xmx256M"/>
</antcall>
<copy tofile="${apiRoot}/apiresults/api-ref-compatibility.html" file="${apiRoot}/adopters/api-ref-compatibility.html"/>
<copy tofile="${apiRoot}/apiresults/api-ref-compatibility.xml" file="${apiRoot}/adopters/api-ref-compatibility.xml"/>
<antcall target="runEclipseApp">
<param name="application" value="org.eclipse.wtp.releng.tools.component.core.Java2API"/>
- <param name="vmargs" value="-Dsrc=${local.cache.dir}/${eclipse.file} -DoutputDir=${apiRoot}/api-eclipse -Dexcludes=.*internal.*"/>
+ <param name="vmargs" value="-Dsrc=${local.cache.dir}/${eclipse.file.win32-win32-x86} -DoutputDir=${apiRoot}/api-eclipse -Dexcludes=.*internal.*"/>
</antcall>
<antcall target="runEclipseApp">
<param name="application" value="org.eclipse.wtp.releng.tools.component.core.Java2API"/>