From 6eb04667ad4f571f20b040c5e7a4e0c25e99787c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Ho=C5=99e=C5=88ovsk=C3=BD?=
 <martin.horenovsky@gmail.com>
Date: Fri, 6 Dec 2019 11:40:53 +0100
Subject: [PATCH] Move misc/ to tools/misc

---
 appveyor.yml                                              | 2 +-
 tests/CMakeLists.txt                                      | 2 +-
 {misc => tools/misc}/CMakeLists.txt                       | 0
 {misc => tools/misc}/SelfTest.vcxproj.user                | 0
 {misc => tools/misc}/appveyorBuildConfigurationScript.bat | 2 +-
 {misc => tools/misc}/appveyorMergeCoverageScript.py       | 0
 {misc => tools/misc}/appveyorTestRunScript.bat            | 2 +-
 {misc => tools/misc}/coverage-helper.cpp                  | 0
 {misc => tools/misc}/installOpenCppCoverage.ps1           | 0
 9 files changed, 4 insertions(+), 4 deletions(-)
 rename {misc => tools/misc}/CMakeLists.txt (100%)
 rename {misc => tools/misc}/SelfTest.vcxproj.user (100%)
 rename {misc => tools/misc}/appveyorBuildConfigurationScript.bat (92%)
 rename {misc => tools/misc}/appveyorMergeCoverageScript.py (100%)
 rename {misc => tools/misc}/appveyorTestRunScript.bat (85%)
 rename {misc => tools/misc}/coverage-helper.cpp (100%)
 rename {misc => tools/misc}/installOpenCppCoverage.ps1 (100%)

diff --git a/appveyor.yml b/appveyor.yml
index 3b190566..485732a9 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -18,7 +18,7 @@ init:
 
 install:
   - ps: if (($env:CONFIGURATION) -eq "Debug" -And ($env:coverage) -eq "1" ) { pip --disable-pip-version-check install codecov }
-  - ps: if (($env:CONFIGURATION) -eq "Debug" -And ($env:coverage) -eq "1" ) { .\misc\installOpenCppCoverage.ps1 }
+  - ps: if (($env:CONFIGURATION) -eq "Debug" -And ($env:coverage) -eq "1" ) { .\tools\misc\installOpenCppCoverage.ps1 }
 
 
 before_build:
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index a66b009c..9708fb0d 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -6,7 +6,7 @@ include(MiscFunctions)
 # until 3.13 (not yet released)
 ####
 if (MSVC)
-configure_file(${CATCH_DIR}/misc/SelfTest.vcxproj.user
+configure_file(${CATCH_DIR}/tools/misc/SelfTest.vcxproj.user
                ${CMAKE_BINARY_DIR}/tests
                COPYONLY)
 endif(MSVC) #Temporary workaround
diff --git a/misc/CMakeLists.txt b/tools/misc/CMakeLists.txt
similarity index 100%
rename from misc/CMakeLists.txt
rename to tools/misc/CMakeLists.txt
diff --git a/misc/SelfTest.vcxproj.user b/tools/misc/SelfTest.vcxproj.user
similarity index 100%
rename from misc/SelfTest.vcxproj.user
rename to tools/misc/SelfTest.vcxproj.user
diff --git a/misc/appveyorBuildConfigurationScript.bat b/tools/misc/appveyorBuildConfigurationScript.bat
similarity index 92%
rename from misc/appveyorBuildConfigurationScript.bat
rename to tools/misc/appveyorBuildConfigurationScript.bat
index f07bb707..5933da38 100644
--- a/misc/appveyorBuildConfigurationScript.bat
+++ b/tools/misc/appveyorBuildConfigurationScript.bat
@@ -8,7 +8,7 @@ SETLOCAL EnableDelayedExpansion
 if "%CONFIGURATION%"=="Debug" (
   if "%coverage%"=="1" (
     @REM # coverage needs to build the special helper as well as the main
-    cmake -Hmisc -Bbuild-misc -A%PLATFORM% || exit /b !ERRORLEVEL!
+    cmake -Htools/misc -Bbuild-misc -A%PLATFORM% || exit /b !ERRORLEVEL!
     cmake --build build-misc || exit /b !ERRORLEVEL!
     cmake -H. -BBuild -A%PLATFORM% -DUSE_WMAIN=%wmain% -DMEMORYCHECK_COMMAND=build-misc\Debug\CoverageHelper.exe -DMEMORYCHECK_COMMAND_OPTIONS=--sep-- -DMEMORYCHECK_TYPE=Valgrind || exit /b !ERRORLEVEL! || exit /b !ERRORLEVEL!
   ) else (
diff --git a/misc/appveyorMergeCoverageScript.py b/tools/misc/appveyorMergeCoverageScript.py
similarity index 100%
rename from misc/appveyorMergeCoverageScript.py
rename to tools/misc/appveyorMergeCoverageScript.py
diff --git a/misc/appveyorTestRunScript.bat b/tools/misc/appveyorTestRunScript.bat
similarity index 85%
rename from misc/appveyorTestRunScript.bat
rename to tools/misc/appveyorTestRunScript.bat
index c129d99e..c491d507 100644
--- a/misc/appveyorTestRunScript.bat
+++ b/tools/misc/appveyorTestRunScript.bat
@@ -4,7 +4,7 @@ cd Build
 if "%CONFIGURATION%"=="Debug" (
   if "%coverage%"=="1" (
     ctest -j 2 -C %CONFIGURATION% -D ExperimentalMemCheck || exit /b !ERRORLEVEL!
-    python ..\misc\appveyorMergeCoverageScript.py || exit /b !ERRORLEVEL!
+    python ..\tools\misc\appveyorMergeCoverageScript.py || exit /b !ERRORLEVEL!
     codecov --root .. --no-color --disable gcov -f cobertura.xml -t %CODECOV_TOKEN% || exit /b !ERRORLEVEL!
   ) else (
     ctest -j 2 -C %CONFIGURATION% || exit /b !ERRORLEVEL!
diff --git a/misc/coverage-helper.cpp b/tools/misc/coverage-helper.cpp
similarity index 100%
rename from misc/coverage-helper.cpp
rename to tools/misc/coverage-helper.cpp
diff --git a/misc/installOpenCppCoverage.ps1 b/tools/misc/installOpenCppCoverage.ps1
similarity index 100%
rename from misc/installOpenCppCoverage.ps1
rename to tools/misc/installOpenCppCoverage.ps1