Update of /cvsroot/cppunit/cppunit2/scons-tools
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv22940/scons-tools
Modified Files:
doxygen.py
Log Message:
- synchronized with lastest jsoncpp.
Index: doxygen.py
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/scons-tools/doxygen.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** doxygen.py 5 Jun 2006 13:22:58 -0000 1.1
--- doxygen.py 1 Sep 2006 19:48:11 -0000 1.2
***************
*** 1,2 ****
--- 1,6 ----
+ # Big issue:
+ # emitter depends on doxyfile which is generated from doxyfile.in.
+ # build fails after cleaning and relaunching the build.
+
import os
import os.path
***************
*** 100,107 ****
exclude_patterns = data.get("EXCLUDE_PATTERNS", default_exclude_patterns)
for node in data.get("INPUT", []):
! if os.path.isfile(node):
! sources.add(node)
! elif os.path.isdir(node):
if recursive:
for root, dirs, files in os.walk(node):
--- 104,117 ----
exclude_patterns = data.get("EXCLUDE_PATTERNS", default_exclude_patterns)
+ doxyfile_dir = str( node.dir )
+
+ ## print 'running from', os.getcwd()
for node in data.get("INPUT", []):
! node_real_path = os.path.normpath( os.path.join( doxyfile_dir, node ) )
! if os.path.isfile(node_real_path):
! ## print str(node), 'is a file'
! sources.append(node)
! elif os.path.isdir(node_real_path):
! ## print str(node), 'is a directory'
if recursive:
for root, dirs, files in os.walk(node):
***************
*** 114,120 ****
if pattern_check and not exclude_check:
sources.append(filename)
else:
for pattern in file_patterns:
! sources.extend(glob.glob("/".join([node, pattern])))
sources = map( lambda path: env.File(path), sources )
return sources
--- 124,133 ----
if pattern_check and not exclude_check:
sources.append(filename)
+ ## print ' adding source', os.path.abspath( filename )
else:
for pattern in file_patterns:
! sources.extend(glob.glob(os.path.join( node, pattern)))
! ## else:
! ## print str(node), 'is neither a file nor a directory'
sources = map( lambda path: env.File(path), sources )
return sources
***************
*** 136,139 ****
--- 149,153 ----
}
+ ## print '#### DoxyEmitter:', source[0].abspath, os.path.exists( source[0].abspath )
data = DoxyfileParse(source[0].get_contents())
***************
*** 152,156 ****
# set up cleaning stuff
for node in targets:
! env.Clean(node, node)
return (targets, source)
--- 166,171 ----
# set up cleaning stuff
for node in targets:
! clean_cmd = env.Clean(node, node)
! env.Depends( clean_cmd, source )
return (targets, source)
***************
*** 168,172 ****
doxyfile_builder = env.Builder(
! action = env.Action("cd ${SOURCE.dir} && ${DOXYGEN} ${SOURCE.file}"),
emitter = DoxyEmitter,
target_factory = env.fs.Entry,
--- 183,188 ----
doxyfile_builder = env.Builder(
! action = env.Action("cd ${SOURCE.dir} && ${DOXYGEN} ${SOURCE.file}",
! varlist=['$SOURCES']),
emitter = DoxyEmitter,
target_factory = env.fs.Entry,
|
