Skip to content

Commit 522bbcd

Browse files
committed
update INSTALL
1 parent 4f0fe1b commit 522bbcd

File tree

2 files changed

+42
-33
lines changed

2 files changed

+42
-33
lines changed

INSTALL

+14-12
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
Quantum GIS (QGIS)
22
Building QGIS from source - step by step
3-
Tuesday October 23, 2012
3+
Friday January 04, 2013
44

55

6-
Last Updated: Tuesday October 23, 2012
7-
Last Change : Tuesday October 23, 2012
6+
Last Updated: Friday January 04, 2013
7+
Last Change : Friday January 04, 2013
88

99

1010
1. Introduction
@@ -104,13 +104,14 @@ Required build deps:
104104
- Sqlite3 >= 3.0.0
105105
- GDAL/OGR >= 1.4.x
106106
- Qwt >= 5.0
107+
- expat >= 1.95
107108

108109
Optional dependencies:
109110

110111
- for GRASS plugin - GRASS >= 6.0.0 (libraries compiled with exceptions support on Linux 32bit)
111112
- for georeferencer - GSL >= 1.8
112113
- for postgis support and SPIT plugin - PostgreSQL >= 8.0.x
113-
- for gps plugin - expat >= 1.95 and gpsbabel
114+
- for gps plugin - gpsbabel
114115
- for mapserver export and PyQGIS - Python >= 2.3 (2.5+ preferred)
115116
- for python support - SIP >= 4.8, PyQt >= must match Qt version, Qscintilla2
116117
- for qgis mapserver - FastCGI
@@ -539,7 +540,7 @@ To run QGIS just use this command
539540
==========================================
540541

541542
This section describes how to build QGIS using Visual Studio on Windows. This
542-
is currently also who the binary QGIS packages are made (earlier versions used
543+
is currently also how the binary QGIS packages are made (earlier versions used
543544
MinGW).
544545

545546
This section describes the setup required to allow Visual Studio to be used to
@@ -608,7 +609,9 @@ Earlier versions of this document also covered how to build all above
608609
dependencies. If you're interested in that, check the history of this page in the Wiki
609610
or the SVN repository.
610611

611-
=== Setting up the Visual Studio project with CMake ===
612+
613+
4.1.3. Setting up the Visual Studio project with CMake
614+
======================================================
612615

613616
To start a command prompt with an environment that both has the VC++ and the OSGeo4W
614617
variables create the following batch file (assuming the above packages were
@@ -633,7 +636,6 @@ installed in the default locations):
633636

634637
@cmd
635638

636-
637639
Start the batch file and on the command prompt checkout the QGIS source from
638640
git to the source directory Quantum-GIS:
639641

@@ -642,8 +644,8 @@ git to the source directory Quantum-GIS:
642644
Create a 'build' directory somewhere. This will be where all the build output
643645
will be generated.
644646

645-
Now run cmake-gui and in the Where is the source code: box, browse to
646-
the top level QGIS directory.
647+
Now run cmake-gui (still from cmd) and in the Where is the source code:
648+
box, browse to the top level QGIS directory.
647649

648650
In the Where to build the binaries: box, browse to the 'build' directory you
649651
created.
@@ -678,7 +680,7 @@ You will also either need to add all the dependency DLLs to the QGIS install
678680
directory or add their respective directories to your PATH.
679681

680682

681-
4.1.3. Packaging
683+
4.1.4. Packaging
682684
================
683685

684686
To create a standalone installer there is a perl script named 'creatensis.pl'
@@ -699,7 +701,7 @@ and 'bzip2') is available at:
699701
http://cygwin.com
700702

701703

702-
4.1.4. Packaging your own build of QGIS
704+
4.1.5. Packaging your own build of QGIS
703705
=======================================
704706

705707
Assuming you have completed the above packaging step, if you want to include
@@ -719,7 +721,7 @@ After this you should now have a nsis installer containing your own build
719721
of QGIS and all dependencies needed to run it on a windows machine.
720722

721723

722-
4.1.5. Osgeo4w packaging
724+
4.1.6. Osgeo4w packaging
723725
========================
724726

725727
The actual packaging process is currently not documented, for now please take a

doc/INSTALL.html

+28-21
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
66
<TITLE>Quantum GIS (QGIS)</TITLE>
77

