conditional updates for JEM and DTP dependencies
diff --git a/releng.wtpbuilder/distribution/wtp.api/build.xml b/releng.wtpbuilder/distribution/wtp.api/build.xml
index 49eb246..c6fdbab 100644
--- a/releng.wtpbuilder/distribution/wtp.api/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.api/build.xml
@@ -75,10 +75,11 @@
<antcall target="getAndInstall">
<param name="groupId" value="gef" />
</antcall>
- <condition property="jem">
+ <condition property="15x">
<equals arg1="R1.5" arg2="${build.stream}"/>
</condition>
<antcall target="getAndInstallJem"/>
+ <antcall target="getAndInstallDtp"/>
<antcall target="getAndInstall">
<param name="groupId" value="tomcat.5" />
</antcall>
@@ -152,12 +153,18 @@
</ant>
</target>
- <target name="getAndInstallJem" if="jem">
+ <target name="getAndInstallJem" if="15x">
<antcall target="getAndInstall">
<param name="groupId" value="jem" />
</antcall>
</target>
+ <target name="getAndInstallDtp" unless="15x">
+ <antcall target="getAndInstall">
+ <param name="groupId" value="dtp" />
+ </antcall>
+ </target>
+
<target name="getAndInstallWTP">
<available file="${wtp.dir}/${file}" property="file.exists"/>
<antcall target="getWTP"/>
@@ -207,46 +214,46 @@
</move>
</target>
- <target name="APIRefCompatibilityScanner" unless="jem">
+ <target name="APIRefCompatibilityScanner" unless="15x">
<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.win32-win32-x86},${local.cache.dir}/${emf.file},${local.cache.dir}/${gef.file} -Duse=${apiRoot}/releng.builder/tools/apitools/adopter_usages -DoutputDir=${apiRoot}/adopters -Xmx512M"/>
</antcall>
</target>
- <target name="APIRefCompatibilityScannerJem" if="jem">
+ <target name="APIRefCompatibilityScannerJem" if="15x">
<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.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 -Xmx512M"/>
</antcall>
</target>
- <target name="Java2APIJem" if="jem">
+ <target name="Java2APIJem" if="15x">
<antcall target="runEclipseApp">
<param name="application" value="org.eclipse.wtp.releng.tools.component.core.Java2API"/>
<param name="vmargs" value="-Dsrc=${local.cache.dir}/${jem.file} -DoutputDir=${apiRoot}/api-jem -Dexcludes=.*internal.*"/>
</antcall>
</target>
- <target name="APIViolationScanner" unless="jem">
+ <target name="APIViolationScanner" unless="15x">
<antcall target="runJavaMain">
<param name="classname" value="org.eclipse.wtp.releng.tools.component.api.violation.APIViolationScanner"/>
<param name="args" value="-src ${local.cache.dir}/${wtp-sdk} -api ${apiRoot}/api-eclipse ${apiRoot}/api-emf ${apiRoot}/api-gef -outputDir ${apiRoot}/apiresults -html -includes org.eclipse.* -excludes org.eclipse.wst.* org.eclipse.jst.* -debug"/>
</antcall>
</target>
- <target name="APIViolationScannerJem" if="jem">
+ <target name="APIViolationScannerJem" if="15x">
<antcall target="runJavaMain">
<param name="classname" value="org.eclipse.wtp.releng.tools.component.api.violation.APIViolationScanner"/>
<param name="args" value="-src ${local.cache.dir}/${wtp-sdk} -api ${apiRoot}/api-eclipse ${apiRoot}/api-emf ${apiRoot}/api-gef ${apiRoot}/api-jem -outputDir ${apiRoot}/apiresults -html -includes org.eclipse.* -excludes org.eclipse.wst.* org.eclipse.jst.* -debug"/>
</antcall>
</target>
- <target name="NonAPIDependencyScanner" unless="jem">
+ <target name="NonAPIDependencyScanner" unless="15x">
<antcall target="runJavaMain">
<param name="classname" value="org.eclipse.wtp.releng.tools.component.api.violation.NonAPIDependencyScanner"/>
<param name="args" value="-src ${local.cache.dir}/${wtp-sdk} -api ${local.cache.dir}/${wtp-sdk} -outputDir ${apiRoot}/apiresults -refapi ${apiRoot}/api-eclipse ${apiRoot}/api-emf ${apiRoot}/api-gef -includes org.eclipse.* -skipAPIGen"/>
</antcall>
</target>
- <target name="NonAPIDependencyScannerJem" if="jem">
+ <target name="NonAPIDependencyScannerJem" if="15x">
<antcall target="runJavaMain">
<param name="classname" value="org.eclipse.wtp.releng.tools.component.api.violation.NonAPIDependencyScanner"/>
<param name="args" value="-src ${local.cache.dir}/${wtp-sdk} -api ${local.cache.dir}/${wtp-sdk} -outputDir ${apiRoot}/apiresults -refapi ${apiRoot}/api-eclipse ${apiRoot}/api-emf ${apiRoot}/api-gef ${apiRoot}/api-jem -includes org.eclipse.* -skipAPIGen"/>
@@ -262,7 +269,7 @@
tag="HEAD"
/>
<mkdir dir="${apiRoot}/adopters"/>
- <condition property="jem">
+ <condition property="15x">
<equals arg1="R1.5" arg2="${build.stream}"/>
</condition>
<antcall target="APIRefCompatibilityScanner"/>
@@ -339,11 +346,11 @@
<target name="runEclipseApp">
<property name="vmargs" value=""/>
- <java jar="${apiRoot}/eclipse/startup.jar" fork="true" failonerror="true" timeout="3600000" dir="${apiRoot}">
+ <java jar="${apiRoot}/eclipse/plugins/org.eclipse.equinox.launcher_1.0.0.v20070226.jar" fork="true" failonerror="true" timeout="3600000" dir="${apiRoot}">
<jvmarg value="-Dosgi.ws=${env.BASEWS}" />
<jvmarg value="-Dosgi.os=${env.BASEOS}" />
<jvmarg value="-Dosgi.arch=${env.BASEARCH}" />
- <jvmarg value="-Xmx256M" />
+ <jvmarg value="-Xmx512M" />
<jvmarg line="${vmargs}" />
<arg value="-application" />
<arg value="${application}" />
@@ -365,10 +372,11 @@
<include name="**/org.eclipse.jdt.core*.jar"/>
<include name="**/org.eclipse.jface.text*.jar"/>
<include name="**/org.eclipse.osgi*.jar"/>
- <include name="**/org.eclipse.text*.jar"/>
+ <include name="**/org.eclipse.text*.jar"/>
+ <include name="**/org.eclipse.equinox.launcher*.jar"/>
</fileset>
</classpath>
- <jvmarg value="-Xmx256M"/>
+ <jvmarg value="-Xmx512M"/>
<arg line="${args}"/>
</java>
</target>
diff --git a/releng.wtpbuilder/distribution/wtp.perf/build.xml b/releng.wtpbuilder/distribution/wtp.perf/build.xml
index 3247cc0..3053cde 100644
--- a/releng.wtpbuilder/distribution/wtp.perf/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.perf/build.xml
@@ -100,10 +100,11 @@
<param name="groupId" value="gef" />
<param name="clean" value="true" />
</antcall>
- <condition property="jem">
+ <condition property="15x">
<equals arg1="R1.5" arg2="${build.stream}"/>
</condition>
<antcall target="getAndInstallJEM"/>
+ <antcall target="getAndInstallDtp"/>
<antcall target="getAndInstall">
<param name="groupId" value="tomcat.5" />
</antcall>
@@ -144,12 +145,20 @@
<copy file="${build.home}/releng.wtpbuilder/distribution/wtp.perf/performance-tests.xml" tofile="${perfRoot}/performance-tests.xml"></copy>
</target>
- <target name="getAndInstallJEM" if="jem">
+ <target name="getAndInstallJEM" if="15x">
<antcall target="getAndInstall">
<param name="groupId" value="jem" />
<param name="clean" value="true" />
</antcall>
</target>
+
+ <target name="getAndInstallDtp" unless="15x">
+ <antcall target="getAndInstall">
+ <param name="groupId" value="dtp" />
+ <param name="clean" value="true" />
+ </antcall>
+ </target>
+
<target name="getAndInstall">
<property name="dependencyTargets" value="${build.home}/releng.wtpbuilder/scripts/dependency/build.xml"/>
<ant antfile="${dependencyTargets}" target="checkDependency">