Build astyle

qgis · Feb 24, 2017 · 77bc28f · 77bc28f
1 parent e0c58eb
commit 77bc28f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/ci/travis/code_layout/before_install.sh b/ci/travis/code_layout/before_install.sh
@@ -13,7 +13,4 @@
 #                                                                         #
 ###########################################################################
 
-export DEBIAN_FRONTEND=noninteractive
-export CORES=2
-
 pip install autopep8
diff --git a/ci/travis/code_layout/install.sh b/ci/travis/code_layout/install.sh
@@ -13,7 +13,10 @@
 #                                                                         #
 ###########################################################################
 
+export CORES=2
+
 mkdir build
 cd build
 
 cmake ../ci/travis/code_layout
+make -j${CORES}
diff --git a/ci/travis/code_layout/script.sh b/ci/travis/code_layout/script.sh
@@ -13,6 +13,10 @@
 #                                                                         #
 ###########################################################################
 
-cd build
+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/scripts/astyle.sh b/scripts/astyle.sh
@@ -14,7 +14,7 @@
 #                                                                         #
 ###########################################################################
 
-for ASTYLE in $(dirname $0)/qgisstyle $(dirname $0)/RelWithDebInfo/qgisstyle
+for ASTYLE in ${QGISSTYLE} $(dirname $0)/qgisstyle $(dirname $0)/RelWithDebInfo/qgisstyle
 do
 	if type -p $ASTYLE >/dev/null; then
 		break