diff --git a/.ci/travis/code_layout/script.sh b/.ci/travis/code_layout/script.sh index 1c5a2198217..b36780d097b 100755 --- a/.ci/travis/code_layout/script.sh +++ b/.ci/travis/code_layout/script.sh @@ -15,5 +15,6 @@ set -e pushd build -xvfb-run ctest -V --output-on-failure +export CTEST_BUILD_COMMAND="/usr/bin/make -j3 -i -k" +python ${TRAVIS_BUILD_DIR}/.ci/travis/scripts/ctest2travis.py xvfb-run ctest -V -E "sip_uptodate|spelling" --output-on-failure -S ${TRAVIS_BUILD_DIR}/.ci/travis/travis.ctest popd diff --git a/.ci/travis/linux/blacklist.txt b/.ci/travis/linux/blacklist.txt index b12438654f8..2995027c493 100755 --- a/.ci/travis/linux/blacklist.txt +++ b/.ci/travis/linux/blacklist.txt @@ -7,6 +7,7 @@ qgis_composerutils ProcessingGrass7AlgorithmsImageryTest ProcessingGrass7AlgorithmsRasterTest PyQgsDBManagerGpkg +PyQgsAppStartup # temporary during processing refactoring ProcessingParametersTest diff --git a/.travis.yml b/.travis.yml index a103a8e5768..fa981a9c1d4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,7 @@ matrix: env: - LLVM_VERSION=3.8 - TRAVIS_CONFIG=linux + dist: precise sudo: false cache: apt: true @@ -49,6 +50,7 @@ matrix: apt: sources: - sourceline: 'ppa:jonathonf/backports' # silversearcher-ag backport + - sourceline: 'ppa:sergey-dryabzhinsky/packages' # doxygen packages: - doxygen - graphviz diff --git a/INSTALL b/INSTALL index 9fc7cc83b63..550423ceea5 100644 --- a/INSTALL +++ b/INSTALL @@ -1,9 +1,11 @@ QGIS Building QGIS from source - step by step -Saturday July 15, 2017 +Friday July 28, 2017 + + +Last Updated: Friday July 28, 2017 +Last Change : Friday July 28, 2017 -Last Updated: Saturday July 15, 2017 -Last Change : Saturday July 15, 2017 1. Introduction 2. Overview @@ -42,7 +44,6 @@ Last Change : Saturday July 15, 2017 9. Authors and Acknowledgments - 1. Introduction =============== @@ -93,7 +94,6 @@ Required build tools: - Flex >= 2.5.6 - Bison >= 2.4 - Required build dependencies: - Qt >= 5.3.0 @@ -109,13 +109,9 @@ Required build dependencies: - QCA - qtkeychain (>= 0.5) - Optional dependencies: -- for GRASS providers and plugin - GRASS >= 6.0.0. QGIS may be compiled with GRASS 6 or GRASS 7. - It can also be compiled with both GRASS versions in a single build but only if QGIS - is not installed with rpath. The desired GRASS version is chosen on runtime by setting - LD_LIBRARY_PATH or PATH. +- for GRASS providers and plugin - GRASS >= 7.0.0. - for georeferencer - GSL >= 1.8 - for PostGIS support - PostgreSQL >= 8.0.x - for gps plugin - gpsbabel @@ -124,7 +120,6 @@ Optional dependencies: - for qgis mapserver - FastCGI - for oracle provider - Oracle OCI library - Indirect dependencies: Some proprietary formats (e.g., ECW and MrSid) supported by GDAL require @@ -143,7 +138,7 @@ those formats in GDAL. Requires: Ubuntu / Debian derived distro -/!\ 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. @@ -171,21 +166,17 @@ of Ubuntu. This is not activated by default, so you need to activate it: 1. Edit your /etc/apt/sources.list file. 2. Uncomment all the lines starting with "deb" - Also you will need to be running Ubuntu 'precise' or higher in order for all dependencies to be met. Now update your local sources database: - sudo apt-get update - 3.3. Install build dependencies =============================== - || Distribution | install command for packages | | stretch | ``apt-get install bison ca-certificates cmake dh-python doxygen flex gdal-bin git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl-dev libpq-dev libproj-dev libqca-qt5-2-dev libqca-qt5-2-plugins libqt5opengl5-dev libqt5scintilla2-dev libqt5sql5-sqlite libqt5svg5-dev libqt5webkit5-dev libqt5xmlpatterns5-dev libqwt-qt5-dev libspatialindex-dev libspatialite-dev libsqlite3-dev libsqlite3-mod-spatialite lighttpd locales ninja-build pkg-config poppler-utils pyqt5-dev pyqt5-dev-tools pyqt5.qsci-dev python3-all-dev python3-dev python3-future python3-gdal python3-mock python3-nose2 python3-psycopg2 python3-pyqt5 python3-pyqt5.qsci python3-pyqt5.qtsql python3-pyqt5.qtsvg python3-sip python3-sip-dev python3-termcolor python3-yaml qt5keychain-dev qtbase5-dev qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb cmake-curses-gui expect`` | | xenial | ``apt-get install bison ca-certificates cmake dh-python doxygen flex gdal-bin git graphviz grass-dev libexpat1-dev libfcgi-dev libgdal-dev libgeos-dev libgsl-dev libpq-dev libproj-dev libqca-qt5-2-dev libqca-qt5-2-plugins libqt5opengl5-dev libqt5scintilla2-dev libqt5sql5-sqlite libqt5svg5-dev libqt5webkit5-dev libqt5xmlpatterns5-dev libqwt-qt5-dev libspatialindex-dev libspatialite-dev libsqlite3-dev libsqlite3-mod-spatialite lighttpd locales ninja-build pkg-config poppler-utils pyqt5-dev pyqt5-dev-tools pyqt5.qsci-dev python3-all-dev python3-dev python3-future python3-gdal python3-mock python3-nose2 python3-psycopg2 python3-pyqt5 python3-pyqt5.qsci python3-pyqt5.qtsql python3-pyqt5.qtsvg python3-sip python3-sip-dev python3-termcolor python3-yaml qt5keychain-dev qtbase5-dev qtpositioning5-dev qtscript5-dev qttools5-dev qttools5-dev-tools spawn-fcgi txt2tags xauth xfonts-100dpi xfonts-75dpi xfonts-base xfonts-scalable xvfb cmake-curses-gui expect`` | @@ -201,13 +192,11 @@ Now update your local sources database: 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 ========================================= @@ -215,11 +204,9 @@ As a convention I do all my development work in $HOME/dev/, so in 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,19 +220,15 @@ if you do not have edit privileges for the QGIS source repository, or use 1. Anonymous Checkout - cd ${HOME}/dev/cpp git clone git://github.com/qgis/QGIS.git - 2. Developer Checkout - cd ${HOME}/dev/cpp git clone git@github.com:qgis/QGIS.git - 3.7. Starting the compile ========================= @@ -254,19 +237,15 @@ 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 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-master cd build-master ccmake .. - When you run ccmake (note the .. is required!), a menu will appear where you can configure various aspects of the build. If you want QGIS to have debugging capabilities then set CMAKE_BUILD_TYPE to Debug. If you do not have @@ -286,68 +265,50 @@ the empty build directory once before starting to use the interactive tools. Now on with the build: - make -jX - where X is the number of available cores. Depending on your platform, this can speed up the build time considerably. Then you can directly run from the build directory: - ./output/bin/qgis - Another option is to install to your system: - make install - 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. If you get the error message "error while loading shared libraries", execute this command in your shell. - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${HOME}/apps/lib/ - Optionally, if you already know what aspects you want in your custom build then you can skip the interactive ccmake .. part by using the cmake -D option for each aspect, e.g.: - cmake -D CMAKE_BUILD_TYPE=Debug -D CMAKE_INSTALL_PREFIX=${HOME}/apps .. - Also, if you want to speed your build times, you can easily do it with ninja, an alternative to make with similar build options. For example, to configure your build you can do either one of: - ccmake -G Ninja .. - - cmake -G Ninja -D CMAKE_BUILD_TYPE=Debug -D CMAKE_INSTALL_PREFIX=${HOME}/apps .. - Build and install with ninja: - ninja (uses all cores by default; also supports the above described -jX option) ninja install - 3.8. Building Debian packages ============================= @@ -357,23 +318,17 @@ you'll find a debian directory. 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 Precise: - dch -l ~precise --force-distribution --distribution precise "precise build" - The QGIS packages will be created with: - dpkg-buildpackage -us -uc -b - /!\ Note: Install devscripts to get dch. /!\ Note: If dpkg-buildpackage complains about unmet build dependencies @@ -391,11 +346,9 @@ build command. The upload of results can be avoided with DEB_TEST_TARGET=test. The packages are created in the parent directory (ie. one level up). Install them using dpkg. E.g.: - sudo debi - 3.9. On Fedora Linux ==================== @@ -406,47 +359,35 @@ new subdirectory called `build` or `build-qt5` in it. 3.9.1. Install build dependencies ================================= - dnf install qt5-qtwebkit-devel qt5-qtlocation-devel qt5-qttools-static qt5-qtscript-devel qca-qt5-devel python3-qt5-devel python3-qscintilla-qt5-devel qscintilla-qt5-devel python3-qscintilla-devel python3-qscintilla-qt5 clang flex bison geos-devel gdal-devel sqlite-devel libspatialite-devel qt5-qtsvg-devel qt5-qtxmlpatterns-devel spatialindex-devel expat-devel proj-devel qwt-qt5-devel gsl-devel postgresql-devel cmake python3-future gdal-python3 python3-psycopg2 python3-PyYAML python3-pygments python3-jinja2 python3-OWSLib qca-qt5-ossl qwt-qt5-devel qtkeychain-qt5-devel qwt-devel sip-devel - To build QGIS server additional dependencies are required: - dnf install fcgi-devel - 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 .. - 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 - Run from the build directory - ./output/bin/qgis - Or install to your system - make install - 3.9.2. Suggested system tweaks ============================== @@ -455,14 +396,12 @@ the useful debug output which is normally printed when running the unit tests. To enable debug prints for the current user, execute: - cat > ~/.config/QtProject/qtlogging.ini << EOL [Rules] default.debug=true EOL - 4. Building on Windows ====================== @@ -491,7 +430,6 @@ The free (as in free beer) Community installer is available under: Download and install following packages: - || Tool | Website | | CMake | https://cmake.org/files/v3.7/cmake-3.7.2-win64-x64.msi | | GNU flex, GNU bison and GIT | http://cygwin.com/setup-x86.exe (32bit) or http://cygwin.com/setup-x86_64.exe (64bit) | @@ -508,7 +446,6 @@ For the QGIS build you need to install following packages from cygwin: - flex - git - and from OSGeo4W (select Advanced Installation): - expat @@ -536,7 +473,6 @@ and from OSGeo4W (select Advanced Installation): - sip-qt5 - spatialite - This will also select packages the above packages depend on. If you install other packages, this might cause issues. Particularly, make sure @@ -561,7 +497,6 @@ To start a command prompt with an environment that both has the VC++ and the OSG variables create the following batch file (assuming the above packages were installed in the default locations): - @echo off set VS90COMNTOOLS=%PROGRAMFILES%\Microsoft Visual Studio 9.0\Common7\Tools\ call "%PROGRAMFILES%\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" x86 @@ -579,14 +514,11 @@ 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 QGIS: - git clone git://github.com/qgis/QGIS.git - Create a 'build' directory somewhere. This will be where all the build output will be generated. @@ -656,18 +588,14 @@ your own hand built QGIS executables, you need to copy them in from your 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. @@ -727,11 +655,9 @@ When Qt installation is complete: Edit C:\Qt\4.8.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.8.0\bin\ to your Environment Variables Path in the windows system preferences. @@ -743,11 +669,9 @@ this message "mingw32-make: *** No rule to make target `debug'. Stop.". To compile the debug version you have to go out of src directory and execute the following command: - c:\Qt\4.8.0 make - 4.2.3. Flex and Bison ===================== @@ -785,25 +709,21 @@ to get versions that match your current Qt installed version. 4.2.4.3. Compile SIP ==================== - c:\Qt\4.8.0\bin\qtvars.bat python configure.py -p win32-g++ make make install - 4.2.4.4. Compile PyQt ===================== - c:\Qt\4.8.0\bin\qtvars.bat python configure.py make make install - 4.2.4.5. Final python notes =========================== @@ -834,18 +754,14 @@ http://www.cmake.org/files/v2.8/cmake-2.8.2-win32-x86.exe 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 GIT: - git clone git://github.com/qgis/QGIS.git - 4.2.8. Compiling ================ @@ -855,28 +771,22 @@ this document. 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.8.0\bin\qtvars.bat - For ease of use add c:\Qt\4.8.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 @@ -898,11 +808,9 @@ When configuration is done, click 'OK' to exit the setup utility. 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) =================================================================================== @@ -1017,7 +925,6 @@ In MSYS console go to the directory where you've unpacked or checked out sources 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 \ @@ -1026,7 +933,6 @@ Run these commands: make make install - It should get installed to c:\msys\local\grass-6.3.cvs By the way, these pages might be useful: @@ -1047,24 +953,19 @@ Unpack to e.g. c:\msys\local\src 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 =============== @@ -1094,13 +995,11 @@ Unpack to c:\msys\local\src Run from MSYS console in the source directory: - ./configure make make install - 4.3.2.6. EXPAT ============== @@ -1112,13 +1011,11 @@ Unpack to c:\msys\local\src Run from MSYS console in the source directory: - ./configure make make install - 4.3.2.7. POSTGRES ================= @@ -1161,10 +1058,8 @@ Parallel Compilation: On multiprocessor/multicore Macs, it's possible to speed up compilation, but it's not automatic. Whenever you type "make" (but NOT "make install"), instead type: - make -j [#cpus] - Replace [#cpus] 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. @@ -1175,16 +1070,12 @@ ie: Macbook Pro i5 (hyperthreading) = 2 cores X 2 = 4 To find out how many CPUs you have available, run the following in Terminal: - /usr/sbin/sysctl -n hw.ncpu - which can be used in build shell scripts like: - make -j $(/usr/sbin/sysctl -n hw.ncpu) - Note: if you get an error in parallel compilation, try removing the -j # flag, so it's just 'make', or using a smaller number. Sometimes make can hiccup on too many threads. @@ -1209,10 +1100,8 @@ do a custom install and install the Unix Development or Command Line Tools optio On Lion, if you have installed Xcode 4.0 - 4.2 and are upgrading to 4.3, it's a good idea to uninstall the old version first with: - sudo /Developer/Library/uninstall-devtools - On Lion and Mt. Lion, using Xcode 4.4+, the developer command line tools can be installed via the Xcode preferences. @@ -1227,11 +1116,9 @@ The supplied clang version 4 can compile QGIS, but presents many warnings compared to just using LLVM. You can specifically use LLVM by exporting paths to the compilers in Terminal, or shell scripts, prior to building QGIS: - export CC=/usr/bin/llvm-gcc export CXX=/usr/bin/llvm-g++ - If you have trouble building some of the dependencies listed below with clang (e.g. OSG & osgEarth), try using only the LLVM compilers. @@ -1275,11 +1162,9 @@ Leopard+ note: Qt includes a couple non-framework libraries in /usr/lib. When using a system SDK 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. 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. @@ -1298,13 +1183,11 @@ strange application). Instead, download the source. NOTE: 2.8.5 is broken for detecting part of Qt. Fixed in 2.8.6. Double-click the source tarball to unpack it, then cd to the source folder and: - ./bootstrap --docdir=/share/doc/CMake --mandir=/share/man make -j [#cpus] sudo make install - 5.3.1. Optional setup: ccache ============================= @@ -1323,33 +1206,27 @@ http://ccache.samba.org/ Double-click the source tarball to unpack, then, in Terminal.app, cd to the source folder and: - ./configure make sudo make install - After install, symbolically link compilers to /usr/local/bin/ccache. (Note: this differs from instructions at http://ccache.samba.org/manual.html Changing the /usr/bin:/usr/local/bin order in PATH is not recommended on OS X. - sudo mkdir /usr/local/bin/compilers && cd /usr/local/bin/compilers sudo ln -s ../ccache gcc sudo ln -s ../ccache g++ sudo ln -s ../ccache cc sudo ln -s ../ccache c++ - Add the following to the end of your ~/.bash_profile (and optionally ~/.bashrc) to allow your login shell to discover the symbolically linked compilers before /usr/bin compilers and to easily toggle using ccache off, by commenting out the line and starting a new login session in Terminal. - export PATH=/usr/local/bin/compilers:$PATH - If you have trouble building some of the dependencies listed below (e.g. OSG & osgEarth), try bypassing ccache. @@ -1408,13 +1285,11 @@ 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.4.3. Additional dependencies: Spatialindex ============================================ @@ -1425,13 +1300,11 @@ http://download.osgeo.org/libspatialindex/ Double-click the source tarball to unpack, then, in Terminal.app, cd to the source folder and: - ./configure --disable-dependency-tracking CFLAGS=-Os make sudo make install - 5.4.4. Additional dependencies: Python ====================================== @@ -1464,22 +1337,18 @@ cd to the source folder. Then for your chosen Python: python.org Python - python configure.py make sudo make install - Leopard system Python SIP wants to install in the system path -- this is not a good idea. More configuration is needed to install outside the system path: - 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 system Python Similar to Leopard, you should install outside the system Python path. @@ -1490,18 +1359,14 @@ Lion. 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 - Lion+ system Python Similar to Snow Leopard, you should install outside the system Python path. @@ -1509,35 +1374,27 @@ The SDK option should match the system you are compiling on: for Lion: - python2.7 configure.py -d /Library/Python/2.7/site-packages -b /usr/local/bin \ -e /usr/local/include -v /usr/local/share/sip --arch=x86_64 -s MacOSX10.7.sdk - for Mt. Lion: - python2.7 configure.py -d /Library/Python/2.7/site-packages -b /usr/local/bin \ -e /usr/local/include -v /usr/local/share/sip --arch=x86_64 -s MacOSX10.8.sdk - for Mavericks: - python2.7 configure.py -d /Library/Python/2.7/site-packages -b /usr/local/bin \ -e /usr/local/include -v /usr/local/share/sip --arch=x86_64 -s MacOSX10.9.sdk - continue... Then continue with compilation and installation: - make sudo make install - 5.4.6. Additional dependencies: QScintilla2 =========================================== @@ -1553,13 +1410,10 @@ QScintilla2 wants to install in the system path -- with libraries going into idea, and it also basically breaks the QtDesigner plugin. More configuration is needed to install outside the system path, in /usr/local/: - cd Qt4Qt5 - Edit QScintilla-gpl-2.x.x/Qt4Qt5/qscintilla.pro in the following manner: - current line --> new line target.path = $$[QT_INSTALL_LIBS] --> target.path = /usr/local/lib @@ -1567,19 +1421,15 @@ Edit QScintilla-gpl-2.x.x/Qt4Qt5/qscintilla.pro in the following manner: Save the qscintilla.pro file and build the QScintilla2 C++ library: - qmake -spec macx-g++ qscintilla.pro make -j [#cpus] sudo make install - adjust the install_name_tool command for the version installed of QScintilla installed: - sudo install_name_tool -id /usr/local/lib/libqscintilla2.11.dylib \ /usr/local/lib/libqscintilla2.11.dylib - This installs QScintilla2's dylib in /usr/local/lib/ and the header files in /usr/local/include/Qsci/, both of which should be automatically found when building QGIS. @@ -1590,14 +1440,12 @@ building QGIS. The plugin allows QScintilla2 widgets to be used within QtDesigner. - cd cd designer-Qt4Qt5 qmake -spec macx-g++ designer.pro make sudo make install - Installs in /Developer/Applications/Qt/plugins/designer/ @@ -1613,20 +1461,16 @@ cd to the source folder. Then for your chosen Python: python.org Python - python configure.py -n /usr/local/Qt4.8/qsci yes - Leopard system Python PyQt wants to install in the system path -- this is not a good idea. More configuration is needed to install outside the system path: - python configure.py -d /Library/Python/2.5/site-packages -b /usr/local/bin -n /usr/local/Qt4.8/qsci -v /usr/local/share/sip/PyQt4 - Snow Leopard system Python Similar to Leopard, you should install outside the system Python path. @@ -1637,34 +1481,26 @@ Substitute '2.7' for python version and 10.7 for SDK version below for Lion. If you are using 32-bit Qt (Qt Carbon): - python2.6 configure.py -d /Library/Python/2.6/site-packages -b /usr/local/bin \ -n /usr/local/Qt4.8/qsci -v /usr/local/share/sip/PyQt4 --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 \ -n /usr/local/Qt4.8/qsci -v /usr/local/share/sip/PyQt4 --use-arch x86_64 - Lion, Mt. Lion, and Mavericks system Python Similar to Snow Leopard, you should install outside the system Python path. But you don't need the use-arch option: - python2.7 configure.py -d /Library/Python/2.7/site-packages -b /usr/local/bin -n /usr/local/Qt4.8/qsci -v /usr/local/share/sip/PyQt4 - continue... - make -j [#cpus] sudo make install - 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. @@ -1678,7 +1514,6 @@ Like PyQt, it needs help to not install in system locations. Snow Leopard: substitute '2.6' for Python version - cd cd Python python2.7 configure.py -o /usr/local/lib -n /usr/local/include \ @@ -1692,7 +1527,6 @@ Snow Leopard: substitute '2.6' for Python version make -j [#cpus] sudo make install - The -o and -n options should match the QScintilla2 C++ dylib install options. @@ -1713,7 +1547,6 @@ Terminal. Type these commands to build and install 6.0.x (assumes v6.0.2, adjust commands for other version as needed): - cat >> qwtconfig.pri </usr/local/bin/python32 < ServerName wcs.qgis.org ServerAdmin tim@linfiniti.com @@ -2215,28 +1988,22 @@ Then create /var/www/wcs/7-wcs.qgis.org.conf setting the contents to this: - 6.3. Create a home page ======================= - mkdir html vim html/index.html - Set the contents to: - This is the test platform for QGIS' wcs client. You can use these services from QGIS directly (to try out WCS for example) by pointing your QGIS to: http://wcs.qgis.org/1.9.0/wcs - 6.4. Now deploy it ================== - sudo mkdir /var/log/apache2/wcs_qgis.org sudo chown www-data /var/log/apache2/wcs_qgis.org cd /etc/apache2/sites-available/ @@ -2246,15 +2013,12 @@ 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 ==================================== @@ -2304,7 +2068,6 @@ procedure is: - Set repository url to git://github.com/qgis/QGIS.git - In advanced repository url settings set refspec to : - +refs/heads/master:refs/remotes/origin/master @@ -2313,7 +2076,6 @@ procedure is: - Build triggers: set to Poll SCM and set schedule to * * * * * (polls every minute) - Build - Execute shell and set shell script to: - cd build cmake .. xvfb-run --auto-servernum --server-num=1 \ @@ -2351,10 +2113,8 @@ http://alexott.blogspot.com/2012/03/jenkins-cmakectest.html If you are interested in seeing embedded debug output, change the following CMake option: - -D CMAKE_BUILD_TYPE=DEBUG (or RELWITHDEBINFO) - This will flood your terminal or system log with lots of useful output from QgsDebugMsg() calls in source code. @@ -2362,34 +2122,25 @@ If you would like to run the test suite, you will need to do so from the build directory, as it will not work with the installed/bundled app. First set the CMake option to enable tests: - -D ENABLE_TESTS=TRUE - Then run all tests from build directory: - cd build make test - To run all tests and report to http://dash.orfeo-toolbox.org/index.php?project=QGIS - cd build make Experimental - You can define the host name reported via 'make Experimental' by setting a CMake option: - -D SITE="my.domain.org" - To run specific test(s) (see 'man ctest'): - cd build # show listing of tests, without running them ctest --show-only @@ -2398,7 +2149,6 @@ To run specific test(s) (see 'man ctest'): ctest --verbose --tests-regex SomeTestName - 9. Authors and Acknowledgments ============================== @@ -2441,7 +2191,3 @@ The following people have contributed to this document: - Debug Output/Tests Section - Larry Shaffer 2012, by way of 'Test Friday' Tim Sutton - - - - diff --git a/cmake_templates/Doxyfile.in b/cmake_templates/Doxyfile.in index 2b88c205119..7135b6cf4da 100644 --- a/cmake_templates/Doxyfile.in +++ b/cmake_templates/Doxyfile.in @@ -303,15 +303,6 @@ EXTENSION_MAPPING = MARKDOWN_SUPPORT = YES -# When the TOC_INCLUDE_HEADINGS tag is set to a non-zero value, all headings up -# to that level are automatically included in the table of contents, even if -# they do not have an id attribute. -# Note: This feature currently applies only to Markdown headings. -# Minimum value: 0, maximum value: 99, default value: 0. -# This tag requires that the tag MARKDOWN_SUPPORT is set to YES. - -TOC_INCLUDE_HEADINGS = 0 - # When enabled doxygen tries to link words that correspond to documented # classes, or namespaces to their corresponding documentation. Such a link can # be prevented in individual cases by putting a % sign in front of the word or @@ -2388,11 +2379,6 @@ DIAFILE_DIRS = PLANTUML_JAR_PATH = -# When using plantuml, the PLANTUML_CFG_FILE tag can be used to specify a -# configuration file for plantuml. - -PLANTUML_CFG_FILE = - # When using plantuml, the specified paths are searched for files specified by # the !include statement in a plantuml block. diff --git a/doc/INSTALL.html b/doc/INSTALL.html index ba6dcda3911..844e0950ec4 100644 --- a/doc/INSTALL.html +++ b/doc/INSTALL.html @@ -1,11 +1,11 @@ - + QGIS - +