Moved scripts into their own folder

scripts/approvalTests.py

@@ -0,0 +1,54 @@
+import os
+import sys
+import subprocess
+import re
+
+filenameParser = re.compile( r'\s*.*/(.*\..pp)(.*)' )
+hexParser = re.compile( r'(.*)\b(0[xX][0-9a-fA-F]+)\b(.*)' )
+
+catchPath = os.path.realpath(os.path.dirname(sys.argv[0]))
+baselinesPath = os.path.join( catchPath, '../projects/SelfTest/Baselines/approvedResults.txt' )
+rawResultsPath = os.path.join( catchPath, '../projects/SelfTest/Baselines/_rawResults.tmp' )
+filteredResultsPath = os.path.join( catchPath, '../projects/SelfTest/Baselines/unapprovedResults.txt' )
+
+if len(sys.argv) == 2:
+	cmdPath = sys.argv[1]
+else:
+	cmdPath = "../projects/XCode4/CatchSelfTest/DerivedData/CatchSelfTest/Build/Products/Debug/CatchSelfTest"
+
+f = open( rawResultsPath, 'w' )
+subprocess.call([ cmdPath, "~dummy", "-s", "-w", "NoAssertions", "-r", "console" ], stdout=f, stderr=f )
+subprocess.call([ cmdPath, "~dummy", "-s", "-w", "NoAssertions", "-r", "console", "-a", "4" ], stdout=f, stderr=f )
+subprocess.call([ cmdPath, "~dummy", "-s", "-w", "NoAssertions", "-r", "junit" ], stdout=f, stderr=f )
+subprocess.call([ cmdPath, "~dummy", "-s", "-w", "NoAssertions", "-r", "xml" ], stdout=f, stderr=f )
+subprocess.call([ cmdPath, "~dummy", "-s", "-w", "NoAssertions", "-r", "basic" ], stdout=f, stderr=f )
+subprocess.call([ cmdPath, "~dummy", "-s", "-w", "NoAssertions", "-r", "basic", "-a", "4" ], stdout=f, stderr=f )
+f.close()
+
+rawFile = open( rawResultsPath, 'r' )
+filteredFile = open( filteredResultsPath, 'w' )
+for line in rawFile:
+	m = filenameParser.match( line )
+	if m:
+		line = m.group(1) + m.group(2)
+
+	while True:
+		m = hexParser.match( line )
+		if m:
+			line = m.group(1) + "0x<hex digits>" + m.group(3)
+		else:
+			break
+	filteredFile.write( line.rstrip() + "\n" )
+filteredFile.close()
+rawFile.close()
+
+os.remove( rawResultsPath )
+print
+diffResult = subprocess.call([ "diff", baselinesPath, filteredResultsPath ] )
+if diffResult == 0:
+	os.remove( filteredResultsPath )
+	print "\033[92mResults matched"
+else:
+	print "\n****************************\n\033[91mResults differed"
+print "\033[0m"
+exit( diffResult)

scripts/approve.py

@@ -0,0 +1,13 @@
+import os
+import sys
+import shutil
+
+catchPath = os.path.realpath(os.path.dirname(sys.argv[0]))
+baselinesPath = os.path.join( catchPath, '../projects/SelfTest/Baselines/approvedResults.txt' )
+filteredResultsPath = os.path.join( catchPath, '../projects/SelfTest/Baselines/unapprovedResults.txt' )
+
+if os.path.isfile( filteredResultsPath ):
+	os.remove( baselinesPath )
+	os.rename( filteredResultsPath, baselinesPath )
+else:
+	print "approval file " + filteredResultsPath + " does not exist"

scripts/generateSingleHeader.py

