Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
Merge branch 'master' of git://github.com/qgis/QGIS
- Loading branch information
Showing
1,069 changed files
with
18,875 additions
and
5,436 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,73 +1,4 @@ | ||
export DEBIAN_FRONTEND=noninteractive | ||
|
||
wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add - | ||
sudo add-apt-repository 'deb http://llvm.org/apt/precise/ llvm-toolchain-precise main' -y | ||
|
||
sudo add-apt-repository ppa:ubuntugis/ppa -y | ||
sudo add-apt-repository ppa:ubuntugis/ubuntugis-unstable -y # For postgresql-9.1-postgis-2.1 | ||
sudo add-apt-repository ppa:smspillaz/cmake-3.0.2 -y | ||
sudo add-apt-repository ppa:kedazo/doxygen-updates-precise -y # For doxygen 1.8.8 | ||
sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y | ||
sudo apt-get update -qq | ||
sudo apt-get install --force-yes --no-install-recommends --no-install-suggests \ | ||
bison \ | ||
cmake \ | ||
cmake-data \ | ||
doxygen \ | ||
flex \ | ||
gdal-bin \ | ||
git \ | ||
graphviz \ | ||
grass-dev \ | ||
libexpat1-dev \ | ||
libfcgi-dev \ | ||
libgdal1-dev \ | ||
libgeos-dev \ | ||
libgsl0-dev \ | ||
libpq-dev \ | ||
libproj-dev \ | ||
libqca2-dev \ | ||
libqca2-plugin-ossl \ | ||
libqscintilla2-dev \ | ||
libqt4-dev \ | ||
libqt4-opengl-dev \ | ||
libqt4-sql-sqlite \ | ||
libqtwebkit-dev \ | ||
libqwt-dev \ | ||
libspatialindex-dev \ | ||
libspatialite-dev \ | ||
libsqlite3-dev \ | ||
lighttpd \ | ||
pkg-config \ | ||
poppler-utils \ | ||
pyqt4-dev-tools \ | ||
python \ | ||
python-dev \ | ||
python-qt4 \ | ||
python-qt4-dev \ | ||
python-qt4-sql \ | ||
python-qscintilla2 \ | ||
python-sip \ | ||
python-sip-dev \ | ||
python-psycopg2 \ | ||
python-numpy \ | ||
python-gdal \ | ||
spawn-fcgi \ | ||
txt2tags \ | ||
xauth \ | ||
xfonts-100dpi \ | ||
xfonts-75dpi \ | ||
xfonts-base \ | ||
xfonts-scalable \ | ||
xvfb \ | ||
python-pip \ | ||
flip \ | ||
jq \ | ||
postgresql-9.1-postgis-2.1/precise # from ubuntugis-unstable, not pgdg | ||
|
||
sudo -H pip install autopep8 # TODO when switching to trusty or above: replace python-pip with python-autopep8 | ||
sudo -H pip install nose2 pyyaml mock | ||
|
||
#update clang | ||
sudo apt-get install --force-yes llvm-3.8 llvm-3.8-dev clang-3.8 libstdc++-4.9-dev | ||
#!/bin/bash | ||
|
||
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" | ||
${DIR}/qt${QT_VERSION}/before_install.sh |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,25 +1,4 @@ | ||
mkdir build | ||
cd build | ||
#!/bin/bash | ||
|
||
export CXX="clang++-3.8" | ||
export CC="clang-3.8" | ||
|
||
cmake --version | ||
${CC} --version | ||
|
||
CLANG_WARNINGS="-Wimplicit-fallthrough" | ||
|
||
cmake -DWITH_SERVER=ON \ | ||
-DWITH_STAGED_PLUGINS=ON \ | ||
-DWITH_GRASS=ON \ | ||
-DSUPPRESS_QT_WARNINGS=ON \ | ||
-DENABLE_MODELTEST=ON \ | ||
-DENABLE_PGTEST=ON \ | ||
-DWITH_QWTPOLAR=OFF \ | ||
-DWITH_APIDOC=ON \ | ||
-DWITH_ASTYLE=ON \ | ||
-DWITH_PYSPATIALITE=ON \ | ||
-DGRASS_PREFIX7=/usr/lib/grass70 \ | ||
-DGRASS_INCLUDE_DIR7=/usr/lib/grass70/include \ | ||
-DCXX_EXTRA_FLAGS="$CLANG_WARNINGS" \ | ||
.. | ||
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" | ||
${DIR}/qt${QT_VERSION}/install.sh |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,73 @@ | ||
export DEBIAN_FRONTEND=noninteractive | ||
|
||
wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add - | ||
sudo add-apt-repository 'deb http://llvm.org/apt/precise/ llvm-toolchain-precise main' -y | ||
|
||
sudo add-apt-repository ppa:ubuntugis/ppa -y | ||
sudo add-apt-repository ppa:ubuntugis/ubuntugis-unstable -y # For postgresql-9.1-postgis-2.1 | ||
sudo add-apt-repository ppa:smspillaz/cmake-3.0.2 -y | ||
sudo add-apt-repository ppa:kedazo/doxygen-updates-precise -y # For doxygen 1.8.8 | ||
sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y | ||
sudo apt-get update -qq | ||
sudo apt-get install --force-yes --no-install-recommends --no-install-suggests \ | ||
bison \ | ||
cmake \ | ||
cmake-data \ | ||
doxygen \ | ||
flex \ | ||
gdal-bin \ | ||
git \ | ||
graphviz \ | ||
grass-dev \ | ||
libexpat1-dev \ | ||
libfcgi-dev \ | ||
libgdal1-dev \ | ||
libgeos-dev \ | ||
libgsl0-dev \ | ||
libpq-dev \ | ||
libproj-dev \ | ||
libqca2-dev \ | ||
libqca2-plugin-ossl \ | ||
libqscintilla2-dev \ | ||
libqt4-dev \ | ||
libqt4-opengl-dev \ | ||
libqt4-sql-sqlite \ | ||
libqtwebkit-dev \ | ||
libqwt-dev \ | ||
libspatialindex-dev \ | ||
libspatialite-dev \ | ||
libsqlite3-dev \ | ||
lighttpd \ | ||
pkg-config \ | ||
poppler-utils \ | ||
pyqt4-dev-tools \ | ||
python \ | ||
python-dev \ | ||
python-qt4 \ | ||
python-qt4-dev \ | ||
python-qt4-sql \ | ||
python-qscintilla2 \ | ||
python-sip \ | ||
python-sip-dev \ | ||
python-psycopg2 \ | ||
python-numpy \ | ||
python-gdal \ | ||
spawn-fcgi \ | ||
txt2tags \ | ||
xauth \ | ||
xfonts-100dpi \ | ||
xfonts-75dpi \ | ||
xfonts-base \ | ||
xfonts-scalable \ | ||
xvfb \ | ||
python-pip \ | ||
flip \ | ||
jq \ | ||
postgresql-9.1-postgis-2.1/precise # from ubuntugis-unstable, not pgdg | ||
|
||
sudo -H pip install autopep8 # TODO when switching to trusty or above: replace python-pip with python-autopep8 | ||
sudo -H pip install nose2 pyyaml mock future | ||
|
||
#update clang | ||
sudo apt-get install --force-yes llvm-3.8 llvm-3.8-dev clang-3.8 libstdc++-4.9-dev | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
mkdir build | ||
cd build | ||
|
||
export CXX="clang++-3.8" | ||
export CC="clang-3.8" | ||
|
||
cmake --version | ||
${CC} --version | ||
|
||
CLANG_WARNINGS="-Wimplicit-fallthrough" | ||
|
||
cmake -DWITH_SERVER=ON \ | ||
-DWITH_STAGED_PLUGINS=ON \ | ||
-DWITH_GRASS=ON \ | ||
-DSUPPRESS_QT_WARNINGS=ON \ | ||
-DENABLE_MODELTEST=ON \ | ||
-DENABLE_PGTEST=ON \ | ||
-DWITH_QSPATIALITE=ON \ | ||
-DWITH_QWTPOLAR=OFF \ | ||
-DWITH_APIDOC=ON \ | ||
-DWITH_ASTYLE=ON \ | ||
-DWITH_PYSPATIALITE=ON \ | ||
-DGRASS_PREFIX7=/usr/lib/grass70 \ | ||
-DGRASS_INCLUDE_DIR7=/usr/lib/grass70/include \ | ||
-DCXX_EXTRA_FLAGS="$CLANG_WARNINGS" \ | ||
.. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
xvfb-run ctest -V -E 'qgis_openstreetmaptest|qgis_wcsprovidertest' -S ./qgis-test-travis.ctest --output-on-failure |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
export DEBIAN_FRONTEND=noninteractive | ||
export CORES=2 | ||
|
||
################################################## | ||
# | ||
# Get precompiled dependencies | ||
# | ||
################################################## | ||
|
||
pushd ${HOME} | ||
|
||
curl -L https://github.com/opengisch/osgeo4travis/raw/binary-py33/osgeo4travis.tar.xz | tar -JxC /home/travis | ||
curl -L https://cmake.org/files/v3.5/cmake-3.5.0-Linux-x86_64.tar.gz | tar --strip-components=1 -zxC /home/travis/osgeo4travis | ||
popd | ||
|
||
pip install psycopg2 numpy nose2 pyyaml mock future |
Oops, something went wrong.