Fixed Boost.Mock generation

git-svn-id: https://svn.code.sf.net/p/turtle/code/trunk@465 860be788-9bd5-4423-9f1e-828f051e677b
This commit is contained in:
mat007 2012-06-15 23:01:00 +00:00
parent 946d1f6874
commit fc5b7f7163
29 changed files with 37 additions and 42 deletions

View file

@ -138,8 +138,8 @@
<replaceregexp match="BOOST_MOCK_BOOST_MOCK" replace="BOOST_MOCK" flags="g">
<fileset dir="${boost.dir}" includes="**/*.hpp,**/*.cpp"/>
</replaceregexp>
<replaceregexp match='"([^"]+)"' replace="&lt;boost/mock/\1&gt;" flags="g">
<fileset dir="${boost.dir}" includes="**/*.hpp,**/*.cpp"/>
<replaceregexp match='"([^"]+\.hpp)"' replace="&lt;boost/mock/\1&gt;" flags="g">
<fileset dir="${boost.dir}" includes="**/*.hpp"/>
</replaceregexp>
<replaceregexp match="&lt;turtle/([^&gt;]+)" replace="&lt;boost/mock/\1" flags="g">
<fileset dir="${boost.dir}" includes="**/*.hpp,**/*.cpp"/>
@ -147,13 +147,10 @@
<replaceregexp match="(namespace mock)" replace="namespace boost${line.separator}{${line.separator}\1" flags="g">
<fileset dir="${boost.dir}" includes="**/*.hpp,**/*.cpp"/>
</replaceregexp>
<replaceregexp match="(}${line.separator}${line.separator}#endif //)" replace="}${line.separator}\1" flags="g">
<replaceregexp match="} // mock" replace="}${line.separator}}" flags="g">
<fileset dir="${boost.dir}" includes="**/*.hpp,**/*.cpp"/>
</replaceregexp>
<replaceregexp match="(}${line.separator}${line.separator}#define)" replace="}${line.separator}\1" flags="g">
<fileset dir="${boost.dir}" includes="**/*.hpp,**/*.cpp"/>
</replaceregexp>
<replaceregexp match="(mock::)" replace="boost::\1" flags="g">
<replaceregexp match="( mock::)" replace=" boost::mock::" flags="g">
<fileset dir="${boost.dir}" includes="**/*.hpp,**/*.cpp"/>
</replaceregexp>
</target>