8-
<!-- Included style.css -->
8+
<!-- Included /home/fischer/src/qgis/doc/style.css -->
99
<STYLE TYPE="text/css">
1010
body{ background: white;
1111
color: black;
@@ -77,13 +77,13 @@
7777
<DIV CLASS="header" ID="header">
7878
<H1>Quantum GIS (QGIS)</H1>
7979
<H2>Building QGIS from source - step by step</H2>
80-
<H3>Tuesday October 23, 2012</H3>
80+
<H3>Friday January 04, 2013</H3>
8181
</DIV>
8282

8383
<DIV CLASS="body" ID="body">
8484
<P>
85-
Last Updated: Tuesday October 23, 2012
86-
Last Change : Tuesday October 23, 2012
85+
Last Updated: Friday January 04, 2013
86+
Last Change : Friday January 04, 2013
8787
</P>
8888
<DIV CLASS="toc">
8989

@@ -211,6 +211,7 @@ <H1>2. Overview</H1>
211211
<LI>Sqlite3 &gt;= 3.0.0
212212
<LI>GDAL/OGR &gt;= 1.4.x
213213
<LI>Qwt &gt;= 5.0
214+
<LI>expat &gt;= 1.95
214215
</UL>
215216

216217
<P>
@@ -221,7 +222,7 @@ <H1>2. Overview</H1>
221222
<LI>for GRASS plugin - GRASS &gt;= 6.0.0 (libraries compiled with exceptions support on Linux 32bit)
222223
<LI>for georeferencer - GSL &gt;= 1.8
223224
<LI>for postgis support and SPIT plugin - PostgreSQL &gt;= 8.0.x
224-
<LI>for gps plugin - expat &gt;= 1.95 and gpsbabel
225+
<LI>for gps plugin - gpsbabel
225226
<LI>for mapserver export and PyQGIS - Python &gt;= 2.3 (2.5+ preferred)
226227
<LI>for python support - SIP &gt;= 4.8, PyQt &gt;= must match Qt version, Qscintilla2
227228
<LI>for qgis mapserver - FastCGI
@@ -861,7 +862,7 @@ <H2>4.1. Building with Microsoft Visual Studio</H2>
861862

862863
<P>
863864
This section describes how to build QGIS using Visual Studio on Windows. This
864-
is currently also who the binary QGIS packages are made (earlier versions used
865+
is currently also how the binary QGIS packages are made (earlier versions used
865866
MinGW).
866867
</P>
867868
<P>
@@ -952,24 +953,30 @@ <H3>4.1.2. Other tools and dependencies</H3>
952953
<LI>spatialite
953954
<LI>libspatialindex-devel
954955
<LI>python-qscintilla
955-
<P></P>
956+
</UL>
957+
958+
<P>
956959
This will also select packages the above packages depend on.
957-
<P></P>
960+
</P>
961+
<P>
958962
Additionally QGIS also needs the include file <CODE>unistd.h</CODE>, which normally
959963
doesn't exist on Windows. It's shipped with Flex/Bison in <CODE>GnuWin32\include</CODE>
960964
and needs to be copied into the <CODE>VC\include</CODE> directory of your Visual C++
961965
installation.
962-
<P></P>
966+
</P>
967+
<P>
963968
Earlier versions of this document also covered how to build all above
964969
dependencies. If you're interested in that, check the history of this page in the Wiki
965970
or the SVN repository.
966-
<P></P>
967-
=== Setting up the Visual Studio project with CMake ===
968-
<P></P>
971+
</P>
972+
973+
<H3>4.1.3. Setting up the Visual Studio project with CMake</H3>
974+
975+
<P>
969976
To start a command prompt with an environment that both has the VC++ and the OSGeo4W
970977
variables create the following batch file (assuming the above packages were
971978
installed in the default locations):
972-
<P></P>
979+
</P>
973980

974981
<div class="code"><PRE>
975982
@echo off
@@ -992,10 +999,10 @@ <H3>4.1.2. Other tools and dependencies</H3>
992999
@cmd
9931000
</PRE></div>
9941001

995-
<P></P>
1002+
<P>
9961003
Start the batch file and on the command prompt checkout the QGIS source from
9971004
git to the source directory <CODE>Quantum-GIS</CODE>:
998-
</UL>
1005+
</P>
9991006

10001007
<div class="code"><PRE>
10011008
git clone git://github.com/qgis/Quantum-GIS.git
@@ -1006,8 +1013,8 @@ <H3>4.1.2. Other tools and dependencies</H3>
10061013
will be generated.
10071014
</P>
10081015
<P>
1009-
Now run <CODE>cmake-gui</CODE> and in the <I>Where is the source code:</I> box, browse to
1010-
the top level QGIS directory.
1016+
Now run <CODE>cmake-gui</CODE> (still from <CODE>cmd</CODE>) and in the <I>Where is the source code:</I>
1017+
box, browse to the top level QGIS directory.
10111018
</P>
10121019
<P>
10131020
In the <I>Where to build the binaries:</I> box, browse to the 'build' directory you
@@ -1052,7 +1059,7 @@ <H3>4.1.2. Other tools and dependencies</H3>
10521059
directory or add their respective directories to your PATH.
10531060
</P>
10541061

1055-
<H3>4.1.3. Packaging</H3>
1062+
<H3>4.1.4. Packaging</H3>
10561063

10571064
<P>
10581065
To create a standalone installer there is a perl script named 'creatensis.pl'
@@ -1079,7 +1086,7 @@ <H3>4.1.3. Packaging</H3>
10791086
<A HREF="http://cygwin.com">http://cygwin.com</A>
10801087
</BLOCKQUOTE>
10811088

1082-
<H3>4.1.4. Packaging your own build of QGIS</H3>
1089+
<H3>4.1.5. Packaging your own build of QGIS</H3>
10831090

10841091
<P>
10851092
Assuming you have completed the above packaging step, if you want to include
@@ -1107,7 +1114,7 @@ <H3>4.1.4. Packaging your own build of QGIS</H3>
11071114
of QGIS and all dependencies needed to run it on a windows machine.
11081115
</P>
11091116

1110-
<H3>4.1.5. Osgeo4w packaging</H3>
1117+
<H3>4.1.6. Osgeo4w packaging</H3>
11111118

11121119
<P>
11131120
The actual packaging process is currently not documented, for now please take a
@@ -3157,5 +3164,5 @@ <H1>9. Authors and Acknowledgments</H1>
31573164

31583165
</DIV>
31593166
<!-- html code generated by txt2tags 2.6 (http://txt2tags.org) -->
3160-
<!-- cmdline: txt2tags -o INSTALL.html -t html INSTALL.t2t -->
3167+
<!-- cmdline: txt2tags -odoc/INSTALL.html -t html doc/INSTALL.t2t -->
31613168
</BODY></HTML>

0 commit comments

Comments
 (0)