eden-emu/Catch2
15
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-05-25 05:59:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Modified generateSingleHeader script to work with .cpp files better

Browse source 
Also fixed the scripts to take into account renamed version file
This commit is contained in:
Martin Hořeňovský 2017-07-09 20:58:51 +02:00
parent fc32165d48
commit 93f84b5b0d
3 changed files with 19 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

16
scripts/generateSingleHeader.py
View file

@ -7,6 +7,7 @@ import sys
import re
import datetime
import string
from glob import glob
from scriptCommon import catchPath
from releaseCommon import Version
@ -21,6 +22,7 @@ ifImplParser = re.compile( r'\s*#ifdef CATCH_CONFIG_RUNNER' )
commentParser1 = re.compile( r'^\s*/\*')
commentParser2 = re.compile( r'^ \*')
blankParser = re.compile( r'^\s*$')
seenHeaders = set([])
rootPath = os.path.join( catchPath, 'include/' )
outputPath = os.path.join( catchPath, 'single_include/catch.hpp' )
@ -49,13 +51,25 @@ def write( line ):
if includeImpl or implIfDefs == -1:
out.write( line )
def insertCpps():
dirs = [os.path.join( rootPath, s) for s in ['', 'internal', 'reporters']]
cppFiles = []
for dir in dirs:
cppFiles += glob(os.path.join(dir, '*.cpp'))
for fname in cppFiles:
dir, name = fname.rsplit(os.path.sep, 1)
dir += os.path.sep
parseFile(dir, name)
def parseFile( path, filename ):
global ifdefs
global implIfDefs
f = open( path + filename, 'r' )
f = open( os.path.join(path, filename), 'r' )
blanks = 0
for line in f:
if '// ~*~* CATCH_CPP_STITCH_PLACE *~*~' in line:
insertCpps()
if ifParser.match( line ):
ifdefs = ifdefs + 1
elif endIfParser.match( line ):