Recreate the catch2/catch.hpp include path inside repo

Also updates scripts that handle these

projects/CMakeLists.txt

@@ -1,4 +1,3 @@
-
 include(MiscFunctions)
 
 # define the sources of the self test

scripts/generateSingleHeader.py

@@ -24,7 +24,7 @@ def generate(v):
 
     seenHeaders = set([])
     rootPath = os.path.join( catchPath, 'include/' )
-    outputPath = os.path.join( catchPath, 'single_include/catch.hpp' )
+    outputPath = os.path.join( catchPath, 'single_include/catch2/catch.hpp' )
 
     globals = {
         'includeImpl' : True,

scripts/releaseCommon.py

@@ -169,7 +169,7 @@ def performUpdates(version):
     import shutil
     for rep in ('automake', 'tap', 'teamcity'):
         sourceFile = os.path.join(catchPath, 'include/reporters/catch_reporter_{}.hpp'.format(rep))
-        destFile = os.path.join(catchPath, 'single_include/catch_reporter_{}.hpp'.format(rep))
+        destFile = os.path.join(catchPath, 'single_include', 'catch2', 'catch_reporter_{}.hpp'.format(rep))
         shutil.copyfile(sourceFile, destFile)
 
     updateReadmeFile(version)

scripts/updateVcpkgPackage.py

@@ -100,7 +100,7 @@ def git_push(path_to_repo):
     # Don't push, so author can review
     print('Changes were commited to the vcpkg fork. Please check, push and open PR.')
 
-header_hash = get_hash(adjusted_path('single_include/catch.hpp'))
+header_hash = get_hash(adjusted_path('single_include/catch2/catch.hpp'))
 licence_hash = get_hash(adjusted_path('LICENSE.txt'))
 update_control(adjusted_path(default_path))
 update_portfile(adjusted_path(default_path), header_hash, licence_hash)

scripts/updateWandbox.py

@@ -34,7 +34,7 @@ def uploadFiles():
         'code': main_file,
         'codes': [{
             'file': 'catch.hpp',
-            'code': open(os.path.join(catchPath, 'single_include', 'catch.hpp')).read()
+            'code': open(os.path.join(catchPath, 'single_include', 'catch2', 'catch.hpp')).read()
         }],
         'options': 'c++11,cpp-no-pedantic,boost-nothing',
         'compiler-option-raw': '-DCATCH_CONFIG_FAST_COMPILE',

single_include/catch2/catch.hpp

@@ -1,6 +1,6 @@
 /*
  *  Catch v2.2.3
- *  Generated: 2018-06-06 23:11:57.601416
+ *  Generated: 2018-06-11 22:16:30.128800
  *  ----------------------------------------------------------
  *  This file has been merged from multiple headers. Please don't edit it directly
  *  Copyright (c) 2018 Two Blue Cubes Ltd. All rights reserved.