Skip to content

Commit b680a1b

Browse files
committed
Make travis files easier diff'able
1 parent c49b5b7 commit b680a1b

File tree

2 files changed

+63
-19
lines changed

2 files changed

+63
-19
lines changed

ci/travis/linux/before_install.sh

Lines changed: 51 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,56 @@ sudo add-apt-repository ppa:grass/grass-stable -y
55
sudo add-apt-repository ppa:smspillaz/cmake-3.0.2 -y
66
sudo add-apt-repository ppa:kedazo/doxygen-updates-precise -y # For doxygen 1.8.8
77
sudo apt-get update -qq
8-
sudo apt-get install --force-yes --no-install-recommends --no-install-suggests \
9-
bison cmake cmake-data doxygen flex git graphviz \
10-
grass-dev grass7-dev libexpat1-dev libfcgi-dev \
11-
libgdal1-dev libgeos-dev libgeos++-dev libgsl0-dev libpq-dev \
12-
libproj-dev libqscintilla2-dev libqt4-dev \
13-
libqt4-opengl-dev libqt4-sql-sqlite libqtwebkit-dev \
14-
libqca2-dev libqca2-plugin-ossl \
15-
libqwt-dev libspatialindex-dev libspatialite-dev \
16-
libsqlite3-dev lighttpd pkg-config poppler-utils \
17-
pyqt4-dev-tools python python-dev python-qt4 \
18-
python-qt4-dev python-sip python-sip-dev python-qt4-sql spawn-fcgi \
19-
txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base \
20-
xfonts-scalable xvfb \
21-
postgresql-9.1-postgis-2.1/precise # postgis one from ubuntugis-unstable, not pgdg
8+
sudo \
9+
apt-get \
10+
install --force-yes --no-install-recommends --no-install-suggests \
11+
bison \
12+
cmake \
13+
cmake-data \
14+
doxygen \
15+
flex \
16+
git \
17+
graphviz \
18+
grass-dev \
19+
grass7-dev \
20+
libexpat1-dev \
21+
libfcgi-dev \
22+
libgdal1-dev \
23+
libgeos++-dev \
24+
libgeos-dev \
25+
libgsl0-dev \
26+
libpq-dev \
27+
libproj-dev \
28+
libqca2-dev \
29+
libqca2-plugin-ossl \
30+
libqscintilla2-dev \
31+
libqt4-dev \
32+
libqt4-opengl-dev \
33+
libqt4-sql-sqlite \
34+
libqtwebkit-dev \
35+
libqwt-dev \
36+
libspatialindex-dev \
37+
libspatialite-dev \
38+
libsqlite3-dev \
39+
lighttpd \
40+
pkg-config \
41+
poppler-utils \
42+
pyqt4-dev-tools \
43+
python \
44+
python-dev \
45+
python-qt4 \
46+
python-qt4-dev \
47+
python-qt4-sql \
48+
python-sip \
49+
python-sip-dev \
50+
spawn-fcgi \
51+
txt2tags \
52+
xauth \
53+
xfonts-100dpi \
54+
xfonts-75dpi \
55+
xfonts-base \
56+
xfonts-scalable \
57+
xvfb \
58+
postgresql-9.1-postgis-2.1/precise # from ubuntugis-unstable, not pgdg
2259
cmake --version
2360
clang --version

ci/travis/linux/install.sh

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,14 @@
11
mkdir build
22
cd build
3-
cmake -DWITH_SERVER=ON -DWITH_STAGED_PLUGINS=OFF -DWITH_GRASS=ON \
4-
-DWITH_GRASS7=ON -DSUPPRESS_QT_WARNINGS=ON -DENABLE_MODELTEST=ON \
5-
-DENABLE_PGTEST=ON -DWITH_QWTPOLAR=OFF -DWITH_APIDOC=ON \
6-
-DWITH_PYSPATIALITE=ON -DGRASS_PREFIX7=/usr/lib/grass70 \
7-
-DGRASS_INCLUDE_DIR7=/usr/lib/grass70/include ..
3+
cmake -DWITH_SERVER=ON \
4+
-DWITH_STAGED_PLUGINS=OFF \
5+
-DWITH_GRASS=ON \
6+
-DWITH_GRASS7=ON \
7+
-DSUPPRESS_QT_WARNINGS=ON \
8+
-DENABLE_MODELTEST=ON \
9+
-DENABLE_PGTEST=ON \
10+
-DWITH_QWTPOLAR=OFF \
11+
-DWITH_APIDOC=ON \
12+
-DWITH_PYSPATIALITE=ON \
13+
-DGRASS_PREFIX7=/usr/lib/grass70 \
14+
-DGRASS_INCLUDE_DIR7=/usr/lib/grass70/include ..

0 commit comments

Comments
 (0)