FCL/sftools/fbf/configs/default: comparison common/build.postbuild.xml

equal deleted inserted replaced

-:1f465f774089
+:3011d062ba36
 <then>
 <property name="sf.epoc32.exclusions.file" value="${sf.sdk.header.list.file}"/>
 </then>
 </if>
 <property name="sf.epoc32.exclusions.file" value="nul:"/>
-<exec executable="7za" dir="${build.drive}" output="${build.log.dir}/zip_${build.id}_binaries_epoc32.log">
+<exec executable="7za" dir="${build.drive}/" output="${build.log.dir}/zip_${build.id}_binaries_epoc32.log">
 <arg value="a"/>
 <arg value="-t${sf.spec.package.zip.format}"/>
 <arg value="-x@${build.log.dir}/rnd_excludefile.txt"/> <!-- rnd content taken from internal hg repos -->
 <arg value="-x@${sf.spec.prebuilt.excludelist}"/>
 <arg value="-x@output/temp_build_files/manifest_excludelist.txt"/> <!-- merged list of prebuilt content such as binaries_prebuilt -->
 </sequential>
 <if>
 <isset property="sf.sdk.header.list.file"/>
 <then>
-<exec executable="7za" dir="${build.drive}" output="${build.log.dir}/zip_${build.id}_binaries_sdk.log">
+<exec executable="7za" dir="${build.drive}/" output="${build.log.dir}/zip_${build.id}_binaries_sdk.log">
 <arg value="a"/>
 <arg value="-t${sf.spec.package.zip.format}"/>
 <arg value="-i@${sf.sdk.header.list.file}"/>
 <arg value="-x@${build.log.dir}/rnd_excludefile.txt"/>
 <arg value="-x@output/temp_build_files/manifest_excludelist.txt"/>
 </antcall>
 </then>
 </if>
 <!-- WinsCW binaries, by udeb/urel/lib -->
-<exec executable="7za" dir="${build.drive}" output="${build.log.dir}/zip_${build.id}_binaries_winscw_udeb.log">
+<exec executable="7za" dir="${build.drive}/" output="${build.log.dir}/zip_${build.id}_binaries_winscw_udeb.log">
 <arg value="a"/>
 <arg value="-t${sf.spec.package.zip.format}"/>
 <arg value="-x@${build.log.dir}/rnd_excludefile.txt"/>
 <arg value="-x@output/temp_build_files/manifest_excludelist.txt"/>
 <arg value="-x@${sf.spec.prebuilt.excludelist}"/>
 <arg value="-xr!*.sym"/>
 <arg value="-xr!*.lib"/>
 <arg value="${build.drive}/output/zips/release/binaries_winscw_udeb.zip"/>
 <arg value="epoc32\release\winscw\udeb"/>
 </exec>
-<exec executable="7za" dir="${build.drive}" output="${build.log.dir}/zip_${build.id}_binaries_winscw_urel.log">
+<exec executable="7za" dir="${build.drive}/" output="${build.log.dir}/zip_${build.id}_binaries_winscw_urel.log">
 <arg value="a"/>
 <arg value="-t${sf.spec.package.zip.format}"/>
 <arg value="-x@${build.log.dir}/rnd_excludefile.txt"/>
 <arg value="-x@output/temp_build_files/manifest_excludelist.txt"/>
 <arg value="-x@${sf.spec.prebuilt.excludelist}"/>
 <arg value="-xr!*.sym"/>
 <arg value="-xr!*.lib"/>
 <arg value="${build.drive}/output/zips/release/binaries_winscw_urel.zip"/>
 <arg value="epoc32\release\winscw\urel"/>
 </exec>
-<exec executable="7za" dir="${build.drive}" output="${build.log.dir}/zip_${build.id}_binaries_winscw_lib.log">
+<exec executable="7za" dir="${build.drive}/" output="${build.log.dir}/zip_${build.id}_binaries_winscw_lib.log">
 <arg value="a"/>
 <arg value="-t${sf.spec.package.zip.format}"/>
 <arg value="-ir!epoc32/release/winscw/*.lib"/>
 <arg value="-x@${build.log.dir}/rnd_excludefile.txt"/>
 <arg value="-x@output/temp_build_files/manifest_excludelist.txt"/>
 <arg value="-x@${sf.spec.prebuilt.excludelist}"/>
 <arg value="${build.drive}/output/zips/release/binaries_winscw_lib.zip"/>
 </exec>
 <!-- ARMv5 binaries, by udeb/urel/lib -->
