diff -r 5fafe4f9fda8 -r 6dad376b9835 sf-platform/compile-hlm-5.ant.xml
--- a/sf-platform/compile-hlm-5.ant.xml	Wed Jul 07 17:26:43 2010 +0100
+++ b/sf-platform/compile-hlm-5.ant.xml	Wed Jul 07 15:15:41 2010 +0100
@@ -184,132 +184,7 @@
         </antcall>
       </else>
     </if>
-    
   </target>
 
-  <!--
-    == Name: SF-S60-COMPILE
-    ==
-    == Desc: Compile S60 part of build using the spec defined in:
-    ==
-    ==         - job_props.ant.xml
-    ==         - job_refs.ant.xml
-    ==
-    -->
-  <target name="sf-s60-compile" depends="sf-compile-options">
-
-        <hlm:argSet id="sbs.tools.var">
-          			<hlm:arg name="config" value="${sf.spec.sbs.tools.config}" />
-          			<hlm:arg name="singlejob" value="true" />
-          			<hlm:arg name="enable-filter" value="${sf.spec.logs.raptorfilter.enable}" />
-                                <hlm:arg name="retry-limit" value="${sf.spec.sbs.retry.limit}" />
-    		</hlm:argSet>
-
-			<hlm:argSet id="sbs.tools.clean.var">
-          			<hlm:arg name="config" value="${sf.spec.sbs.tools.config}" />
-          			<hlm:arg name="singlejob" value="true" />
-          			<hlm:arg name="enable-filter" value="${sf.spec.logs.raptorfilter.enable}" />
-    		</hlm:argSet>
-
-    		<hlm:argSet id="sbs.main.sbs.var">
-          			<hlm:arg name="config" value="${sf.spec.sbs.config}" />
-          			<hlm:arg name="enable-filter" value="${sf.spec.logs.raptorfilter.enable}" />
-                                <hlm:arg name="retry-limit" value="${sf.spec.sbs.retry.limit}" />
-    		</hlm:argSet>
-
-			<hlm:argSet id="sbs.main.clean.sbs.var">
-          			<hlm:arg name="config" value="${sf.spec.sbs.config}" />
-          			<hlm:arg name="enable-filter" value="${sf.spec.logs.raptorfilter.enable}" />
-				<hlm:arg name="command" value="CLEAN --check" />
-    		</hlm:argSet>
-			
-          			<hlm:argSet id="sbs.main.what.sbs.var">
-          			<hlm:arg name="config" value="${sf.spec.sbs.config}" />
-          			<hlm:arg name="enable-filter" value="${sf.spec.logs.raptorfilter.enable}" />
-				<hlm:arg name="command" value="WHAT" />
-    		</hlm:argSet>
-
-    		<hlm:sbsMakeOptions engine="gmake" id="sbs.toolsbuild.options" />
-    		<hlm:sbsMakeOptions engine="gmake" id="sbs.fullbuild.options" />
-
-		<antcall target="sf-list-dir" inheritAll="false">
-			<param name="sf.list.name" value="s60-baseline"/>
-		</antcall>
-		
-			<!-- s60 what  -->
-			<!--
-    		<antcall target="compile-main" inheritAll="false" inheritRefs="true">
-          			<param name="build.system" value="${sf.spec.build.system}" />
-          			<param name="sysdef.configurations.list" value="${sf.spec.s60.sysdef.clean.configurations.list}" />
-          			<reference refid="sbs.main.what.sbs.var" torefid="sbs.var" />
-          			<reference refid="sbs.fullbuild.options" torefid="sbs.make.options" />
-          			<reference refid="sf.spec.s60.system.definition.files" torefid="system.definition.files" />
-    		</antcall>
-			-->
-			<!-- s60 clean main build -->
-			<if><istrue value="${sf.spec.baseline.clean}"/>
-				<then>
-					<antcall target="compile-main" inheritAll="false" inheritRefs="true">
-							<param name="build.system" value="${sf.spec.build.system}" />
-							<param name="sysdef.configurations.list" value="${sf.spec.s60.sysdef.clean.configurations.list}" />
-							<reference refid="sbs.main.clean.sbs.var" torefid="sbs.var" />
-							<reference refid="sbs.fullbuild.options" torefid="sbs.make.options" />
-							<reference refid="sf.spec.s60.system.definition.files" torefid="system.definition.files" />
-					</antcall>
-				</then>
-			</if>
-
-			<antcall target="sf-list-dir" inheritAll="false">
-				<param name="sf.list.name" value="post-s60-clean"/>
-			</antcall>
-			
-			<!-- what has been cleaned from baseline PDK by s60 model -->
-			<antcall target="sf-delta-dir" inheritAll="false">
-				<param name="sf.list_a.name" value="s60-baseline"/>
-				<param name="sf.list_b.name" value="post-s60-clean"/>
-			</antcall>		
-			
-
-            <!-- s60  tools build -->
-    		<antcall target="compile-main" inheritAll="false" inheritRefs="true">
-          			<param name="build.system" value="${sf.spec.build.system}" />
-          			<param name="sysdef.configurations.list" value="${sf.spec.s60.sysdef.clean.configurations.list}" />
-          			<reference refid="sbs.tools.var" torefid="sbs.var" />
-          			<reference refid="sbs.toolsbuild.options" torefid="sbs.make.options" />
-          			<reference refid="sf.spec.s60.system.definition.files" torefid="system.definition.files" />
-    		</antcall>
-
-			<antcall target="sf-list-dir" inheritAll="false">
-				<param name="sf.list.name" value="post-s60-build-tools"/>
-			</antcall>
-
-    		<!-- s60 main build -->
-    		<antcall target="compile-main" inheritAll="false" inheritRefs="true">
-          			<param name="build.system" value="${sf.spec.build.system}" />
-          			<param name="sysdef.configurations.list" value="${sf.spec.s60.sysdef.clean.configurations.list}" />
-          			<reference refid="sbs.main.sbs.var" torefid="sbs.var" />
-          			<reference refid="sbs.fullbuild.options" torefid="sbs.make.options" />
-          			<reference refid="sf.spec.s60.system.definition.files" torefid="system.definition.files" />
-    		</antcall>
-			
-			
-			<antcall target="sf-list-dir" inheritAll="false">
-				<param name="sf.list.name" value="post-s60-build-main"/>
-			</antcall>
-
-			<!-- what has been built by tools+2+main -->
-			<antcall target="sf-delta-dir" inheritAll="false">
-				<param name="sf.list_a.name" value="s60-baseline"/>
-				<param name="sf.list_b.name" value="post-s60-build-main"/>
-			</antcall>		
-			
-			<!-- what has been cleaned and rebuilt -->
-			<antcall target="sf-intersect-dir" inheritAll="false">
-				<param name="sf.list_a.name" value="post-s60-clean_delta"/>       <!-- clean list -->
-				<param name="sf.list_b.name" value="post-s60-build-main_delta"/>  <!-- built list -->
-			</antcall>
-		
-	</target>
-    
 </project>