aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorEgor Tensin <Egor.Tensin@gmail.com>2021-04-18 19:45:41 +0300
committerEgor Tensin <Egor.Tensin@gmail.com>2021-04-18 19:46:50 +0300
commit208cee254b93781887513c3c0e3390def202f659 (patch)
tree3f77ad6d802a32d5c7ae7ea228f0f0502888e69c
parentv1.0 (diff)
downloadcmake-common-208cee254b93781887513c3c0e3390def202f659.tar.gz
cmake-common-208cee254b93781887513c3c0e3390def202f659.zip
tools: bring back the .py extension
It should help running the scripts on Windows, where the .py extension is associated with the Python interpreter.
-rw-r--r--.github/workflows/basic.yml2
-rw-r--r--README.md9
-rw-r--r--docs/ctest-driver.md6
-rw-r--r--docs/project-clang-format.md4
-rw-r--r--setup.cfg4
-rwxr-xr-xtools/ctest-driver.py (renamed from tools/ctest-driver)0
-rwxr-xr-xtools/project-clang-format.py (renamed from tools/project-clang-format)0
7 files changed, 13 insertions, 12 deletions
diff --git a/.github/workflows/basic.yml b/.github/workflows/basic.yml
index 197306c..a0977e8 100644
--- a/.github/workflows/basic.yml
+++ b/.github/workflows/basic.yml
@@ -16,7 +16,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v2
- name: Run clang-format
- run: ./tools/project-clang-format --clang-format clang-format-10
+ run: ./tools/project-clang-format.py --clang-format clang-format-10
basic:
strategy:
diff --git a/README.md b/README.md
index 346c074..a407c47 100644
--- a/README.md
+++ b/README.md
@@ -145,12 +145,13 @@ done
Tools
-----
-* [project-clang-format] &mdash; `clang-format` all C/C++ files in the project.
-* [ctest-driver] &mdash; wrap an executable for testing with CTest;
+* [project-clang-format.py] &mdash; `clang-format` all C/C++ files in the
+project.
+* [ctest-driver.py] &mdash; wrap an executable for testing with CTest;
cross-platform `grep`.
-[project-clang-format]: docs/project-clang-format.md
-[ctest-driver]: docs/ctest-driver.md
+[project-clang-format.py]: docs/project-clang-format.md
+[ctest-driver.py]: docs/ctest-driver.md
Examples
--------
diff --git a/docs/ctest-driver.md b/docs/ctest-driver.md
index 1a70f5d..af7c3b2 100644
--- a/docs/ctest-driver.md
+++ b/docs/ctest-driver.md
@@ -4,10 +4,10 @@ PASS_REGULAR_EXPRESSION feature:
1. The regular expression syntax used by CMake is deficient.
2. The exit code of a test is ignored if one of the regexes matches.
-`ctest-driver` tries to fix them.
+`ctest-driver.py` tries to fix them.
- $ python3 path/to/tools/ctest-driver run --pass-regex OK --fail-regex Fail -- path/to/executable arg1 arg2
+ $ python3 path/to/tools/ctest-driver.py run --pass-regex OK --fail-regex Fail -- path/to/executable arg1 arg2
In addition, it's a cross-platform `grep`:
- $ python3 path/to/tools/ctest-driver grep --pass-regex OK --fail-regex Fail -- path/to/logfile.log
+ $ python3 path/to/tools/ctest-driver.py grep --pass-regex OK --fail-regex Fail -- path/to/logfile.log
diff --git a/docs/project-clang-format.md b/docs/project-clang-format.md
index d294730..d0badce 100644
--- a/docs/project-clang-format.md
+++ b/docs/project-clang-format.md
@@ -1,5 +1,5 @@
`clang-format` all C/C++ files in the project.
$ cd project/
- $ python3 path/to/tools/project-clang-format # Prints a diff
- $ python3 path/to/tools/project-clang-format -i # Edits files in-place
+ $ python3 path/to/tools/project-clang-format.py # Prints a diff
+ $ python3 path/to/tools/project-clang-format.py -i # Edits files in-place
diff --git a/setup.cfg b/setup.cfg
index 1254a8b..e9beb34 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -21,8 +21,8 @@ classifiers =
packages = find:
python_requires = >=3.6
scripts =
- tools/project-clang-format
- tools/ctest-driver
+ tools/project-clang-format.py
+ tools/ctest-driver.py
[options.data_files]
share/cmake = common.cmake
diff --git a/tools/ctest-driver b/tools/ctest-driver.py
index 414e20c..414e20c 100755
--- a/tools/ctest-driver
+++ b/tools/ctest-driver.py
diff --git a/tools/project-clang-format b/tools/project-clang-format.py
index c8fde49..c8fde49 100755
--- a/tools/project-clang-format
+++ b/tools/project-clang-format.py