Skip to content

Commit a7c8e4f

Browse files
author
wonder
committed
Fixed indentation of chapter about MSYS in install notes.
git-svn-id: http://svn.osgeo.org/qgis/trunk@7137 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent bc64646 commit a7c8e4f

File tree

2 files changed

+60
-55
lines changed

2 files changed

+60
-55
lines changed

INSTALL

+59-53
Original file line numberDiff line numberDiff line change
@@ -49,23 +49,24 @@
4949
5.8. Check out the QGIS Source Code
5050
5.9. Starting the compile
5151
5.10. Running QGIS
52-
5.11. Initial setup
53-
5.11.1. MSYS
54-
5.11.2. MinGW
55-
5.11.3. Flex and Bison
56-
5.12. Installing dependencies
57-
5.12.1. Getting ready
58-
5.12.2. GDAL level one
59-
5.12.3. GRASS
60-
5.12.4. GDAL level two
61-
5.12.5. GEOS
62-
5.12.6. SQLITE
63-
5.12.7. GSL
64-
5.12.8. EXPAT
65-
5.12.9. POSTGRES
66-
5.13. Cleanup
67-
6. Further help and information
68-
7. Authors and Acknowledgments
52+
6. Creation of MSYS environment for compilation of Quantum GIS
53+
6.1. Initial setup
54+
6.1.1. MSYS
55+
6.1.2. MinGW
56+
6.1.3. Flex and Bison
57+
6.2. Installing dependencies
58+
6.2.1. Getting ready
59+
6.2.2. GDAL level one
60+
6.2.3. GRASS
61+
6.2.4. GDAL level two
62+
6.2.5. GEOS
63+
6.2.6. SQLITE
64+
6.2.7. GSL
65+
6.2.8. EXPAT
66+
6.2.9. POSTGRES
67+
6.3. Cleanup
68+
7. Further help and information
69+
8. Authors and Acknowledgments
6970

7071

7172
------------------------------------------------------------------------
@@ -772,13 +773,17 @@ above commands to select the Qt4 version of the relevant applications.
772773

773774

774775
sudo apt-get install gdal-bin libgdal1-dev libgeos-dev proj libtool \
775-
libgdal-doc libhdf4g-dev libhdf4g-run python-dev \
776-
swig libgsl0-dev g++ libjasper-1.701-dev libtiff4-dev subversion gsl-bin \
776+
libgdal-doc libhdf4g-dev libhdf4g-run python-dev python-qt4-dev sip4 \
777+
swig libgsl0-dev g++ libjasper-1.701-dev libtiff4-dev subversion gsl-bin \
777778
libsqlite3-dev sqlite3 ccache make libpq-dev flex bison
778779

779780

780781
/!\ Debian users should use libgdal-dev above rather
781782

783+
/!\ *Note:* For python language bindings SIP >= 4.5 and PyQt4 >= 4.1 is required! Some stable GNU/Linux
784+
distributions (e.g. Debian or SuSE) only provide SIP < 4.5 and PyQt4 < 4.1. To include support for python
785+
language bindings you need to build and install those packages from source.
786+
782787

783788
5.5. GRASS Specific Steps
784789
=========================
@@ -914,16 +919,17 @@ Now you can try to run QGIS:
914919
If all has worked properly the QGIS application should start up and appear
915920
on your screen.
916921

917-
= Creation of MSYS environment for compilation of Quantum GIS
918-
(including all dark magic involved) =
919922

923+
6. Creation of MSYS environment for compilation of Quantum GIS
924+
==============================================================
920925

921-
5.11. Initial setup
922-
===================
923926

927+
6.1. Initial setup
928+
==================
924929

925-
5.11.1. MSYS
926-
============
930+
931+
6.1.1. MSYS
932+
===========
927933

928934
This is the environment that supplies many utilities from UNIX world in Windows and is needed
929935
by many dependencies to be able to compile.
@@ -937,8 +943,8 @@ Install to c:\msys
937943
All stuff we're going to compile is going to get to this directory (resp. its subdirs).
938944

939945

940-
5.11.2. MinGW
941-
=============
946+
6.1.2. MinGW
947+
============
942948

943949
Download from here:
944950

@@ -949,8 +955,8 @@ Install to c:\msys\mingw
949955
It suffices to download and install only g++ and mingw-make components.
950956

951957

952-
5.11.3. Flex and Bison
953-
======================
958+
6.1.3. Flex and Bison
959+
=====================
954960

955961
Flex and Bison are tools for generation of parsers, they're needed for GRASS and also QGIS compilation.
956962

