Skip to content

Commit c381a88

Browse files
DelazJDelazJ
committedSep 18, 2015
Merge remote-tracking branch 'upstream/master' into ConsistentTerms2
·
ltr-3_40archive/master_2
2 parents 11f683d + 8b9e0b6 commit c381a88

File tree

4,139 files changed

+1060761
-331607
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

4,139 files changed

+1060761
-331607
lines changed
 

‎.gitignore

Lines changed: 41 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,65 @@
1-
*.pyc
2-
.DS_Store
3-
Thumb.db
4-
desktop.ini
51
*.*~
6-
*~
2+
*.autosave
3+
*.aux
74
*.diff
8-
*.orig
95
*.log*
6+
*.orig
7+
*.out
108
*.prepare
11-
debian/*.debhelper
12-
debian/*.substvars
13-
Makefile
9+
*.pyc
10+
*.sortinc
11+
*.tex
12+
*.toc
13+
*~
1414
*-stamp
15+
.*.swp
16+
.DS_Store
17+
.idea
18+
.kdev4/
19+
.project
20+
.pydevproject
21+
/CMakeLists.txt.user
22+
/CMakeLists.txt.user.*
1523
api_doc
1624
build*
25+
debian/*.debhelper
26+
debian/*.substvars
27+
desktop.ini
28+
doc/CODING.tex
29+
doc/INSTALL.tex
30+
i18n/*.qm
31+
Makefile
32+
ms-windows/*.exe*
1733
ms-windows/Installer-Files/postinstall.bat
1834
ms-windows/Installer-Files/preremove.bat
19-
ms-windows/osgeo4w/packages/
20-
ms-windows/osgeo4w/unpacked/
21-
ms-windows/*Setup.exe
22-
ms-windows/osgeo4w/nsis/
23-
ms-windows/osgeo4w/untgz/
24-
scripts/astyle
25-
qtcreator-build/
2635
ms-windows/nsis/
2736
ms-windows/osgeo4w/addons/
28-
ms-windows/packages/
2937
ms-windows/osgeo4w/binary-*
38+
ms-windows/osgeo4w/nsis/
39+
ms-windows/osgeo4w/packages-x86/
40+
ms-windows/osgeo4w/packages-x86_64/
41+
ms-windows/osgeo4w/unpacked/
42+
ms-windows/osgeo4w/untgz/
43+
ms-windows/packages/
3044
ms-windows/progs/
3145
ms-windows/untgz/
46+
qgis.kdev4
47+
qgis.supp
48+
qgis-test.ctest
49+
qtcreator-build/
3250
scripts/astyle.exe
33-
# vim temporary files
34-
.*.swp
35-
*.aux
36-
*.out
37-
*.tex
38-
*.toc
39-
doc/CODING.tex
40-
doc/INSTALL.tex
4151
scripts/Debug
52+
scripts/qgisstyle*
4253
scripts/RelWithDebInfo
43-
/CMakeLists.txt.user
44-
/CMakeLists.txt.user.*
45-
qgis-test.ctest
46-
i18n/*.qm
47-
.project
48-
.pydevproject
49-
.idea
50-
/python/plugins/sextante/resources_rc.py
51-
/python/plugins/sextante/about/ui_aboutdialogbase.py
52-
scripts/qgisstyle
53-
.kdev4/
54-
qgis.kdev4
55-
qgis.supp
5654
src/core/qgscontexthelp_texts.cpp
5755
src/core/qgsexpression_texts.cpp
56+
tests/testdata/checker360by180.asc.aux.xml
57+
tests/testdata/grass/wgs84/test/.gislock
58+
tests/testdata/grass/wgs84/test6/.gislock
59+
tests/testdata/grass/wgs84/test7/.gislock
5860
tests/testdata/raster/band1_byte_noct_epsg4326.tif.aux.xml
5961
tests/testdata/raster/band1_float32_noct_epsg4326.tif.aux.xml
6062
tests/testdata/raster/band1_int16_noct_epsg4326.tif.aux.xml
6163
tests/testdata/raster/band3_float32_noct_epsg4326.tif.aux.xml
6264
tests/testdata/raster/band3_int16_noct_epsg4326.tif.aux.xml
63-
tests/testdata/checker360by180.asc.aux.xml
64-
tests/testdata/grass/wgs84/test/.gislock
65-
tests/testdata/grass/wgs84/test6/.gislock
66-
tests/testdata/grass/wgs84/test7/.gislock
65+
Thumb.db

‎.travis.yml

Lines changed: 22 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
11
language: cpp
22

3+
os:
4+
- linux
5+
- osx
6+
37
compiler:
48
- clang
59

10+
git:
11+
depth: 30
12+
613
cache: apt
714

815
notifications:
@@ -11,43 +18,28 @@ notifications:
1118
on_success: change
1219
skip_join: true
1320

21+
notifications:
22+
webhooks:
23+
urls:
24+
- https://webhooks.gitter.im/e/467e3aff72e344d1dae3
25+
on_success: change # options: [always|never|change] default: always
26+
on_failure: always # options: [always|never|change] default: always
27+
on_start: never # default: never
28+
1429
addons:
1530
postgresql: "9.1"
1631

1732
before_install:
18-
- sudo add-apt-repository ppa:ubuntugis/ppa -y
19-
- sudo add-apt-repository ppa:ubuntugis/ubuntugis-unstable -y # For postgresql-9.1-postgis-2.1
20-
- sudo add-apt-repository ppa:smspillaz/cmake-3.0.2 -y
21-
- sudo rm -f /etc/apt/sources.list.d/pgdg-source.list # postgis from pgdg requires different gdal package than the grass package
22-
- sudo apt-get update -qq
23-
- sudo apt-get remove postgresql-9.1-postgis-2.1 # Remove postgis from pgdg, will install postgis from ubuntugis-unstable instead
24-
- sudo apt-get install --no-install-recommends
25-
bison cmake cmake-data doxygen flex git graphviz
26-
grass-dev libexpat1-dev libfcgi-dev libgdal1-dev
27-
libgeos-dev libgsl0-dev libpq-dev libproj-dev
28-
libqscintilla2-dev libqt4-dev libqt4-opengl-dev
29-
libqtwebkit-dev libqwt-dev libspatialindex-dev
30-
libspatialite-dev libsqlite3-dev lighttpd pkg-config
31-
poppler-utils pyqt4-dev-tools python python-dev
32-
python-qt4 python-qt4-dev python-sip python-sip-dev
33-
spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi
34-
xfonts-base xfonts-scalable xvfb
35-
postgresql-9.1-postgis-2.1
36-
- cmake --version
37-
- clang --version
33+
- ./ci/travis/${TRAVIS_OS_NAME}/before_install.sh
3834

3935
install:
40-
- mkdir build
41-
- cd build
42-
- cmake -DWITH_SERVER=ON -DWITH_STAGED_PLUGINS=OFF -DWITH_GRASS=OFF
43-
-DSUPPRESS_QT_WARNINGS=ON -DENABLE_MODELTEST=ON -DENABLE_PGTEST=ON
44-
-DWITH_QWTPOLAR=OFF -DWITH_APIDOC=ON -DWITH_PYSPATIALITE=ON ..
36+
- ./ci/travis/${TRAVIS_OS_NAME}/install.sh
4537

4638
before_script:
47-
- printf "[qgis_test]\nhost=localhost\ndbname=qgis_test\nuser=postgres" > ~/.pg_service.conf
48-
- psql -c 'CREATE DATABASE qgis_test;' -U postgres
49-
- psql -c 'CREATE EXTENSION postgis;' -U postgres -d qgis_test
50-
- psql -f $TRAVIS_BUILD_DIR/tests/testdata/provider/testdata.sql -U postgres -d qgis_test
39+
- ./ci/travis/${TRAVIS_OS_NAME}/before_script.sh
5140

52-
script: xvfb-run ctest -V -E 'qgis_openstreetmaptest|PyQgsPalLabelingServer|qgis_wcsprovidertest' -S ../qgis-test-travis.ctest --output-on-failure
41+
script:
42+
- ./ci/travis/${TRAVIS_OS_NAME}/script.sh
5343

44+
after_script:
45+
- ./ci/travis/${TRAVIS_OS_NAME}/after_script.sh

0 commit comments

Comments
 (0)