Update of /cvsroot/cppunit/cppunit2/scons-tools
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv5281/scons-tools
Modified Files:
doxygen.py
Log Message:
Modified assertion implementation to force evaluation of user
condition expression first, while preserving delegation to
function, overloading and optional parameters feature.
See CPPUT_BEGIN_ASSERTION_MACRO() documentation in testinfo.h for an example
to update your custom assertion code.
New implementation rely on operator evaluation order and operator overloading. The trick is documented in CPPUT_BEGIN_ASSERTION_MACRO().
Index: doxygen.py
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/scons-tools/doxygen.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** doxygen.py 16 Mar 2007 22:41:39 -0000 1.3
--- doxygen.py 14 Aug 2007 17:30:52 -0000 1.4
***************
*** 18,36 ****
Doxygen tool. This is currently for Doxygen 1.4.6.
"""
! doxyfile_builder = env.Builder(
! action = env.Action("cd ${SOURCE.dir} && ${DOXYGEN} ${SOURCE.file}",
! varlist=['$SOURCES']),
! emitter = DoxyEmitter,
! single_source = True,
! )
!
! env.Append(BUILDERS = {
! 'Doxygen': doxyfile_builder,
! })
! env.AppendUnique(
! DOXYGEN = 'doxygen',
! )
def exists(env):
--- 18,37 ----
Doxygen tool. This is currently for Doxygen 1.4.6.
"""
+ env['HAS_DOXYGEN'] = exists( env )
+ if env['HAS_DOXYGEN']:
+ doxyfile_builder = env.Builder(
+ action = env.Action("cd ${SOURCE.dir} && ${DOXYGEN} ${SOURCE.file}",
+ varlist=['$SOURCES']),
+ emitter = DoxyEmitter,
+ single_source = True,
+ )
! env.Append(BUILDERS = {
! 'Doxygen': doxyfile_builder,
! })
! env.AppendUnique(
! DOXYGEN = 'doxygen',
! )
def exists(env):
|
