added back conditional JEM logic for 1.5.x vs 2.x tests

releng.wtpbuilder/distribution/wtp.api/build.xml

@@ -75,7 +75,10 @@
 		<antcall target="getAndInstall">
 			<param name="groupId" value="gef" />
 		</antcall>
-
+		<condition property="jem">
+			<equals arg1="R1.5" arg2="${build.stream}"/>
+		</condition>
+		<antcall target="getAndInstallJem"/>
 		<antcall target="getAndInstall">
 			<param name="groupId" value="tomcat.5" />
 		</antcall>
@@ -149,6 +152,12 @@
 		</ant>
 	</target>
 
+	<target name="getAndInstallJem" if="jem">
+		<antcall target="getAndInstall">
+			<param name="groupId" value="jem" />
+		</antcall>	
+	</target>
+	
 	<target name="getAndInstallWTP">
 		<available file="${wtp.dir}/${file}" property="file.exists"/>
 		<antcall target="getWTP"/>
@@ -198,6 +207,52 @@
 		</move>
 	</target>
 
+	<target name="APIRefCompatibilityScanner" unless="jem">
+		<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">
+		<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">
+		<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">
+		<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">
+		<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">
+		<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">
+		<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"/>
+		</antcall>
+	</target>
+	
 	<target name="run">
 		<cvs
 			cvsRoot=":pserver:anonymous@dev.eclipse.org:/cvsroot/webtools"
@@ -207,10 +262,11 @@
 			tag="HEAD"
 		/>
 		<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.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>
+		<condition property="jem">
+			<equals arg1="R1.5" arg2="${build.stream}"/>
+		</condition>
+		<antcall target="APIRefCompatibilityScanner"/>
+		<antcall target="APIRefCompatibilityScannerJem"/>
 		<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"/>
 
@@ -226,20 +282,16 @@
 			<param name="application" value="org.eclipse.wtp.releng.tools.component.core.Java2API"/>
 			<param name="vmargs" value="-Dsrc=${local.cache.dir}/${gef.file} -DoutputDir=${apiRoot}/api-gef -Dexcludes=.*internal.*"/>
 		</antcall>
-		<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>
+		
 		<antcall target="runEclipseApp">
 			<param name="application" value="org.eclipse.wtp.releng.tools.component.core.Java2API"/>
 			<param name="vmargs" value="-Dsrc=${local.cache.dir}/${wtp-sdk} -DoutputDir=${apiRoot}/api-wtp"/>
 		</antcall>
-
-		<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>
-
+		<antcall target="Java2APIJem"/>
+		
+		<antcall target="APIViolationScanner"/>
+		<antcall target="APIViolationScannerJem"/>
+		
 		<antcall target="runJavaMain">
 			<param name="classname" value="org.eclipse.wtp.releng.tools.component.api.API2ComponentAPI"/>
 			<param name="args" value="-src ${local.cache.dir}/${wtp-sdk} -api ${local.cache.dir}/${wtp-sdk} -outputDir ${apiRoot}/apiresults -html"/>
@@ -250,11 +302,9 @@
 			<param name="vmargs" value="-Dsrc=${local.cache.dir}/${wtp-sdk} -DoutputDir=${apiRoot}/apiresults -Dapi=${local.cache.dir}/${wtp-sdk} -Dexcludes=.*internal.* -DskipAPIGen=true -Dhtml=true"/>
 		</antcall>
 
-		<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"/>
-		</antcall>
-
+		<antcall target="NonAPIDependencyScanner"/>
+		<antcall target="NonAPIDependencyScannerJem"/>
+		
 		<mkdir dir="${apiRoot}/results/consolelogs"/>
 		<copy todir="${apiRoot}" overwrite="true">
 			<fileset dir="${build.home}/releng.wtpbuilder/distribution/wtp.tests/testScripts"/>