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)
qgis · Jun 5, 2017 · fa5bd49 · fa5bd49
1 parent c8555c3
commit fa5bd49
Show file tree

Hide file tree

Showing 35 changed files with 633 additions and 627 deletions.
diff --git a/.ci/travis/code_layout/CMakeLists.txt b/.ci/travis/code_layout/CMakeLists.txt
diff --git a/.ci/travis/code_layout/install.sh b/.ci/travis/code_layout/install.sh
@@ -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}
diff --git a/.ci/travis/code_layout/script.sh b/.ci/travis/code_layout/script.sh
@@ -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
diff --git a/.ci/travis/linux/blacklist.txt b/.ci/travis/linux/blacklist.txt
@@ -11,6 +11,8 @@ PyQgsDBManagerGpkg
 # layout tests are run on separate build
 qgis_indentation
 qgis_spelling
+qgis_sipify
+qgis_sip_uptodate
 
 # flacky
 qgis_filedownloader

diff --git a/.ci/travis/macos/blacklist.txt b/.ci/travis/macos/blacklist.txt
@@ -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
diff --git a/.gitignore b/.gitignore
@@ -21,7 +21,6 @@
 .pydevproject
 /CMakeLists.txt.user
 /CMakeLists.txt.user.*
-.ci/travis/code_layout/scripts/qgisstyle*
 api_doc
 build*
 debian/*.debhelper