SF.net SVN: geany:[3207] trunk
eht16 at users.sourceforge.net
eht16 at xxxxx
Tue Nov 11 18:07:16 UTC 2008
Revision: 3207
http://geany.svn.sourceforge.net/geany/?rev=3207&view=rev
Author: eht16
Date: 2008-11-11 18:07:16 +0000 (Tue, 11 Nov 2008)
Log Message:
-----------
Improve the checking for 'rst2html.py' when creating HTML docs.
Update Waf to 1.5.0 (final).
Modified Paths:
--------------
trunk/doc/Makefile.am
trunk/waf
trunk/wscript
Modified: trunk/doc/Makefile.am
===================================================================
--- trunk/doc/Makefile.am 2008-11-11 17:42:54 UTC (rev 3206)
+++ trunk/doc/Makefile.am 2008-11-11 18:07:16 UTC (rev 3207)
@@ -18,6 +18,7 @@
# when generating documentation, first try rst2html.py as it is the upstream default
doc: geany.txt
+ (rst2html.py --version) < /dev/null > /dev/null 2>&1 && \
rst2html.py -stg --stylesheet=geany.css $(srcdir)/geany.txt geany.html || \
rst2html -stg --stylesheet=geany.css $(srcdir)/geany.txt geany.html
Modified: trunk/waf
===================================================================
--- trunk/waf 2008-11-11 17:42:54 UTC (rev 3206)
+++ trunk/waf 2008-11-11 18:07:16 UTC (rev 3207)
@@ -38,10 +38,10 @@
except:pass
VERSION="1.5.0"
-REVISION="e0730d02f63846cebb6d4c8b0dad1f79"
+REVISION="80c6ad48eea21944e014f0f0e609ef9c"
INSTALL=sys.platform=='win32' and 'c:/temp' or '/usr/local'
C1='#('
-C2='#%'
+C2='#&'
cwd = os.getcwd()
join = os.path.join
@@ -127,5 +127,5 @@
Scripting.prepare(t, cwd, VERSION, wafdir)
#==>
@@ Diff output truncated at 100000 characters. @@
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