diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-unpack-rnd.html --- a/doc/api/helium/target-sf-unpack-rnd.html Tue Oct 06 17:31:14 2009 +0100 +++ b/doc/api/helium/target-sf-unpack-rnd.html Thu Oct 08 19:36:20 2009 +0100 @@ -82,7 +82,7 @@

Target sf-unpack-rnd

Location

-

D:\maintools\sf-config\common\build.xml:484: +

d:\maintools\sf-config\common\build.xml:498:

Conditional execution

@@ -91,7 +91,7 @@

Description

-

unpack rnd zips if available

+

Unpack the rnd zips ready to be used in the build


@@ -154,11 +154,20 @@
     <target name="sf-unpack-rnd">
         <echo message="Unpacking any available RnD binaries"/>
-        <exec executable="7za" dir="${build.drive}" output="${build.log.dir}/unzip_${build.id}_binaries_rnd.log">
-        <arg value="x"/>
-        <arg value="-y"/> <!-- Need to unpack in overwrite mode, due to TEF -->
-        <arg value="${build.drive}/output/zips/bin*.zip"/>
-        </exec>
+        <for param="rndZip">
+            <fileset dir="${build.drive}/output/zips/">
+                <include name="binaries_*.zip"/> <!-- Internal rnd bins -->
+                <include name="release/bin_*.zip"/> <!-- Releaseable rnd bins -->
+            </fileset>
+            <sequential>
+                <exec executable="7za" dir="${build.drive}" output="${build.log.dir}/unzip_${build.id}_binaries_rnd.log" append="true">
+                    <arg value="x"/>
+                    <arg value="-y"/> <!-- Need to unpack in overwrite mode, due to TEF -->
+                    <arg value="-i!epoc32\*"/> <!-- Only unzip items into the epoc32 tree -->
+                    <arg value="@{rndZip}"/>
+                </exec>
+            </sequential>
+	</for>
     </target>