@@ -965,12 +971,12 @@ Download the following packages:
965971
Unpack them all to c:\msys\local
966972

967973

968-
5.12. Installing dependencies
969-
=============================
974+
6.2. Installing dependencies
975+
============================
970976

971977

972-
5.12.1. Getting ready
973-
=====================
978+
6.2.1. Getting ready
979+
====================
974980

975981
Paul Kelly did a great job and prepared a package of precompiled libraries for GRASS.
976982
The package currently includes:
@@ -995,8 +1001,8 @@ Moreover he also left the notes how to compile it (for those interested):
9951001
Unpack the whole package to c:\msys\local
9961002

9971003

998-
5.12.2. GDAL level one
999-
======================
1004+
6.2.2. GDAL level one
1005+
=====================
10001006

10011007
Since Quantum GIS needs GDAL with GRASS support, we need to compile GDAL
10021008
from source - Paul Kelly's package doesn't include GRASS support in GDAL.
@@ -1060,8 +1066,8 @@ Libtool on windows assumes a line length limit of 8192 for some reason and tries
10601066
Make and make install should be hassle free after this.
10611067

10621068

1063-
5.12.3. GRASS
1064-
=============
1069+
6.2.3. GRASS
1070+
============
10651071

10661072
Grab sources from CVS or use a weekly snapshot, see:
10671073

@@ -1087,8 +1093,8 @@ By the way, these pages might be useful:
10871093
- http://geni.ath.cx/grass.html
10881094

10891095

1090-
5.12.4. GDAL level two
1091-
======================
1096+
6.2.4. GDAL level two
1097+
=====================
10921098

10931099
At this stage, we'll use GDAL sources we've used before, only the compilation will be a bit different.
10941100

@@ -1111,8 +1117,8 @@ Then again, edit gdal-config and change line with CONFIG_LIBS
11111117
Now, GDAL should be able to work also with GRASS raster layers.
11121118

11131119

1114-
5.12.5. GEOS
1115-
============
1120+
6.2.5. GEOS
1121+
===========
11161122

11171123
Download the sources:
11181124

@@ -1141,8 +1147,8 @@ Now, in MSYS console, go to the source directory and run:
11411147

11421148

11431149

1144-
5.12.6. SQLITE
1145-
==============
1150+
6.2.6. SQLITE
1151+
=============
11461152

11471153
You can use precompiled DLL, no need to compile from source:
11481154

@@ -1159,8 +1165,8 @@ Then download this archive:
11591165
and copy sqlite3.h to c:\msys\local\include
11601166

11611167

1162-
5.12.7. GSL
1163-
===========
1168+
6.2.7. GSL
1169+
==========
11641170

11651171
Download sources:
11661172

@@ -1177,8 +1183,8 @@ Run from MSYS console in the source directory:
11771183

11781184

11791185

1180-
5.12.8. EXPAT
1181-
=============
1186+
6.2.8. EXPAT
1187+
============
11821188

11831189
Download sources:
11841190

@@ -1195,8 +1201,8 @@ Run from MSYS console in the source directory:
11951201

11961202

11971203

1198-
5.12.9. POSTGRES
1199-
================
1204+
6.2.9. POSTGRES
1205+
===============
12001206

12011207
We're going to use precompiled binaries. Use the link below for download:
12021208

@@ -1205,21 +1211,21 @@ We're going to use precompiled binaries. Use the link below for download:
12051211
copy contents of pgsql directory from the archive to c:\msys\local
12061212

12071213

1208-
5.13. Cleanup
1209-
=============
1214+
6.3. Cleanup
1215+
============
12101216

12111217
We're done with preparation of MSYS environment. Now you can delete all stuff in c:\msys\local\src - it takes quite a lot
12121218
of space and it's not necessary at all.
12131219

12141220

1215-
6. Further help and information
1221+
7. Further help and information
12161222
===============================
12171223

12181224
Please visit http://qgis.org for information on joining our mailing lists
12191225
and getting involved in the project further.
12201226

12211227

1222-
7. Authors and Acknowledgments
1228+
8. Authors and Acknowledgments
12231229
==============================
12241230

12251231
The follwing people have contributed to this document:

INSTALL.t2t

+1-2
Original file line numberDiff line numberDiff line change
@@ -794,8 +794,7 @@ $HOME/apps/bin/qgis
794794
If all has worked properly the QGIS application should start up and appear
795795
on your screen.
796796

797-
= Creation of MSYS environment for compilation of Quantum GIS
798-
(including all dark magic involved) =
797+
= Creation of MSYS environment for compilation of Quantum GIS =
799798

800799
== Initial setup ==
801800

0 commit comments

Comments
 (0)