Revision: 3022 http://geany.svn.sourceforge.net/geany/?rev=3022&view=rev Author: eht16 Date: 2008-09-29 18:09:43 +0000 (Mon, 29 Sep 2008)

Log Message: ----------- When generating documentation, first try rst2html.py as it is the upstream default.

Modified Paths: -------------- trunk/ChangeLog trunk/doc/Makefile.am trunk/wscript

Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-09-29 12:44:31 UTC (rev 3021) +++ trunk/ChangeLog 2008-09-29 18:09:43 UTC (rev 3022) @@ -25,6 +25,9 @@ the correct value from Scintilla and use it (this fixes a display problem with Perl code like 'sub test()'). Add missing styles for filetype Perl. + * doc/Makefile.am, wscript: + When generating documentation, first try rst2html.py as it is + the upstream default.

2008-09-27 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>

Modified: trunk/doc/Makefile.am =================================================================== --- trunk/doc/Makefile.am 2008-09-29 12:44:31 UTC (rev 3021) +++ trunk/doc/Makefile.am 2008-09-29 18:09:43 UTC (rev 3022) @@ -13,7 +13,9 @@ api-doc: Doxyfile doxygen

+# when generating documentation, first try rst2html.py as it is the upstream default doc: geany.txt + rst2html.py -stg --stylesheet=geany.css $(srcdir)/geany.txt geany.html || \ rst2html -stg --stylesheet=geany.css $(srcdir)/geany.txt geany.html

doc-clean:

Modified: trunk/wscript =================================================================== --- trunk/wscript 2008-09-29 12:44:31 UTC (rev 3021) +++ trunk/wscript 2008-09-29 18:09:43 UTC (rev 3022) @@ -438,8 +438,12 @@

if Options.options.htmldoc: os.chdir('doc') - launch('rst2html -stg --stylesheet=geany.css geany.txt geany.html', + # first try rst2html.py as it is the upstream default + ret = launch('rst2html.py -stg --stylesheet=geany.css geany.txt geany.html', 'Generating HTML documentation') + if not ret == 0: + launch('rst2html -stg --stylesheet=geany.css geany.txt geany.html', + 'Generating HTML documentation (using fallback "rst2html")')

if Options.options.update_po: # the following code was taken from midori's WAF script, thanks @@ -467,6 +471,9 @@ Utils.pprint(success_color, status) try: ret = subprocess.call(command.split()) + except OSError, e: + ret = 1 + print str(e), ":", command except: ret = 1

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.