Changed layout to match boost

.gitignore

@@ -0,0 +1,2 @@
+bin
+out

Jamroot.jam

@@ -1,3 +1,8 @@
+# Copyright Rene Rivera 2007.
+#
+# Distributed under the Boost Software License, Version 1.0.
+#    (See accompanying file LICENSE_1_0.txt or copy at
+#          http://www.boost.org/LICENSE_1_0.txt)
 
 import modules ;
 

build/build.properties

@@ -1,5 +1 @@
-extensions = svn,headers,check
+extensions = headers,check
-src.dir = ${root.dir}
-tests.dir = ${root.dir}
-libraries.dir = ${root.dir}
-boost.dir = ${out.dir}/../boost

build/build.xml

@@ -1,134 +1,25 @@
+<!--
+ Copyright Mathieu Champlon 2008.
+
+ Distributed under the Boost Software License, Version 1.0.
+    (See accompanying file LICENSE_1_0.txt or copy at
+          http://www.boost.org/LICENSE_1_0.txt)
+-->
 <project name="turtle" default="all">
 
   <property environment="env"/>
-  <import file="${env.PONEY_HOME}/poney.xml"/>
+  <fail unless="env.BOOST_ROOT" message="missing BOOST_ROOT environment variable"/>
-
+  <property name="boost.dir" value="${env.BOOST_ROOT}"/>
-  <property name="boost.root" value="${env.BOOST_ROOT}"/>
+  <property name="include.dir" value="${env.BOOST_ROOT}"/>
-  <property name="boost.dir" value="${out.dir}/../boost"/>
+  <property name="src.dir" value="${root.dir}"/>
+  <property name="doc.dir" value="${src.dir}/doc"/>
+  <property name="tests.dir" value="${src.dir}/test"/>
+  <property name="libraries.dir" value="${src.dir}/include"/>
   <property name="boostbook.dir" value="${out.dir}/boostbook"/>
-  <property name="boost-mock.dir" value="${boost.dir}/libs/mock"/>
+  <property name="boost-mock.dir" value="${out.dir}/boost-mock"/>
+  <property name="version" value="unreleased"/>
 
-  <target name="clean" description="clean intermediate build artifacts">
+  <import file="${env.PONEY_HOME}/poney.xml"/>
-    <delete dir="${out.dir}"/>
-  </target>
-
-  <target name="configure" description="update external libraries">
-    <update name="boost"/>
-  </target>
-
-  <presetdef name="build-turtle-test">
-    <build-test input="test" depends="boost" mode="all" excludes="bench_*,fail_*">
-      <compilerarg value="-Wno-uninitialized" location="mid" if="is-cygwin"/>
-      <compilerarg value="-Wno-strict-aliasing" location="mid" if="is-gcc"/>
-      <compilerarg value="/wd4505" if="is-msvc"/>
-    </build-test>
-  </presetdef>
-
-  <target name="test" description="run unit tests">
-    <delete dir="${tests.dir}/test/bin"/>
-    <build-turtle-test name="turtle"/>
-    <build-turtle-test name="turtle_max_args">
-      <defineset>
-        <define name="MOCK_MAX_ARGS" value="21"/>
-      </defineset>
-    </build-turtle-test>
-    <build-turtle-test name="turtle_use_conversions">
-      <defineset define="MOCK_USE_CONVERSIONS"/>
-    </build-turtle-test>
-    <build-turtle-test name="turtle_no_decltype">
-      <defineset define="MOCK_NO_DECLTYPE"/>
-    </build-turtle-test>
-    <build-turtle-test name="turtle_no_variadic_macros">
-      <defineset define="MOCK_NO_VARIADIC_MACROS"/>
-    </build-turtle-test>
-    <build-turtle-test name="turtle_thread_safe">
-      <defineset define="MOCK_THREAD_SAFE"/>
-    </build-turtle-test>
-  </target>
-
-  <target name="analyse" description="run errors analyser">
-    <quiet>
-      <mkdir dir="${reports.dir}"/>
-      <delete file="${reports.dir}/errors-${platform}.log"/>
-      <touch file="${reports.dir}/errors-${platform}.log"/>
-    </quiet>
-    <for param="file">
-      <fileset dir="${tests.dir}/test" includes="fail*.cpp"/>
-      <sequential>
-        <record name="${reports.dir}/errors-${platform}.log" action="start" append="true"/>
-        <ant target="-analyse">
-          <property name="file" value="@{file}"/>
-        </ant>
-        <record name="${reports.dir}/errors-${platform}.log" action="stop"/>
-      </sequential>
-    </for>
-  </target>
-
-  <target name="-analyse">
-    <trycatch>
-      <try>
-        <echo>${file}</echo>
-        <compile name="errors" input="${tests.dir}/errors_test" outdir="${out.dir}/errors_test" excludes="**">
-          <includepath path="${libraries.dir}"/>
-          <fileset file="${file}"/>
-        </compile>
-      </try>
-    </trycatch>
-  </target>
-
-  <target name="bench" description="run compilation benchmark">
-    <mkdir dir="${reports.dir}"/>
-    <quiet>
-      <delete file="${reports.dir}/benchmark-${platform}.log"/>
-      <touch file="${reports.dir}/benchmark-${platform}.log"/>
-      <delete dir="${out.dir}/bench_test"/>
-      <delete dir="${tests.dir}/test/bin"/>
-    </quiet>
-    <for param="file">
-      <fileset dir="${tests.dir}/test" includes="bench_*.cpp"/>
-      <sequential>
-        <record name="${reports.dir}/benchmark-${platform}.log" action="start" append="true"/>
-        <ant target="-bench">
-          <property name="file" value="@{file}"/>
-        </ant>
-        <record name="${reports.dir}/benchmark-${platform}.log" action="stop"/>
-      </sequential>
-    </for>
-  </target>
-
-  <target name="-bench">
-    <echo>${file}</echo>
-    <stopwatch name="bench"/>
-    <quiet>
-      <compile name="bench" input="${tests.dir}/test" outdir="${out.dir}/bench_test" excludes="**">
-        <includepath path="${libraries.dir}"/>
-        <fileset file="${file}"/>
-      </compile>
-    </quiet>
-    <stopwatch name="bench" action="total"/>
-  </target>
-
-  <target name="reports" description="generate code analysis reports">
-    <headers name="turtle" excludes="**/*_iterate.hpp,**/*_template.hpp"/>
-    <check name="turtle"/>
-  </target>
-
-  <target name="export" description="export distribution">
-    <sync todir="${dist.dir}/include">
-      <fileset dir="${libraries.dir}" includes="turtle/**"/>
-    </sync>
-    <info version="svn rev ${svn.revision}" todir="${dist.dir}"/>
-  </target>
-
-  <target name="package" depends="export" description="package distribution">
-    <mkdir dir="${dist.dir}"/>
-    <zip destfile="${dist.dir}/${ant.project.name}.zip">
-      <fileset dir="${dist.dir}" includes="include/**"/>
-    </zip>
-    <tar destfile="${dist.dir}/${ant.project.name}.tar.bz2" compression="bzip2">
-      <fileset dir="${dist.dir}" includes="include/**"/>
-    </tar>
-  </target>
   
   <condition property="b2.toolset" value="--toolset=${boost.toolset}" else="">
     <isset property="boost.toolset"/>
@@ -137,37 +28,65 @@
     <os family="windows"/>
   </condition>
   <presetdef name="b2">
-    <exec taskname="b2" failonerror="true" executable="${boost.root}/${b2}">
+    <exec taskname="b2" failonerror="true" executable="${boost.dir}/${b2}">
       <arg value="-q"/>
       <arg value="${b2.toolset}"/>
     </exec>
   </presetdef>
 
-  <target name="boost.generate" description="generate boost.mock into ${boost.dir}">
+  <target name="reports" description="generate code analysis reports">
+    <headers name="turtle" excludes="**/*_iterate.hpp,**/*_template.hpp"/>
+    <check name="turtle"/>
+  </target>
+
+  <target name="test" description="run tests">
+    <b2 dir="${tests.dir}"/>
+  </target>
+
+  <target name="documentation" depends="boost.generate" description="generate documentation">
+    <b2 dir="${boost-mock.dir}/doc">
+      <env key="BOOSTBOOK_DIR" value="${boostbook.dir}"/>
+    </b2>
+  </target>
+
+  <target name="release" depends="documentation" description="produce release packages">
+    <fail unless="version" message="missing version property"/>
+    <copy file="version.hpp" tofile="${out.dir}/version.hpp">
+      <filterset>
+        <filter token="MOCK_VERSION" value="${version}"/>
+      </filterset>
+    </copy>
+    <zip destfile="${dist.dir}/${ant.project.name}-${version}.zip">
+      <fileset dir="${dist.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/**"/>
+      <zipfileset dir="${doc.dir}/html" prefix="doc"/>
+      <zipfileset dir="${out.dir}" includes="version.hpp" prefix="include/turtle"/>
+    </tar>
+  </target>
+
+  <target name="all" depends="test,reports,release" description="build and run tests then package distribution"/>
+
+  <target name="boost.generate" description="generate Boost.Mock">
     <delete dir="${boost-mock.dir}"/>
-    <copy todir="${boost-mock.dir}/include/turtle">
+    <copy todir="${boost-mock.dir}" overwrite="true" preservelastmodified="true">
-      <fileset dir="${libraries.dir}/turtle"/>
+      <fileset dir="${src.dir}" includes="LICENSE_1_0.txt,index.html,include/**,doc/**,test/**" excludes="**/bin/**"/>
     </copy>
     <copy todir="${boostbook.dir}">
-      <fileset dir="${boost.root}/tools/boostbook" includes="xsl/**,dtd/**"/>
+      <fileset dir="${boost.dir}/tools/boostbook" includes="xsl/**,dtd/**"/>
     </copy>
     <copy todir="${boostbook.dir}" overwrite="true">
       <fileset dir="boostbook"/>
     </copy>
     <copy todir="${boost-mock.dir}/doc/html">
-      <fileset dir="${boost.root}/doc/src" includes="**/boostbook.css,**/**.png"/>
+      <fileset dir="${boost.dir}/doc/src" includes="**/boostbook.css,**/**.png"/>
-      <fileset dir="boost/doc" includes="images/*.png"/>
-    </copy>
-    <copy todir="${boost-mock.dir}" overwrite="true">
-      <fileset dir="${tests.dir}" includes="test/**"/>
-      <fileset dir="boost" includes="test/**,doc/**,index.html"/>
-    </copy>
-    <copy todir="${boost.dir}">
-      <fileset dir="boost" includes="LICENSE_1_0.txt,Jamroot.jam,Jamfile.v2"/>
     </copy>
   </target>
 
-  <target name="boost.convert" description="convert boost.mock in ${boost.dir}">
+  <target name="boost.convert" depends="boost.generate" description="convert Boost.Mock">
     <move file="${boost-mock.dir}/include/turtle" tofile="${boost-mock.dir}/include/boost/mock"/>
     <replaceregexp match="MOCK" replace="BOOST_MOCK" flags="g">
       <fileset dir="${boost-mock.dir}" includes="**/*.cpp,**/*.hpp,**/*.qbk"/>
@@ -214,55 +133,29 @@
     <replaceregexp match="\[include changelog.qbk\]" replace="" flags="g">
       <fileset dir="${boost-mock.dir}" includes="**/mock.qbk"/>
     </replaceregexp>
-    <copy todir="${boostbook.dir}" overwrite="true">
-      <fileset dir="${boost.root}/tools/boostbook" includes="xsl/**,dtd/**"/>
-    </copy>
   </target>
 
-  <target name="boost.test" description="run boost.mock tests in ${boost.dir}">
+  <target name="boost.test" description="run Boost.Mock tests">
     <b2 dir="${boost-mock.dir}/test"/>
   </target>
 
-  <target name="boost.doc" description="generate boost.mock documentation in ${boost.dir}">
+  <target name="boost.documentation" depends="boost.generate" description="generate Boost.Mock documentation">
     <b2 dir="${boost-mock.dir}/doc">
       <env key="BOOSTBOOK_DIR" value="${boostbook.dir}"/>
     </b2>
   </target>
 
-  <target name="boost.package" description="package boost.mock">
+  <target name="boost.package" description="package Boost.Mock">
     <zip destfile="${out.dir}/boost-mock.zip">
-      <fileset dir="${boost.dir}" includes="libs/mock/**" excludes="**/bin/**"/>
+      <fileset dir="${boost-mock.dir}" includes="libs/mock/**" excludes="**/bin/**"/>
-      <fileset dir="${boost.dir}" includes="LICENSE_1_0.txt"/>
+      <fileset dir="${boost-mock.dir}" includes="LICENSE_1_0.txt"/>
     </zip>
     <tar destfile="${out.dir}/boost-mock.tar.bz2" compression="bzip2">
-      <fileset dir="${boost.dir}" includes="libs/mock/**" excludes="**/bin/**"/>
+      <fileset dir="${boost-mock.dir}" includes="libs/mock/**" excludes="**/bin/**"/>
-      <fileset dir="${boost.dir}" includes="LICENSE_1_0.txt"/>
+      <fileset dir="${boost-mock.dir}" includes="LICENSE_1_0.txt"/>
     </tar>
   </target>
 
-  <target name="documentation" depends="boost.generate,boost.doc" description="generate documentation"/>
+  <target name="boost" depends="boost.convert,boost.test,boost.documentation,boost.package" description="convert to boost with documentation and tests"/>
-
-  <target name="boost" depends="boost.generate,boost.convert,boost.doc,boost.test,boost.package" description="convert to boost with documentation and tests"/>
-
-  <target name="release" depends="documentation,package" description="produce release packages">
-    <fail unless="version" message="missing version property"/>
-    <copy file="version.hpp" tofile="${out.dir}/version.hpp">
-      <filterset>
-        <filter token="MOCK_VERSION" value="${version}"/>
-      </filterset>
-    </copy>
-    <zip destfile="${dist.dir}/${ant.project.name}-${version}.zip">
-      <fileset dir="${dist.dir}" includes="include/**"/>
-      <zipfileset dir="${boost-mock.dir}/doc/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/**"/>
-      <zipfileset dir="${boost-mock.dir}/doc/html" prefix="doc"/>
-      <zipfileset dir="${out.dir}" includes="version.hpp" prefix="include/turtle"/>
-    </tar>
-  </target>
-
-  <target name="all" depends="configure,test,bench,reports,export,package" description="configure, build and run tests and benchmark, export and package distribution"/>
 
 </project>

build/vc100/.gitignore

@@ -0,0 +1,3 @@
+/*.opensdf
+/*.sdf
+/*.suo

build/vc100/turtle.vcxproj

@@ -19,45 +19,45 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\turtle\config.hpp" />
+    <ClInclude Include="..\..\include\turtle\config.hpp" />
-    <ClInclude Include="..\..\turtle\constraint.hpp" />
+    <ClInclude Include="..\..\include\turtle\constraint.hpp" />
-    <ClInclude Include="..\..\turtle\constraints.hpp" />
+    <ClInclude Include="..\..\include\turtle\constraints.hpp" />
-    <ClInclude Include="..\..\turtle\detail\action.hpp" />
+    <ClInclude Include="..\..\include\turtle\detail\action.hpp" />
-    <ClInclude Include="..\..\turtle\detail\addressof.hpp" />
+    <ClInclude Include="..\..\include\turtle\detail\addressof.hpp" />
-    <ClInclude Include="..\..\turtle\detail\child.hpp" />
+    <ClInclude Include="..\..\include\turtle\detail\child.hpp" />
-    <ClInclude Include="..\..\turtle\detail\cleanup.hpp" />
+    <ClInclude Include="..\..\include\turtle\detail\cleanup.hpp" />
-    <ClInclude Include="..\..\turtle\detail\context.hpp" />
+    <ClInclude Include="..\..\include\turtle\detail\context.hpp" />
-    <ClInclude Include="..\..\turtle\detail\expectation_template.hpp" />
+    <ClInclude Include="..\..\include\turtle\detail\expectation_template.hpp" />
-    <ClInclude Include="..\..\turtle\detail\formatter.hpp" />
+    <ClInclude Include="..\..\include\turtle\detail\formatter.hpp" />
-    <ClInclude Include="..\..\turtle\detail\function.hpp" />
+    <ClInclude Include="..\..\include\turtle\detail\function.hpp" />
-    <ClInclude Include="..\..\turtle\detail\function_impl_template.hpp" />
+    <ClInclude Include="..\..\include\turtle\detail\function_impl_template.hpp" />
-    <ClInclude Include="..\..\turtle\detail\function_iterate.hpp" />
+    <ClInclude Include="..\..\include\turtle\detail\function_iterate.hpp" />
-    <ClInclude Include="..\..\turtle\detail\function_template.hpp" />
+    <ClInclude Include="..\..\include\turtle\detail\function_template.hpp" />
-    <ClInclude Include="..\..\turtle\detail\functor.hpp" />
+    <ClInclude Include="..\..\include\turtle\detail\functor.hpp" />
-    <ClInclude Include="..\..\turtle\detail\group.hpp" />
+    <ClInclude Include="..\..\include\turtle\detail\group.hpp" />
-    <ClInclude Include="..\..\turtle\detail\invocation.hpp" />
+    <ClInclude Include="..\..\include\turtle\detail\invocation.hpp" />
-    <ClInclude Include="..\..\turtle\detail\is_functor.hpp" />
+    <ClInclude Include="..\..\include\turtle\detail\is_functor.hpp" />
-    <ClInclude Include="..\..\turtle\detail\matcher_base_template.hpp" />
+    <ClInclude Include="..\..\include\turtle\detail\matcher_base_template.hpp" />
-    <ClInclude Include="..\..\turtle\detail\mutex.hpp" />
+    <ClInclude Include="..\..\include\turtle\detail\mutex.hpp" />
-    <ClInclude Include="..\..\turtle\detail\object_impl.hpp" />
+    <ClInclude Include="..\..\include\turtle\detail\object_impl.hpp" />
-    <ClInclude Include="..\..\turtle\detail\parameter.hpp" />
+    <ClInclude Include="..\..\include\turtle\detail\parameter.hpp" />
-    <ClInclude Include="..\..\turtle\detail\parent.hpp" />
+    <ClInclude Include="..\..\include\turtle\detail\parent.hpp" />
-    <ClInclude Include="..\..\turtle\detail\root.hpp" />
+    <ClInclude Include="..\..\include\turtle\detail\root.hpp" />
-    <ClInclude Include="..\..\turtle\detail\sequence_impl.hpp" />
+    <ClInclude Include="..\..\include\turtle\detail\sequence_impl.hpp" />
-    <ClInclude Include="..\..\turtle\detail\signature.hpp" />
+    <ClInclude Include="..\..\include\turtle\detail\signature.hpp" />
-    <ClInclude Include="..\..\turtle\detail\type_name.hpp" />
+    <ClInclude Include="..\..\include\turtle\detail\type_name.hpp" />
-    <ClInclude Include="..\..\turtle\detail\verifiable.hpp" />
+    <ClInclude Include="..\..\include\turtle\detail\verifiable.hpp" />
-    <ClInclude Include="..\..\turtle\error.hpp" />
+    <ClInclude Include="..\..\include\turtle\error.hpp" />
-    <ClInclude Include="..\..\turtle\exception.hpp" />
+    <ClInclude Include="..\..\include\turtle\exception.hpp" />
-    <ClInclude Include="..\..\turtle\format.hpp" />
+    <ClInclude Include="..\..\include\turtle\format.hpp" />
-    <ClInclude Include="..\..\turtle\log.hpp" />
+    <ClInclude Include="..\..\include\turtle\log.hpp" />
-    <ClInclude Include="..\..\turtle\matcher.hpp" />
+    <ClInclude Include="..\..\include\turtle\matcher.hpp" />
-    <ClInclude Include="..\..\turtle\mock.hpp" />
+    <ClInclude Include="..\..\include\turtle\mock.hpp" />
-    <ClInclude Include="..\..\turtle\object.hpp" />
+    <ClInclude Include="..\..\include\turtle\object.hpp" />
-    <ClInclude Include="..\..\turtle\reset.hpp" />
+    <ClInclude Include="..\..\include\turtle\reset.hpp" />
-    <ClInclude Include="..\..\turtle\sequence.hpp" />
+    <ClInclude Include="..\..\include\turtle\sequence.hpp" />
-    <ClInclude Include="..\..\turtle\stream.hpp" />
+    <ClInclude Include="..\..\include\turtle\stream.hpp" />
-    <ClInclude Include="..\..\turtle\verify.hpp" />
+    <ClInclude Include="..\..\include\turtle\verify.hpp" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{831F2DEE-1E35-4533-A3B2-12C01BA8DA1D}</ProjectGuid>

build/vc100/turtle.vcxproj.filters

@@ -10,121 +10,121 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\turtle\config.hpp">
+    <ClInclude Include="..\..\include\turtle\config.hpp">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\turtle\constraint.hpp">
+    <ClInclude Include="..\..\include\turtle\constraint.hpp">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\turtle\constraints.hpp">
+    <ClInclude Include="..\..\include\turtle\constraints.hpp">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\turtle\error.hpp">
+    <ClInclude Include="..\..\include\turtle\error.hpp">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\turtle\log.hpp">
+    <ClInclude Include="..\..\include\turtle\exception.hpp">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\turtle\mock.hpp">
+    <ClInclude Include="..\..\include\turtle\format.hpp">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\turtle\object.hpp">
+    <ClInclude Include="..\..\include\turtle\log.hpp">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\turtle\sequence.hpp">
+    <ClInclude Include="..\..\include\turtle\matcher.hpp">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\turtle\detail\signature.hpp">
+    <ClInclude Include="..\..\include\turtle\mock.hpp">
-      <Filter>Source Files\detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\turtle\detail\child.hpp">
-      <Filter>Source Files\detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\turtle\detail\group.hpp">
-      <Filter>Source Files\detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\turtle\detail\context.hpp">
-      <Filter>Source Files\detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\turtle\detail\parent.hpp">
-      <Filter>Source Files\detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\turtle\detail\root.hpp">
-      <Filter>Source Files\detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\turtle\detail\type_name.hpp">
-      <Filter>Source Files\detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\turtle\detail\verifiable.hpp">
-      <Filter>Source Files\detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\turtle\detail\action.hpp">
-      <Filter>Source Files\detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\turtle\detail\expectation_template.hpp">
-      <Filter>Source Files\detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\turtle\detail\function.hpp">
-      <Filter>Source Files\detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\turtle\detail\function_iterate.hpp">
-      <Filter>Source Files\detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\turtle\detail\function_template.hpp">
-      <Filter>Source Files\detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\turtle\detail\invocation.hpp">
-      <Filter>Source Files\detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\turtle\detail\object_impl.hpp">
-      <Filter>Source Files\detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\turtle\detail\function_impl_template.hpp">
-      <Filter>Source Files\detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\turtle\detail\is_functor.hpp">
-      <Filter>Source Files\detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\turtle\stream.hpp">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\turtle\format.hpp">
+    <ClInclude Include="..\..\include\turtle\object.hpp">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\turtle\verify.hpp">
+    <ClInclude Include="..\..\include\turtle\reset.hpp">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\turtle\reset.hpp">
+    <ClInclude Include="..\..\include\turtle\sequence.hpp">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\turtle\detail\functor.hpp">
+    <ClInclude Include="..\..\include\turtle\stream.hpp">
-      <Filter>Source Files\detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\turtle\detail\parameter.hpp">
-      <Filter>Source Files\detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\turtle\detail\sequence_impl.hpp">
-      <Filter>Source Files\detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\turtle\detail\formatter.hpp">
-      <Filter>Source Files\detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\turtle\detail\cleanup.hpp">
-      <Filter>Source Files\detail</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\turtle\matcher.hpp">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\turtle\exception.hpp">
+    <ClInclude Include="..\..\include\turtle\verify.hpp">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\turtle\detail\addressof.hpp">
+    <ClInclude Include="..\..\include\turtle\detail\function.hpp">
       <Filter>Source Files\detail</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\turtle\detail\mutex.hpp">
+    <ClInclude Include="..\..\include\turtle\detail\function_impl_template.hpp">
       <Filter>Source Files\detail</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\turtle\detail\matcher_base_template.hpp">
+    <ClInclude Include="..\..\include\turtle\detail\function_iterate.hpp">
+      <Filter>Source Files\detail</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\turtle\detail\function_template.hpp">
+      <Filter>Source Files\detail</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\turtle\detail\functor.hpp">
+      <Filter>Source Files\detail</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\turtle\detail\group.hpp">
+      <Filter>Source Files\detail</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\turtle\detail\invocation.hpp">
+      <Filter>Source Files\detail</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\turtle\detail\is_functor.hpp">
+      <Filter>Source Files\detail</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\turtle\detail\matcher_base_template.hpp">
+      <Filter>Source Files\detail</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\turtle\detail\mutex.hpp">
+      <Filter>Source Files\detail</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\turtle\detail\object_impl.hpp">
+      <Filter>Source Files\detail</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\turtle\detail\parameter.hpp">
+      <Filter>Source Files\detail</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\turtle\detail\parent.hpp">
+      <Filter>Source Files\detail</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\turtle\detail\root.hpp">
+      <Filter>Source Files\detail</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\turtle\detail\sequence_impl.hpp">
+      <Filter>Source Files\detail</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\turtle\detail\signature.hpp">
+      <Filter>Source Files\detail</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\turtle\detail\type_name.hpp">
+      <Filter>Source Files\detail</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\turtle\detail\verifiable.hpp">
+      <Filter>Source Files\detail</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\turtle\detail\action.hpp">
+      <Filter>Source Files\detail</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\turtle\detail\addressof.hpp">
+      <Filter>Source Files\detail</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\turtle\detail\child.hpp">
+      <Filter>Source Files\detail</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\turtle\detail\cleanup.hpp">
+      <Filter>Source Files\detail</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\turtle\detail\context.hpp">
+      <Filter>Source Files\detail</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\turtle\detail\expectation_template.hpp">
+      <Filter>Source Files\detail</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\turtle\detail\formatter.hpp">
       <Filter>Source Files\detail</Filter>
     </ClInclude>
   </ItemGroup>

doc/changelog.qbk

@@ -7,7 +7,7 @@
 
 [section Changelog]
 
-[section trunk]
+[section unreleased]
 Not yet released
 
 * Dropped support for obsolete Boost.Phoenix V2

doc/html/.gitignore

@@ -0,0 +1,2 @@
+*.html
+standalone_HTML.manifest

include/turtle/detail/function_impl_template.hpp

@@ -110,22 +110,26 @@ namespace detail
             }
             wrapper exactly( std::size_t count )
             {
-                this->e_->invoke( boost::make_shared< detail::exactly >( count ) );
+                this->e_->invoke(
+                    boost::make_shared< detail::exactly >( count ) );
                 return *this;
             }
             wrapper at_least( std::size_t min )
             {
-                this->e_->invoke( boost::make_shared< detail::at_least >( min ) );
+                this->e_->invoke(
+                    boost::make_shared< detail::at_least >( min ) );
                 return *this;
             }
             wrapper at_most( std::size_t max )
             {
-                this->e_->invoke( boost::make_shared< detail::at_most >( max ) );
+                this->e_->invoke(
+                    boost::make_shared< detail::at_most >( max ) );
                 return *this;
             }
             wrapper between( std::size_t min, std::size_t max )
             {
-                this->e_->invoke( boost::make_shared< detail::between >( min, max ) );
+                this->e_->invoke(
+                    boost::make_shared< detail::between >( min, max ) );
                 return *this;
             }
 

index.html

@@ -1,3 +1,4 @@
+<!-- boost-no-inspect -->
 <html>
 <head>
 <meta http-equiv="refresh" content="0; URL=doc/html/index.html">

test/Jamfile.jam

@@ -30,7 +30,7 @@ rule run-test ( name )
   run $(name) undefined.cpp /boost//unit_test_framework : : : <define>MOCK_USE_CONVERSIONS : $(name)_use_conversions ;
   run $(name) undefined.cpp /boost//unit_test_framework : : : <define>MOCK_NO_DECLTYPE : $(name)_no_decltype ;
   run $(name) undefined.cpp /boost//unit_test_framework : : : <define>MOCK_NO_VARIADIC_MACROS : $(name)_no_variadic_macros ;
-  run $(name) undefined.cpp /boost//unit_test_framework : : : <define>MOCK_THREAD_SAFE : $(name)_thread_safe ;
+  run $(name) undefined.cpp /boost//unit_test_framework /boost//thread : : : <define>MOCK_THREAD_SAFE <define>BOOST_THREAD_USES_MOVE : $(name)_thread_safe ;
 }
 
 rule run-tests

test/detail/test_function.cpp

@@ -6,7 +6,6 @@
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-#define BOOST_AUTO_TEST_MAIN
 #include "../mock_error.hpp"
 #include "../undefined.hpp"
 #include <turtle/detail/function.hpp>

test/test_constraint.cpp

@@ -26,3 +26,17 @@ BOOST_AUTO_TEST_CASE( mock_constraint_is_supported_by_compilers_with_variadic_ma
 }
 
 #endif // MOCK_VARIADIC_MACROS
+
+namespace
+{
+    MOCK_CONSTRAINT_EXT( constraint_0_ext, 0,, actual == 0 )
+    MOCK_CONSTRAINT_EXT( constraint_1_ext, 1, ( expected ), actual == expected )
+    MOCK_CONSTRAINT_EXT( constraint_2_ext, 2, ( expected_0, expected_1 ), actual == expected_0 || actual == expected_1 )
+}
+
+BOOST_AUTO_TEST_CASE( mock_constraint_ext_is_supported_by_all_compilers )
+{
+    BOOST_CHECK( constraint_0_ext.c_( 0 ) );
+    BOOST_CHECK( constraint_1_ext( 0 ).c_( 0 ) );
+    BOOST_CHECK( constraint_2_ext( 0, 0 ).c_( 0 ) );
+}