Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' of https://github.com/arangodb/arangodb into devel

This commit is contained in:
Jan Steemann 2015-08-05 11:52:39 +02:00
parent b7faf3aac0 c6521c0b92
commit 0a04083442
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Documentation/Scripts/generateExamples.py
View File

@ -295,8 +295,8 @@ allErrors = err;
################################################################################ ################################################################################
### @brief Try to match the start of a command section ### @brief Try to match the start of a command section
################################################################################ ################################################################################
regularStartLine = re.compile(r'^(/// )?@EXAMPLE_ARANGOSH_OUTPUT{([^}]*)}') regularStartLine = re.compile(r'^(/// )? *@EXAMPLE_ARANGOSH_OUTPUT{([^}]*)}')
runLine = re.compile(r'^(/// )?@EXAMPLE_ARANGOSH_RUN{([^}]*)}') runLine = re.compile(r'^(/// )? *@EXAMPLE_ARANGOSH_RUN{([^}]*)}')
def matchStartLine(line, filename): def matchStartLine(line, filename):
global regularStartLine, errorStartLine, runLine, FilterForTestcase global regularStartLine, errorStartLine, runLine, FilterForTestcase
@ -342,7 +342,7 @@ def matchStartLine(line, filename):
# Not found, remain in STATE_BEGIN # Not found, remain in STATE_BEGIN
return ("", STATE_BEGIN) return ("", STATE_BEGIN)
endExample = re.compile(r'^(/// )?@END_EXAMPLE_') endExample = re.compile(r'^(/// )? *@END_EXAMPLE_')
#r5 = re.compile(r'^ +') #r5 = re.compile(r'^ +')
################################################################################ ################################################################################
@ -576,7 +576,7 @@ def loopDirectories():
if os.path.isdir(filename): if os.path.isdir(filename):
for root, dirs, files in os.walk(filename): for root, dirs, files in os.walk(filename):
for file in files: for file in files:
if (file.endswith(".mdpp") or file.endswith(".js") or file.endswith(".cpp")) and not file.endswith("ahuacatl.js"): if (file.endswith(".mdpp") or file.endswith(".js") or file.endswith(".cpp")):
filenames.append(os.path.join(root, file)) filenames.append(os.path.join(root, file))
else: else:
filenames.append(filename) filenames.append(filename)