mirrors/turtle
3
0
Fork 0
mirror of https://github.com/mat007/turtle.git synced 2026-06-22 12:13:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #10 from mat007/update-for-release

Browse source 
Update for release
This commit is contained in:
Mathieu Champlon 2015-04-26 11:46:35 +02:00
commit 32bd5a2d29
2 changed files with 19 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

27
build/build.xml
View file

@ -29,33 +29,35 @@
<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}"/>
<copy todir="${boost-mock.dir}"> <copy todir="${boost-mock.dir}">
<fileset dir="${root.dir}"/> <fileset dir="${root.dir}" excludes="bin/**"/>
</copy> </copy>
<move file="${boost-mock.dir}/include/turtle" tofile="${boost-mock.dir}/include/boost/mock"/> <move file="${boost-mock.dir}/include/turtle" tofile="${boost-mock.dir}/include/boost/mock"/>
<delete dir="${boost-mock.dir}/doc/html/turtle"/>
<replaceregexp match="MOCK" replace="BOOST_MOCK" flags="g"> <replaceregexp match="MOCK" replace="BOOST_MOCK" flags="g">
<fileset dir="${boost-mock.dir}" includes="**/*.cpp,**/*.hpp,**/*.qbk"/> <fileset dir="${boost-mock.dir}" includes="**/*.cpp,**/*.hpp,**/*.qbk"/>
</replaceregexp> </replaceregexp>
@ -108,13 +110,14 @@
</target> </target>
<target name="boost.package" depends="boost.build" description="package Boost.Mock"> <target name="boost.package" depends="boost.build" description="package Boost.Mock">
<zip destfile="${out.dir}/boost-mock.zip"> <fail unless="version" message="missing version property"/>
<fileset dir="${boost-mock.dir}" includes="libs/mock/**" excludes="**/bin/**"/> <zip destfile="${dist.dir}/boost-mock-${version}.zip">
<fileset dir="${boost-mock.dir}" includes="LICENSE_1_0.txt"/> <fileset dir="${boost-mock.dir}" includes="include/**,test/**,doc/**" excludes="**/bin/**"/>
<fileset dir="${boost-mock.dir}" includes="LICENSE_1_0.txt,index.html"/>
</zip> </zip>
<tar destfile="${out.dir}/boost-mock.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>

6
doc/changelog.qbk
View file

@ -7,8 +7,8 @@
[section Changelog] [section Changelog]
[section unreleased] [section 1.2.7]
Not yet released Released 25 April 2015
* Dropped support for obsolete Boost.Phoenix V2 * Dropped support for obsolete Boost.Phoenix V2
* Added support for multiple parameters constraints * Added support for multiple parameters constraints
@ -17,6 +17,8 @@ Not yet released
* Fixed mocking protected member function * Fixed mocking protected member function
* Document how actions store data by copy * Document how actions store data by copy
[endsect]
[section 1.2.6] [section 1.2.6]
Released 24 May 2014 Released 24 May 2014