SF.net SVN: geany:[3455] trunk/wscript
eht16 at users.sourceforge.net
eht16 at xxxxx
Fri Jan 9 18:21:31 UTC 2009
Revision: 3455
http://geany.svn.sourceforge.net/geany/?rev=3455&view=rev
Author: eht16
Date: 2009-01-09 18:21:30 +0000 (Fri, 09 Jan 2009)
Log Message:
-----------
Fix broken generation of API docs.
Modified Paths:
--------------
trunk/wscript
Modified: trunk/wscript
===================================================================
--- trunk/wscript 2009-01-09 18:21:12 UTC (rev 3454)
+++ trunk/wscript 2009-01-09 18:21:30 UTC (rev 3455)
@@ -185,7 +185,7 @@
else:
gtk_version = 'Unknown'
# GIO check
- conf.check_cfg(package='gio-2.0', uselib_store='GIO')
+ conf.check_cfg(package='gio-2.0', uselib_store='GIO', mandatory=False)
conf_define_from_opt('LIBDIR', Options.options.libdir, conf.env['PREFIX'] + '/lib')
conf_define_from_opt('DOCDIR', Options.options.docdir, conf.env['DATADIR'] + '/doc/geany')
@@ -366,7 +366,7 @@
# Doxyfile
obj = bld.new_task_gen('subst')
obj.source = 'doc/Doxyfile.in'
- obj.target = 'Doxyfile'
+ obj.target = 'doc/Doxyfile'
obj.install_path = None
obj.dict = { 'VERSION' : VERSION }
@@ -421,10 +421,15 @@
print 'gtk-update-icon-cache -q -f -t %s' % dir
if Options.options.apidoc:
- doxyfile = os.path.join(Build.bld.srcnode.abspath( \
- Build.bld.env), 'doc', 'Doxyfile')
- os.chdir('doc')
- launch('doxygen ' + doxyfile, 'Generating API reference documentation')
+ doxyfile = os.path.join(Build.bld.srcnode.abspath(Build.bld.env), 'doc', 'Doxyfile')
+ cmd = Configure.find_program_impl(Build.bld.env, 'doxygen')
+ if cmd:
+ os.chdir('doc')
+ ret = launch('%s %s' % (cmd, doxyfile), 'Generating API reference documentation')
+ else:
+ Utils.pprint('RED',
+ 'doxygen could not be found. Please install the doxygen package.')
+ sys.exit(1)
if Options.options.htmldoc:
# first try rst2html.py as it is the upstream default, fall back to rst2html
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Commits
mailing list