[QGIS Commit] r14468 - in trunk/qgis: . doc scripts
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Sun Oct 31 17:08:41 EDT 2010
Author: jef
Date: 2010-10-31 14:08:41 -0700 (Sun, 31 Oct 2010)
New Revision: 14468
Added:
trunk/qgis/scripts/scandeps.pl
Modified:
trunk/qgis/INSTALL
trunk/qgis/doc/linux.t2t
trunk/qgis/doc/msvc.t2t
trunk/qgis/doc/msys.t2t
Log:
documentation update
Modified: trunk/qgis/INSTALL
===================================================================
--- trunk/qgis/INSTALL 2010-10-31 18:09:25 UTC (rev 14467)
+++ trunk/qgis/INSTALL 2010-10-31 21:08:41 UTC (rev 14468)
@@ -9,16 +9,14 @@
3. Building on GNU/Linux
3.1. Building QGIS with Qt 4.x
3.2. Prepare apt
- 3.3. Install Qt4
- 3.4. Install additional software dependencies required by QGIS
- 3.5. GRASS Specific Steps
- 3.6. Setup ccache (Optional)
- 3.7. Prepare your development environment
- 3.8. Check out the QGIS Source Code
- 3.9. Starting the compile
- 3.10. Building Debian packages
- 3.11. Running QGIS
- 3.12. A practical case: Building QGIS and GRASS from source on Ubuntu with ECW and MrSID formats support
+ 3.3. Install build dependencies
+ 3.4. Setup ccache (Optional)
+ 3.5. Prepare your development environment
+ 3.6. Check out the QGIS Source Code
+ 3.7. Starting the compile
+ 3.8. Building Debian packages
+ 3.9. Running QGIS
+ 3.10. A practical case: Building QGIS and GRASS from source on Ubuntu with ECW and MrSID formats support
4. Building on Windows
4.1. Building with Microsoft Visual Studio
4.2. Building using MinGW
@@ -133,7 +131,11 @@
in use for a while, you may need to just skip those steps which are irrelevant
to you.
+/!\ Note: Refer to the section ''Building Debian packages'' for building
+debian packages. Unless you plan to develop on QGIS, that is probably the
+easiest option to compile and install QGIS.
+
3.2. Prepare apt
================
@@ -153,14 +155,22 @@
- 3.3. Install Qt4
- ================
+ 3.3. Install build dependencies
+ ===============================
- sudo apt-get install libqt4-core libqt4-debug \
- libqt4-dev libqt4-gui libqt4-qt3support libqt4-sql lsb-qt4 qt4-designer \
- qt4-dev-tools qt4-doc qt4-qtconfig uim-qt gcc libapt-pkg-perl resolvconf
+ || Distribution | install command for packages |
+ | hardy | ``apt-get install bison cmake fcgi-dev flex grass-dev libexpat1-dev libgdal1-dev libgeos-dev libgsl0-dev libpq-dev libqt4-core libqt4-dev libqt4-gui libqt4-sql libsqlite3-dev proj pyqt4-dev-tools python python-dev python-qt4 python-qt4-dev python-sip4 python-sip4-dev sip4`` |
+ | intrepid | ``apt-get install bison cmake flex grass-dev libexpat1-dev libfcgi-dev libgdal1-dev libgeos-dev libgsl0-dev libpq-dev libqt4-core libqt4-dev libqt4-gui libqt4-sql libqwt5-qt4-dev libsqlite3-dev proj pyqt4-dev-tools python python-dev python-qt4 python-qt4-dev python-sip4 python-sip4-dev sip4`` |
+ | jaunty | ``apt-get install bison cmake flex grass-dev libexpat1-dev libfcgi-dev libgdal1-dev libgeos-dev libgsl0-dev libpq-dev libqt4-core libqt4-dev libqt4-gui libqt4-sql libqwt5-qt4-dev libsqlite3-dev proj pyqt4-dev-tools python python-dev python-qt4 python-qt4-dev python-sip4 python-sip4-dev sip4`` |
+ | karmic | ``apt-get install bison cmake flex grass-dev libexpat1-dev libfcgi-dev libgdal1-dev libgeos-dev libgsl0-dev libpq-dev libqt4-core libqt4-dev libqt4-gui libqt4-sql libqwt5-qt4-dev libsqlite3-dev proj pyqt4-dev-tools python python-dev python-qt4 python-qt4-dev python-sip4 python-sip4-dev sip4`` |
+ | lenny | ``apt-get install bison cmake flex grass-dev libexpat1-dev libfcgi-dev libgdal1-dev libgeos-dev libgsl0-dev libpq-dev libqt4-dev libqwt5-qt4-dev libsqlite3-dev pkg-config proj pyqt4-dev-tools python python-dev python-qt4 python-qt4-dev python-sip4-dev sip4`` |
+ | lucid | ``apt-get install bison cmake flex grass-dev libexpat1-dev libfcgi-dev libgdal1-dev libgeos-dev libgsl0-dev libpq-dev libproj-dev libqt4-dev libqwt5-qt4-dev libspatialite-dev libsqlite3-dev pkg-config pyqt4-dev-tools python python-dev python-qt4 python-qt4-dev python-sip python-sip-dev`` |
+ | maverick | ``apt-get install bison cmake flex grass-dev libexpat1-dev libfcgi-dev libgdal1-dev libgeos-dev libgsl0-dev libpq-dev libproj-dev libqt4-dev libqtwebkit-dev libqwt5-qt4-dev libspatialite-dev libsqlite3-dev pkg-config pyqt4-dev-tools python python-dev python-qt4 python-qt4-dev python-sip python-sip-dev`` |
+ | sid | ``apt-get install bison cmake flex grass-dev libexpat1-dev libfcgi-dev libgdal1-dev libgeos-dev libgsl0-dev libpq-dev libproj-dev libqt4-dev libqwt5-qt4-dev libspatialite-dev libsqlite3-dev pkg-config pyqt4-dev-tools python python-dev python-qt4 python-qt4-dev python-sip python-sip-dev`` |
+ | squeeze | ``apt-get install bison cmake flex grass-dev libexpat1-dev libfcgi-dev libgdal1-dev libgeos-dev libgsl0-dev libpq-dev libproj-dev libqt4-dev libqwt5-qt4-dev libspatialite-dev libsqlite3-dev pkg-config pyqt4-dev-tools python python-dev python-qt4 python-qt4-dev python-sip python-sip-dev`` |
+(extracted from the respective control files in debian/)
/!\ A Special Note: If you are following this set of instructions on
a system where you already have Qt3 development tools installed, there will
@@ -198,45 +208,12 @@
Use the simple command line dialog that appears after running each of the
above commands to select the Qt4 version of the relevant applications.
-
- 3.4. Install additional software dependencies required by QGIS
- ==============================================================
-
-
- sudo apt-get install gdal-bin libgdal1-dev libgeos-dev proj \
- libgdal-doc libhdf4g-dev libhdf4g-run python-dev \
- libgsl0-dev g++ libjasper-dev libtiff4-dev subversion \
- libsqlite3-dev sqlite3 ccache make libpq-dev flex bison cmake txt2tags \
- python-qt4 python-qt4-dev python-sip4 sip4 python-sip4-dev
-
-
-/!\ Debian users should use libgdal-dev above rather
-
/!\ Note: For python language bindings SIP >= 4.5 and PyQt4 >= 4.1 is required! Some stable GNU/Linux
distributions (e.g. Debian or SuSE) only provide SIP < 4.5 and PyQt4 < 4.1. To include support for python
language bindings you may need to build and install those packages from source.
-If you do not have cmake installed already:
-
- sudo apt-get install cmake
-
-
-
- 3.5. GRASS Specific Steps
- =========================
-
-/!\ Note: If you don't need to build with GRASS support, you can
-skip this section.
-
-Now you can install grass from dapper:
-
-
- sudo apt-get install grass libgrass-dev
-
-
-
- 3.6. Setup ccache (Optional)
+ 3.4. Setup ccache (Optional)
============================
You should also setup ccache to speed up compile times:
@@ -248,7 +225,7 @@
- 3.7. Prepare your development environment
+ 3.5. Prepare your development environment
=========================================
As a convention I do all my development work in $HOME/dev/<language>, so in
@@ -263,7 +240,7 @@
This directory path will be assumed for all instructions that follow.
- 3.8. Check out the QGIS Source Code
+ 3.6. Check out the QGIS Source Code
===================================
There are two ways the source can be checked out. Use the anonymous method
@@ -302,11 +279,9 @@
- 3.9. Starting the compile
+ 3.7. Starting the compile
=========================
-/!\ Note: The next section describes howto build debian packages
-
I compile my development version of QGIS into my ~/apps directory to avoid
conflicts with Ubuntu packages that may be under /usr. This way for example
you can use the binary packages of QGIS on your system along side with your
@@ -346,8 +321,8 @@
It may take a little while to build depending on your platform.
- 3.10. Building Debian packages
- ==============================
+ 3.8. Building Debian packages
+ =============================
Instead of creating a personal installation as in the previous step you can
also create debian package. This is done from the qgis root directory, where
@@ -386,8 +361,8 @@
- 3.11. Running QGIS
- ==================
+ 3.9. Running QGIS
+ =================
Now you can try to run QGIS:
@@ -399,7 +374,7 @@
on your screen.
- 3.12. A practical case: Building QGIS and GRASS from source on Ubuntu with ECW and MrSID formats support
+ 3.10. A practical case: Building QGIS and GRASS from source on Ubuntu with ECW and MrSID formats support
========================================================================================================
The following procedure has been tested on Ubuntu 8.04, 8.10 and 9.04 32bit. If you want
@@ -408,7 +383,7 @@
installed any previous version of gdal, grass and qgis.
- 3.12.1. Step 1: install base packages
+ 3.10.1. Step 1: install base packages
=====================================
First you need to install the necessary packages required to download the source
@@ -419,7 +394,7 @@
- 3.12.2. Step 2: compile and install the ecw libraries
+ 3.10.2. Step 2: compile and install the ecw libraries
=====================================================
Go to the ERDAS web site http://www.erdas.com/ and follow the links
@@ -460,7 +435,7 @@
- 3.12.3. Step 3: download the MrSID binaries
+ 3.10.3. Step 3: download the MrSID binaries
===========================================
Go to the LIZARDTECH web site http://www.lizardtech.com/ and follow the links
@@ -471,7 +446,7 @@
Uncompress the downloaded file. The resulting directory name should be similar to "Geo_DSDK-7.0.0.2167"
- 3.12.4. Step 4: compile and install the gdal libraries
+ 3.10.4. Step 4: compile and install the gdal libraries
======================================================
Download the latest gdal source code
@@ -548,7 +523,7 @@
- 3.12.5. Step 5: compile and install GRASS
+ 3.10.5. Step 5: compile and install GRASS
=========================================
Before downloading and compile GRASS source code you need to install a few
@@ -570,7 +545,8 @@
Uncompress the arquive, enter the newly created folder and run configure with a few specific parameters
- CFLAGS="-fexceptions" ./configure --with-tcltk-includes=/usr/include/tcl8.4 --with-proj-share=/usr/share/proj --with-gdal=/usr/local/bin/gdal-config --with-python=/usr/bin/python2.5-config
+ CFLAGS="-fexceptions" ./configure --with-tcltk-includes=/usr/include/tcl8.4 --with-proj-share=/usr/share/proj --with-gdal=/usr/local/bin/gdal-config \
+ --with-python=/usr/bin/python2.5-config
The additional gcc option -fexceptions is necessary to enable exceptions support in GRASS libraries. It is currently the only way to avoid QGIS crashes if a fatal error happens in GRASS library. See also http://trac.osgeo.org/grass/ticket/869
@@ -601,7 +577,7 @@
- 3.12.6. Step 6: compile and install QGIS
+ 3.10.6. Step 6: compile and install QGIS
========================================
As for GRASS you can obtain the QGIS source code from different sources,
@@ -712,7 +688,7 @@
- expat
- fcgi
- gdal17
-- grass-devel-vc
+- grass
- gsl-devel
- iconv
- pyqt4
@@ -1147,7 +1123,10 @@
export PATH="/usr/local/bin:/usr/local/lib:$PATH"
- ./configure --prefix=/usr/local --bindir=/usr/local --with-includes=/usr/local/include --with-libs=/usr/local/lib --with-cxx --without-jpeg --without-tiff --with-postgres=yes --with-postgres-includes=/local/pgsql/include --with-pgsql-libs=/local/pgsql/lib --with-opengl=windows --with-fftw --with-freetype --with-freetype-includes=/mingw/include/freetype2 --without-x --without-tcltk --enable-x11=no --enable-shared=yes --with-proj-share=/usr/local/share/proj
+ ./configure --prefix=/usr/local --bindir=/usr/local --with-includes=/usr/local/include --with-libs=/usr/local/lib --with-cxx --without-jpeg \
+ --without-tiff --with-postgres=yes --with-postgres-includes=/local/pgsql/include --with-pgsql-libs=/local/pgsql/lib --with-opengl=windows --with-fftw \
+ --with-freetype --with-freetype-includes=/mingw/include/freetype2 --without-x --without-tcltk --enable-x11=no --enable-shared=yes \
+ --with-proj-share=/usr/local/share/proj
make
make install
Modified: trunk/qgis/doc/linux.t2t
===================================================================
--- trunk/qgis/doc/linux.t2t 2010-10-31 18:09:25 UTC (rev 14467)
+++ trunk/qgis/doc/linux.t2t 2010-10-31 21:08:41 UTC (rev 14468)
@@ -19,6 +19,10 @@
in use for a while, you may need to just skip those steps which are irrelevant
to you.
+/!\ **Note:** Refer to the section ''Building Debian packages'' for building
+debian packages. Unless you plan to develop on QGIS, that is probably the
+easiest option to compile and install QGIS.
+
== Prepare apt ==
The packages qgis depends on to build are available in the "universe" component
@@ -37,14 +41,21 @@
```
-== Install Qt4 ==
+== Install build dependencies ==
-```
-sudo apt-get install libqt4-core libqt4-debug \
-libqt4-dev libqt4-gui libqt4-qt3support libqt4-sql lsb-qt4 qt4-designer \
-qt4-dev-tools qt4-doc qt4-qtconfig uim-qt gcc libapt-pkg-perl resolvconf
-```
+|| Distribution | install command for packages |
+| hardy | ``apt-get install bison cmake fcgi-dev flex grass-dev libexpat1-dev libgdal1-dev libgeos-dev libgsl0-dev libpq-dev libqt4-core libqt4-dev libqt4-gui libqt4-sql libsqlite3-dev proj pyqt4-dev-tools python python-dev python-qt4 python-qt4-dev python-sip4 python-sip4-dev sip4`` |
+| intrepid | ``apt-get install bison cmake flex grass-dev libexpat1-dev libfcgi-dev libgdal1-dev libgeos-dev libgsl0-dev libpq-dev libqt4-core libqt4-dev libqt4-gui libqt4-sql libqwt5-qt4-dev libsqlite3-dev proj pyqt4-dev-tools python python-dev python-qt4 python-qt4-dev python-sip4 python-sip4-dev sip4`` |
+| jaunty | ``apt-get install bison cmake flex grass-dev libexpat1-dev libfcgi-dev libgdal1-dev libgeos-dev libgsl0-dev libpq-dev libqt4-core libqt4-dev libqt4-gui libqt4-sql libqwt5-qt4-dev libsqlite3-dev proj pyqt4-dev-tools python python-dev python-qt4 python-qt4-dev python-sip4 python-sip4-dev sip4`` |
+| karmic | ``apt-get install bison cmake flex grass-dev libexpat1-dev libfcgi-dev libgdal1-dev libgeos-dev libgsl0-dev libpq-dev libqt4-core libqt4-dev libqt4-gui libqt4-sql libqwt5-qt4-dev libsqlite3-dev proj pyqt4-dev-tools python python-dev python-qt4 python-qt4-dev python-sip4 python-sip4-dev sip4`` |
+| lenny | ``apt-get install bison cmake flex grass-dev libexpat1-dev libfcgi-dev libgdal1-dev libgeos-dev libgsl0-dev libpq-dev libqt4-dev libqwt5-qt4-dev libsqlite3-dev pkg-config proj pyqt4-dev-tools python python-dev python-qt4 python-qt4-dev python-sip4-dev sip4`` |
+| lucid | ``apt-get install bison cmake flex grass-dev libexpat1-dev libfcgi-dev libgdal1-dev libgeos-dev libgsl0-dev libpq-dev libproj-dev libqt4-dev libqwt5-qt4-dev libspatialite-dev libsqlite3-dev pkg-config pyqt4-dev-tools python python-dev python-qt4 python-qt4-dev python-sip python-sip-dev`` |
+| maverick | ``apt-get install bison cmake flex grass-dev libexpat1-dev libfcgi-dev libgdal1-dev libgeos-dev libgsl0-dev libpq-dev libproj-dev libqt4-dev libqtwebkit-dev libqwt5-qt4-dev libspatialite-dev libsqlite3-dev pkg-config pyqt4-dev-tools python python-dev python-qt4 python-qt4-dev python-sip python-sip-dev`` |
+| sid | ``apt-get install bison cmake flex grass-dev libexpat1-dev libfcgi-dev libgdal1-dev libgeos-dev libgsl0-dev libpq-dev libproj-dev libqt4-dev libqwt5-qt4-dev libspatialite-dev libsqlite3-dev pkg-config pyqt4-dev-tools python python-dev python-qt4 python-qt4-dev python-sip python-sip-dev`` |
+| squeeze | ``apt-get install bison cmake flex grass-dev libexpat1-dev libfcgi-dev libgdal1-dev libgeos-dev libgsl0-dev libpq-dev libproj-dev libqt4-dev libqwt5-qt4-dev libspatialite-dev libsqlite3-dev pkg-config pyqt4-dev-tools python python-dev python-qt4 python-qt4-dev python-sip python-sip-dev`` |
+(extracted from the respective control files in ``debian/``)
+
/!\ **A Special Note:** If you are following this set of instructions on
a system where you already have Qt3 development tools installed, there will
be a conflict between Qt3 tools and Qt4 tools. For example, qmake will
@@ -81,38 +92,11 @@
Use the simple command line dialog that appears after running each of the
above commands to select the Qt4 version of the relevant applications.
-== Install additional software dependencies required by QGIS ==
-
-```
-sudo apt-get install gdal-bin libgdal1-dev libgeos-dev proj \
-libgdal-doc libhdf4g-dev libhdf4g-run python-dev \
-libgsl0-dev g++ libjasper-dev libtiff4-dev subversion \
-libsqlite3-dev sqlite3 ccache make libpq-dev flex bison cmake txt2tags \
-python-qt4 python-qt4-dev python-sip4 sip4 python-sip4-dev
-```
-
-/!\ Debian users should use libgdal-dev above rather
-
/!\ **Note:** For python language bindings SIP >= 4.5 and PyQt4 >= 4.1 is required! Some stable GNU/Linux
distributions (e.g. Debian or SuSE) only provide SIP < 4.5 and PyQt4 < 4.1. To include support for python
language bindings you may need to build and install those packages from source.
-If you do not have cmake installed already:
-```
-sudo apt-get install cmake
-```
-== GRASS Specific Steps ==
-
-/!\ **Note:** If you don't need to build with GRASS support, you can
-skip this section.
-
-Now you can install grass from dapper:
-
-```
-sudo apt-get install grass libgrass-dev
-```
-
== Setup ccache (Optional) ==
You should also setup ccache to speed up compile times:
@@ -176,8 +160,6 @@
== Starting the compile ==
-/!\ **Note:** The next section describes howto build debian packages
-
I compile my development version of QGIS into my ~/apps directory to avoid
conflicts with Ubuntu packages that may be under /usr. This way for example
you can use the binary packages of QGIS on your system along side with your
@@ -426,7 +408,8 @@
Uncompress the arquive, enter the newly created folder and run configure with a few specific parameters
```
-CFLAGS="-fexceptions" ./configure --with-tcltk-includes=/usr/include/tcl8.4 --with-proj-share=/usr/share/proj --with-gdal=/usr/local/bin/gdal-config --with-python=/usr/bin/python2.5-config
+CFLAGS="-fexceptions" ./configure --with-tcltk-includes=/usr/include/tcl8.4 --with-proj-share=/usr/share/proj --with-gdal=/usr/local/bin/gdal-config \
+--with-python=/usr/bin/python2.5-config
```
The additional gcc option -fexceptions is necessary to enable exceptions support in GRASS libraries. It is currently the only way to avoid QGIS crashes if a fatal error happens in GRASS library. See also http://trac.osgeo.org/grass/ticket/869
Modified: trunk/qgis/doc/msvc.t2t
===================================================================
--- trunk/qgis/doc/msvc.t2t 2010-10-31 18:09:25 UTC (rev 14467)
+++ trunk/qgis/doc/msvc.t2t 2010-10-31 21:08:41 UTC (rev 14468)
@@ -44,7 +44,7 @@
- expat
- fcgi
- gdal17
-- grass-devel-vc
+- grass
- gsl-devel
- iconv
- pyqt4
Modified: trunk/qgis/doc/msys.t2t
===================================================================
--- trunk/qgis/doc/msys.t2t 2010-10-31 18:09:25 UTC (rev 14467)
+++ trunk/qgis/doc/msys.t2t 2010-10-31 21:08:41 UTC (rev 14468)
@@ -289,7 +289,10 @@
Run these commands:
```
export PATH="/usr/local/bin:/usr/local/lib:$PATH"
-./configure --prefix=/usr/local --bindir=/usr/local --with-includes=/usr/local/include --with-libs=/usr/local/lib --with-cxx --without-jpeg --without-tiff --with-postgres=yes --with-postgres-includes=/local/pgsql/include --with-pgsql-libs=/local/pgsql/lib --with-opengl=windows --with-fftw --with-freetype --with-freetype-includes=/mingw/include/freetype2 --without-x --without-tcltk --enable-x11=no --enable-shared=yes --with-proj-share=/usr/local/share/proj
+./configure --prefix=/usr/local --bindir=/usr/local --with-includes=/usr/local/include --with-libs=/usr/local/lib --with-cxx --without-jpeg \
+--without-tiff --with-postgres=yes --with-postgres-includes=/local/pgsql/include --with-pgsql-libs=/local/pgsql/lib --with-opengl=windows --with-fftw \
+--with-freetype --with-freetype-includes=/mingw/include/freetype2 --without-x --without-tcltk --enable-x11=no --enable-shared=yes \
+--with-proj-share=/usr/local/share/proj
make
make install
```
Added: trunk/qgis/scripts/scandeps.pl
===================================================================
--- trunk/qgis/scripts/scandeps.pl (rev 0)
+++ trunk/qgis/scripts/scandeps.pl 2010-10-31 21:08:41 UTC (rev 14468)
@@ -0,0 +1,71 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+
+open I, "doc/linux.t2t";
+open O, ">doc/linux.t2t.new";
+while(<I>) {
+ last if /^\|\| Distribution \| install command for packages \|\n$/;
+ print O;
+}
+
+print O "|| Distribution | install command for packages |\n";
+
+for my $c (<debian/control.*>) {
+ my ($dist) = $c =~ /^.*\/control\.(.*)$/;
+
+ open F, $c;
+ while(<F>) {
+ chop;
+ last if /^Build-Depends:/i;
+ }
+
+ s/^Build-Depends:\s*//;
+ my $deps = $_;
+
+ while(<F>) {
+ chop;
+ last if /^\S/;
+ $deps .= $_;
+ }
+
+ my @deps;
+ foreach my $p (split /,/, $deps) {
+ $p =~ s/^\s+//;
+ $p =~ s/\s+.*$//;
+ next if $p =~ /^(debhelper|subversion|python-central)$/;
+ push @deps, $p;
+ }
+
+ my $dep="";
+ my @dep;
+ foreach my $p (sort @deps) {
+ if( length("$dep $p") > 60 ) {
+ push @dep, $dep;
+ $dep = $p;
+ } else {
+ $dep .= " $p";
+ }
+ }
+
+ push @dep, $dep;
+
+ print O "| $dist | ``apt-get install " . join( " ", @dep ) . "`` |\n";
+}
+
+while(<I>) {
+ last if /^$/;
+}
+
+print O;
+
+while(<I>) {
+ print O;
+}
+
+close O;
+close I;
+
+rename "doc/linux.t2t", "doc/linux.t2t.orig";
+rename "doc/linux.t2t.new", "doc/linux.t2t";
More information about the QGIS-commit
mailing list