sharpetronics/geany
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

When generating documentation, first try rst2html.py as it is the upstream default.

Browse Source 
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@3022 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Enrico Tröger 2008-09-29 18:09:43 +00:00
parent 0117b3e5b2
commit bb8ffda3f4
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -25,6 +25,9 @@
the correct value from Scintilla and use it (this fixes a display the correct value from Scintilla and use it (this fixes a display
problem with Perl code like 'sub test()'). problem with Perl code like 'sub test()').
Add missing styles for filetype Perl. 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> 2008-09-27 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>

2
doc/Makefile.am
View File

@ -13,7 +13,9 @@ pdf: geany.txt
api-doc: Doxyfile api-doc: Doxyfile
doxygen doxygen
# when generating documentation, first try rst2html.py as it is the upstream default
doc: geany.txt doc: geany.txt
rst2html.py -stg --stylesheet=geany.css $(srcdir)/geany.txt geany.html || \
rst2html -stg --stylesheet=geany.css $(srcdir)/geany.txt geany.html rst2html -stg --stylesheet=geany.css $(srcdir)/geany.txt geany.html
doc-clean: doc-clean:

9
wscript
View File

@ -438,8 +438,12 @@ def shutdown():
if Options.options.htmldoc: if Options.options.htmldoc:
os.chdir('doc') 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') '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: if Options.options.update_po:
# the following code was taken from midori's WAF script, thanks # the following code was taken from midori's WAF script, thanks
@ -467,6 +471,9 @@ def launch(command, status, success_color='GREEN'):
Utils.pprint(success_color, status) Utils.pprint(success_color, status)
try: try:
ret = subprocess.call(command.split()) ret = subprocess.call(command.split())
except OSError, e:
ret = 1
print str(e), ":", command
except: except:
ret = 1 ret = 1