[QGIS Commit] r15792 - in trunk/qgis: . doc ms-windows

svn_qgis at osgeo.org svn_qgis at osgeo.org
Thu Apr 21 06:48:37 EDT 2011


Author: timlinux
Date: 2011-04-21 03:48:37 -0700 (Thu, 21 Apr 2011)
New Revision: 15792

Modified:
   trunk/qgis/INSTALL
   trunk/qgis/doc/msvc.t2t
   trunk/qgis/ms-windows/plugins.nsh
   trunk/qgis/ms-windows/ui.nsh
Log:
Added a note about not enabling python bindings global install on windows

Modified: trunk/qgis/INSTALL
===================================================================
--- trunk/qgis/INSTALL	2011-04-21 08:59:23 UTC (rev 15791)
+++ trunk/qgis/INSTALL	2011-04-21 10:48:37 UTC (rev 15792)
@@ -1,11 +1,9 @@
 Quantum GIS (QGIS)
 Building QGIS from source - step by step
 
+Last update: 20110421
+Last change: 20110307
 
-Last update: 20110404
-Last change: 20110404
-
-
   1. Introduction
   2. Overview
   3. Building on GNU/Linux
@@ -33,6 +31,7 @@
   6. Authors and Acknowledgments
 
 
+
   1. Introduction
   ===============
 
@@ -85,6 +84,7 @@
 - Flex
 - Bison
 
+
 Required build deps:
 
 - Qt >= 4.4.0
@@ -94,6 +94,7 @@
 - GDAL/OGR >= 1.4.x
 - Qwt >= 5.0
 
+
 Optional dependencies:
 
 - for GRASS plugin - GRASS >= 6.0.0 (libraries compiled with exceptions support on Linux 32bit)
@@ -105,6 +106,7 @@
 - for qgis mapserver - FastCGI
 
 
+
   3. Building on GNU/Linux
   ========================
 
@@ -128,7 +130,7 @@
 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 
+/!\ 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.
 
@@ -147,12 +149,15 @@
 
 Now update your local sources database:
 
+
   sudo apt-get update 
 
 
+
   3.3. Install build dependencies
   ===============================
 
+
   || Distribution | install command for packages |
   | lenny | ``apt-get install bison cmake doxygen flex graphviz 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 txt2tags`` |
   | lucid | ``apt-get install bison cmake doxygen flex graphviz 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 txt2tags`` |
@@ -170,10 +175,12 @@
 designed to live alongside each other. This means that for example if you
 have them both installed you will have three qmake exe's:
 
+
   /usr/bin/qmake -> /etc/alternatives/qmake 
   /usr/bin/qmake-qt3
   /usr/bin/qmake-qt4 
 
+
 The same applies to all other Qt binaries. You will notice above that the
 canonical 'qmake' is managed by apt alternatives, so before we start to
 build QGIS, we need to make Qt4 the default. To return Qt3 to default later
@@ -182,6 +189,7 @@
 You can use apt alternatives to correct this so that the Qt4 version of
 applications is used in all cases:
 
+
   sudo update-alternatives --config qmake
   sudo update-alternatives --config uic 
   sudo update-alternatives --config designer 
@@ -192,6 +200,7 @@
   sudo update-alternatives --config lrelease 
   sudo update-alternatives --config linguist 
 
+
 Use the simple command line dialog that appears after running each of the
 above commands to select the Qt4 version of the relevant applications.
 
@@ -205,11 +214,13 @@
 
 You should also setup ccache to speed up compile times:
 
+
   cd /usr/local/bin 
   sudo ln -s /usr/bin/ccache gcc 
   sudo ln -s /usr/bin/ccache g++ 
 
 
+
   3.5. Prepare your development environment
   =========================================
 
@@ -217,9 +228,11 @@
 this case we will create a work environment for C++ development work like
 this:
 
+
   mkdir -p ${HOME}/dev/cpp 
   cd ${HOME}/dev/cpp 
 
+
 This directory path will be assumed for all instructions that follow.
 
 
@@ -233,17 +246,22 @@
 
 1. Anonymous Checkout
 
+
   cd ${HOME}/dev/cpp 
   svn co https://svn.osgeo.org/qgis/trunk/qgis qgis
 
+
 2. Developer Checkout
 
+
   cd ${HOME}/dev/cpp 
   svn co --username <yourusername> https://svn.osgeo.org/qgis/trunk/qgis qgis
 
+
 The first time you check out the source you will be prompted to accept the
 qgis.org certificate. Press 'p' to accept it permanently:
 
+
   Error validating server certificate for 'https://svn.qgis.org:443':
      - The certificate is not issued by a trusted authority. Use the
        fingerprint to validate the certificate manually!  Certificate
@@ -256,6 +274,7 @@
        accept (t)emporarily or accept (p)ermanently?  
 
 
+
   3.7. Starting the compile
   =========================
 
@@ -264,15 +283,19 @@
 you can use the binary packages of QGIS on your system along side with your
 development version. I suggest you do something similar:
 
+
   mkdir -p ${HOME}/apps 
 
+
 Now we create a build directory and run ccmake:
 
+
   cd qgis
   mkdir build
   cd build
   ccmake ..
 
