Update of /cvsroot/cppunit/cppunit2/doc
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv20791/doc
Modified Files:
SConscript doxyfile.in
Log Message:
- made doxygen generation more robust: no longer attempt to manage dependencies.
Index: SConscript
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/doc/SConscript,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SConscript 1 Sep 2006 20:12:11 -0000 1.1
--- SConscript 16 Mar 2007 22:41:38 -0000 1.2
***************
*** 4,20 ****
if 'doxygen' in env['TOOLS']:
doc_topdir = env['ROOTBUILD_DIR']
doxyfile = env.SubstInFile( '#doc/doxyfile', 'doxyfile.in',
SUBST_DICT = {
'%CPPUNIT_VERSION%' : env['CPPUNIT_VERSION'],
'%TOPDIR%' : env.Dir('#').abspath,
! '%DOC_TOPDIR%' : str(doc_topdir) } )
doc_cmd = env.Doxygen( doxyfile )
env.Alias('doc', doc_cmd)
env.AlwaysBuild(doc_cmd)
!
! for dir in doc_cmd:
! filename = os.path.split(dir.path)[1]
! targz_path = os.path.join( env['DIST_DIR'], '%s.tar.gz' % filename )
! zip_doc_cmd = env.TarGz( targz_path, [env.Dir(dir)],
! TARGZ_BASEDIR = doc_topdir )
! env.Alias( 'doc-dist', zip_doc_cmd )
--- 4,23 ----
if 'doxygen' in env['TOOLS']:
doc_topdir = env['ROOTBUILD_DIR']
+ env['DOXYGEN_DOC_TOP_DIR'] = doc_topdir
+ env['DOXYGEN_HTML_DIR'] = env.Dir( 'cppunit2-doc-html-' + env['CPPUNIT_VERSION'] )
doxyfile = env.SubstInFile( '#doc/doxyfile', 'doxyfile.in',
SUBST_DICT = {
'%CPPUNIT_VERSION%' : env['CPPUNIT_VERSION'],
'%TOPDIR%' : env.Dir('#').abspath,
! '%DOC_TOPDIR%' : str(doc_topdir),
! '%HTML_OUTPUT%' : str(env['DOXYGEN_HTML_DIR']) } )
doc_cmd = env.Doxygen( doxyfile )
env.Alias('doc', doc_cmd)
env.AlwaysBuild(doc_cmd)
! ##
! ## for dir in doc_cmd:
! ## filename = os.path.split(dir.path)[1]
! ## targz_path = os.path.join( env['DIST_DIR'], '%s.tar.gz' % filename )
! ## zip_doc_cmd = env.TarGz( targz_path, [env.Dir(dir)],
! ## TARGZ_BASEDIR = doc_topdir )
! ## env.Alias( 'doc-dist', zip_doc_cmd )
Index: doxyfile.in
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/doc/doxyfile.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** doxyfile.in 7 Sep 2006 22:45:50 -0000 1.3
--- doxyfile.in 16 Mar 2007 22:41:39 -0000 1.4
***************
*** 107,111 ****
#---------------------------------------------------------------------------
GENERATE_HTML = YES
! HTML_OUTPUT = cppunit2-doc-html-%CPPUNIT_VERSION%
HTML_FILE_EXTENSION = .html
HTML_HEADER = header.html
--- 107,111 ----
#---------------------------------------------------------------------------
GENERATE_HTML = YES
! HTML_OUTPUT = %HTML_OUTPUT%
HTML_FILE_EXTENSION = .html
HTML_HEADER = header.html
|
