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

Updated to latest boost headers and layout

Browse source 
git-svn-id: https://svn.code.sf.net/p/turtle/code/trunk@748 860be788-9bd5-4423-9f1e-828f051e677b
This commit is contained in:
mat007 2014-05-29 10:17:19 +00:00
parent 897c0bdac3
commit 077e046641
7 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

3
build/boost/doc/Jamfile.jam
View file

@ -39,10 +39,9 @@ boostbook standalone
<xsl:param>nav.layout=horizontal <xsl:param>nav.layout=horizontal
; ;
# not needed anymore once in boost
project example project example
: requirements : requirements
<include>../../../../.. <include>../include
; ;
rule compile-examples rule compile-examples

7
build/boost/test/Jamfile.jam
View file

@ -8,7 +8,12 @@
import testing ; import testing ;
project : requirements <define>BOOST_AUTO_TEST_MAIN <define>BOOST_ALL_NO_LIB ; project
: requirements
<define>BOOST_AUTO_TEST_MAIN
<define>BOOST_ALL_NO_LIB
<include>../include
;
rule run-test ( name ) rule run-test ( name )
{ {

29
build/build.xml
View file

@ -143,10 +143,9 @@
</presetdef> </presetdef>
<target name="boost.generate" description="generate boost.mock into ${boost.dir}"> <target name="boost.generate" description="generate boost.mock into ${boost.dir}">
<delete dir="${boost.dir}/boost/mock"/>
<delete dir="${boost.dir}/libs/mock"/> <delete dir="${boost.dir}/libs/mock"/>
<copy todir="${boost.dir}/boost/mock"> <copy todir="${boost.dir}/libs/mock/include/turtle">
<fileset dir="${libraries.dir}/turtle" includes="**"/> <fileset dir="${libraries.dir}/turtle"/>
</copy> </copy>
<copy todir="${boostbook.dir}"> <copy todir="${boostbook.dir}">
<fileset dir="${boost.root}/tools/boostbook" includes="xsl/**,dtd/**"/> <fileset dir="${boost.root}/tools/boostbook" includes="xsl/**,dtd/**"/>
@ -168,45 +167,38 @@
</target> </target>
<target name="boost.convert" description="convert boost.mock in ${boost.dir}"> <target name="boost.convert" description="convert boost.mock in ${boost.dir}">
<move file="${boost.dir}/libs/mock/include/turtle" tofile="${boost.dir}/libs/mock/include/boost/mock"/>
<replaceregexp match="MOCK" replace="BOOST_MOCK" flags="g"> <replaceregexp match="MOCK" replace="BOOST_MOCK" flags="g">
<fileset dir="${boost.dir}/boost/mock" includes="**/*.hpp"/>
<fileset dir="${boost.dir}/libs/mock" includes="**/*.cpp,**/*.hpp,**/*.qbk"/> <fileset dir="${boost.dir}/libs/mock" includes="**/*.cpp,**/*.hpp,**/*.qbk"/>
</replaceregexp> </replaceregexp>
<replaceregexp match="BOOST_MOCK_BOOST_MOCK" replace="BOOST_MOCK" flags="g"> <replaceregexp match="BOOST_MOCK_BOOST_MOCK" replace="BOOST_MOCK" flags="g">
<fileset dir="${boost.dir}/boost/mock" includes="**/*.hpp"/>
<fileset dir="${boost.dir}/libs/mock" includes="**/*.cpp,**/*.hpp,**/*.qbk"/> <fileset dir="${boost.dir}/libs/mock" includes="**/*.cpp,**/*.hpp,**/*.qbk"/>
</replaceregexp> </replaceregexp>
<replaceregexp match='"([^"]+\.hpp)"' replace="&lt;boost/mock/\1&gt;" flags="g"> <replaceregexp match='"([^"]+\.hpp)"' replace="&lt;boost/mock/\1&gt;" flags="g">
<fileset dir="${boost.dir}/boost/mock" includes="**/*.hpp" excludes="**/detail/*.hpp"/> <fileset dir="${boost.dir}/libs/mock/include" includes="**/*.hpp" excludes="**/detail/*.hpp"/>
</replaceregexp> </replaceregexp>
<replaceregexp match='"\.\./([^"]+\.hpp)"' replace="&lt;boost/mock/\1&gt;" flags="g"> <replaceregexp match='"\.\./([^"]+\.hpp)"' replace="&lt;boost/mock/\1&gt;" flags="g">
<fileset dir="${boost.dir}/boost/mock" includes="**/*.hpp"/> <fileset dir="${boost.dir}/libs/mock/include" includes="**/*.hpp"/>
</replaceregexp> </replaceregexp>
<replaceregexp match='"([^"]+\.hpp)"' replace="&lt;boost/mock/detail/\1&gt;" flags="g"> <replaceregexp match='"([^"]+\.hpp)"' replace="&lt;boost/mock/detail/\1&gt;" flags="g">
<fileset dir="${boost.dir}/boost/mock" includes="**/detail/*.hpp"/> <fileset dir="${boost.dir}/libs/mock/include" includes="**/detail/*.hpp"/>
</replaceregexp> </replaceregexp>
<replaceregexp match="&lt;turtle/([^&gt;]+)" replace="&lt;boost/mock/\1" flags="g"> <replaceregexp match="&lt;turtle/([^&gt;]+)" replace="&lt;boost/mock/\1" flags="g">
<fileset dir="${boost.dir}/boost/mock" includes="**/*.hpp"/>
<fileset dir="${boost.dir}/libs/mock" includes="**/*.cpp,**/*.hpp,**/*.qbk"/> <fileset dir="${boost.dir}/libs/mock" includes="**/*.cpp,**/*.hpp,**/*.qbk"/>
</replaceregexp> </replaceregexp>
<replaceregexp match="(namespace mock)" replace="namespace boost${line.separator}{${line.separator}\1" flags="g"> <replaceregexp match="(namespace mock)" replace="namespace boost${line.separator}{${line.separator}\1" flags="g">
<fileset dir="${boost.dir}/boost/mock" includes="**/*.hpp"/>
<fileset dir="${boost.dir}/libs/mock" includes="**/*.cpp,**/*.hpp,**/*.qbk"/> <fileset dir="${boost.dir}/libs/mock" includes="**/*.cpp,**/*.hpp,**/*.qbk"/>
</replaceregexp> </replaceregexp>
<replaceregexp match="} // mock" replace="}${line.separator}}" flags="g"> <replaceregexp match="} // mock" replace="}${line.separator}}" flags="g">
<fileset dir="${boost.dir}/boost/mock" includes="**/*.hpp"/>
<fileset dir="${boost.dir}/libs/mock" includes="**/*.cpp,**/*.hpp"/> <fileset dir="${boost.dir}/libs/mock" includes="**/*.cpp,**/*.hpp"/>
</replaceregexp> </replaceregexp>
<replaceregexp match=" mock::" replace=" boost::mock::" flags="g"> <replaceregexp match=" mock::" replace=" boost::mock::" flags="g">
<fileset dir="${boost.dir}/boost/mock" includes="**/*.hpp"/>
<fileset dir="${boost.dir}/libs/mock" includes="**/*.cpp,**/*.hpp,**/*.qbk"/> <fileset dir="${boost.dir}/libs/mock" includes="**/*.cpp,**/*.hpp,**/*.qbk"/>
</replaceregexp> </replaceregexp>
<replaceregexp match="^mock::" replace="boost::mock::" flags="m"> <replaceregexp match="^mock::" replace="boost::mock::" flags="m">
<fileset dir="${boost.dir}/boost/mock" includes="**/*.hpp"/>
<fileset dir="${boost.dir}/libs/mock" includes="**/*.cpp,**/*.hpp,**/*.qbk"/> <fileset dir="${boost.dir}/libs/mock" includes="**/*.cpp,**/*.hpp,**/*.qbk"/>
</replaceregexp> </replaceregexp>
<replaceregexp match="http://turtle.sourceforge.net" replace="Boost.Mock" flags="g"> <replaceregexp match="http://turtle.sourceforge.net" replace="Boost.Mock" flags="g">
<fileset dir="${boost.dir}/boost/mock" includes="**/*.hpp"/>
<fileset dir="${boost.dir}/libs/mock" includes="**/*.cpp,**/*.hpp"/> <fileset dir="${boost.dir}/libs/mock" includes="**/*.cpp,**/*.hpp"/>
</replaceregexp> </replaceregexp>
<replaceregexp match="reference.helpers." replace="reference.helpers.boost_" flags="g"> <replaceregexp match="reference.helpers." replace="reference.helpers.boost_" flags="g">
@ -238,15 +230,18 @@
<target name="boost.package" description="package boost.mock"> <target name="boost.package" description="package boost.mock">
<zip destfile="${out.dir}/boost-mock.zip"> <zip destfile="${out.dir}/boost-mock.zip">
<fileset dir="${boost.dir}" includes="boost/mock/**"/>
<fileset dir="${boost.dir}" includes="libs/mock/**" excludes="**/bin/**"/> <fileset dir="${boost.dir}" includes="libs/mock/**" excludes="**/bin/**"/>
<fileset dir="${boost.dir}" includes="LICENSE_1_0.txt,Jamroot.jam,Jamfile.v2"/> <fileset dir="${boost.dir}" includes="LICENSE_1_0.txt"/>
</zip> </zip>
<tar destfile="${out.dir}/boost-mock.tar.bz2" compression="bzip2">
<fileset dir="${boost.dir}" includes="libs/mock/**" excludes="**/bin/**"/>
<fileset dir="${boost.dir}" includes="LICENSE_1_0.txt"/>
</tar>
</target> </target>
<target name="documentation" depends="boost.generate,boost.doc" description="generate documentation"/> <target name="documentation" depends="boost.generate,boost.doc" description="generate documentation"/>
<target name="boost" depends="boost.generate,boost.convert,boost.doc,boost.test" 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"> <target name="release" depends="documentation,package" description="produce release packages">
<fail unless="version" message="missing version property"/> <fail unless="version" message="missing version property"/>

2
test/detail/test_is_functor.cpp
View file

@ -12,7 +12,7 @@
#pragma warning( push, 0 ) #pragma warning( push, 0 )
#endif #endif
#include <boost/lambda/lambda.hpp> #include <boost/lambda/lambda.hpp>
#include <boost/spirit/home/phoenix.hpp> #include <boost/phoenix/phoenix.hpp>
#ifdef BOOST_MSVC #ifdef BOOST_MSVC
#pragma warning( pop ) #pragma warning( pop )
#endif #endif

4
test/test_log.cpp
View file

@ -15,8 +15,8 @@
#ifdef BOOST_MSVC #ifdef BOOST_MSVC
#pragma warning( push, 0 ) #pragma warning( push, 0 )
#endif #endif
#include <boost/spirit/home/phoenix.hpp> #include <boost/phoenix/phoenix.hpp>
#include <boost/spirit/home/phoenix/bind.hpp> #include <boost/phoenix/bind.hpp>
#ifndef BOOST_MSVC // this produces an ICE with all versions of MSVC #ifndef BOOST_MSVC // this produces an ICE with all versions of MSVC
#include <boost/lambda/bind.hpp> #include <boost/lambda/bind.hpp>
#include <boost/lambda/lambda.hpp> #include <boost/lambda/lambda.hpp>

1
turtle/config.hpp
View file

@ -22,6 +22,7 @@
# define MOCK_MAX_ARGS 9 # define MOCK_MAX_ARGS 9
#elif BOOST_PP_LESS(9, MOCK_MAX_ARGS) #elif BOOST_PP_LESS(9, MOCK_MAX_ARGS)
# define MOCK_USE_BOOST_PHOENIX # define MOCK_USE_BOOST_PHOENIX
# define BOOST_PHOENIX_USE_V2_OVER_V3
#endif #endif
#ifndef MOCK_MAX_SEQUENCES #ifndef MOCK_MAX_SEQUENCES

2
turtle/detail/lambda.hpp
View file

@ -11,7 +11,7 @@
#include "../config.hpp" #include "../config.hpp"
#ifdef MOCK_USE_BOOST_PHOENIX #ifdef MOCK_USE_BOOST_PHOENIX
#include <boost/spirit/home/phoenix/bind.hpp> #include <boost/phoenix/bind.hpp>
#else #else
#include <boost/bind.hpp> #include <boost/bind.hpp>
#endif #endif