diff --git a/INSTALL b/INSTALL index 61b05d8a739d..51d04ecbe5bf 100644 --- a/INSTALL +++ b/INSTALL @@ -1,10 +1,10 @@ QGIS Building QGIS from source - step by step -Friday February 02, 2018 +Sunday February 18, 2018 -Last Updated: Friday February 02, 2018 -Last Change : Friday February 02, 2018 +Last Updated: Sunday February 18, 2018 +Last Change : Sunday February 18, 2018 1. Introduction @@ -23,7 +23,7 @@ Last Change : Friday February 02, 2018 4.1. Building with Microsoft Visual Studio 4.2. Building using MinGW 4.3. Creation of MSYS environment for compilation of QGIS - 4.4 Building on Linux with mxe + 4.4. Building on Linux with mxe 5. Building on MacOS X 5.1. Install Developer Tools 5.2. Install Qt4 from disk image @@ -1028,7 +1028,6 @@ We're done with preparation of MSYS environment. Now you can delete all stuff in of space and it's not necessary at all. - 4.4. Building on Linux with mxe =============================== @@ -1037,12 +1036,14 @@ You can find the build script and a README file in the ms-windows/mxe directory. For now, Python buildings cannot be built with mxe. + 4.4.1. Initial setup ==================== Please follow the instructions on mxe website to setup your building toolchain http://mxe.cc/, take note of the path where you have installed mxe. + 4.4.2. Building the dependencies ================================ @@ -1056,8 +1057,9 @@ built in mxe before attempting to build QGIS. Edit the build-mxe.sh script and change the path where your mxe installation is located, you can also change the build and release directory. + 4.4.4. Testing QGIS - ==================== + =================== Copy and unzip the release package on a Windows machine and launch it! diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 6b215db713d4..7b1b300de2ec 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -15,7 +15,8 @@ IF(TXT2TAGS_EXECUTABLE) IF(WITH_TXT2TAGS_PDF) ADD_TXT2TAGS_PDFS(QGIS_DOC_FILES INSTALL.t2t news.t2t) ENDIF(WITH_TXT2TAGS_PDF) - ADD_CUSTOM_TARGET (t2tdoc ALL DEPENDS ${QGIS_DOC_FILES}) + FILE(GLOB t2tfiles doc/*.t2t) + ADD_CUSTOM_TARGET (t2tdoc ALL DEPENDS ${QGIS_DOC_FILES} ${t2tfiles}) ELSE(TXT2TAGS_EXECUTABLE) SET(QGIS_DOC_FILES ${CMAKE_SOURCE_DIR}/INSTALL diff --git a/doc/INSTALL.html b/doc/INSTALL.html index e94483168308..3459dc7d291d 100644 --- a/doc/INSTALL.html +++ b/doc/INSTALL.html @@ -77,13 +77,13 @@

-Last Updated: Friday February 02, 2018 -Last Change : Friday February 02, 2018 +Last Updated: Sunday February 18, 2018 +Last Change : Sunday February 18, 2018

@@ -107,30 +107,31 @@