@@ -0,0 +1,113 @@
+import os
+import sys
+import re
+import datetime
+
+versionParser = re.compile( r'(\s*Version\slibraryVersion)\s*\(\s*(.*)\s*,\s*(.*)\s*,\s*(.*)\s*,\s*\"(.*)\"\s*\).*' )
+includesParser = re.compile( r'\s*#include\s*"(.*)"' )
+guardParser = re.compile( r'\s*#.*_INCLUDED')
+defineParser = re.compile( r'\s*#define')
+commentParser1 = re.compile( r'^\s*/\*')
+commentParser2 = re.compile( r'^\s*\*')
+blankParser = re.compile( r'^\s*$')
+seenHeaders = set([])
+catchPath = os.path.realpath(os.path.dirname(sys.argv[0]))
+rootPath = os.path.join( catchPath, '../include/' )
+versionPath = os.path.join( rootPath, "internal/catch_version.hpp" )
+readmePath = os.path.join( catchPath, "../README.md" )
+#outputPath = os.path.join( catchPath, 'single_include/catch.hpp' )
+
+bumpVersion = len(sys.argv) < 2 or sys.argv[1] <> "nobump"
+
+def parseFile( path, filename ):
+	f = open( path + filename, 'r' )
+	blanks = 0
+	for line in f:
+		m = includesParser.match( line )
+		if m:
+			header = m.group(1)
+			headerPath, sep, headerFile = header.rpartition( "/" )
+			if not headerFile in seenHeaders:
+				seenHeaders.add( headerFile )
+				print "// #included from: " + header
+				if( headerPath == "internal" and path.endswith( "internal/" ) ):
+					headerPath = ""
+					sep = ""
+				if os.path.exists( path + headerPath + sep + headerFile ):
+					parseFile( path + headerPath + sep, headerFile )
+				else:
+					parseFile( rootPath + headerPath + sep, headerFile )
+		elif (not guardParser.match( line ) or defineParser.match( line ) ) and not commentParser1.match( line )and not commentParser2.match( line ):
+			if blankParser.match( line ):
+				blanks = blanks + 1
+			else:
+				blanks = 0
+			if blanks < 2:
+				print line.rstrip()
+
+class Version:
+	def __init__(self):
+		f = open( versionPath, 'r' )
+		for line in f:
+			m = versionParser.match( line )
+			if m:
+				self.variableDecl = m.group(1)
+				self.majorVersion = int(m.group(2))
+				self.minorVersion = int(m.group(3))
+				self.buildNumber = int(m.group(4))
+				self.branchName = m.group(5)
+		f.close()
+
+	def incrementBuildNumber(self):
+		self.buildNumber = self.buildNumber+1
+
+	def updateVersionFile(self):
+		f = open( versionPath, 'r' )
+		lines = []
+		for line in f:
+			m = versionParser.match( line )
+			if m:
+				lines.append( '{0}( {1}, {2}, {3}, "{4}" );'.format( self.variableDecl, self.majorVersion, self.minorVersion, self.buildNumber, self.branchName ) )
+			else:
+				lines.append( line.rstrip() )
+		f.close()
+		f = open( versionPath, 'w' )
+		for line in lines:
+			f.write( line + "\n" )
+
+	def updateReadmeFile(self):
+		f = open( readmePath, 'r' )
+		lines = []
+		for line in f:
+			lines.append( line.rstrip() )
+		f.close()
+		f = open( readmePath, 'w' )
+		for line in lines:
+			if line.startswith( "## CATCH" ):
+				f.write( '## CATCH v{0}.{1} build {2} ({3} branch)\n'.format( self.majorVersion, self.minorVersion, self.buildNumber, self.branchName ) )
+			else:
+				f.write( line + "\n" )
+
+def generateSingleInclude():
+	v = Version()
+	if bumpVersion:
+		v.incrementBuildNumber()
+		v.updateVersionFile()
+		v.updateReadmeFile()
+	print "/*"
+	print " *  CATCH v{0}.{1} build {2} ({3} branch)".format( v.majorVersion, v.minorVersion, v.buildNumber, v.branchName )
+	print " *  Generated: " + str( datetime.datetime.now() )
+	print " *  ----------------------------------------------------------"
+	print " *  This file has been merged from multiple headers. Please don't edit it directly"
+	print " *  Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved."
+	print " *"
+	print " *  Distributed under the Boost Software License, Version 1.0. (See accompanying"
+	print " *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)"
+	print " */"
+	print '#ifndef TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED'
+	print '#define TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED'
+	parseFile( rootPath, 'catch.hpp' )
+	print '#endif // TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED'
+	print
+
+generateSingleInclude()