Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMartin Hořeňovský2019-12-06 11:53:31 +0100
committerMartin Hořeňovský2019-12-06 11:53:31 +0100
commit91ee07e08c5a72536834960ecf2527fa90244046 (patch)
treeee7bf0251c746a50e6e871cf00ea52baf9ed44ec
parent6eb04667ad4f571f20b040c5e7a4e0c25e99787c (diff)
downloadcatch3-91ee07e08c5a72536834960ecf2527fa90244046.tar.gz
Moved scripts/ to tools/scripts/
-rw-r--r--.travis.yml2
-rw-r--r--docs/contributing.md2
-rw-r--r--docs/release-process.md2
-rw-r--r--tests/CMakeLists.txt2
-rwxr-xr-xtools/scripts/approvalTests.py (renamed from scripts/approvalTests.py)0
-rwxr-xr-xtools/scripts/approve.py (renamed from scripts/approve.py)0
-rwxr-xr-xtools/scripts/benchmarkCompile.py (renamed from scripts/benchmarkCompile.py)0
-rwxr-xr-xtools/scripts/benchmarkRunner.py (renamed from scripts/benchmarkRunner.py)0
-rwxr-xr-xtools/scripts/developBuild.py (renamed from scripts/developBuild.py)0
-rw-r--r--tools/scripts/embed.py (renamed from scripts/embed.py)0
-rwxr-xr-xtools/scripts/embedClara.py (renamed from scripts/embedClara.py)0
-rw-r--r--tools/scripts/extractFeaturesFromReleaseNotes.py (renamed from scripts/extractFeaturesFromReleaseNotes.py)0
-rwxr-xr-xtools/scripts/fixWhitespace.py (renamed from scripts/fixWhitespace.py)0
-rwxr-xr-xtools/scripts/generateSingleHeader.py (renamed from scripts/generateSingleHeader.py)0
-rwxr-xr-xtools/scripts/majorRelease.py (renamed from scripts/majorRelease.py)0
-rwxr-xr-xtools/scripts/minorRelease.py (renamed from scripts/minorRelease.py)0
-rwxr-xr-xtools/scripts/patchRelease.py (renamed from scripts/patchRelease.py)0
-rw-r--r--tools/scripts/releaseCommon.py (renamed from scripts/releaseCommon.py)0
-rwxr-xr-xtools/scripts/releaseNotes.py (renamed from scripts/releaseNotes.py)0
-rw-r--r--tools/scripts/scriptCommon.py (renamed from scripts/scriptCommon.py)2
-rw-r--r--tools/scripts/updateDocumentToC.py (renamed from scripts/updateDocumentToC.py)0
-rw-r--r--tools/scripts/updateWandbox.py (renamed from scripts/updateWandbox.py)0
22 files changed, 5 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index 837ec890..18766e52 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -175,7 +175,7 @@ before_script:
- export CXX=${COMPILER}
- cd ${TRAVIS_BUILD_DIR}
# Regenerate single header file, so it is tested in the examples...
- - python scripts/generateSingleHeader.py
+ - python tools/scripts/generateSingleHeader.py
- |
if [[ ${CPP17} -eq 1 ]]; then
diff --git a/docs/contributing.md b/docs/contributing.md
index 5429bf9d..2bfd2a92 100644
--- a/docs/contributing.md
+++ b/docs/contributing.md
@@ -35,7 +35,7 @@ While these files are not essential to compilation they help to keep the impleme
At time of writing this set is not complete but has reasonable coverage.
If you add additional headers please try to remember to add a surrogate cpp for it.
-The other directories are `scripts` which contains a set of python scripts to help in testing Catch as well as
+The other directories are `tools/scripts` which contains a set of python scripts to help in testing Catch as well as
generating the single include, and `docs`, which contains the documentation as a set of markdown files.
__When submitting a pull request please do not include changes to the single include, or to the version number file
diff --git a/docs/release-process.md b/docs/release-process.md
index ca48da03..1b39b1f2 100644
--- a/docs/release-process.md
+++ b/docs/release-process.md
@@ -1,7 +1,7 @@
<a id="top"></a>
# How to release
-When enough changes have accumulated, it is time to release new version of Catch. This document describes the process in doing so, that no steps are forgotten. Note that all referenced scripts can be found in the `scripts/` directory.
+When enough changes have accumulated, it is time to release new version of Catch. This document describes the process in doing so, that no steps are forgotten. Note that all referenced scripts can be found in the `tools/scripts/` directory.
## Necessary steps
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 9708fb0d..f65f5100 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -213,7 +213,7 @@ add_test(NAME FilteredSection-2 COMMAND $<TARGET_FILE:SelfTest> \#1394\ nested -
set_tests_properties(FilteredSection-2 PROPERTIES FAIL_REGULAR_EXPRESSION "No tests ran")
# AppVeyor has a Python 2.7 in path, but doesn't have .py files as autorunnable
-add_test(NAME ApprovalTests COMMAND ${PYTHON_EXECUTABLE} ${CATCH_DIR}/scripts/approvalTests.py $<TARGET_FILE:SelfTest>)
+add_test(NAME ApprovalTests COMMAND ${PYTHON_EXECUTABLE} ${CATCH_DIR}/tools/scripts/approvalTests.py $<TARGET_FILE:SelfTest>)
set_tests_properties(ApprovalTests PROPERTIES FAIL_REGULAR_EXPRESSION "Results differed")
add_test(NAME RegressionCheck-1670 COMMAND $<TARGET_FILE:SelfTest> "#1670 regression check" -c A -r compact)
diff --git a/scripts/approvalTests.py b/tools/scripts/approvalTests.py
index 18a34959..18a34959 100755
--- a/scripts/approvalTests.py
+++ b/tools/scripts/approvalTests.py
diff --git a/scripts/approve.py b/tools/scripts/approve.py
index 252d08ec..252d08ec 100755
--- a/scripts/approve.py
+++ b/tools/scripts/approve.py
diff --git a/scripts/benchmarkCompile.py b/tools/scripts/benchmarkCompile.py
index 586c26ac..586c26ac 100755
--- a/scripts/benchmarkCompile.py
+++ b/tools/scripts/benchmarkCompile.py
diff --git a/scripts/benchmarkRunner.py b/tools/scripts/benchmarkRunner.py
index dc753cf0..dc753cf0 100755
--- a/scripts/benchmarkRunner.py
+++ b/tools/scripts/benchmarkRunner.py
diff --git a/scripts/developBuild.py b/tools/scripts/developBuild.py
index a8115fe2..a8115fe2 100755
--- a/scripts/developBuild.py
+++ b/tools/scripts/developBuild.py
diff --git a/scripts/embed.py b/tools/scripts/embed.py
index 66757033..66757033 100644
--- a/scripts/embed.py
+++ b/tools/scripts/embed.py
diff --git a/scripts/embedClara.py b/tools/scripts/embedClara.py
index 7ceb3e32..7ceb3e32 100755
--- a/scripts/embedClara.py
+++ b/tools/scripts/embedClara.py
diff --git a/scripts/extractFeaturesFromReleaseNotes.py b/tools/scripts/extractFeaturesFromReleaseNotes.py
index 090f4772..090f4772 100644
--- a/scripts/extractFeaturesFromReleaseNotes.py
+++ b/tools/scripts/extractFeaturesFromReleaseNotes.py
diff --git a/scripts/fixWhitespace.py b/tools/scripts/fixWhitespace.py
index bfa4aa08..bfa4aa08 100755
--- a/scripts/fixWhitespace.py
+++ b/tools/scripts/fixWhitespace.py
diff --git a/scripts/generateSingleHeader.py b/tools/scripts/generateSingleHeader.py
index f8968774..f8968774 100755
--- a/scripts/generateSingleHeader.py
+++ b/tools/scripts/generateSingleHeader.py
diff --git a/scripts/majorRelease.py b/tools/scripts/majorRelease.py
index 8da34066..8da34066 100755
--- a/scripts/majorRelease.py
+++ b/tools/scripts/majorRelease.py
diff --git a/scripts/minorRelease.py b/tools/scripts/minorRelease.py
index 6e71cd80..6e71cd80 100755
--- a/scripts/minorRelease.py
+++ b/tools/scripts/minorRelease.py
diff --git a/scripts/patchRelease.py b/tools/scripts/patchRelease.py
index 14176420..14176420 100755
--- a/scripts/patchRelease.py
+++ b/tools/scripts/patchRelease.py
diff --git a/scripts/releaseCommon.py b/tools/scripts/releaseCommon.py
index 283337d4..283337d4 100644
--- a/scripts/releaseCommon.py
+++ b/tools/scripts/releaseCommon.py
diff --git a/scripts/releaseNotes.py b/tools/scripts/releaseNotes.py
index 5e770bba..5e770bba 100755
--- a/scripts/releaseNotes.py
+++ b/tools/scripts/releaseNotes.py
diff --git a/scripts/scriptCommon.py b/tools/scripts/scriptCommon.py
index eadf9ff3..a6930063 100644
--- a/scripts/scriptCommon.py
+++ b/tools/scripts/scriptCommon.py
@@ -3,7 +3,7 @@ import sys
import subprocess
-catchPath = os.path.dirname(os.path.realpath( os.path.dirname(sys.argv[0])))
+catchPath = os.path.dirname(os.path.dirname(os.path.realpath( os.path.dirname(sys.argv[0]))))
def getBuildExecutable():
if os.name == 'nt':
diff --git a/scripts/updateDocumentToC.py b/tools/scripts/updateDocumentToC.py
index 325c8a3c..325c8a3c 100644
--- a/scripts/updateDocumentToC.py
+++ b/tools/scripts/updateDocumentToC.py
diff --git a/scripts/updateWandbox.py b/tools/scripts/updateWandbox.py
index b448713d..b448713d 100644
--- a/scripts/updateWandbox.py
+++ b/tools/scripts/updateWandbox.py