Friday February 02, 2018

  • 4.1. Building with Microsoft Visual Studio
  • 4.2. Building using MinGW
  • 4.3. Creation of MSYS environment for compilation of QGIS +
  • 4.4. Building on Linux with mxe -
  • 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
    • @@ -1455,6 +1456,44 @@

    4.3.3. Cleanup

    +

    4.4. Building on Linux with mxe

    + +

    +With this approach you can build a windows binary on Linux using mxe MXE (M cross environment). +You can find the build script and a README file in the ms-windows/mxe directory. +

    +

    +For now, Python buildings cannot be built with mxe. +

    + +

    4.4.1. Initial setup

    + +

    +Please follow the instructions on mxe website to setup your building toolchain http://mxe.cc/, +take note of the path where you have installed mxe. +

    + +

    4.4.2. Building the dependencies

    + +

    +Please see the README under ms-windows/mxe for a list of the dependencies that need to be +built in mxe before attempting to build QGIS. +

    + +

    4.4.3. Cross-Building QGIS

    + +

    +Edit the build-mxe.sh script and change the path where your mxe installation is located, you +can also change the build and release directory. +

    + +

    4.4.4. Testing QGIS

    + +

    +Copy and unzip the release package on a Windows machine and launch it! +

    + +

    5. Building on MacOS X

    @@ -1521,7 +1560,7 @@

    5. Building on MacOS X

    many threads.

    - +

    5.1. Install Developer Tools

    @@ -1578,7 +1617,7 @@

    5.1. Install Developer Tools

    (e.g. OSG & osgEarth), try using only the LLVM compilers.

    - +

    5.2. Install Qt4 from disk image

    @@ -1638,7 +1677,7 @@

    5.2. Install Qt4 from disk image

    CMAKE_MODULE_LINKER_FLAGS and CMAKE_EXE_LINKER_FLAGS in the cmake build.

    - +

    5.3. Install CMake for OSX

    @@ -1720,7 +1759,7 @@

    5.3.1. Optional setup: ccache

    osgEarth), try bypassing ccache.

    - +

    5.4. Install development frameworks for QGIS dependencies

    @@ -2393,7 +2432,7 @@

    5.4.13. Optional dependencies: OSG & osgEarth

    And as for OSG, you can leave the bin/ executables where they are.

    - +

    5.5. API documentation

    @@ -2429,7 +2468,7 @@

    5.5. API documentation

    QGIS.app/Contents/Resources/doc

    - +

    5.6. QGIS source

    @@ -2464,7 +2503,7 @@

    5.6. QGIS source

    - +

    5.7. Configure the build

    @@ -2604,7 +2643,7 @@

    5.7. Configure the build

    -D QGIS_MACAPP_BUNDLE=2 \ - +

    5.8. Building

    @@ -2632,7 +2671,7 @@

    5.8. Building

    sudo make install - +

    5.9. Post-Install

    @@ -2668,7 +2707,7 @@

    5.9. Post-Install

    installing the mod-fastcgi that is missing on Lion.

    - +

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

    @@ -2679,7 +2718,7 @@

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

    require slight variations in package names.

    - +

    6.1. Preparation

    @@ -2699,7 +2738,7 @@

    6.1. Preparation

    cd cgi-bin/

    - +

    6.2. Setup mapserver

    @@ -2765,7 +2804,7 @@

    6.2. Setup mapserver

    </VirtualHost> - +

    6.3. Create a home page

    @@ -2783,7 +2822,7 @@ 
    6.3. Create a home page
    
   http://wcs.qgis.org/1.9.0/wcs
    - +

    6.4. Now deploy it

    @@ -2796,14 +2835,14 @@ 
    6.4. Now deploy it
    
   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

    @@ -2905,7 +2944,7 @@

    7. Setting up a Jenkins Build Server

    http://alexott.blogspot.com/2012/03/jenkins-cmakectest.html - +

    8. Debug output and running tests

    @@ -2971,7 +3010,7 @@

    8. Debug output and running tests

    ctest --verbose --tests-regex SomeTestName - +

    9. Authors and Acknowledgments

    @@ -3037,5 +3076,5 @@

    9. Authors and Acknowledgments

    - + diff --git a/doc/INSTALL.t2t b/doc/INSTALL.t2t index 218ba0a6e2f1..4b25ac3fcf26 100644 --- a/doc/INSTALL.t2t +++ b/doc/INSTALL.t2t @@ -104,6 +104,7 @@ source directory. = Building on Windows = %!include: msvc.t2t %!include: msys.t2t +%!include: mxe.t2t %!include: osx.t2t diff --git a/doc/mxe.t2t b/doc/mxe.t2t new file mode 100644 index 000000000000..4fa4dc7af261 --- /dev/null +++ b/doc/mxe.t2t @@ -0,0 +1,26 @@ + +== Building on Linux with mxe == + +With this approach you can build a windows binary on Linux using mxe MXE (M cross environment). +You can find the build script and a README file in the ms-windows/mxe directory. + +For now, Python buildings cannot be built with mxe. + +=== Initial setup === + +Please follow the instructions on mxe website to setup your building toolchain http://mxe.cc/, +take note of the path where you have installed mxe. + +=== Building the dependencies === + +Please see the README under ms-windows/mxe for a list of the dependencies that need to be +built in mxe before attempting to build QGIS. + +=== Cross-Building QGIS === + +Edit the build-mxe.sh script and change the path where your mxe installation is located, you +can also change the build and release directory. + +=== Testing QGIS === + +Copy and unzip the release package on a Windows machine and launch it!