Kaydet (Commit) 2762a61d authored tarafından Enrico Tröger's avatar Enrico Tröger

Fix broken generation of API docs.

git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@3455 ea778897-0a13-0410-b9d1-a72fbfd435f5
üst 787a6802
......@@ -185,7 +185,7 @@ def configure(conf):
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 @@ def build(bld):
# 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 @@ def shutdown():
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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment