Skip to content

Commit

Permalink
Provide 1 .hpp + 1 .cpp distribution of Catch2
Browse files Browse the repository at this point in the history
This commits also adds a script that does the amalgamation of headers
and .cpp files into the distributable version, removes the old
`generateSingleHeader` script, and also adds a very simple compilation
test for the amalgamated distribution.
  • Loading branch information
horenmar committed Sep 9, 2020
1 parent 8b89a60 commit 60dfec5
Show file tree
Hide file tree
Showing 8 changed files with 20,556 additions and 129 deletions.
6 changes: 6 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,12 @@ matrix:
before_script:
- export CXX=${COMPILER}
- cd ${TRAVIS_BUILD_DIR}
# We want to regenerate the amalgamated header if the extra tests
# are enabled.
- |
if [[ ${EXTRAS} -eq 1 ]]; then
python3 ./tools/scripts/generateAmalgamatedFiles.py
fi
- |
if [[ ${CPP17} -eq 1 ]]; then
Expand Down
2 changes: 2 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ install:

before_build:
- set CXXFLAGS=%additional_flags%
# If we are building examples/extra-tests, we need to regenerate the amalgamated files
- cmd: if "%examples%"=="1" ( python .\tools\scripts\generateAmalgamatedFiles.py )
# Indirection because appveyor doesn't handle multiline batch scripts properly
# https://stackoverflow.com/questions/37627248/how-to-split-a-command-over-multiple-lines-in-appveyor-yml/37647169#37647169
# https://help.appveyor.com/discussions/questions/3888-multi-line-cmd-or-powershell-warning-ignore
Expand Down
Loading

0 comments on commit 60dfec5

Please sign in to comment.