diff --git a/INSTALL b/INSTALL index 2c287cd7a14..a46d53bb5c2 100644 --- a/INSTALL +++ b/INSTALL @@ -1,10 +1,10 @@ QGIS Building QGIS from source - step by step -Thursday May 26, 2016 +Friday May 27, 2016 -Last Updated: Thursday May 26, 2016 -Last Change : Thursday May 26, 2016 +Last Updated: Friday May 27, 2016 +Last Change : Friday May 27, 2016 1. Introduction @@ -19,7 +19,8 @@ Last Change : Thursday May 26, 2016 3.7. Starting the compile 3.8. Building Debian packages 3.9. Building QGIS with Qt 5.x - 3.10. On Fedora Linux + 3.10. On Debian Linux + 3.11. On Fedora Linux 4. Building on Windows 4.1. Building with Microsoft Visual Studio 4.2. Building using MinGW @@ -336,36 +337,32 @@ code is compatible with PyQt5. You have been warned. + 3.10. On Debian Linux ===================== -We assume that you have the source code of QGIS ready and created a -new subdirectory called `build` or `build-qt5` in it. +We assume that you have the source code of QGIS ready and created a new +subdirectory called `build` or `build-qt5` in it. + 3.10.1. Install build dependencies ================================== - apt-egt install git build-essential cmake flex bison pyqt5-dev qttools5-dev - qtpositioning5-dev libqt5svg5-dev libqt5webkit5-dev libqt5gui5 libqt5scripttools5 - qtscript5-dev libqca-qt5-2-dev grass-dev libgeos-dev libgdal-dev libqt5xmlpatterns5-dev - libqt5scintilla2-dev pyqt5.qsci-dev python3-pyqt5.qsci libgsl-dev txt2tags libproj-dev - libqwt-qt5-dev libspatialindex-dev pyqt5-dev-tools qttools5-dev-tools qt5-default - python3-future python3-pyqt5.qtsql python3-psycopg2 + apt-get install git build-essential cmake flex bison pyqt5-dev qttools5-dev qtpositioning5-dev libqt5svg5-dev libqt5webkit5-dev libqt5gui5 libqt5scripttools5 qtscript5-dev libqca-qt5-2-dev grass-dev libgeos-dev libgdal-dev libqt5xmlpatterns5-dev libqt5scintilla2-dev pyqt5.qsci-dev python3-pyqt5.qsci libgsl-dev txt2tags libproj-dev libqwt-qt5-dev libspatialindex-dev pyqt5-dev-tools qttools5-dev-tools qt5-default python3-future python3-pyqt5.qtsql python3-psycopg2 Make sure that your build directory is completely empty when you enter the following command. Do never try to "re-use" an existing Qt4 build directory. If you want to use `ccmake` or other interactive tools, run the following -command in the empty build directory once before starting to use the interactive -tools. +command in the empty build directory once before starting to use the +interactive tools. cmake -DENABLE_QT5=ON -DPORT_PLUGINS=ON -If everything went ok you can finally start to compile. (As usual append a -jX -where X is the number of available cores option to make to speed up your build -process) +If everything went ok you can finally start to compile. (As usual append a -jX where X is the number of available cores option to make to speed up your build process) make + 3.11. On Fedora Linux ===================== diff --git a/doc/INSTALL.html b/doc/INSTALL.html index 37ea301b8f1..f72ad78d168 100644 --- a/doc/INSTALL.html +++ b/doc/INSTALL.html @@ -77,13 +77,13 @@ label{ background-color: #FFFFCC;

-Last Updated: Thursday May 26, 2016 -Last Change : Thursday May 26, 2016 +Last Updated: Friday May 27, 2016 +Last Change : Friday May 27, 2016

@@ -101,37 +101,38 @@ Last Change : Thursday May 26, 2016
  • 3.7. Starting the compile
  • 3.8. Building Debian packages
  • 3.9. Building QGIS with Qt 5.x -
  • 3.10. On Fedora Linux +
  • 3.10. On Debian Linux +
  • 3.11. On Fedora Linux -
  • Building on Windows +
  • Building on Windows -
  • Building on MacOS X +
  • Building on MacOS X -
  • Setting up the WCS test server on GNU/Linux +
  • Setting up the WCS test server on GNU/Linux -
  • Setting up a Jenkins Build Server -
  • Debug output and running tests -
  • Authors and Acknowledgments +
  • Setting up a Jenkins Build Server +
  • Debug output and running tests +
  • Authors and Acknowledgments
    • @@ -554,14 +555,48 @@ You have been warned.

    -

    3.10. On Fedora Linux

    +

    3.10. On Debian Linux

    + +

    +We assume that you have the source code of QGIS ready and created a new +subdirectory called `build` or `build-qt5` in it. +

    + +

    3.10.1. Install build dependencies

    + +
    +apt-get install git build-essential cmake flex bison pyqt5-dev qttools5-dev qtpositioning5-dev libqt5svg5-dev libqt5webkit5-dev  libqt5gui5 libqt5scripttools5 qtscript5-dev libqca-qt5-2-dev grass-dev libgeos-dev libgdal-dev libqt5xmlpatterns5-dev libqt5scintilla2-dev pyqt5.qsci-dev python3-pyqt5.qsci libgsl-dev txt2tags libproj-dev libqwt-qt5-dev libspatialindex-dev pyqt5-dev-tools qttools5-dev-tools qt5-default python3-future python3-pyqt5.qtsql python3-psycopg2
+
    + +

    +Make sure that your build directory is completely empty when you enter the +following command. Do never try to "re-use" an existing Qt4 build directory. +If you want to use `ccmake` or other interactive tools, run the following +command in the empty build directory once before starting to use the +interactive tools. +

    + +
    +cmake -DENABLE_QT5=ON -DPORT_PLUGINS=ON
+
    + +

    +If everything went ok you can finally start to compile. (As usual append a -jX where X is the number of available cores option to make to speed up your build process) +

    + +
    +make
+
    + + +

    3.11. On Fedora Linux

    We assume that you have the source code of QGIS ready and created a new subdirectory called `build` or `build-qt5` in it.

    -

    3.10.1. Install build dependencies

    +

    3.11.1. Install build dependencies

     dnf install qt5-qtwebkit-devel qt5-qtlocation-devel qt5-qttools-static
@@ -610,10 +645,10 @@ Or install to your system
 make install
    - +

    4. Building on Windows

    - +

    4.1. Building with Microsoft Visual Studio

    @@ -871,7 +906,7 @@ look at: ms-windows/osgeo4w/package.cmd

    - +

    4.2. Building using MinGW

    @@ -1140,7 +1175,7 @@ tree. Read the READMEfile there and follow the instructions. Next right click on qgis.nsi and choose the option 'Compile NSIS Script'.

    - +

    4.3. Creation of MSYS environment for compilation of QGIS

    4.3.1. Initial setup

    @@ -1397,7 +1432,7 @@ We're done with preparation of MSYS environment. Now you can delete all stuff in of space and it's not necessary at all.

    - +

    5. Building on MacOS X

    @@ -1464,7 +1499,7 @@ so it's just 'make', or using a smaller number. Sometimes make can hiccup on to many threads.

    - +

    5.1. Install Developer Tools

    @@ -1521,7 +1556,7 @@ If you have trouble building some of the dependencies listed below with clang (e.g. OSG & osgEarth), try using only the LLVM compilers.

    - +

    5.2. Install Qt4 from disk image

    @@ -1581,7 +1616,7 @@ 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.

    - +

    5.3. Install CMake for OSX

    @@ -1663,7 +1698,7 @@ If you have trouble building some of the dependencies listed below (e.g. OSG &am osgEarth), try bypassing ccache.

    - +

    5.4. Install development frameworks for QGIS dependencies

    @@ -2336,7 +2371,7 @@ folder in the include/ folder to /Library/Application Support/OpenSceneGraph/Hea And as for OSG, you can leave the bin/ executables where they are.

    - +

    5.5. API documentation

    @@ -2372,7 +2407,7 @@ QGIS.app bundling on install, inside the app in: QGIS.app/Contents/Resources/doc

    - +

    5.6. QGIS source

    @@ -2407,7 +2442,7 @@ git merge qgisupstream

    - +

    5.7. Configure the build

    @@ -2548,7 +2583,7 @@ non-standard, libs (ie postgres' libpq) set the bundle value to 2: -D QGIS_MACAPP_BUNDLE=2 \ - +

    5.8. Building

    @@ -2576,7 +2611,7 @@ or, for an /Applications build: sudo make install - +

    5.9. Post-Install

    @@ -2612,7 +2647,7 @@ for instructions on setting up Apache fastcgi and testing Mapserver, including installing the mod-fastcgi that is missing on Lion.

    - +

    6. Setting up the WCS test server on GNU/Linux

    @@ -2623,7 +2658,7 @@ These notes are for Ubuntu - other versions and Debian derived distros may require slight variations in package names.

    - +

    6.1. Preparation

    @@ -2643,7 +2678,7 @@ is integrated into master. cd cgi-bin/

    - +

    6.2. Setup mapserver

    @@ -2709,7 +2744,7 @@ Then create /var/www/wcs/7-wcs.qgis.org.conf setting the contents to this: </VirtualHost> - +

    6.3. Create a home page

    @@ -2727,7 +2762,7 @@ Set the contents to:
   http://wcs.qgis.org/1.9.0/wcs
    - +

    6.4. Now deploy it

    @@ -2740,14 +2775,14 @@ Set the contents to:
   sudo /etc/init.d/apache2 reload
    - +

    6.5. Debugging

       sudo tail -f /var/log/apache2/wcs_qgis.org/error.log
    - +

    7. Setting up a Jenkins Build Server

    @@ -2849,7 +2884,7 @@ I based some of the set up from this nice blog article here: http://alexott.blogspot.com/2012/03/jenkins-cmakectest.html - +

    8. Debug output and running tests

    @@ -2915,7 +2950,7 @@ ctest --show-only ctest --verbose --tests-regex SomeTestName - +

    9. Authors and Acknowledgments

    diff --git a/doc/linux.t2t b/doc/linux.t2t index 30612f27e21..fe42711511e 100644 --- a/doc/linux.t2t +++ b/doc/linux.t2t @@ -217,6 +217,33 @@ code is compatible with PyQt5. You have been warned. +== On Debian Linux == + +We assume that you have the source code of QGIS ready and created a new +subdirectory called `build` or `build-qt5` in it. + +=== Install build dependencies === + +``` +apt-get install git build-essential cmake flex bison pyqt5-dev qttools5-dev qtpositioning5-dev libqt5svg5-dev libqt5webkit5-dev libqt5gui5 libqt5scripttools5 qtscript5-dev libqca-qt5-2-dev grass-dev libgeos-dev libgdal-dev libqt5xmlpatterns5-dev libqt5scintilla2-dev pyqt5.qsci-dev python3-pyqt5.qsci libgsl-dev txt2tags libproj-dev libqwt-qt5-dev libspatialindex-dev pyqt5-dev-tools qttools5-dev-tools qt5-default python3-future python3-pyqt5.qtsql python3-psycopg2 +``` + +Make sure that your build directory is completely empty when you enter the +following command. Do never try to "re-use" an existing Qt4 build directory. +If you want to use `ccmake` or other interactive tools, run the following +command in the empty build directory once before starting to use the +interactive tools. + +``` +cmake -DENABLE_QT5=ON -DPORT_PLUGINS=ON +``` + +If everything went ok you can finally start to compile. (As usual append a -jX where X is the number of available cores option to make to speed up your build process) + +``` +make +``` + == On Fedora Linux == We assume that you have the source code of QGIS ready and created a