Fixed packaging

This commit is contained in:
Mathieu Champlon 2015-04-25 13:24:51 +02:00
parent 96ac97dc87
commit f83326037b

View file

@ -29,26 +29,27 @@
<run dir="." script="build"/> <run dir="." script="build"/>
</target> </target>
<target name="release" depends="build" description="produce release packages"> <target name="package" depends="build" description="produce release packages">
<fail unless="version" message="missing version property"/> <fail unless="version" message="missing version property"/>
<copy file="version.hpp" tofile="${out.dir}/version.hpp"> <copy file="version.hpp" tofile="${out.dir}/version.hpp" overwrite="true">
<filterset> <filterset>
<filter token="MOCK_VERSION" value="${version}"/> <filter token="MOCK_VERSION" value="${version}"/>
</filterset> </filterset>
</copy> </copy>
<mkdir dir="${dist.dir}"/>
<zip destfile="${dist.dir}/${ant.project.name}-${version}.zip"> <zip destfile="${dist.dir}/${ant.project.name}-${version}.zip">
<fileset dir="${dist.dir}" includes="include/**"/> <fileset dir="${src.dir}" includes="include/**"/>
<zipfileset dir="${doc.dir}/html" prefix="doc"/> <zipfileset dir="${doc.dir}/html" prefix="doc"/>
<zipfileset dir="${out.dir}" includes="version.hpp" prefix="include/turtle"/> <zipfileset dir="${out.dir}" includes="version.hpp" prefix="include/turtle"/>
</zip> </zip>
<tar destfile="${dist.dir}/${ant.project.name}-${version}.tar.bz2" compression="bzip2"> <tar destfile="${dist.dir}/${ant.project.name}-${version}.tar.bz2" compression="bzip2">
<fileset dir="${dist.dir}" includes="include/**"/> <fileset dir="${src.dir}" includes="include/**"/>
<zipfileset dir="${doc.dir}/html" prefix="doc"/> <zipfileset dir="${doc.dir}/html" prefix="doc"/>
<zipfileset dir="${out.dir}" includes="version.hpp" prefix="include/turtle"/> <zipfileset dir="${out.dir}" includes="version.hpp" prefix="include/turtle"/>
</tar> </tar>
</target> </target>
<target name="all" depends="build,reports,release" description="build documentation, run tests and package distribution"/> <target name="all" depends="build,reports,package" description="build documentation, run tests and package distribution"/>
<target name="boost.convert" description="convert Boost.Mock"> <target name="boost.convert" description="convert Boost.Mock">
<delete dir="${boost-mock.dir}"/> <delete dir="${boost-mock.dir}"/>
@ -109,13 +110,13 @@
<target name="boost.package" depends="boost.build" description="package Boost.Mock"> <target name="boost.package" depends="boost.build" description="package Boost.Mock">
<fail unless="version" message="missing version property"/> <fail unless="version" message="missing version property"/>
<zip destfile="${out.dir}/boost-mock-${version}.zip"> <zip destfile="${dist.dir}/boost-mock-${version}.zip">
<fileset dir="${boost-mock.dir}" includes="libs/mock/**" excludes="**/bin/**"/> <fileset dir="${boost-mock.dir}" includes="include/**,test/**,doc/**" excludes="**/bin/**"/>
<fileset dir="${boost-mock.dir}" includes="LICENSE_1_0.txt"/> <fileset dir="${boost-mock.dir}" includes="LICENSE_1_0.txt,index.html"/>
</zip> </zip>
<tar destfile="${out.dir}/boost-mock-${version}.tar.bz2" compression="bzip2"> <tar destfile="${dist.dir}/boost-mock-${version}.tar.bz2" compression="bzip2">
<fileset dir="${boost-mock.dir}" includes="libs/mock/**" excludes="**/bin/**"/> <fileset dir="${boost-mock.dir}" includes="include/**,test/**,doc/**" excludes="**/bin/**"/>
<fileset dir="${boost-mock.dir}" includes="LICENSE_1_0.txt"/> <fileset dir="${boost-mock.dir}" includes="LICENSE_1_0.txt,index.html"/>
</tar> </tar>
</target> </target>