-<exec executable="7za" dir="${build.drive}" output="${build.log.dir}/zip_${build.id}_binaries_armv5_udeb.log">
+<exec executable="7za" dir="${build.drive}/" output="${build.log.dir}/zip_${build.id}_binaries_armv5_udeb.log">
 <arg value="a"/>
 <arg value="-t${sf.spec.package.zip.format}"/>
 <arg value="-x@${build.log.dir}/rnd_excludefile.txt"/>
 <arg value="-x@output/temp_build_files/manifest_excludelist.txt"/>
 <arg value="-x@${sf.spec.prebuilt.excludelist}"/>
 <arg value="-xr!*.sym"/>
 <arg value="${build.drive}/output/zips/release/binaries_armv5_udeb.zip"/>
 <arg value="epoc32\release\armv5\udeb"/>
 </exec>
-<exec executable="7za" dir="${build.drive}" output="${build.log.dir}/zip_${build.id}_binaries_armv5_urel.log">
+<exec executable="7za" dir="${build.drive}/" output="${build.log.dir}/zip_${build.id}_binaries_armv5_urel.log">
 <arg value="a"/>
 <arg value="-t${sf.spec.package.zip.format}"/>
 <arg value="-x@${build.log.dir}/rnd_excludefile.txt"/>
 <arg value="-x@output/temp_build_files/manifest_excludelist.txt"/>
 <arg value="-x@${sf.spec.prebuilt.excludelist}"/>
 <arg value="-xr!*.sym"/>
 <arg value="${build.drive}/output/zips/release/binaries_armv5_urel.zip"/>
 <arg value="epoc32\release\armv5\urel"/>
 </exec>
-<exec executable="7za" dir="${build.drive}" output="${build.log.dir}/zip_${build.id}_binaries_armv5_lib.log">
+<exec executable="7za" dir="${build.drive}/" output="${build.log.dir}/zip_${build.id}_binaries_armv5_lib.log">
 <arg value="a"/>
 <arg value="-t${sf.spec.package.zip.format}"/>
 <arg value="-x@${build.log.dir}/rnd_excludefile.txt"/>
 <arg value="-x@output/temp_build_files/manifest_excludelist.txt"/>
 <arg value="-x@${sf.spec.prebuilt.excludelist}"/>
 <param name="zip.target.name" value="rnd-postbuild" />
 </antcall>
 </target>
 <target name="sf-package-tools" depends="sf-merge-manifest">
-<exec executable="7za" dir="${build.drive}" output="${build.log.dir}/zip_${build.id}_tools_epoc32.log">
+<exec executable="7za" dir="${build.drive}/" output="${build.log.dir}/zip_${build.id}_tools_epoc32.log">
 <arg value="a"/>
 <arg value="-t${sf.spec.package.zip.format}"/>
 <arg value="-x@${build.log.dir}/rnd_excludefile.txt"/>
-<arg value="-x@output/temp_build_files/manifest_excludelist.txt"/>
+<arg value="-x@/output/temp_build_files/manifest_excludelist.txt"/>
 <arg value="-x@${sf.spec.prebuilt.excludelist}"/>
 <arg value="${build.drive}/output/zips/release/tools_epoc.zip"/>
 <arg value="epoc32/tools"/>
 <arg value="epoc32/gcc"/>
 <arg value="epoc32/gcc_mingw"/>
 <!-- merge manifests for prebuilt stuff delivered at the start of build process -->
 <target name="sf-merge-manifest">
 <echo message="INFO Build drive is ${build.drive} "/>
 <concat destfile="${build.drive}\output\temp_build_files\manifest_excludelist.txt">
-<fileset dir="${build.drive}" includes="*manifest*"/>
+<fileset dir="${build.drive}" includes="*manifest*" excludes="manifest_excludelist.txt"/>
 </concat>
 <!-- touch file to update/create it in the event that there are no manifest* files available
 as 7z will not be happy being given a non-existent file -->
 <touch file="${build.drive}\output\temp_build_files\manifest_excludelist.txt"/>

changeset 1037	3011d062ba36
parent 1036	1f465f774089
child 1041	705ebddb2efc