add qscintilla to INSTALL

qgis · Sep 28, 2012 · 3c5cb06 · 3c5cb06
1 parent ada8d40
commit 3c5cb06
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 36 deletions.
diff --git a/INSTALL b/INSTALL
@@ -1,10 +1,10 @@
 Quantum GIS (QGIS)
 Building QGIS from source - step by step
-Saturday August 04, 2012
+Friday September 28, 2012
 
 
-Last Updated: Saturday August 04, 2012
-Last Change : Saturday July 21, 2012
+Last Updated: Friday September 28, 2012
+Last Change : Friday September 28, 2012
 
 
   1. Introduction
@@ -110,7 +110,7 @@ Optional dependencies:
 - for postgis support and SPIT plugin - PostgreSQL >= 8.0.x
 - for gps plugin - expat >= 1.95 and gpsbabel
 - for mapserver export and PyQGIS - Python >= 2.3 (2.5+ preferred)
-- for python support - SIP >= 4.8, PyQt >= must match Qt version
+- for python support - SIP >= 4.8, PyQt >= must match Qt version, Qscintilla2
 - for qgis mapserver - FastCGI
 
 
@@ -593,6 +593,7 @@ Advanced Installation):
 - sip
 - spatialite
 - libspatialindex-devel
+- python-qscintilla
 
 This will also select packages the above packages depend on.
 
@@ -605,9 +606,7 @@ Earlier versions of this document also covered how to build all above
 dependencies.  If you're interested in that, check the history of this page in the Wiki
 or the SVN repository.
 
-
-    4.1.3. Setting up the Visual Studio project with CMake
-    ======================================================
+=== Setting up the Visual Studio project with CMake ===
 
 To start a command prompt with an environment that both has the VC++ and the OSGeo4W
 variables create the following batch file (assuming the above packages were
@@ -632,6 +631,7 @@ installed in the default locations):
 
   @cmd
 
+
 Start the batch file and on the command prompt checkout the QGIS source from
 git to the source directory Quantum-GIS:
 
@@ -676,7 +676,7 @@ You will also either need to add all the dependency DLLs to the QGIS install
 directory or add their respective directories to your PATH.
 
 
-    4.1.4. Packaging
+    4.1.3. Packaging
     ================
 
 To create a standalone installer there is a perl script named 'creatensis.pl'
@@ -697,7 +697,7 @@ and 'bzip2') is available at:
   http://cygwin.com
 
 
-    4.1.5. Packaging your own build of QGIS
+    4.1.4. Packaging your own build of QGIS
     =======================================
 
 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
 of QGIS and all dependencies needed to run it on a windows machine.
 
 
-    4.1.6. Osgeo4w packaging
+    4.1.5. Osgeo4w packaging
     ========================
 
 The actual packaging process is currently not documented, for now please take a

diff --git a/doc/INSTALL.html b/doc/INSTALL.html
@@ -5,7 +5,7 @@
 <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
 <TITLE>Quantum GIS (QGIS)</TITLE>
 
