fix issue in gen_stats_doc.py and make travis only generate the .rst files since docutils is too old

This commit is contained in:
arvidn 2015-12-20 02:02:09 -05:00
parent 673613a160
commit 1a6792609d
3 changed files with 8 additions and 2 deletions

View File

@ -72,7 +72,8 @@ install:
- rst2html --version - rst2html --version
script: script:
- if [[ $docs == "1" && $TRAVIS_OS_NAME == "linux" ]]; then cd docs; make RST2HTML=rst2html; cd ..; fi # disable invoking docutils for now, until we can have a modern version of it
- if [[ $docs == "1" && $TRAVIS_OS_NAME == "linux" ]]; then cd docs; make rst RST2HTML=rst2html; cd ..; fi
- cd test - cd test
- bjam --hash -j3 warnings-as-errors=on variant=$variant -l900 $coverage_toolset $target - bjam --hash -j3 warnings-as-errors=on variant=$variant -l900 $coverage_toolset $target
# if we're building with code coverage, report it as soon as possible # if we're building with code coverage, report it as soon as possible

View File

@ -7,9 +7,12 @@ f = open('../include/libtorrent/performance_counters.hpp')
counter_type = '' counter_type = ''
for l in f: for l in f:
# ignore anything after //
if '//' in l: l = l.split('//')[0]
l = l.strip() l = l.strip()
if l.startswith('//'): continue
if l.startswith('#'): continue if l.startswith('#'): continue
if l == '': continue if l == '': continue

View File

@ -55,6 +55,8 @@ FIGURES = \
disk_cache \ disk_cache \
troubleshooting troubleshooting
rst: $(TARGETS:=.rst) $(FIGURES:=.png) todo.html
html: $(TARGETS:=.html) $(FIGURES:=.png) todo.html html: $(TARGETS:=.html) $(FIGURES:=.png) todo.html
pdf: $(TARGETS:=.pdf) $(FIGURES:=.eps) pdf: $(TARGETS:=.pdf) $(FIGURES:=.eps)