common/build.xml
changeset 256 d64a45951a43
parent 254 5033df3f8834
child 257 792dd66af9a1
equal deleted inserted replaced
255:62336323cabc 256:d64a45951a43
   562         <property name="zips.${zip.target.name}.spec.name" value="${zip.target.name}" />
   562         <property name="zips.${zip.target.name}.spec.name" value="${zip.target.name}" />
   563         <hlm:zipContentMacro type="${zip.target.name}" file="${zip.config.file}" />
   563         <hlm:zipContentMacro type="${zip.target.name}" file="${zip.config.file}" />
   564     </target>
   564     </target>
   565     
   565     
   566     <target name="sf-package-source" depends="sf-preprocess-package-config">
   566     <target name="sf-package-source" depends="sf-preprocess-package-config">
   567         <!-- Firstly zip up src by package -->
   567         <!-- Firstly zip up src & rnd by package -->
   568         <antcall target="sf-zip-content">
   568         <antcall target="sf-zip-content">
   569             <param name="zip.config.file" value="${sf.common.config.dir}/generated/zip.cfg.xml.ftl"/>
   569             <param name="zip.config.file" value="${sf.common.config.dir}/generated/zip.cfg.xml.ftl"/>
   570             <param name="zip.target.name" value="src" />
   570             <param name="zip.target.name" value="src" />
   571         </antcall>
   571         </antcall>
   572         <!-- Then zip up zips by layer -->
   572         <!-- Then zip up src zips by layer -->
   573         <antcall target="sf-zip-content">
   573         <antcall target="sf-zip-content">
   574             <param name="zip.config.file" value="${sf.common.config.dir}/generated/zip.cfg.xml.ftl"/>
   574             <param name="zip.config.file" value="${sf.common.config.dir}/generated/zip.cfg.xml.ftl"/>
   575             <param name="zip.target.name" value="src-by-layer" />
   575             <param name="zip.target.name" value="src-by-layer" />
   576         </antcall>
   576         </antcall>
       
   577         <!-- Copy the zip that needs to have a different name when a PDK is released -->
       
   578 	<copy file="${build.drive}/output/zips/bin_rnd_internal_updated.zip" tofile="${build.drive}/output/zips/binaries_epoc_additional.zip" failonerror="false"/>
   577     </target>
   579     </target>
   578     
   580     
   579     <target name="sf-package-tools" depends="sf-preprocess-package-config">
   581     <target name="sf-package-tools" depends="sf-preprocess-package-config">
   580         <echo message="Packaging epoc32 tools - Temporary method"/>
   582         <echo message="Packaging epoc32 tools - Temporary method"/>
   581             <exec executable="7za" dir="${build.drive}" output="${build.log.dir}/zip_${build.id}_tools_epoc32.log">
   583         <exec executable="7za" dir="${build.drive}" output="${build.log.dir}/zip_${build.id}_tools_epoc32.log">
   582                 <arg value="a"/>
   584             <arg value="a"/>
   583                 <arg value="-tzip"/>
   585             <arg value="-tzip"/>
   584                 <arg value="-x@${build.log.dir}/rnd_excludefile.txt"/>
   586             <arg value="-x@${build.log.dir}/rnd_excludefile.txt"/>
   585 <!--                <arg value="-x@${build.log.dir}/*_includefile.txt"/> -->
   587 <!--            <arg value="-x@${build.log.dir}/*_includefile.txt"/> -->
   586                 <arg value="tools_epoc.zip"/> 
   588             <arg value="${build.drive}/output/zips/tools_epoc.zip"/> 
   587                 <arg value="epoc32/tools"/>
   589             <arg value="epoc32/tools"/>
   588             </exec>
   590         </exec>
   589         <if><available file="${build.drive}/tools_epoc.zip"/>
       
   590             <then><move file="${build.drive}/tools_epoc.zip" todir="${build.drive}/output/zips/"/></then>
       
   591         </if>
       
   592     </target>
   591     </target>
   593     
   592     
   594     <target name="sf-package-binary" depends="sf-preprocess-package-config,sf-package-postbuild-rnd">
   593     <target name="sf-package-binary" depends="sf-preprocess-package-config,sf-package-postbuild-rnd">
   595         <!-- Warning: Reverting to using the He zipper will also revert to a single zip for the binaries:
   594         <!-- Warning: Reverting to using the He zipper will also revert to a single zip for the binaries:
   596              would need to update the template and possibly the script that populates it -->
   595              would need to update the template and possibly the script that populates it -->