From 8405fe7107b12c8febfc35ecac590404033c1fd8 Mon Sep 17 00:00:00 2001
From: Mathieu Champlon <mathieu.champlon@masagroup.net>
Date: Sat, 25 Apr 2015 08:04:54 +0200
Subject: [PATCH 1/4] Updated release date and version

---
 doc/changelog.qbk | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/doc/changelog.qbk b/doc/changelog.qbk
index b1b547c..628e5ce 100644
--- a/doc/changelog.qbk
+++ b/doc/changelog.qbk
@@ -7,8 +7,8 @@
 
 [section Changelog]
 
-[section unreleased]
-Not yet released
+[section 1.2.7]
+Released 25 April 2015
 
 * Dropped support for obsolete Boost.Phoenix V2
 * Added support for multiple parameters constraints
@@ -17,6 +17,8 @@ Not yet released
 * Fixed mocking protected member function
 * Document how actions store data by copy
 
+[endsect]
+
 [section 1.2.6]
 Released 24 May 2014
 

From 96ac97dc8789d525b193364b8789b5c955a5baa9 Mon Sep 17 00:00:00 2001
From: Mathieu Champlon <mathieu.champlon@masagroup.net>
Date: Sat, 25 Apr 2015 08:05:32 +0200
Subject: [PATCH 2/4] Added version number to boost-mock release package

---
 build/build.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/build/build.xml b/build/build.xml
index dceaa60..5f4ed18 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -108,11 +108,12 @@
   </target>
 
   <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"/>
+    <zip destfile="${out.dir}/boost-mock-${version}.zip">
       <fileset dir="${boost-mock.dir}" includes="libs/mock/**" excludes="**/bin/**"/>
       <fileset dir="${boost-mock.dir}" includes="LICENSE_1_0.txt"/>
     </zip>
-    <tar destfile="${out.dir}/boost-mock.tar.bz2" compression="bzip2">
+    <tar destfile="${out.dir}/boost-mock-${version}.tar.bz2" compression="bzip2">
       <fileset dir="${boost-mock.dir}" includes="libs/mock/**" excludes="**/bin/**"/>
       <fileset dir="${boost-mock.dir}" includes="LICENSE_1_0.txt"/>
     </tar>

From f83326037b1382187d69fabea0952774ab86b28e Mon Sep 17 00:00:00 2001
From: Mathieu Champlon <mathieu.champlon@masagroup.net>
Date: Sat, 25 Apr 2015 13:24:51 +0200
Subject: [PATCH 3/4] Fixed packaging

---
 build/build.xml | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/build/build.xml b/build/build.xml
index 5f4ed18..d58d08b 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -29,26 +29,27 @@
     <run dir="." script="build"/>
   </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"/>
-    <copy file="version.hpp" tofile="${out.dir}/version.hpp">
+    <copy file="version.hpp" tofile="${out.dir}/version.hpp" overwrite="true">
       <filterset>
         <filter token="MOCK_VERSION" value="${version}"/>
       </filterset>
     </copy>
+    <mkdir dir="${dist.dir}"/>
     <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="${out.dir}" includes="version.hpp" prefix="include/turtle"/>
     </zip>
     <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="${out.dir}" includes="version.hpp" prefix="include/turtle"/>
     </tar>
   </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">
     <delete dir="${boost-mock.dir}"/>
@@ -109,13 +110,13 @@
 
   <target name="boost.package" depends="boost.build" description="package Boost.Mock">
     <fail unless="version" message="missing version property"/>
-    <zip destfile="${out.dir}/boost-mock-${version}.zip">
-      <fileset dir="${boost-mock.dir}" includes="libs/mock/**" excludes="**/bin/**"/>
-      <fileset dir="${boost-mock.dir}" includes="LICENSE_1_0.txt"/>
+    <zip destfile="${dist.dir}/boost-mock-${version}.zip">
+      <fileset dir="${boost-mock.dir}" includes="include/**,test/**,doc/**" excludes="**/bin/**"/>
+      <fileset dir="${boost-mock.dir}" includes="LICENSE_1_0.txt,index.html"/>
     </zip>
-    <tar destfile="${out.dir}/boost-mock-${version}.tar.bz2" compression="bzip2">
-      <fileset dir="${boost-mock.dir}" includes="libs/mock/**" excludes="**/bin/**"/>
-      <fileset dir="${boost-mock.dir}" includes="LICENSE_1_0.txt"/>
+    <tar destfile="${dist.dir}/boost-mock-${version}.tar.bz2" compression="bzip2">
+      <fileset dir="${boost-mock.dir}" includes="include/**,test/**,doc/**" excludes="**/bin/**"/>
+      <fileset dir="${boost-mock.dir}" includes="LICENSE_1_0.txt,index.html"/>
     </tar>
   </target>
 

From 0856925142fcd49b2e1c6f03ae143a72b185ed7e Mon Sep 17 00:00:00 2001
From: Mathieu Champlon <mathieu.champlon@masagroup.net>
Date: Sat, 25 Apr 2015 22:16:44 +0200
Subject: [PATCH 4/4] Fixed Boost.Mock conversion

---
 build/build.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build/build.xml b/build/build.xml
index d58d08b..39f009d 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -54,9 +54,10 @@
   <target name="boost.convert" description="convert Boost.Mock">
     <delete dir="${boost-mock.dir}"/>
     <copy todir="${boost-mock.dir}">
-      <fileset dir="${root.dir}"/>
+      <fileset dir="${root.dir}" excludes="bin/**"/>
     </copy>
     <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">
       <fileset dir="${boost-mock.dir}" includes="**/*.cpp,**/*.hpp,**/*.qbk"/>
     </replaceregexp>