Fixed file globbing in documentation parsers

This commit is contained in:
Andrey Kamaev 2012-07-05 05:11:15 +00:00
parent acf356b080
commit 5f8715c8b4
2 changed files with 13 additions and 6 deletions

View File

@ -1,7 +1,7 @@
import os, sys, glob, re import os, sys, fnmatch, re
sys.path.append("../modules/python/src2/") sys.path.append("../modules/python/src2/")
sys.path.append("../modules/java/") sys.path.append("../modules/java/generator")
import hdr_parser as hp import hdr_parser as hp
import rst_parser as rp import rst_parser as rp
@ -185,8 +185,10 @@ def process_module(module, path):
rstparser.parse(module, path) rstparser.parse(module, path)
rst = rstparser.definitions rst = rstparser.definitions
hdrlist = glob.glob(os.path.join(path, "include", "opencv2", module, "*.h*")) hdrlist = []
hdrlist.extend(glob.glob(os.path.join(path, "include", "opencv2", module, "detail", "*.h*"))) for root, dirs, files in os.walk(os.path.join(path, "include")):
for filename in fnmatch.filter(files, "*.h*"):
hdrlist.append(os.path.join(root, filename))
if module == "gpu": if module == "gpu":
hdrlist.append(os.path.join(path, "..", "core", "include", "opencv2", "core", "devmem2d.hpp")) hdrlist.append(os.path.join(path, "..", "core", "include", "opencv2", "core", "devmem2d.hpp"))

View File

@ -1,4 +1,4 @@
import os, sys, re, string, glob import os, sys, re, string, fnmatch
allmodules = ["core", "flann", "imgproc", "ml", "highgui", "video", "features2d", "calib3d", "objdetect", "legacy", "contrib", "gpu", "androidcamera", "java", "python", "stitching", "ts", "photo", "nonfree", "videostab"] allmodules = ["core", "flann", "imgproc", "ml", "highgui", "video", "features2d", "calib3d", "objdetect", "legacy", "contrib", "gpu", "androidcamera", "java", "python", "stitching", "ts", "photo", "nonfree", "videostab"]
verbose = False verbose = False
show_warnings = True show_warnings = True
@ -125,7 +125,12 @@ class RstParser(object):
def parse(self, module_name, module_path=None): def parse(self, module_name, module_path=None):
if module_path is None: if module_path is None:
module_path = "../" + module_name module_path = "../" + module_name
doclist = glob.glob(os.path.join(module_path,"doc/*.rst"))
doclist = []
for root, dirs, files in os.walk(os.path.join(module_path,"doc")):
for filename in fnmatch.filter(files, "*.rst"):
doclist.append(os.path.join(root, filename))
for doc in doclist: for doc in doclist:
self.parse_rst_file(module_name, doc) self.parse_rst_file(module_name, doc)