# HG changeset patch
# User matt.davies@SYM-BUILD02.ad-sfpd.intra
# Date 1245424428 -3600
# Node ID bf91a7e3c25b21d603827a70b464aa006a5ac9bd
# Parent  87306c6a66323636aef41c8d9a9b663ca796f1fe# Parent  32693583e769cfde67ac95c422c28da3100a0147
merge in changes

diff -r 32693583e769 -r bf91a7e3c25b common/build.xml
--- a/common/build.xml	Fri Jun 19 14:38:25 2009 +0100
+++ b/common/build.xml	Fri Jun 19 16:13:48 2009 +0100
@@ -306,6 +306,7 @@
             <then>
                 <echo message="INFO Packaging Binaries"/>
                 <runtarget target="sf-package-binary"/>
+                <runtarget target="sf-package-tools"/>
             </then>
         </if>
         </parallel>
@@ -502,6 +503,23 @@
         </antcall>
     </target>
     
+    <target name="sf-package-tools" depends="sf-preprocess-package-config">
+        <echo message="Packaging epoc32 tools - Temporary method"/>
+            <exec executable="7za" dir="${build.drive}" output="${build.log.dir}/zip_${build.id}_tools_epoc32.log">
+            <arg value="a"/>
+            <arg value="-tzip"/>
+            <arg value="-x@${build.log.dir}/rnd_excludefile.txt"/>
+<!--            <arg value="-x@${build.log.dir}/*_includefile.txt"/> -->
+            <arg value="tools_epoc.zip"/> 
+            <arg value="epoc32/tools"/>
+            </exec>
+        <if><available file="${build.drive}/tools_epoc.zip"/>
+            <then><move file="${build.drive}/tools_epoc.zip" todir="${build.drive}/output/zips/"/></then>
+        </if>
+
+    </target>
+
+    
     <target name="sf-package-binary" depends="sf-preprocess-package-config,sf-package-postbuild-rnd">
         <!--antcall target="sf-zip-content">
             <param name="zip.config.file" value="${sf.common.config.dir}/generated/zip.cfg.xml.ftl"/>
@@ -515,6 +533,7 @@
             <arg value="a"/>
             <arg value="-tzip"/>
             <arg value="-x@${build.drive}/rnd_excludefile.txt"/> <!-- excludes -->
+            <arg value="-x!epoc32\tools"/>
             <arg value="-x!epoc32\build"/> 
             <arg value="-xr!*.sym"/> 
             <arg value="binaries_epoc.zip"/> 
@@ -527,6 +546,7 @@
             <exec executable="7za" dir="${build.drive}" output="${build.log.dir}/zip_${build.id}_binaries_epoc32.log">
             <arg value="a"/>
             <arg value="-tzip"/>
+            <arg value="-x!epoc32\tools"/> 
             <arg value="-x!epoc32\build"/> <!-- excludes -->
             <arg value="-xr!*.sym"/> 
             <arg value="binaries_epoc.zip"/> 
@@ -537,6 +557,7 @@
         <if><available file="${build.drive}/binaries_epoc.zip"/>
         <then><move file="${build.drive}/binaries_epoc.zip" todir="${build.drive}/output/zips/"/></then>
         </if>
+
     </target>
 
     <target name="sf-package-postbuild-rnd" depends="sf-preprocess-package-config">
diff -r 32693583e769 -r bf91a7e3c25b common/common_props.ant.xml
--- a/common/common_props.ant.xml	Fri Jun 19 14:38:25 2009 +0100
+++ b/common/common_props.ant.xml	Fri Jun 19 16:13:48 2009 +0100
@@ -39,7 +39,7 @@
     
     <property name="sf.spec.baseline.enable" value="true"/>
     <property name="sf.spec.baseline.select" value="auto"/> <!-- auto|explicit|location -->
-    <property name="sf.spec.baseline.getenv_options" value="-i emu"/>
+    <property name="sf.spec.baseline.getenv_options" value="-i emu,tools"/>
     <property name="sf.spec.toolsbaseline.enable" value="true"/>
     <property name="sf.spec.toolsbaseline.select" value="auto"/>
     <property name="sf.spec.toolsbaseline.getenv_options" value="-i tools"/>