Skip to content
Permalink
Browse files

run code_layout build from top CMakeLists

instead of adding an extra CMakeLists in .ci/travis/code_layout to build API doc, astyle and run tests (indentation, spelling, sip, doc coverage), the top CMakeLists has been adapted to allow not building core libraries and possibly just the static code layout
* astyle has been moved from /src/astyle to /lib/astyle (I would propose to move all external libraries, and possibly add git submodules)
  • Loading branch information
3nids committed Jun 5, 2017
1 parent c8555c3 commit fa5bd491fce269e55fe463f52eede0c2735a184a
Showing with 633 additions and 627 deletions.
  1. +0 −28 .ci/travis/code_layout/CMakeLists.txt
  2. +1 −1 .ci/travis/code_layout/install.sh
  3. +0 −4 .ci/travis/code_layout/script.sh
  4. +2 −0 .ci/travis/linux/blacklist.txt
  5. +5 −1 .ci/travis/macos/blacklist.txt
  6. +0 −1 .gitignore
  7. +540 −515 CMakeLists.txt
  8. +1 −1 cmake_templates/Doxyfile.in
  9. +1 −2 debian/copyright
  10. +52 −52 doc/CMakeLists.txt
  11. 0 {src → external}/astyle/ASBeautifier.cpp
  12. 0 {src → external}/astyle/ASEnhancer.cpp
  13. 0 {src → external}/astyle/ASFormatter.cpp
  14. 0 {src → external}/astyle/ASLocalizer.cpp
  15. 0 {src → external}/astyle/ASLocalizer.h
  16. 0 {src → external}/astyle/ASResource.cpp
  17. 0 {src → external}/astyle/CMakeLists.txt
  18. 0 {src → external}/astyle/LICENSE.md
  19. 0 {src → external}/astyle/astyle.h
  20. 0 {src → external}/astyle/astyle_main.cpp
  21. 0 {src → external}/astyle/astyle_main.h
  22. +1 −1 scripts/addcopyright.sh
  23. +2 −2 scripts/astyle.sh
  24. +1 −1 scripts/spell_check/.agignore
  25. +1 −1 scripts/update-indent.sh
  26. +0 −3 src/CMakeLists.txt
  27. +7 −6 tests/CMakeLists.txt
  28. +16 −0 tests/code_layout/CMakeLists.txt
  29. +2 −2 tests/{scripts → code_layout}/sipifyheader.expected.sip
  30. 0 tests/{scripts → code_layout}/sipifyheader.h
  31. 0 tests/{src/python → code_layout}/test_qgsdoccoverage.py
  32. 0 tests/{src/python → code_layout}/test_qgssipcoverage.py
  33. 0 tests/{scripts → code_layout}/test_sipfiles_uptodate.sh
  34. +1 −1 tests/{scripts → code_layout}/test_sipify.sh
  35. +0 −5 tests/src/python/CMakeLists.txt

This file was deleted.

@@ -18,5 +18,5 @@ export CORES=2
mkdir build
cd build

cmake -DWITH_APIDOC=ON ../.ci/travis/code_layout
cmake -DWITH_CORE=OFF -DWITH_APIDOC=ON -DWITH_ASTYLE=ON -DENABLE_TESTS=ON ..
make -j${CORES}
@@ -14,10 +14,6 @@
###########################################################################
set -e

DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )

export QGISSTYLE=${DIR}/scripts/qgisstyle

pushd build
xvfb-run ctest -V --output-on-failure
popd
@@ -11,6 +11,8 @@ PyQgsDBManagerGpkg
# layout tests are run on separate build
qgis_indentation
qgis_spelling
qgis_sipify
qgis_sip_uptodate

# flacky
qgis_filedownloader
@@ -1,4 +1,8 @@
# layout tests are run on separate build
qgis_spelling
qgis_sipify
qgis_sip_uptodate

qgis_openstreetmaptest
qgis_wcsprovidertest
PyQgsServer
@@ -49,4 +53,4 @@ PyQgsFileDownloader
PyQgsSettings
PyQgsConsole
PyQgsLocator
PyQgsAuthManagerPasswordOWSTest
PyQgsAuthManagerPasswordOWSTest
@@ -21,7 +21,6 @@
.pydevproject
/CMakeLists.txt.user
/CMakeLists.txt.user.*
.ci/travis/code_layout/scripts/qgisstyle*
api_doc
build*
debian/*.debhelper

0 comments on commit fa5bd49

Please sign in to comment.
You can’t perform that action at this time.