Mercurial > hg > evolve

changeset 3056:1a4f26eec0af

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test2rst: ignore the #if/#endif line in the output They are not useful for the rest.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 21 Sep 2017 16:55:17 +0200
parents ef361938dfa1
children f98f3f62f8c4
files docs/makefile docs/test2rst.py
diffstat 2 files changed, 16 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/docs/makefile
+++ b/docs/makefile
@@ -2,10 +2,10 @@
 all: tutorials/tutorial.rst tutorials/topic-tutorial.rst static/logo-evolve.ico
 	sphinx-build . ../html/
 
-tutorials/tutorial.rst: tutorials/tutorial.t
+tutorials/tutorial.rst: tutorials/tutorial.t test2rst.py
 	python test2rst.py tutorials/
 
-tutorials/topic-tutorial.rst: tutorials/topic-tutorial.t
+tutorials/topic-tutorial.rst: tutorials/topic-tutorial.t test2rst.py
 	python test2rst.py tutorials/
 
 static/logo-evolve.ico: static/logo-evolve.svg
--- a/docs/test2rst.py
+++ b/docs/test2rst.py
@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 
+import re
 import os
 import os.path as op
 import sys
@@ -12,6 +13,13 @@
    :maxdepth: 1
 '''
 
+ignored_patterns = [
+    re.compile('^#if'),
+    re.compile('^#else'),
+    re.compile('^#endif'),
+    re.compile('#rest-ignore$'),
+]
+
 
 def rstify(orig, name):
     newlines = []
@@ -28,8 +36,12 @@
             sphinx_directive_mode = False
             continue
 
-        # Ignore line
-        if line.endswith('#rest-ignore'):
+        ignored = False
+        for pattern in ignored_patterns:
+            if pattern.search(line):
+                ignored = True
+                break
+        if ignored:
             continue
 
         # Sphinx directives mode