+
 When you run ccmake (note the .. is required!), a menu will appear where 
 you can configure various aspects of the build. If you do not have root
 access or do not want to overwrite existing QGIS installs (by your
@@ -286,15 +309,19 @@
 
 Now on with the build:
 
+
   make
   make install
 
+
 It may take a little while to build depending on your platform.
 
 After that you can try to run QGIS:
 
+
   $HOME/apps/bin/qgis
 
+
 If all has worked properly the QGIS application should start up and appear
 on your screen.
 
@@ -308,16 +335,22 @@
 
 First you need to install the debian packaging tools once:
 
+
   apt-get install build-essential
 
+
 First you need to create an changelog entry for your distribution. For example for Ubuntu Lucid:
 
+
   dch -l ~lucid  --force-distribution --distribution lucid "lucid build"
 
+
 The QGIS packages will be created with:
 
+
   dpkg-buildpackage -us -uc -b
 
+
 /!\ Note: If dpkg-buildpackage complains about unmet build dependencies
 you can install them using apt-get and re-run the command.
 
@@ -328,9 +361,11 @@
 The packages are created in the parent directory (ie. one level up).
 Install them using dpkg.  E.g.:
 
+
   sudo debi
 
 
+
   3.9. A practical case: Building QGIS and GRASS from source on Ubuntu with ECW and MrSID formats support
   =======================================================================================================
 
@@ -346,46 +381,58 @@
 First you need to install the necessary packages required to download the source 
 code and compile it. Open the terminal and issue the following command:
 
+
   sudo apt-get install build-essential g++ subversion
 
 
+
     3.9.2. Step 2: compile and install the ecw libraries
     ====================================================
 
 Go to the ERDAS web site http://www.erdas.com/ and follow the links
-"'products --> ECW JPEG2000 Codec SDK --> downloads'" 
-then download the "'Image Compression SDK Source Code 3.3'" (you'll need to make a registration 
+"'''products --> ECW JPEG2000 Codec SDK --> downloads'''" 
+then download the "'''Image Compression SDK Source Code 3.3'''" (you'll need to make a registration 
 and accept a license).
 
 Uncompress the arquive in a proper location (this guide assumes 
 that all the downloaded source code will be placed in the user home) 
 and the enter the newly created folder
 
+
   cd /libecwj2-3.3
 
+
 Compile the code with the standard commands
 
+
   ./configure
 
+
 then
 
+
   make
 
+
 then
 
+
   sudo make install
 
+
 leave the folder 
 
+
   cd ..
 
 
+
     3.9.3. Step 3: download the MrSID binaries
     ==========================================
 
 Go to the LIZARDTECH web site http://www.lizardtech.com/ and follow the links
-"'download --> Developer SDKs'", 
-then download the "'GeoExpress SDK for Linux (x86) - gcc 4.1 32-bit'"
+"'''download --> Developer SDKs'''", 
+then download the "'''GeoExpress SDK for Linux (x86) - gcc 4.1 32-bit'''"
 (you'll need to make a registration and accept a license).
 
 Uncompress the downloaded file. The resulting directory name should be similar to "Geo_DSDK-7.0.0.2167"
@@ -396,23 +443,32 @@
 
 Download the latest gdal source code
 
+
   svn checkout https://svn.osgeo.org/gdal/trunk/gdal gdal
 
+
 then copy a few files from the MrSID binaries folder to the folder with the gdal source code
-('replace "USERNAME" with your actual account username')
+('''replace "USERNAME" with your actual account username''')
 
+
   cp /home/USERNAME/Geo_DSDK-7.0.0.2167/include/*.* /home/USERNAME/gdal/frmts/mrsid/
 
+
 enter the gdal source code folder
 
+
   cd /gdal
 
+
 and run configure with a few specific parameters
 
+
   ./configure --without-grass --with-mrsid=../Geo_DSDK-7.0.0.2167 --without-jp2mrsid
 
+
 at the end of the configuration process you should read something like
 
+
   ...
   GRASS support:             no
   ...
@@ -422,36 +478,50 @@
   MrSID support              yes      
   ...
 
+
 then compile normally
 
+
   make
 
+
 and
 
+
   sudo make install
 
+
 finish the process by creating the necessary links to the most recent shared libraries
 
+
   sudo ldconfig
 
+
 at this point you may want to check if gdal was compiled correctly with MrSID and ECW
 support by issuing one (or both) of the following commands
 
+
   gdalinfo --formats | grep 'ECW'
 
+
+
   gdalinfo --formats | grep 'SID'
 
+
 leave the folder 
 
+
   cd ..
 
 
+
     3.9.5. Step 5: compile and install GRASS
     ========================================
 
 Before downloading and compile GRASS source code you need to install a few
 other libraries and programs. We can do this trough apt
 
+
   sudo apt-get install flex bison libreadline5-dev libncurses5-dev lesstif2-dev debhelper dpatch libtiff4-dev \
   tcl8.4-dev tk8.4-dev fftw-dev xlibmesa-gl-dev libfreetype6-dev autoconf2.13 autotools-dev \
   libgdal1-dev proj libjpeg62-dev libpng12-dev libpq-dev unixodbc-dev doxygen fakeroot cmake \
@@ -459,35 +529,46 @@
   libqt4-dev libgsl0-dev python-qt4 swig python-wxversion python-wxgtk2.8 libwxgtk2.8-0 libwxbase2.8-0 tcl8.4-dev \
   tk8.4-dev tk8.4 libfftw3-dev libfftw3-3
 
+
 At this point we can get the GRASS source code: you may want to download it
 trough svn or maybe you want just to download the latest available source code arquive.
 For example the GRASS 6.4rc4 is available at http://grass.itc.it/grass64/source/grass-6.4.0RC4.tar.gz
 
 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
 
+
 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
 
 Then as usual (it will take a while)
 
+
   make
 
+
 and
 
+
   sudo make install
 
+
 leave the folder 
 
+
   cd ..
 
+
 you have now compiled and installed GRASS (also with the new wxpyhton interface) so you
 may want to give it a try
 
+
   grass64 -wxpython
 
 
+
     3.9.6. Step 6: compile and install QGIS
     =======================================
 
@@ -499,18 +580,24 @@
 
 uncompress the arquive and enter the newly created folder
 
+
   cd /qgis_1.1.0
 
+
 then run ccmake
 
+
   ccmake .
 
+
 press the "c" key, then when the option list will appear we need to manually
 configure the "GRASS_PREFIX" parameter. Scroll down until the "GRASS_PREFIX" will appear, 
 press enter and manually set it to
 
+
   /usr/local/grass-6.4.0RC4
 
+
 then press enter again.
 
 Press the "c" again and the option "Press [g] to generate and exit" will appear.
@@ -518,20 +605,26 @@
 
 then as usual (it will take a while)
 
+
   make
 
+
 and
 
+
   sudo make install
 
+
 At the end of the process you should have QGIS and GRASS working with MrSID and ECW
 raster format support.
 
 To run QGIS just use this command 
 
+
   qgis
 
 
+
   4. Building on Windows
   ======================
 
@@ -569,6 +662,7 @@
 
 Download and install following packages:
 
+
   || Tool | Website |
   | CMake | http://www.cmake.org/files/v2.8/cmake-2.8.4-win32-x86.exe |
   | Flex | http://gnuwin32.sourceforge.net/downlinks/flex.php |
@@ -595,6 +689,7 @@
 - qwt5-devel-qt4
 - sip
 
+
 This will also select packages the above packages depend on.
 
 Additionally QGIS also needs the include file unistd.h, which normally
@@ -614,6 +709,7 @@
 variables create the following batch file (assuming the above packages were
 installed in the default locations):
 
+
   @echo off
   path %SYSTEMROOT%\system32;%SYSTEMROOT%;%SYSTEMROOT%\System32\Wbem;%PROGRAMFILES%\CMake 2.8\bin;%PROGRAMFILES%\subversion\bin;%PROGRAMFILES%\GnuWin32\bin
   set PYTHONPATH=
@@ -633,15 +729,20 @@
   
   @cmd
 
+
 Start the batch file and on the command prompt checkout the QGIS source from
 svn to the source directory qgis-trunk:
 
+
   svn co https://svn.osgeo.org/qgis/trunk/qgis qgis-trunk
 
+
 or using git-svn (from the git shell):
 
+
   git svn clone --username $USER --revision 15611:HEAD https://svn.osgeo.org/qgis/trunk/qgis
 
+
 Create a 'build' directory somewhere. This will be where all the build output
 will be generated.
 
@@ -654,6 +755,9 @@
 Adjust the path to bison and flex so that the shortened C:/Progra~1 is used 
 rather than C:/Program Files.
 
+Untick the 'BINDINGS_GLOBAL_INSTALL' option so that python bindings are placed 
+into the output directory when you run the INSTALL target.
+
 Hit Configure to start the configuration and select Visual Studio 9 2008
 and keep native compilers and click Finish.
 
@@ -681,19 +785,25 @@
     4.1.4. Packaging
     ================
 
-To create a windows 'all in one' standalone  package under ubuntu (yes you
+To create a windows 'all in one' standalone  package ''under ubuntu'' (yes you
 read correctly) do the following:
 
+
   sudo apt-get install nsis
 
+
 Now 
 
+
   cd qgis/ms-windows/osgeo4w
 
+
 And run the nsis creation script:
 
+
   creatensis.pl
 
+
 When the script completes, it should have created a QGIS installer executable
 in the ms-windows directory (using the QGIS binaries from OSGEO4W). 
 
@@ -706,11 +816,18 @@
 windows installation into the ms-windows file tree created by the creatensis
 script.
 
+
   cd ms-windows/
   rm -rf osgeo4w/unpacked/apps/qgis/*
   cp -r /tmp/qgis1.7.0/* osgeo4w/unpacked/apps/qgis/
+
+
+Now create a package.
+
+
   ./quickpackage.sh
 
+
 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.
 
@@ -770,9 +887,11 @@
 
 Edit C:\Qt\4.7.0\bin\qtvars.bat and add the following lines:
 
+
   set PATH=%PATH%;C:\msys\local\bin;c:\msys\local\lib 
   set PATH=%PATH%;"C:\Program Files\Subversion\bin" 
 
+
 I suggest you also add C:\Qt\4.7.0\bin\ to your Environment Variables Path in
 the windows system preferences.
 
@@ -784,9 +903,11 @@
 compile the debug version you have to go out of src directory and execute the
 following command:
 
+
   c:\Qt\4.7.0 make 
 
 
+
     4.2.3. Flex and Bison
     =====================
 
@@ -824,21 +945,25 @@
       4.2.4.3. Compile SIP
       ====================
 
+
   c:\Qt\4.7.0\bin\qtvars.bat 
   python configure.py -p win32-g++ 
   make 
   make install 
 
 
+
       4.2.4.4. Compile PyQt
       =====================
 
+
   c:\Qt\4.7.0\bin\qtvars.bat 
   python configure.py 
   make 
   make install 
 
 
+
       4.2.4.5. Final python notes
       ===========================
 
@@ -869,20 +994,26 @@
 Start a cmd.exe window ( Start -> Run -> cmd.exe ) Create development 
 directory and move into it
 
+
   md c:\dev\cpp 
   cd c:\dev\cpp 
 
+
 Check out sources from SVN:
 
 For svn trunk:
 
+
   svn co https://svn.osgeo.org/qgis/trunk/qgis 
 
+
 For svn 1.5 branch
 
+
   svn co https://svn.osgeo.org/qgis/branches/Release-1_5_0 qgis1.5.0
 
 
+
     4.2.8. Compiling
     ================
 
@@ -892,22 +1023,28 @@
 Start a cmd.exe window ( Start -> Run -> cmd.exe ) if you don't have one
 already.  Add paths to compiler and our MSYS environment:
 
+
   c:\Qt\4.7.0\bin\qtvars.bat 
 
+
 For ease of use add c:\Qt\4.7.0\bin\ to your system path in system
 properties so you can just type qtvars.bat when you open the cmd console.
 Create build directory and set it as current directory:
 
+
   cd c:\dev\cpp\qgis 
   md build 
   cd build 
 
 
+
     4.2.9. Configuration
     ====================
 
+
   cmakesetup ..  
 
+
 Note: You must include the '..' above.
 
 Click 'Configure' button.  When asked, you should choose 'MinGW Makefiles' as
@@ -929,9 +1066,11 @@
     4.2.10. Compilation and installation
     ====================================
 
+
    make make install 
 
 
+
     4.2.11. Run qgis.exe from the directory where it's installed (CMAKE_INSTALL_PREFIX)
     ===================================================================================
 
@@ -1046,6 +1185,7 @@
 
 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 \
@@ -1054,6 +1194,7 @@
   make
   make install
 
+
 It should get installed to c:\msys\local\grass-6.3.cvs
 
 By the way, these pages might be useful:
@@ -1074,19 +1215,24 @@
 To compile, I had to patch the sources: in file source/headers/timeval.h line 13.
 Change it from:
 
+
   #ifdef _WIN32
 
 to:
 
+
   #if defined(_WIN32) && defined(_MSC_VER)
 
+
 Now, in MSYS console, go to the source directory and run:
 
+
   ./configure --prefix=/usr/local
   make
   make install
 
 
+
       4.3.2.4. SQLITE
       ===============
 
@@ -1116,11 +1262,13 @@
 
 Run from MSYS console in the source directory:
 
+
   ./configure
   make
   make install
 
 
+
       4.3.2.6. EXPAT
       ==============
 
@@ -1132,11 +1280,13 @@
 
 Run from MSYS console in the source directory:
 
+
   ./configure
   make
   make install
 
 
+
       4.3.2.7. POSTGRES
       =================
 
@@ -1175,8 +1325,10 @@
 up compilation, but it's not automatic.  Whenever you type "make" (but NOT "make install"),
 instead type:
 
+
   make -j [n]
 
+
 Replace [n] with the number of cores and/or processors your Mac has.  On recent
 models with hyperthreading processors this can be double the physical count of
 processors and cores.
@@ -1199,8 +1351,10 @@
 PPC note: There appear to be issues with Qt Cocoa on PPC Macs.  QT Carbon
 is recommended on PPC Macs.
 
+
   http://qt.nokia.com/downloads
 
+
 If you want debug frameworks, Qt also provides a dmg with these.  These are in
 addition to the non-debug frameworks.
 
@@ -1212,9 +1366,11 @@
 these libraries will not be found.  To fix this problem,
 add symlinks to /usr/local:
 
+
   sudo ln -s /usr/lib/libQtUiTools.a /usr/local/lib/
   sudo ln -s /usr/lib/libQtCLucene.dylib /usr/local/lib/
 
+
 These should then be found automatically on Leopard and above.  Earlier systems
 may need some help by adding '-L/usr/local/lib' to CMAKE_SHARED_LINKER_FLAGS,
 CMAKE_MODULE_LINKER_FLAGS and CMAKE_EXE_LINKER_FLAGS in the cmake build.
@@ -1227,8 +1383,10 @@
 PROJ, GEOS, GDAL, SQLite3, and image libraries, as frameworks.  There is also
 a GSL framework.
 
+
   http://www.kyngchaos.com/wiki/software/frameworks
 
+
 Once downloaded, open and install the frameworks.
 
 William provides an additional installer package for Postgresql (for PostGIS support).
@@ -1236,13 +1394,17 @@
 Postgres + PostGIS server, all you need is the client-only package.
 It's available here:
 
+
   http://www.kyngchaos.com/wiki/software/postgres 
 
+
 Also available is a GRASS application:
 
+
   http://www.kyngchaos.com/wiki/software/grass
 
 
+
     5.2.1. Additional Dependencies: General compatibility note
     ==========================================================
 
@@ -1266,15 +1428,19 @@
 
 Get the expat sources:
 
+
   http://sourceforge.net/project/showfiles.php?group_id=10127 
 
+
 Double-click the source tarball to unpack, then, in Terminal.app, cd to the source folder and:
 
+
   ./configure
   make 
   sudo make install 
 
 
+
     5.2.3. Additional Dependencies: Python
     ======================================
 
@@ -1284,8 +1450,10 @@
 
 If installing from python.org, make sure you install at least the latest Python 2.x from 
 
+
   http://www.python.org/download/
 
+
 Python 3 is a major change, and may have compatibility issues, so try it at your own risk.
 
 
@@ -1294,25 +1462,31 @@
 
 Retrieve the python bindings toolkit SIP from
 
+
   http://www.riverbankcomputing.com/software/sip/download
 
+
 Double-click the source tarball to unpack it, then, in Terminal.app, cd to the source folder
 and (this installs by default into the Python framework, and is appropriate only for 
 python.org Python installs):
 
+
   python configure.py 
   make 
   sudo make install 
 
+
 Leopard notes
 
 If building on Leopard, using Leopard's bundled Python, SIP wants to install in the
 system path -- this is not a good idea.  Use this configure command instead of the 
 basic configure above:
 
+
   python configure.py -n -d /Library/Python/2.5/site-packages -b /usr/local/bin \
   -e /usr/local/include -v /usr/local/share/sip -s MacOSX10.5.sdk
 
+
 Snow Leopard notes
 
 Similar to Leopard, you should install outside the system Python path.
@@ -1320,48 +1494,62 @@
 and make sure to run the versioned python binary (this one responds to the
 'arch' command, 'python' does not). If you are using 32-bit Qt (Qt Carbon):
 
+
   python2.6 configure.py -n -d /Library/Python/2.6/site-packages -b /usr/local/bin \
   -e /usr/local/include -v /usr/local/share/sip --arch=i386 -s MacOSX10.6.sdk
 
+
 For 64-bit Qt (Qt Cocoa), use this configure line:
 
+
   python2.6 configure.py -n -d /Library/Python/2.6/site-packages -b /usr/local/bin \
   -e /usr/local/include -v /usr/local/share/sip --arch=x86_64 -s MacOSX10.6.sdk
 
 
+
     5.2.5. Additional Dependencies: PyQt
     ====================================
 
 Retrieve the python bindings toolkit for Qt from
 
+
   http://www.riverbankcomputing.com/software/pyqt/download
 
+
 Double-click the source tarball to unpack it, then, in Terminal.app, cd to the source folder
 and (this installs by default into the Python framework, and is appropriate only for
 python.org Python installs):
 
+
   python configure.py 
   yes 
 
+
 There is a problem with the configuration that needs to be fixed now
 (it affects PyQwt compilation later).  Edit pyqtconfig.py and change the qt_dir line to:
 
+
       'qt_dir': '/usr',
 
+
 Then continue with compilation and installation (this is a good place to use
 parallel compilation, if you can):
 
+
   make 
   sudo make install 
 
+
 Leopard notes
 
 If building on Leopard, using Leopard's bundled Python, PyQt wants to install
 in the system path -- this is not a good idea.  Use this configure command
 instead of the basic configure above:
 
+
   python configure.py -d /Library/Python/2.5/site-packages -b /usr/local/bin
 
+
 If there is a problem with undefined symbols in QtOpenGL on Leopard, edit
 QtOpenGL/makefile and add -undefined dynamic_lookup to LFLAGS.
 Then make again.
@@ -1374,21 +1562,27 @@
 'arch' command, which is important for pyuic4, 'python' does not).
 If you are using 32-bit Qt (Qt Carbon):
 
+
   python2.6 configure.py -d /Library/Python/2.6/site-packages -b /usr/local/bin --use-arch i386
 
+
 For 64-bit Qt (Qt Cocoa), use this configure line:
 
+
   python2.6 configure.py -d /Library/Python/2.6/site-packages -b /usr/local/bin --use-arch x86_64
 
 
+
     5.2.6. Additional Dependencies: Qwt/PyQwt
     =========================================
 
 The GPS tracking feature uses Qwt.  Some popular 3rd-party plugins use PyQwt.
 You can take care of both with the PyQwt source from:
 
+
   http://pyqwt.sourceforge.net/
 
+
 Double-click the tarball to unpack it.  The following assumes PyQwt v5.2.0 (comes with Qwt 5.2.1).
 Normal compilation does both Qwt and PyQwt at the same time, but Qwt is statically linked
 into PyQwt, and Qgis can't use it.  So, we need to split the build.
@@ -1398,39 +1592,49 @@
 qmake).  Scroll down to the 'release/debug mode' block.  Edit the last 'CONFIG +='
 line, within an 'else' block, and change 'debug' to 'release'.  Like so:
 
+
       else {
           CONFIG           += release     # release/debug
       }
 
+
 Also uncomment (remove # prefix) the line 'CONFIG += QwtDll'.  Like so:
 
+
   CONFIG           += QwtDll
 
+
 If you are building for Qt Carbon 32bit on Snow Leopard, add a line at the bottom:
 
+
   CONFIG += x86
 
+
 Save and close.
 
 Now, cd into the qwt-5.2 subdir in a Terminal.  Type these commands to build and install:
 
+
   qmake -spec macx-g++
   make
   sudo make install
   sudo install_name_tool -id /usr/local/qwt-5.2.1-svn/lib/libqwt.5.dylib \
   /usr/local/qwt-5.2.1-svn/lib/libqwt.5.dylib
 
+
 The Qwt shared library is now installed in /usr/local/qwt-5.x.x[-svn] (x.x is the 
 minor.point version, and it may be an SVN version).  Remember this for QGIS and PyQwt configuration.
 
 Now for PyQwt.  Still in the Terminal:
 
+
   cd ../configure
   python configure.py --extra-include-dirs=/usr/local/qwt-5.2.1-svn/include \
   --extra-lib-dirs=/usr/local/qwt-5.2.1-svn/lib --extra-libs=qwt
   make
   sudo make install
 
+
 Make sure to use the qwt install path from the Qwt build above.
 
 Snow Leopard note
@@ -1439,11 +1643,13 @@
 it will default to a combination that does not work (ie x86_64 for a Carbon Qt).
 This is not needed for Qt Cocoa. Configure as follows:
 
+
   python configure.py --extra-cflags="-arch i386" --extra-cxxflags="-arch i386" \
   --extra-lflags="-arch i386" --extra-include-dirs=/usr/local/qwt-5.2.1-svn/include \
   --extra-lib-dirs=/usr/local/qwt-5.2.1-svn/lib --extra-libs=qwt
 
 
+
     5.2.7. Additional Dependencies: Bison
     =====================================
 
@@ -1452,33 +1658,41 @@
 The version of bison available by default on Mac OS X 10.4 is too old so you need to
 get a more recent one on your system. Download at least version 2.3 from:
 
+
   ftp.gnu.org/gnu/bison/
 
+
 Now build and install it to a prefix of /usr/local.Ê Double-click the source
 tarball to unpack it, then cd to the source folder and:
 
+
   ./configure --prefix=/usr/local 
   make
   sudo make install 
 
 
+
   5.3. Install CMake for OSX
   ==========================
 
 Get the latest source release from here:
 
+
   http://www.cmake.org/cmake/resources/software.html
 
+
 Binary installers are available for OS X, but they are not recommended
 (2.4 versions install in /usr instead of /usr/local, and 2.6 versions are a
 strange application). Instead, download the source, double-click the source tarball,
 then cd to the source folder and:
 
+
   ./bootstrap --docdir=/share/doc/CMake --mandir=/share/man
   make
   sudo make install
 
 
+
   5.4. Install subversion for OSX
   ===============================
 
@@ -1489,27 +1703,35 @@
 build of svn. If you are a GUI inclined person you may want to grab their gui
 client too. Get the command line client here:
 
+
   curl -O http://ufpr.dl.sourceforge.net/sourceforge/macsvn/Subversion_1.4.2.zip 
 
+
 Once downloaded open the zip file and run the installer.
 
 You also need to install BerkleyDB available from the same
 http://sourceforge.net/projects/macsvn/ (website). At the time of writing the
 file was here:
 
+
   curl -O http://ufpr.dl.sourceforge.net/sourceforge/macsvn/Berkeley_DB_4.5.20.zip 
 
+
 Once again unzip this and run the installer therein.
 
 Lastly we need to ensure that the svn commandline executeable is in the path.
 Add the following line to the end of /etc/bashrc using sudo:
 
+
   sudo vim /etc/bashrc 
 
+
 And add this line to the bottom before saving and quiting:
 
+
   export PATH=/usr/local/bin:$PATH:/usr/local/pgsql/bin 
 
+
 /usr/local/bin needs to be first in the path so that the newer bison (that will
 be built from source further down) is found before the bison (which is very
 old) that is installed by MacOSX
@@ -1523,21 +1745,28 @@
 Now we are going to check out the sources for QGIS. First we will create a
 directory for working in (or some folder of your choice):
 
+
   mkdir -p ~/dev/cpp cd ~/dev/cpp 
 
+
 Now we check out the sources:
 
 Trunk:
 
+
   svn co https://svn.osgeo.org/qgis/trunk/qgis qgis 
 
+
 For a release branch version x.y.z:
 
+
   svn co https://svn.qgis.org/qgis/branches/Release-x_y_z qgis-x.y.z
 
+
 The first time you check out QGIS sources you will probably get a message like
 this:
 
+
    Error validating server certificate for 'https://svn.qgis.org:443':
    - The certificate is not issued by a trusted authority. Use the fingerprint to
      validate the certificate manually!  Certificate information:
@@ -1547,6 +1776,7 @@
    - Fingerprint: 2f:cd:f1:5a:c7:64:da:2b:d1:34:a5:20:c6:15:67:28:33:ea:7a:9b
      (R)eject, accept (t)emporarily or accept (p)ermanently?  
 
+
 I suggest you press 'p' to accept the key permanently.
 
 
@@ -1560,6 +1790,7 @@
 building into a pre-existing ${HOME}/Applications directory.
 In a Terminal cd to the qgis source folder previously downloaded, then:
 
+
   mkdir build
   cd build
   cmake -D CMAKE_INSTALL_PREFIX=~/Applications -D CMAKE_BUILD_TYPE=Release \
@@ -1569,6 +1800,7 @@
   -D QWT_INCLUDE_DIR=/usr/local/qwt-5.2.1-svn/include \
   ..
 
+
 This will automatically find and use the previously installed frameworks, and the GRASS
 application if installed.
 
@@ -1576,6 +1808,7 @@
 (minimum GRASS version as stated in the Qgis requirements, substitute the GRASS
 path and version as required):
 
+
   cmake -D CMAKE_INSTALL_PREFIX=~/Applications -D CMAKE_BUILD_TYPE=Release \
   -D CMAKE_BUILD_TYPE=MinSizeRel \
   -D WITH_INTERNAL_SPATIALITE=FALSE -D WITH_MAPSERVER=TRUE \
@@ -1584,9 +1817,11 @@
   -D GRASS_PREFIX=/user/local/grass-6.4.0 \
   ..
 
+
 Snow Leopard note: To handle 32-bit Qt (Carbon), create a 32bit python wrapper
 script and add arch flags to the configuration:
 
+
   sudo cat >/usr/local/bin/python32 <<EOF
   #!/bin/sh
   exec arch -i386 /usr/bin/python2.6 \${1+"\$@"}
@@ -1602,6 +1837,7 @@
   -D CMAKE_OSX_ARCHITECTURES=i386 -D PYTHON_EXECUTABLE=/usr/local/bin/python32 \
   ..
 
+
 Bundling note: Older Qt versions may have problems with some Qt plugins and Qgis.
 The way to handle this is to bundle Qt inside the Qgis application.  You can do this now
 or wait to see if there are immediate crashes when running Qgis.  It's also a good
@@ -1610,26 +1846,34 @@
 
 To bundle Qt, add the following line before the last line in the above cmake configurations:
 
+
   -D QGIS_MACAPP_BUNDLE=1 \
 
 
+
   5.7. Building
   =============
 
 Now we can start the build process (remember the parallel compilation note at
 the beginning, this is a good place to use it, if you can):
 
+
   make 
 
+
 If all built without errors you can then install it:
 
+
   make install 
 
+
 or, for a /Applications build:
 
+
   sudo make install
 
 
+
   6. Authors and Acknowledgments
   ==============================
 
@@ -1659,3 +1903,7 @@
  - Tim Sutton 2006
  - Debian package section: Juergen Fischer 2008
 
+
+
+
+

Modified: trunk/qgis/doc/msvc.t2t
===================================================================
--- trunk/qgis/doc/msvc.t2t	2011-04-21 08:59:23 UTC (rev 15791)
+++ trunk/qgis/doc/msvc.t2t	2011-04-21 10:48:37 UTC (rev 15792)
@@ -117,6 +117,9 @@
 Adjust the path to bison and flex so that the shortened ``C:/Progra~1`` is used 
 rather than ``C:/Program Files``.
 
+Untick the 'BINDINGS_GLOBAL_INSTALL' option so that python bindings are placed 
+into the output directory when you run the INSTALL target.
+
 Hit ``Configure`` to start the configuration and select ``Visual Studio 9 2008``
 and keep ``native compilers`` and click ``Finish``.
 
@@ -175,6 +178,11 @@
 cd ms-windows/
 rm -rf osgeo4w/unpacked/apps/qgis/*
 cp -r /tmp/qgis1.7.0/* osgeo4w/unpacked/apps/qgis/
+```
+
+Now create a package.
+
+```
 ./quickpackage.sh
 ```
 

Modified: trunk/qgis/ms-windows/plugins.nsh
===================================================================
--- trunk/qgis/ms-windows/plugins.nsh	2011-04-21 08:59:23 UTC (rev 15791)
+++ trunk/qgis/ms-windows/plugins.nsh	2011-04-21 10:48:37 UTC (rev 15792)
@@ -26,5 +26,7 @@
 WriteRegStr HKEY_CURRENT_USER "Software\QuantumGIS\QGIS\Plugins" "oracleplugin" "true"
 WriteRegStr HKEY_CURRENT_USER "Software\QuantumGIS\QGIS\Plugins" "evis" "true"
 WriteRegStr HKEY_CURRENT_USER "Software\QuantumGIS\QGIS\Plugins" "rasterterrainplugin" "true"
+WriteRegStr HKEY_CURRENT_USER "Software\QuantumGIS\QGIS\Plugins" "roadgraphplugin" "true"
+WriteRegStr HKEY_CURRENT_USER "Software\QuantumGIS\QGIS\Plugins" "spatialqueryplugin" "true"
 
 ###############################  reg2nsis end  #################################

Modified: trunk/qgis/ms-windows/ui.nsh
===================================================================
--- trunk/qgis/ms-windows/ui.nsh	2011-04-21 08:59:23 UTC (rev 15791)
+++ trunk/qgis/ms-windows/ui.nsh	2011-04-21 10:48:37 UTC (rev 15792)
@@ -7,8 +7,8 @@
 #           Please don't remove this header.                                   #
 ################################################################################
 
-WriteRegBin HKEY_CURRENT_USER "Software\QuantumGIS\QGIS\UI" "state" 40004200790074006500410072007200610079002800000000000000ff000000000000000000fd0000000000000002000000000000000000000000000000e700000000000200b600fc0002000000000000000500fb000000000000000c0000004c0000006500000067000000650000006e000000640001000000000000008d00000000000200b60000000000000072000000ff00ff00ff00fb00000000000000100000004f00000076000000650000007200000076000000690000006500000077000000000000000100f4000000000000002a0000000000000014000000ff00ff00ff00fb0000000000000022000000430000006f0000006f0000007200000064000000690000006e000000610000007400000065000000430000006100000070000000740000007500000072000000650000000000000001007e00000000000000a000000000000000a1000000ff00ff00ff00fb0000000000000014000000550000006e000000640000006f0000005700000069000000640000006700000065000000740000000000000000000000ff00ff00ff00ff00000000000000dc000000ff00ff00ff00fb000000000000001a0000004f000000730000006d000000550000006e000000640000006
 f0000005200000065000000640000006f00000044000000570000000000000000000000ff00ff00ff00ff00000000000000a3000000ff00ff00ff0000000000000001000000000001002f00000000000200b600fc0002000000000000000100fb00000000000000180000004f000000730000006d0000004600000065000000610000007400000075000000720000006500000044000000570000000000000000008d00000000000200b60000000000010065000000ff00ff00ff000000000005009300000000000200b6000000000000000100000000000000020000000000000001000000000000000200fc00000000000000040000000000000001000000000000000000000000000000020000000000000004000000000000001600000046000000690000006c00000065000000540000006f0000006f0000006c0000004200000061000000720001000000000000000000000000000100b70000000000000000000000000000000000000000000000180000004c00000061000000790000006500000072000000540000006f0000006f0000006c000000420000006100000072000100000000000100b700000000000000c200000000000000000000000000000000000000000000000800000048000000650000006c00000070000000000000000300d900000000000000dd
 00000000000000000000000000000000000000000000000e000000500000006c0000007500000067000000690000006e0000007300010000000000020079000000000001003700000000000000000000000000000000000000000000000200000000000000020000000000000014000000410000007400000074000000720000006900000062000000750000007400000065000000730001000000000000000000ff00ff00ff00ff00000000000000000000000000000000000000000000001c0000004d0000006100000070000000200000004e000000610000007600000069000000670000006100000074000000690000006f0000006e0001000000000001002600ff00ff00ff00ff000000000000000000000000000000000000000000000002000000000000000300000000000000140000004400000069000000670000006900000074000000690000007a000000690000006e000000670001000000000000000000ff00ff00ff00ff000000000000000000000000000000000000000000000026000000410000006400000076000000610000006e000000630000006500000064000000200000004400000069000000670000006900000074000000690000007a000000690000006e000000670001000000000001004900ff00ff00ff00ff0000000000000000000000000
 0000000000000000000001a0000004f00000070000000650000006e0000005300000074000000720000006500000065000000740000004d0000006100000070000100000000000200d800ff00ff00ff00ff00000000000000000000000000000000002900
-WriteRegBin HKEY_CURRENT_USER "Software\QuantumGIS\QGIS\UI" "geometry" 400042007900740065004100720072006100790028000100d900d000cb000000010000000000ff00ff00ff00fc00ff00ff00ff00fc000000000006008300000000000300760000000000000000000000000000001400000000000400b40000000000010091000000000000000000020000002900
+WriteRegBin HKEY_CURRENT_USER "Software\QuantumGIS\QGIS\UI" "state" 40004200790074006500410072007200610079002800000000000000ff000000000000000000fd000000000000000200000000000000000000000000010007000000000002000900fc0002000000000000000700fb000000000000000c0000004c0000006500000067000000650000006e000000640001000000000000008c00000000000200090000000000000072000000ff00ff00ff00fb00000000000000100000004f00000076000000650000007200000076000000690000006500000077000000000000000100f4000000000000002a0000000000000014000000ff00ff00ff00fb0000000000000022000000430000006f0000006f0000007200000064000000690000006e000000610000007400000065000000430000006100000070000000740000007500000072000000650000000000000001007e00000000000000a000000000000000a1000000ff00ff00ff00fb0000000000000014000000550000006e000000640000006f0000005700000069000000640000006700000065000000740000000000000000000000ff00ff00ff00ff0000000000000000000000000000000000fb000000000000001a0000004f000000730000006d000000550000006e000000640000006
 f0000005200000065000000640000006f00000044000000570000000000000000000000ff00ff00ff00ff0000000000000000000000000000000000fb0000000000000008000000550000006e000000640000006f0000000000000000000000ff00ff00ff00ff00000000000000dc000000ff00ff00ff00fb000000000000002000000053000000680000006f000000720000007400000065000000730000007400000050000000610000007400000068000000440000006f000000630000006b0000000000000001007e00000000000100170000000000010017000000ff00ff00ff0000000000000001000000000001002f00000000000200b600fc0002000000000000000100fb00000000000000180000004f000000730000006d0000004600000065000000610000007400000075000000720000006500000044000000570000000000000000008d00000000000200b60000000000000000000000000000000000000000000300540000000000020009000000000000000100000000000000020000000000000001000000000000000200fc00000000000000070000000000000001000000000000000000000000000000020000000000000000000000000000000200000000000000000000000000000002000000000000000400000000000000180000006d000000460000
 00690000006c00000065000000540000006f0000006f0000006c0000004200000061000000720001000000000000000000ff00ff00ff00ff00000000000000000000000000000000000000000000001a0000006d0000004c00000061000000790000006500000072000000540000006f0000006f0000006c000000420000006100000072000100000000000000e000ff00ff00ff00ff0000000000000000000000000000000000000000000000200000006d0000004400000069000000670000006900000074000000690000007a00000065000000540000006f0000006f0000006c0000004200000061000000720001000000000002002900ff00ff00ff00ff0000000000000000000000000000000000000000000000180000006d00000048000000650000006c00000070000000540000006f0000006f0000006c0000004200000061000000720000000000000004002300ff00ff00ff00ff0000000000000000000000000000000000000000000000020000000000000004000000000000000a00000047000000520000004100000053000000530001000000000000000000ff00ff00ff00ff00000000000000000000000000000000000000000000001a0000006d0000004c0000006100000062000000650000006c000000540000006f0000006f0000006c0000004200000
 061000000720001000000000001006f00ff00ff00ff00ff00000000000000000000000000000000000000000000001c0000006d000000520000006100000073000000740000006500000072000000540000006f0000006f0000006c0000004200000061000000720001000000000002000900ff00ff00ff00ff00000000000000000000000000000000000000000000001c0000006d0000004d00000061000000700000004e0000006100000076000000540000006f0000006f0000006c0000004200000061000000720001000000000002005d0000000000020004000000000000000000000000000000000000000000000002000000000000000200000000000000300000006d000000410000006400000076000000610000006e0000006300000065000000640000004400000069000000670000006900000074000000690000007a00000065000000540000006f0000006f0000006c0000004200000061000000720001000000000000000000ff00ff00ff00ff0000000000000000000000000000000000000000000000240000006d00000041000000740000007400000072000000690000006200000075000000740000006500000073000000540000006f0000006f0000006c000000420000006100000072000100000000000100b200000000000200af00000000000000
 00000000000000000000000000000000030000000000000001000000000000001c0000006d000000500000006c0000007500000067000000690000006e000000540000006f0000006f0000006c0000004200000061000000720001000000000000000000ff00ff00ff00ff00000000000000000000000000000000002900
+WriteRegBin HKEY_CURRENT_USER "Software\QuantumGIS\QGIS\UI" "geometry" 400042007900740065004100720072006100790028000100d900d000cb000000010000000000ff00ff00ff00fc00ff00ff00ff00fc000000000004006400000000000200f50000000000000000000000000000001400000000000400b40000000000010091000000000000000000020000002900
 WriteRegStr HKEY_CURRENT_USER "Software\QuantumGIS\QGIS\UI" "lastVectorFileFilter" "[OGR] ESRI Shapefiles (*.shp *.SHP)"
 WriteRegStr HKEY_CURRENT_USER "Software\QuantumGIS\QGIS\UI" "encoding" "System"
 WriteRegStr HKEY_CURRENT_USER "Software\QuantumGIS\QGIS\UI" "lastRasterFileFilter" "SAR_CEOS, CEOS, JAXAPALSAR, ELAS, AIG, OGDI, MEM, BSB, DIMAP, AirSAR, RS2, HDF4, HDF4Image, ISIS3, ISIS2, PDS, ERS, L1B, FIT, WCS, WMS, INGR, COSAR, TSX, DOQ1, DOQ2, ENVI, EHdr, GenBin, PAux, MFF2, FujiBAS, GSC, FAST, LAN, CPG, IDA, NDF, EIR, DIPEx, HTTP, HDF5Image and all other files (*)"
@@ -18,5 +18,6 @@
 WriteRegBin HKEY_CURRENT_USER "Software\QuantumGIS\QGIS\UI" "recentProjectionsEpsg" 34003300320036000000340032003100310000000000
 WriteRegBin HKEY_CURRENT_USER "Software\QuantumGIS\QGIS\UI" "recentProjectionsProj4" 2b00700072006f006a003d006c006f006e0067006c006100740020002b0065006c006c00700073003d005700470053003800340020002b0064006100740075006d003d005700470053003800340020002b006e006f005f00640065006600730000002b00700072006f006a003d006c006f006e0067006c006100740020002b0065006c006c00700073003d00620065007300730065006c0020002b006e006f005f00640065006600730000000000
 WriteRegBin HKEY_CURRENT_USER "Software\QuantumGIS\QGIS\UI" "recentProjectsList" 43003a002f0044006f00630075006d0065006e0074007300200061006e0064002000530065007400740069006e00670073002f00410064006d0069006e006900730074007200610074006f0072002f006700690064006100740061002f004c0061006e00640063006f007600650072002f006c0061006e00640063006f007600650072002e0071006700730000000000
+WriteRegStr HKEY_CURRENT_USER "Software\QuantumGIS\QGIS\UI" "tileScaleEnabled" "false"
 
 ###############################  reg2nsis end  #################################



More information about the QGIS-commit mailing list