-<!-- Included style.css -->
+<!-- Included /home/fischer/src/qgis/doc/style.css -->
 <STYLE TYPE="text/css">
 body{  background: white;
   color: black;
@@ -77,13 +77,13 @@
 <DIV CLASS="header" ID="header">
 <H1>Quantum GIS (QGIS)</H1>
 <H2>Building QGIS from source - step by step</H2>
-<H3>Saturday August 04, 2012</H3>
+<H3>Friday September 28, 2012</H3>
 </DIV>
 
 <DIV CLASS="body" ID="body">
 <P>
-Last Updated: Saturday August 04, 2012
-Last Change : Saturday July 21, 2012
+Last Updated: Friday September 28, 2012
+Last Change : Friday September 28, 2012
 </P>
 <DIV CLASS="toc">
 
@@ -221,7 +221,7 @@ <H1>2. Overview</H1>
 <LI>for postgis support and SPIT plugin - PostgreSQL &gt;= 8.0.x
 <LI>for gps plugin - expat &gt;= 1.95 and gpsbabel
 <LI>for mapserver export and PyQGIS - Python &gt;= 2.3 (2.5+ preferred)
-<LI>for python support - SIP &gt;= 4.8, PyQt &gt;= must match Qt version
+<LI>for python support - SIP &gt;= 4.8, PyQt &gt;= must match Qt version, Qscintilla2
 <LI>for qgis mapserver - FastCGI
 </UL>
 
@@ -949,30 +949,25 @@ <H3>4.1.2. Other tools and dependencies</H3>
 <LI>sip
 <LI>spatialite
 <LI>libspatialindex-devel
-</UL>
-
-<P>
+<LI>python-qscintilla
+<P></P>
 This will also select packages the above packages depend on.
-</P>
-<P>
+<P></P>
 Additionally QGIS also needs the include file <CODE>unistd.h</CODE>, which normally
 doesn't exist on Windows.  It's shipped with Flex/Bison in <CODE>GnuWin32\include</CODE>
 and needs to be copied into the <CODE>VC\include</CODE> directory of your Visual C++
 installation.
-</P>
-<P>
+<P></P>
 Earlier versions of this document also covered how to build all above
 dependencies.  If you're interested in that, check the history of this page in the Wiki
 or the SVN repository.
-</P>
-
-<H3>4.1.3. Setting up the Visual Studio project with CMake</H3>
-
-<P>
+<P></P>
+=== Setting up the Visual Studio project with CMake ===
+<P></P>
 To start a command prompt with an environment that both has the VC++ and the OSGeo4W
 variables create the following batch file (assuming the above packages were
 installed in the default locations):
-</P>
+<P></P>
 
 <div class="code"><PRE>
 @echo off
@@ -995,10 +990,10 @@ <H3>4.1.3. Setting up the Visual Studio project with CMake</H3>
 @cmd
 </PRE></div>
 
-<P>
+<P></P>
 Start the batch file and on the command prompt checkout the QGIS source from
 git to the source directory <CODE>Quantum-GIS</CODE>:
-</P>
+</UL>
 
 <div class="code"><PRE>
 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>
 directory or add their respective directories to your PATH.
 </P>
 
-<H3>4.1.4. Packaging</H3>
+<H3>4.1.3. Packaging</H3>
 
 <P>
 To create a standalone installer there is a perl script named 'creatensis.pl'
@@ -1082,7 +1077,7 @@ <H3>4.1.4. Packaging</H3>
 	<A HREF="http://cygwin.com">http://cygwin.com</A>
 	</BLOCKQUOTE>
 
-<H3>4.1.5. Packaging your own build of QGIS</H3>
+<H3>4.1.4. Packaging your own build of QGIS</H3>
 
 <P>
 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>
 of QGIS and all dependencies needed to run it on a windows machine.
 </P>
 
-<H3>4.1.6. Osgeo4w packaging</H3>
+<H3>4.1.5. Osgeo4w packaging</H3>
 
 <P>
 The actual packaging process is currently not documented, for now please take a
@@ -2823,5 +2818,5 @@ <H1>8. Authors and Acknowledgments</H1>
 
 </DIV>
 <!-- html code generated by txt2tags 2.6 (http://txt2tags.org) -->
-<!-- cmdline: txt2tags -o INSTALL.html -t html INSTALL.t2t -->
+<!-- cmdline: txt2tags -o/home/fischer/src/qgis/debian/build/doc/INSTALL.html -t html /home/fischer/src/qgis/doc/INSTALL.t2t -->
 </BODY></HTML>
diff --git a/doc/INSTALL.t2t b/doc/INSTALL.t2t
@@ -61,6 +61,8 @@ Building QGIS from source - step by step
 % End of comments
 % -------------------
 
+% change to force build: Fri, 28 Sep 2012 11:08:01 +0200
+
 Last Updated: %%date(%A %B %d, %Y)
 Last Change : %%mtime(%A %B %d, %Y)
 

diff --git a/doc/msvc.t2t b/doc/msvc.t2t
@@ -54,7 +54,7 @@ For the QGIS build you need to install following packages from OSGeo4W (select
 - sip
 - spatialite
 - libspatialindex-devel
--
+- python-qscintilla
 
 This will also select packages the above packages depend on.
 

diff --git a/doc/overview.t2t b/doc/overview.t2t
@@ -30,7 +30,7 @@ Optional dependencies:
 - for postgis support and SPIT plugin - PostgreSQL >= 8.0.x
 - for gps plugin - expat >= 1.95 and gpsbabel
 - for mapserver export and PyQGIS - Python >= 2.3 (2.5+ preferred)
-- for python support - SIP >= 4.8, PyQt >= must match Qt version
+- for python support - SIP >= 4.8, PyQt >= must match Qt version, Qscintilla2
 - for qgis mapserver - FastCGI
 -