diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2018-09-10 12:36:51 +0100 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2018-09-10 15:03:23 +0100 |
| commit | 943181c2efe20b705aa40d30197693e7a4c1d0ac (patch) | |
| tree | 2361d339f13b31fcefe22f72cdb49700e0c9218b /ci | |
| parent | 7e353b7a140dade32f1f1db6afd1721cf2c18a4a (diff) | |
| download | libgit2-943181c2efe20b705aa40d30197693e7a4c1d0ac.tar.gz | |
Revert "clar: introduce CLAR_XML option"
This reverts commit a2d73f5643814cddf90d5bf489332e14ada89ab8.
Using clar to propagate the XML settings was a mistake.
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/build.ps1 | 4 | ||||
| -rwxr-xr-x | ci/build.sh | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/ci/build.ps1 b/ci/build.ps1 index c74717d10..159c1dd1b 100644 --- a/ci/build.ps1 +++ b/ci/build.ps1 @@ -18,9 +18,7 @@ Write-Host "#################################################################### Write-Host "## Configuring build environment" Write-Host "##############################################################################" -$TestOutputDirectory = $BuildDirectory -replace "\\", "/" - -Invoke-Expression "cmake ${SourceDirectory} -DBUILD_EXAMPLES=ON -DCLAR_XML=${TestOutputDirectory} ${Env:CMAKE_OPTIONS}" +Invoke-Expression "cmake ${SourceDirectory} -DBUILD_EXAMPLES=ON ${Env:CMAKE_OPTIONS}" if ($LastExitCode -ne 0) { [Environment]::Exit($LastExitCode) } Write-Host "" diff --git a/ci/build.sh b/ci/build.sh index b4f0a6f67..49e733077 100755 --- a/ci/build.sh +++ b/ci/build.sh @@ -28,8 +28,8 @@ echo "########################################################################## echo "## Configuring build environment" echo "##############################################################################" -echo cmake ${SOURCE_DIR} -DENABLE_WERROR=ON -DBUILD_EXAMPLES=ON -DBUILD_FUZZERS=ON -DUSE_STANDALONE_FUZZERS=ON -DCLAR_XML=\"${BUILD_DIR}\" ${CMAKE_OPTIONS} -cmake ${SOURCE_DIR} -DENABLE_WERROR=ON -DBUILD_EXAMPLES=ON -DBUILD_FUZZERS=ON -DUSE_STANDALONE_FUZZERS=ON -DCLAR_XML="${BUILD_DIR}" ${CMAKE_OPTIONS} +echo cmake ${SOURCE_DIR} -DENABLE_WERROR=ON -DBUILD_EXAMPLES=ON -DBUILD_FUZZERS=ON -DUSE_STANDALONE_FUZZERS=ON ${CMAKE_OPTIONS} +cmake ${SOURCE_DIR} -DENABLE_WERROR=ON -DBUILD_EXAMPLES=ON -DBUILD_FUZZERS=ON -DUSE_STANDALONE_FUZZERS=ON ${CMAKE_OPTIONS} echo "" echo "##############################################################################" |