From d65b09fb8ae48ca245d055b32c0d651a536c2e27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Ho=C5=99e=C5=88ovsk=C3=BD?= Date: Mon, 11 Jun 2018 22:12:14 +0200 Subject: [PATCH] Recreate the catch2/catch.hpp include path inside repo Also updates scripts that handle these --- projects/CMakeLists.txt | 1 - scripts/generateSingleHeader.py | 2 +- scripts/releaseCommon.py | 2 +- scripts/updateVcpkgPackage.py | 2 +- scripts/updateWandbox.py | 2 +- single_include/{ => catch2}/catch.hpp | 2 +- single_include/{ => catch2}/catch_reporter_automake.hpp | 0 single_include/{ => catch2}/catch_reporter_tap.hpp | 0 single_include/{ => catch2}/catch_reporter_teamcity.hpp | 0 9 files changed, 5 insertions(+), 6 deletions(-) rename single_include/{ => catch2}/catch.hpp (99%) rename single_include/{ => catch2}/catch_reporter_automake.hpp (100%) rename single_include/{ => catch2}/catch_reporter_tap.hpp (100%) rename single_include/{ => catch2}/catch_reporter_teamcity.hpp (100%) diff --git a/projects/CMakeLists.txt b/projects/CMakeLists.txt index f0a8c258..94235d1c 100644 --- a/projects/CMakeLists.txt +++ b/projects/CMakeLists.txt @@ -1,4 +1,3 @@ - include(MiscFunctions) # define the sources of the self test diff --git a/scripts/generateSingleHeader.py b/scripts/generateSingleHeader.py index c3ce1aec..22b882ab 100755 --- a/scripts/generateSingleHeader.py +++ b/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, diff --git a/scripts/releaseCommon.py b/scripts/releaseCommon.py index 6e44da24..1a8ee2c8 100644 --- a/scripts/releaseCommon.py +++ b/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) diff --git a/scripts/updateVcpkgPackage.py b/scripts/updateVcpkgPackage.py index c1f40b59..c649c62b 100644 --- a/scripts/updateVcpkgPackage.py +++ b/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) diff --git a/scripts/updateWandbox.py b/scripts/updateWandbox.py index 5785feb4..564f9489 100644 --- a/scripts/updateWandbox.py +++ b/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', diff --git a/single_include/catch.hpp b/single_include/catch2/catch.hpp similarity index 99% rename from single_include/catch.hpp rename to single_include/catch2/catch.hpp index 28448ddb..6fac1e7c 100644 --- a/single_include/catch.hpp +++ b/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. diff --git a/single_include/catch_reporter_automake.hpp b/single_include/catch2/catch_reporter_automake.hpp similarity index 100% rename from single_include/catch_reporter_automake.hpp rename to single_include/catch2/catch_reporter_automake.hpp diff --git a/single_include/catch_reporter_tap.hpp b/single_include/catch2/catch_reporter_tap.hpp similarity index 100% rename from single_include/catch_reporter_tap.hpp rename to single_include/catch2/catch_reporter_tap.hpp diff --git a/single_include/catch_reporter_teamcity.hpp b/single_include/catch2/catch_reporter_teamcity.hpp similarity index 100% rename from single_include/catch_reporter_teamcity.hpp rename to single_include/catch2/catch_reporter_teamcity.hpp