Skip to content
Snippets Groups Projects
Commit ad4a3f02 authored by Stéphane Del Pino's avatar Stéphane Del Pino
Browse files

git subrepo pull packages/CLI11

subrepo:
  subdir:   "packages/CLI11"
  merged:   "b440890ea"
upstream:
  origin:   "git@github.com:CLIUtils/CLI11.git"
  branch:   "master"
  commit:   "b440890ea"
git-subrepo:
  version:  "0.4.3"
  origin:   "git@github.com:ingydotnet/git-subrepo.git"
  commit:   "2f68596"
parent 79662156
No related branches found
No related tags found
1 merge request!120git subrepo clone (merge) --branch=main git@github.com:taocpp/PEGTL.git packages/PEGTL
Showing
with 417 additions and 326 deletions
...@@ -440,6 +440,42 @@ ...@@ -440,6 +440,42 @@
"contributions": [ "contributions": [
"doc" "doc"
] ]
},
{
"login": "paddy-hack",
"name": "Olaf Meeuwissen",
"avatar_url": "https://avatars.githubusercontent.com/u/6804372?v=4",
"profile": "https://github.com/paddy-hack",
"contributions": [
"code"
]
},
{
"login": "dryleev",
"name": "dryleev",
"avatar_url": "https://avatars.githubusercontent.com/u/83670813?v=4",
"profile": "https://github.com/dryleev",
"contributions": [
"code"
]
},
{
"login": "AnticliMaxtic",
"name": "Max",
"avatar_url": "https://avatars.githubusercontent.com/u/43995389?v=4",
"profile": "https://github.com/AnticliMaxtic",
"contributions": [
"code"
]
},
{
"login": "alexdewar",
"name": "Alex Dewar",
"avatar_url": "https://avatars.githubusercontent.com/u/23149834?v=4",
"profile": "https://profiles.sussex.ac.uk/p281168-alex-dewar/publications",
"contributions": [
"code"
]
} }
], ],
"contributorsPerLine": 7, "contributorsPerLine": 7,
......
version: 1.9.1.{build} version: 2.1.1.{build}
branches: branches:
only: only:
......
...@@ -8,4 +8,3 @@ steps: ...@@ -8,4 +8,3 @@ steps:
- script: cmake --build . - script: cmake --build .
displayName: 'Build' displayName: 'Build'
workingDirectory: build workingDirectory: build
...@@ -8,5 +8,3 @@ steps: ...@@ -8,5 +8,3 @@ steps:
inputs: inputs:
testResultsFormat: 'cTest' testResultsFormat: 'cTest'
testResultsFiles: '**/Test.xml' testResultsFiles: '**/Test.xml'
...@@ -23,4 +23,3 @@ export PATH="${DEPS_DIR}/doxygen/build/bin:${PATH}" ...@@ -23,4 +23,3 @@ export PATH="${DEPS_DIR}/doxygen/build/bin:${PATH}"
cd "${TRAVIS_BUILD_DIR}" cd "${TRAVIS_BUILD_DIR}"
set +evx set +evx
#!/usr/bin/env bash #!/usr/bin/env bash
echo -en "travis_fold:start:script.build\\r" echo -en "travis_fold:start:script.build\\r"
echo "Building..." echo "Building..."
STD=$1 STD="$1"
shift shift
set -evx set -evx
mkdir -p build mkdir -p build
cd build cd build
cmake .. -DCLI11_WARNINGS_AS_ERRORS=ON -DCLI11_SINGLE_FILE=ON -DCMAKE_CXX_STANDARD=$STD -DCLI11_SINGLE_FILE_TESTS=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_COMPILER_LAUNCHER=ccache $@ cmake .. -DCLI11_WARNINGS_AS_ERRORS=ON -DCLI11_SINGLE_FILE=ON -DCMAKE_CXX_STANDARD="$STD" -DCLI11_SINGLE_FILE_TESTS=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_COMPILER_LAUNCHER=ccache $@
cmake --build . -- -j2 cmake --build . -- -j2
set +evx set +evx
......
...@@ -4,7 +4,7 @@ echo -en "travis_fold:start:script.build\\r" ...@@ -4,7 +4,7 @@ echo -en "travis_fold:start:script.build\\r"
echo "Building..." echo "Building..."
set -evx set -evx
cd ${TRAVIS_BUILD_DIR} cd "${TRAVIS_BUILD_DIR}"
mkdir -p build mkdir -p build
cd build cd build
cmake .. -DCLI11_SINGLE_FILE_TESTS=OFF -DCLI11_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=Coverage cmake .. -DCLI11_SINGLE_FILE_TESTS=OFF -DCLI11_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=Coverage
......
...@@ -22,4 +22,3 @@ HeaderFilterRegex: '.*hpp' ...@@ -22,4 +22,3 @@ HeaderFilterRegex: '.*hpp'
CheckOptions: CheckOptions:
- key: google-readability-braces-around-statements.ShortStatementLines - key: google-readability-braces-around-statements.ShortStatementLines
value: '3' value: '3'
format:
line_width: 99
# Causes a few issues - can be solved later, possibly.
markup:
enable_markup: false
# Contributing
Thanks for considering to write a Pull Request (PR) for CLI11! Here are a few guidelines to get you started: Thanks for considering to write a Pull Request (PR) for CLI11! Here are a few guidelines to get you started:
Make sure you are comfortable with the license; all contributions are licensed under the original license. Make sure you are comfortable with the license; all contributions are licensed under the original license.
## Adding functionality ## Adding functionality
Make sure any new functions you add are are: Make sure any new functions you add are are:
* Documented by `///` documentation for Doxygen * Documented by `///` documentation for Doxygen
...@@ -12,7 +15,7 @@ Make sure any new functions you add are are: ...@@ -12,7 +15,7 @@ Make sure any new functions you add are are:
In general, make sure the addition is well thought out and does not increase the complexity of CLI11 needlessly. In general, make sure the addition is well thought out and does not increase the complexity of CLI11 needlessly.
## Things you should know: ## Things you should know
* Once you make the PR, tests will run to make sure your code works on all supported platforms * Once you make the PR, tests will run to make sure your code works on all supported platforms
* The test coverage is also measured, and that should remain 100% * The test coverage is also measured, and that should remain 100%
...@@ -20,10 +23,9 @@ In general, make sure the addition is well thought out and does not increase the ...@@ -20,10 +23,9 @@ In general, make sure the addition is well thought out and does not increase the
* Everything must pass clang-tidy as well, run with `-DCLI11_CLANG_TIDY=ON` (if you set `-DCLI11_CLANG_TIDY_OPTIONS="-fix"`, make sure you use a single threaded build process, or just build one example target). * Everything must pass clang-tidy as well, run with `-DCLI11_CLANG_TIDY=ON` (if you set `-DCLI11_CLANG_TIDY_OPTIONS="-fix"`, make sure you use a single threaded build process, or just build one example target).
* Your changes must also conform to most of the [Google C++ Style Guide](https://google.github.io/styleguide/cppguide.html) rules checked by [cpplint](https://github.com/cpplint/cpplint). For unused cpplint filters and justifications, see [CPPLINT.cfg](/CPPLINT.cfg). * Your changes must also conform to most of the [Google C++ Style Guide](https://google.github.io/styleguide/cppguide.html) rules checked by [cpplint](https://github.com/cpplint/cpplint). For unused cpplint filters and justifications, see [CPPLINT.cfg](/CPPLINT.cfg).
## Pre-commit ## Pre-commit
Format is handled by pre-commit. You should install it: Format is handled by pre-commit. You should install it (or use [pipx](https://pypa.github.io/pipx/)):
```bash ```bash
python3 -m pip install pre-commit python3 -m pip install pre-commit
...@@ -31,13 +33,12 @@ python3 -m pip install pre-commit ...@@ -31,13 +33,12 @@ python3 -m pip install pre-commit
Then, you can run it on the items you've added to your staging area, or all files: Then, you can run it on the items you've added to your staging area, or all files:
``` ```bash
pre-commit run pre-commit run
# OR # OR
pre-commit run --all-files pre-commit run --all-files
``` ```
And, if you want to always use it, you can install it as a git hook (hence the name, pre-commit): And, if you want to always use it, you can install it as a git hook (hence the name, pre-commit):
```bash ```bash
...@@ -72,9 +73,12 @@ yarn all-contributors add username code,bug ...@@ -72,9 +73,12 @@ yarn all-contributors add username code,bug
Remember to replace the emoji in the readme, being careful not to replace the ones in all-contributors if any overlap. Remember to replace the emoji in the readme, being careful not to replace the ones in all-contributors if any overlap.
Steps: Steps:
* Update changelog if needed * Update changelog if needed
* Update the version in `.appveyor.yml` and `include/CLI/Version.hpp`. * Update the version in `.appveyor.yml` and `include/CLI/Version.hpp`.
* Find and replace in README: * Find and replace in README:
* Replace " 🆕" and "🆕 " with "" (ignores the description line) * Replace " 🆕" and "🆕 " with "" (ignores the description line)
* Check for `\/\/$` (vi syntax) to catch leftover `// 🆕` * Check for `\/\/$` (vi syntax) to catch leftover `// 🆕`
* Replace "🚧" with "🆕" (manually ignore the description line) * Replace "🚧" with "🆕" (manually ignore the description line)
* Make a release in the GitHub UI, use a name such as "Version X.Y(.Z): Title"
* Currently, the release action wipes the title after you release, so remember to edit the title back to the original name after the `CLI11.hpp` file gets uploaded.
...@@ -5,10 +5,17 @@ inputs: ...@@ -5,10 +5,17 @@ inputs:
description: 'Other arguments' description: 'Other arguments'
required: false required: false
default: '' default: ''
cmake-version:
description: 'The CMake version to run'
required: true
runs: runs:
using: composite using: composite
steps: steps:
- name: CMake ${{ inputs.cmake-version }}
uses: jwlawson/actions-setup-cmake@v1.11
with:
cmake-version: "${{ inputs.cmake-version }}"
- run: | - run: |
mkdir -p build-tmp mkdir -p build-tmp
touch build-tmp/tmp touch build-tmp/tmp
......
...@@ -37,10 +37,13 @@ jobs: ...@@ -37,10 +37,13 @@ jobs:
- name: Make header - name: Make header
run: cmake --build build --target CLI11-generate-single-file run: cmake --build build --target CLI11-generate-single-file
- name: Copy file to main folder
run: cp build/include/CLI11.hpp CLI11.hpp
- uses: actions/upload-artifact@v2 - uses: actions/upload-artifact@v2
with: with:
name: CLI11.hpp name: CLI11.hpp
path: build/include/CLI11.hpp path: CLI11.hpp
- uses: actions/upload-artifact@v2 - uses: actions/upload-artifact@v2
with: with:
......
...@@ -15,7 +15,7 @@ jobs: ...@@ -15,7 +15,7 @@ jobs:
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- uses: actions/setup-python@v2 - uses: actions/setup-python@v2
- uses: pre-commit/action@v2.0.2 - uses: pre-commit/action@v2.0.3
cuda-build: cuda-build:
name: CUDA build only name: CUDA build only
...@@ -28,7 +28,7 @@ jobs: ...@@ -28,7 +28,7 @@ jobs:
- name: Add wget - name: Add wget
run: apt-get update && apt-get install -y wget run: apt-get update && apt-get install -y wget
- name: Setup cmake - name: Setup cmake
uses: jwlawson/actions-setup-cmake@v1.8 uses: jwlawson/actions-setup-cmake@v1.11
- name: Configure - name: Configure
run: cmake -S . -B build -DCLI11_CUDA_TESTS=ON run: cmake -S . -B build -DCLI11_CUDA_TESTS=ON
- name: Build - name: Build
...@@ -40,143 +40,111 @@ jobs: ...@@ -40,143 +40,111 @@ jobs:
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: CMake 3.4 - name: Check CMake 3.4
uses: jwlawson/actions-setup-cmake@v1.8
with: with:
cmake-version: "3.4" cmake-version: "3.4"
- name: Check CMake 3.4
uses: ./.github/actions/quick_cmake uses: ./.github/actions/quick_cmake
- name: CMake 3.5
uses: jwlawson/actions-setup-cmake@v1.8
with:
cmake-version: "3.5"
- name: Check CMake 3.5 - name: Check CMake 3.5
uses: ./.github/actions/quick_cmake uses: ./.github/actions/quick_cmake
with:
cmake-version: "3.5"
if: success() || failure() if: success() || failure()
- name: CMake 3.6
uses: jwlawson/actions-setup-cmake@v1.8
with:
cmake-version: "3.6"
- name: Check CMake 3.6 - name: Check CMake 3.6
uses: ./.github/actions/quick_cmake uses: ./.github/actions/quick_cmake
with:
cmake-version: "3.6"
if: success() || failure() if: success() || failure()
- name: CMake 3.7
uses: jwlawson/actions-setup-cmake@v1.8
with:
cmake-version: "3.7"
- name: Check CMake 3.7 - name: Check CMake 3.7
uses: ./.github/actions/quick_cmake uses: ./.github/actions/quick_cmake
with:
cmake-version: "3.7"
if: success() || failure() if: success() || failure()
- name: CMake 3.8
uses: jwlawson/actions-setup-cmake@v1.8
with:
cmake-version: "3.8"
- name: Check CMake 3.8 - name: Check CMake 3.8
uses: ./.github/actions/quick_cmake uses: ./.github/actions/quick_cmake
with:
cmake-version: "3.8"
if: success() || failure() if: success() || failure()
- name: CMake 3.9
uses: jwlawson/actions-setup-cmake@v1.8
with:
cmake-version: "3.9"
- name: Check CMake 3.9 - name: Check CMake 3.9
uses: ./.github/actions/quick_cmake uses: ./.github/actions/quick_cmake
with:
cmake-version: "3.9"
if: success() || failure() if: success() || failure()
- name: CMake 3.10
uses: jwlawson/actions-setup-cmake@v1.8
with:
cmake-version: "3.10"
- name: Check CMake 3.10 - name: Check CMake 3.10
uses: ./.github/actions/quick_cmake uses: ./.github/actions/quick_cmake
with:
cmake-version: "3.10"
if: success() || failure() if: success() || failure()
- name: CMake 3.11
uses: jwlawson/actions-setup-cmake@v1.8
with:
cmake-version: "3.11"
- name: Check CMake 3.11 (full) - name: Check CMake 3.11 (full)
uses: ./.github/actions/quick_cmake uses: ./.github/actions/quick_cmake
with: with:
cmake-version: "3.11"
args: -DCLI11_SANITIZERS=ON -DCLI11_BUILD_EXAMPLES_JSON=ON args: -DCLI11_SANITIZERS=ON -DCLI11_BUILD_EXAMPLES_JSON=ON
if: success() || failure() if: success() || failure()
- name: CMake 3.12
uses: jwlawson/actions-setup-cmake@v1.8
with:
cmake-version: "3.12"
- name: Check CMake 3.12 - name: Check CMake 3.12
uses: ./.github/actions/quick_cmake uses: ./.github/actions/quick_cmake
with:
cmake-version: "3.12"
if: success() || failure() if: success() || failure()
- name: CMake 3.13
uses: jwlawson/actions-setup-cmake@v1.8
with:
cmake-version: "3.13"
- name: Check CMake 3.13 - name: Check CMake 3.13
uses: ./.github/actions/quick_cmake uses: ./.github/actions/quick_cmake
with:
cmake-version: "3.13"
if: success() || failure() if: success() || failure()
- name: CMake 3.14
uses: jwlawson/actions-setup-cmake@v1.8
with:
cmake-version: "3.14"
- name: Check CMake 3.14 - name: Check CMake 3.14
uses: ./.github/actions/quick_cmake uses: ./.github/actions/quick_cmake
with:
cmake-version: "3.14"
if: success() || failure() if: success() || failure()
- name: CMake 3.15
uses: jwlawson/actions-setup-cmake@v1.8
with:
cmake-version: "3.15"
- name: Check CMake 3.15 - name: Check CMake 3.15
uses: ./.github/actions/quick_cmake uses: ./.github/actions/quick_cmake
with:
cmake-version: "3.15"
if: success() || failure() if: success() || failure()
- name: CMake 3.16
uses: jwlawson/actions-setup-cmake@v1.8
with:
cmake-version: "3.16"
- name: Check CMake 3.16 - name: Check CMake 3.16
uses: ./.github/actions/quick_cmake uses: ./.github/actions/quick_cmake
with:
cmake-version: "3.16"
if: success() || failure() if: success() || failure()
- name: CMake 3.17
uses: jwlawson/actions-setup-cmake@v1.8
with:
cmake-version: "3.17"
- name: Check CMake 3.17 - name: Check CMake 3.17
uses: ./.github/actions/quick_cmake uses: ./.github/actions/quick_cmake
with:
cmake-version: "3.17"
if: success() || failure() if: success() || failure()
- name: CMake 3.18
uses: jwlawson/actions-setup-cmake@v1.8
with:
cmake-version: "3.18"
- name: Check CMake 3.18 - name: Check CMake 3.18
uses: ./.github/actions/quick_cmake uses: ./.github/actions/quick_cmake
with:
cmake-version: "3.18"
if: success() || failure() if: success() || failure()
- name: CMake 3.19 - name: Check CMake 3.19
uses: jwlawson/actions-setup-cmake@v1.8
with:
cmake-version: "3.19"
- name: Check CMake 3.19 (full)
uses: ./.github/actions/quick_cmake uses: ./.github/actions/quick_cmake
with: with:
args: -DCLI11_SANITIZERS=ON -DCLI11_BUILD_EXAMPLES_JSON=ON cmake-version: "3.19"
if: success() || failure() if: success() || failure()
- name: CMake 3.20
uses: jwlawson/actions-setup-cmake@v1.8
with:
cmake-version: "3.20"
- name: Check CMake 3.20 - name: Check CMake 3.20
uses: ./.github/actions/quick_cmake uses: ./.github/actions/quick_cmake
with:
cmake-version: "3.20"
if: success() || failure() if: success() || failure()
- name: Check CMake 3.21 (full)
uses: ./.github/actions/quick_cmake
with:
cmake-version: "3.21"
args: -DCLI11_SANITIZERS=ON -DCLI11_BUILD_EXAMPLES_JSON=ON
if: success() || failure()
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
[subrepo] [subrepo]
remote = git@github.com:CLIUtils/CLI11.git remote = git@github.com:CLIUtils/CLI11.git
branch = master branch = master
commit = 4af78beef777e313814b4daff70e2da9171a385a commit = b440890eaf29d526e13997f67c2e0288c7c3c60f
parent = 015d2fd5332b347d28c47c8dfe3f401382724178 parent = 4bd033645f2c3c03bdf1682e34ec57bbd2b5dd21
cmdver = 0.4.3 cmdver = 0.4.3
method = merge method = merge
ci:
autoupdate_commit_msg: "chore(deps): pre-commit.ci autoupdate"
autofix_commit_msg: "style: pre-commit.ci fixes"
skip:
- docker-clang-format
repos: repos:
- repo: https://github.com/psf/black - repo: https://github.com/psf/black
rev: 20.8b1 rev: 21.9b0
hooks: hooks:
- id: black - id: black
- repo: https://github.com/pre-commit/pre-commit-hooks - repo: https://github.com/pre-commit/pre-commit-hooks
rev: v3.4.0 rev: v4.0.1
hooks: hooks:
- id: check-added-large-files - id: check-added-large-files
- id: mixed-line-ending
- id: trailing-whitespace
- id: check-merge-conflict
- id: check-case-conflict - id: check-case-conflict
- id: check-merge-conflict
- id: check-symlinks - id: check-symlinks
- id: check-yaml - id: check-yaml
- id: end-of-file-fixer
- id: mixed-line-ending
- id: trailing-whitespace
- repo: local - repo: local
hooks: hooks:
...@@ -27,3 +34,39 @@ repos: ...@@ -27,3 +34,39 @@ repos:
args: args:
- -style=file - -style=file
- -i - -i
- repo: https://github.com/cheshirekow/cmake-format-precommit
rev: v0.6.13
hooks:
- id: cmake-format
additional_dependencies: [pyyaml]
- repo: https://github.com/markdownlint/markdownlint
rev: v0.11.0
hooks:
- id: markdownlint
args: ["--style=scripts/mdlint_style.rb"]
- repo: local
hooks:
- id: remarklint
name: remarklint
language: node
entry: remark
types: [markdown]
args: ["--frail", "--quiet"]
additional_dependencies: [remark, remark-lint, remark-cli, remark-preset-lint-recommended, remark-lint-list-item-indent, remark-lint-no-undefined-references]
- repo: local
hooks:
- id: disallow-caps
name: Disallow improper capitalization
language: pygrep
entry: PyBind|Numpy|Cmake|CCache|PyTest|Github
exclude: .pre-commit-config.yaml
- repo: https://github.com/codespell-project/codespell
rev: v2.1.0
hooks:
- id: codespell
args: ["-L", "atleast,ans,doub,inout"]
repos:
- repo: https://github.com/psf/black
rev: 19.3b0
hooks:
- id: black
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v2.3.0
hooks:
- id: check-added-large-files
- id: mixed-line-ending
- id: trailing-whitespace
- id: check-merge-conflict
- id: check-case-conflict
- id: check-symlinks
- id: check-yaml
- repo: local
hooks:
- id: clang-format
name: Clang Format
language: system
types:
- c++
entry: clang-format
args:
- -style=file
- -i
{
"plugins": [
"remark-preset-lint-recommended",
["remark-lint-list-item-indent", "space"],
["remark-lint-no-undefined-references", {"allow": ["^1"]}]
]
}
This diff is collapsed.
CLI11 provides all the features you expect in a powerful command line parser, with a beautiful, minimal syntax and no dependencies beyond C++11. It is header only, and comes in a single file form for easy inclusion in projects. It is easy to use for small projects, but powerful enough for complex command line projects, and can be customized for frameworks. CLI11 provides all the features you expect in a powerful command line parser, with a beautiful, minimal syntax and no dependencies beyond C++11. It is header only, and comes in a single file form for easy inclusion in projects. It is easy to use for small projects, but powerful enough for complex command line projects, and can be customized for frameworks.
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
// This is a standalone header file generated by MakeSingleHeader.py in CLI11/scripts // This is a standalone header file generated by MakeSingleHeader.py in CLI11/scripts
// from: {git} // from: {git}
// //
// CLI11 {version} Copyright (c) 2017-2020 University of Cincinnati, developed by Henry // CLI11 {version} Copyright (c) 2017-2021 University of Cincinnati, developed by Henry
// Schreiner under NSF AWARD 1414736. All rights reserved. // Schreiner under NSF AWARD 1414736. All rights reserved.
// //
// Redistribution and use in source and binary forms of CLI11, with or without // Redistribution and use in source and binary forms of CLI11, with or without
...@@ -31,6 +31,8 @@ ...@@ -31,6 +31,8 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#pragma once
// Standard combined includes: // Standard combined includes:
{public_includes} {public_includes}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment