Skip to content

Commit 3c5cb06

Browse files
jef-njef-n
committedSep 28, 2012
add qscintilla to INSTALL
·
ltr-3_40Before-merge-new_vector_api
1 parent ada8d40 commit 3c5cb06

File tree

5 files changed

+33
-36
lines changed

5 files changed

+33
-36
lines changed
 

‎INSTALL

Lines changed: 10 additions & 10 deletions
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-
Saturday August 04, 2012
3+
Friday September 28, 2012
44

55

6-
Last Updated: Saturday August 04, 2012
7-
Last Change : Saturday July 21, 2012
6+
Last Updated: Friday September 28, 2012
7+
Last Change : Friday September 28, 2012
88

99

1010
1. Introduction
@@ -110,7 +110,7 @@ Optional dependencies:
110110
- for postgis support and SPIT plugin - PostgreSQL >= 8.0.x
111111
- for gps plugin - expat >= 1.95 and gpsbabel
112112
- for mapserver export and PyQGIS - Python >= 2.3 (2.5+ preferred)
113-
- for python support - SIP >= 4.8, PyQt >= must match Qt version
113+
- for python support - SIP >= 4.8, PyQt >= must match Qt version, Qscintilla2
114114
- for qgis mapserver - FastCGI
115115

116116

@@ -593,6 +593,7 @@ Advanced Installation):
593593
- sip
594594
- spatialite
595595
- libspatialindex-devel
596+
- python-qscintilla
596597

597598
This will also select packages the above packages depend on.
598599

@@ -605,9 +606,7 @@ Earlier versions of this document also covered how to build all above
605606
dependencies. If you're interested in that, check the history of this page in the Wiki
606607
or the SVN repository.
607608

608-
609-
4.1.3. Setting up the Visual Studio project with CMake
610-
======================================================
609+
=== Setting up the Visual Studio project with CMake ===
611610

612611
To start a command prompt with an environment that both has the VC++ and the OSGeo4W
613612
variables create the following batch file (assuming the above packages were
@@ -632,6 +631,7 @@ installed in the default locations):
632631

633632
@cmd
634633

634+
635635
Start the batch file and on the command prompt checkout the QGIS source from
636636
git to the source directory Quantum-GIS:
637637

@@ -676,7 +676,7 @@ You will also either need to add all the dependency DLLs to the QGIS install
676676
directory or add their respective directories to your PATH.
677677

678678

679-
4.1.4. Packaging
679+
4.1.3. Packaging
680680
================
681681

682682
To create a standalone installer there is a perl script named 'creatensis.pl'
@@ -697,7 +697,7 @@ and 'bzip2') is available at:
697697
http://cygwin.com
698698

699699

700-
4.1.5. Packaging your own build of QGIS
700+
4.1.4. Packaging your own build of QGIS
701701
=======================================
702702

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

719719

720-
4.1.6. Osgeo4w packaging
720+
4.1.5. Osgeo4w packaging
721721
========================
722722

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

‎doc/INSTALL.html

Lines changed: 19 additions & 24 deletions
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>Saturday August 04, 2012</H3>
80+
<H3>Friday September 28, 2012</H3>
8181
</DIV>
8282

8383
<DIV CLASS="body" ID="body">
8484
<P>
85-
Last Updated: Saturday August 04, 2012
86-
Last Change : Saturday July 21, 2012
85+
Last Updated: Friday September 28, 2012
86+
Last Change : Friday September 28, 2012
8787
</P>
8888
<DIV CLASS="toc">
8989

@@ -221,7 +221,7 @@ <H1>2. Overview</H1>
221221
<LI>for postgis support and SPIT plugin - PostgreSQL &gt;= 8.0.x
222222
<LI>for gps plugin - expat &gt;= 1.95 and gpsbabel
223223
<LI>for mapserver export and PyQGIS - Python &gt;= 2.3 (2.5+ preferred)
224-
<LI>for python support - SIP &gt;= 4.8, PyQt &gt;= must match Qt version
224+
<LI>for python support - SIP &gt;= 4.8, PyQt &gt;= must match Qt version, Qscintilla2
225225
<LI>for qgis mapserver - FastCGI
226226
</UL>
227227

@@ -949,30 +949,25 @@ <H3>4.1.2. Other tools and dependencies</H3>
949949
<LI>sip
950950
<LI>spatialite
951951
<LI>libspatialindex-devel
952-
</UL>
953-
954-
<P>
952+
<LI>python-qscintilla
953+
<P></P>
955954
This will also select packages the above packages depend on.
956-
</P>
957-
<P>
955+
<P></P>
958956
Additionally QGIS also needs the include file <CODE>unistd.h</CODE>, which normally
959957
doesn't exist on Windows. It's shipped with Flex/Bison in <CODE>GnuWin32\include</CODE>
960958
and needs to be copied into the <CODE>VC\include</CODE> directory of your Visual C++
961959
installation.
962-
</P>
963-
<P>
960+
<P></P>
964961
Earlier versions of this document also covered how to build all above
965962
dependencies. If you're interested in that, check the history of this page in the Wiki
966963
or the SVN repository.
967-
</P>
968-
969-
<H3>4.1.3. Setting up the Visual Studio project with CMake</H3>
970-
971-
<P>
964+
<P></P>
965+
=== Setting up the Visual Studio project with CMake ===
966+
<P></P>
972967
To start a command prompt with an environment that both has the VC++ and the OSGeo4W
973968
variables create the following batch file (assuming the above packages were
974969
installed in the default locations):
975-
</P>
970+
<P></P>
976971

977972
<div class="code"><PRE>
978973
@echo off
@@ -995,10 +990,10 @@ <H3>4.1.3. Setting up the Visual Studio project with CMake</H3>
995990
@cmd
996991
</PRE></div>
997992

998-
<P>
993+
<P></P>
999994
Start the batch file and on the command prompt checkout the QGIS source from
1000995
git to the source directory <CODE>Quantum-GIS</CODE>:
1001-
</P>
996+
</UL>
1002997

1003998
<div class="code"><PRE>
1004999
git clone git://github.com/qgis/Quantum-GIS.git
@@ -1055,7 +1050,7 @@ <H3>4.1.3. Setting up the Visual Studio project with CMake</H3>
10551050
directory or add their respective directories to your PATH.
10561051
</P>
10571052

1058-
<H3>4.1.4. Packaging</H3>
1053+
<H3>4.1.3. Packaging</H3>
10591054

10601055
<P>
10611056
To create a standalone installer there is a perl script named 'creatensis.pl'
@@ -1082,7 +1077,7 @@ <H3>4.1.4. Packaging</H3>
10821077
<A HREF="http://cygwin.com">http://cygwin.com</A>
10831078
</BLOCKQUOTE>
10841079

1085-
<H3>4.1.5. Packaging your own build of QGIS</H3>
1080+
<H3>4.1.4. Packaging your own build of QGIS</H3>
10861081

10871082
<P>
10881083
Assuming you have completed the above packaging step, if you want to include
@@ -1110,7 +1105,7 @@ <H3>4.1.5. Packaging your own build of QGIS</H3>
11101105
of QGIS and all dependencies needed to run it on a windows machine.
11111106
</P>
11121107

1113-
<H3>4.1.6. Osgeo4w packaging</H3>
1108+
<H3>4.1.5. Osgeo4w packaging</H3>
11141109

11151110
<P>
11161111
The actual packaging process is currently not documented, for now please take a
@@ -2823,5 +2818,5 @@ <H1>8. Authors and Acknowledgments</H1>
28232818

28242819
</DIV>
28252820
<!-- html code generated by txt2tags 2.6 (http://txt2tags.org) -->
2826-
<!-- cmdline: txt2tags -o INSTALL.html -t html INSTALL.t2t -->
2821+
<!-- cmdline: txt2tags -o/home/fischer/src/qgis/debian/build/doc/INSTALL.html -t html /home/fischer/src/qgis/doc/INSTALL.t2t -->
28272822
</BODY></HTML>

‎doc/INSTALL.t2t

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ Building QGIS from source - step by step
6161
% End of comments
6262
% -------------------
6363

64+
% change to force build: Fri, 28 Sep 2012 11:08:01 +0200
65+
6466
Last Updated: %%date(%A %B %d, %Y)
6567
Last Change : %%mtime(%A %B %d, %Y)
6668

‎doc/msvc.t2t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ For the QGIS build you need to install following packages from OSGeo4W (select
5454
- sip
5555
- spatialite
5656
- libspatialindex-devel
57-
-
57+
- python-qscintilla
5858

5959
This will also select packages the above packages depend on.
6060

‎doc/overview.t2t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Optional dependencies:
3030
- for postgis support and SPIT plugin - PostgreSQL >= 8.0.x
3131
- for gps plugin - expat >= 1.95 and gpsbabel
3232
- for mapserver export and PyQGIS - Python >= 2.3 (2.5+ preferred)
33-
- for python support - SIP >= 4.8, PyQt >= must match Qt version
33+
- for python support - SIP >= 4.8, PyQt >= must match Qt version, Qscintilla2
3434
- for qgis mapserver - FastCGI
3535
-
3636

0 commit comments

Comments
 (0)
Please sign in to comment.