Skip to content

Commit 7425310

Browse files
author
timlinux
committed
Removed redundnat intrduction section
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@6997 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 6ea9b4b commit 7425310

File tree

2 files changed

+24
-40
lines changed

2 files changed

+24
-40
lines changed

INSTALL

+23-32
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,16 @@ Tim Sutton
77

88
1. Introduction
99
2. Procedure for building under windows build environment using msys
10-
2.1. Introduction
11-
2.2. MSYS:
12-
2.3. Qt4.3
13-
2.4. Flex and Bison
14-
2.5. Python stuff: (optional)
15-
2.6. Subversion:
16-
2.7. CMake:
17-
2.8. QGIS:
18-
2.9. Compiling:
19-
2.10. Configuration
20-
2.11. Create the installation package: (optional)
10+
2.1. MSYS:
11+
2.2. Qt4.3
12+
2.3. Flex and Bison
13+
2.4. Python stuff: (optional)
14+
2.5. Subversion:
15+
2.6. CMake:
16+
2.7. QGIS:
17+
2.8. Compiling:
18+
2.9. Configuration
19+
2.10. Create the installation package: (optional)
2120

2221

2322
------------------------------------------------------------------------
@@ -26,6 +25,8 @@ Tim Sutton
2625
1. Introduction
2726
===============
2827

28+
This document is for developers and describes the procedure required to compile this version of QGIS.
29+
2930

3031
2. Procedure for building under windows build environment using msys
3132
====================================================================
@@ -40,17 +41,7 @@ Tim Sutton
4041

4142

4243

43-
2.1. Introduction
44-
=================
45-
46-
This document describes the process you need to follow to get QGIS built directly
47-
under windows (rather than using a cross compiler under linux).
48-
49-
Note: The process for building under windows is still being sorted out so
50-
check this document regularly for updates.
51-
52-
53-
2.2. MSYS:
44+
2.1. MSYS:
5445
==========
5546

5647
MSYS provides a unix style build environment under windows. We have created a zip archive that contains just about all dependencies.
@@ -66,7 +57,7 @@ and unpack to c:\msys
6657
http://www.7-zip.org/
6758

6859

69-
2.3. Qt4.3
60+
2.2. Qt4.3
7061
==========
7162

7263
Download qt4.3 opensource precompiled edition exe and install (including the
@@ -90,13 +81,13 @@ If you plan to do some debugging, you'll need to compile debug version of Qt:
9081
C:\Qt\4.3.0\bin\qtvars.bat compile_debug
9182

9283

93-
2.4. Flex and Bison
84+
2.3. Flex and Bison
9485
===================
9586

9687
Get Flex http://sourceforge.net/project/showfiles.php?group_id=23617&package_id=16424 (the zip bin) and extract it into c:\msys\mingw\bin
9788

9889

99-
2.5. Python stuff: (optional)
90+
2.4. Python stuff: (optional)
10091
=============================
10192

10293
Follow this section in case you would like to use Python bindings for QGIS.
@@ -131,7 +122,7 @@ as their installer doesn't include some development files which are necessary.
131122
after a successfull install, they're not needed anymore.
132123

133124

134-
2.6. Subversion:
125+
2.5. Subversion:
135126
================
136127

137128
In order to check out QGIS sources from the repository, you need Subversion
@@ -140,15 +131,15 @@ client. This installer should work fine:
140131
http://subversion.tigris.org/files/documents/15/36797/svn-1.4.3-setup.exe
141132

142133

143-
2.7. CMake:
134+
2.6. CMake:
144135
===========
145136

146137
CMake is build system used by Quantum GIS. Download it from here:
147138

148139
http://www.cmake.org/files/v2.4/cmake-2.4.6-win32-x86.exe
149140

150141

151-
2.8. QGIS:
142+
2.7. QGIS:
152143
==========
153144

154145
* Start a cmd.exe window ( Start -> Run -> cmd.exe )
@@ -172,7 +163,7 @@ http://www.cmake.org/files/v2.4/cmake-2.4.6-win32-x86.exe
172163

173164

174165

175-
2.9. Compiling:
166+
2.8. Compiling:
176167
===============
177168

178169
As a background read http://wiki.qgis.org/qgiswiki/Building_with_CMake
@@ -193,8 +184,8 @@ As a background read http://wiki.qgis.org/qgiswiki/Building_with_CMake
193184

194185

195186

196-
2.10. Configuration
197-
===================
187+
2.9. Configuration
188+
==================
198189

199190

200191
cmakesetup ..
@@ -235,7 +226,7 @@ As a background read http://wiki.qgis.org/qgiswiki/Building_with_CMake
235226
will be used from that place.
236227

237228

238-
2.11. Create the installation package: (optional)
229+
2.10. Create the installation package: (optional)
239230
=================================================
240231

241232
Downlad and install NSIS from (http://nsis.sourceforge.net/Main_Page)

INSTALL.t2t

+1-8
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Tim Sutton
1010
%formatted documentation by running txt2tags on this document. See the txt2tags home
1111
%page for more details.
1212

13-
13+
This document is for developers and describes the procedure required to compile this version of QGIS.
1414

1515
= Procedure for building under windows build environment using msys =
1616
```
@@ -22,13 +22,6 @@ Tim Sutton
2222
---------------------------------------------------------------------------------
2323
```
2424

25-
== Introduction ==
26-
This document describes the process you need to follow to get QGIS built directly
27-
under windows (rather than using a cross compiler under linux).
28-
29-
Note: The process for building under windows is still being sorted out so
30-
check this document regularly for updates.
31-
3225
== MSYS: ==
3326

3427
MSYS provides a unix style build environment under windows. We have created a zip archive that contains just about all dependencies.

0 commit comments

Comments
 (0)