# HG changeset patch
# User Shabe Razvi <shaber@symbian.org>
# Date 1271177696 -3600
# Node ID e06b37cce80d1a3ddc417829b5864022928ba57b
# Parent  3eaa6b94ec6887521e5cd5aa7c09390f0a28537a
Update packaging to deliver output into epoc32\ location

diff -r 3eaa6b94ec68 -r e06b37cce80d common/tools/listdir.py
--- a/common/tools/listdir.py	Tue Apr 13 16:49:42 2010 +0100
+++ b/common/tools/listdir.py	Tue Apr 13 17:54:56 2010 +0100
@@ -26,9 +26,9 @@
   if(len(sys.argv)>2):
     x_dirs = string.lower(sys.argv[2])
     exclude_dirs = re.split(',', x_dirs)
-  scandir(directory, exclude_dirs)
+  scandir(directory, exclude_dirs,directory)
 
-def scandir(top, exclude_dirs):
+def scandir(top, exclude_dirs,directory):
     fixpath = re.compile('\\\\')    
     fixroot = re.compile('^%s\\\\' % top)
     for root, dirs, files in os.walk(top, topdown=True):
@@ -38,6 +38,6 @@
         for name in files:
             filename = os.path.join(root, name)
             fn = string.lower(fixpath.sub('/',fixroot.sub('',filename)))
-            print fn
+            print fn.strip(directory)
 
 main()
diff -r 3eaa6b94ec68 -r e06b37cce80d sf-tools/build.xml
--- a/sf-tools/build.xml	Tue Apr 13 16:49:42 2010 +0100
+++ b/sf-tools/build.xml	Tue Apr 13 17:54:56 2010 +0100
@@ -48,8 +48,10 @@
 
     <echo message="INFO Getting bootstrap environment listing"/>
     <antcall target="sf-list-dir" inheritAll="false">
+      <param name="sf.dir.location" value="${build.drive}/"/> 
+      <param name="sf.dir.exclude"  value="${build.drive}/epoc32/build"/>     
       <param name="sf.list.name" value="bootstrap"/>
-    </antcall>
+    </antcall>    
   </target>
   
   
@@ -89,12 +91,14 @@
 
  <target name="sf-package-binary">
 
-    <exec executable="7z" dir="${build.drive}/epoc32" output="${build.log.dir}/zip_${build.id}_binaries_${sf.spec.job.name}.log">
+    <exec executable="7z" dir="${build.drive}" output="${build.log.dir}/zip_${build.id}_binaries_${sf.spec.job.name}.log">
         <arg value="a"/>
         <arg value="-t${sf.spec.package.zip.format}"/>
         <arg value="-x@${build.log.dir}/listdir_${build.id}_bootstrap.log"/>
-        <arg value="-x!build\"/>
+        <arg value="-x!epoc32\build"/>
+        <arg value="-x!sf"/>
         <arg value="${build.drive}/output/zips/release/binaries_${sf.spec.job.name}.zip"/>
+        <arg value="epoc32\"/>
     </exec>
 
     <antcall target="sf-zip-content">