INSTALL is a output file (followup 1dd6db3)

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!
 

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

doc/INSTALL.html

@@ -77,13 +77,13 @@
 <DIV CLASS="header" ID="header">
 <H1>QGIS</H1>
 <H2>Building QGIS from source - step by step</H2>
-<H3>Friday February 02, 2018</H3>
+<H3>Sunday February 18, 2018</H3>
 </DIV>
 
 <DIV CLASS="body" ID="body">
 <P>
-Last Updated: Friday February 02, 2018
-Last Change : Friday February 02, 2018
+Last Updated: Sunday February 18, 2018
+Last Change : Sunday February 18, 2018
 </P>
 <DIV CLASS="toc">
 
@@ -107,30 +107,31 @@ <H3>Friday February 02, 2018</H3>
     <LI><A HREF="#toc14">4.1. Building with Microsoft Visual Studio</A>
     <LI><A HREF="#toc15">4.2. Building using MinGW</A>
     <LI><A HREF="#toc16">4.3. Creation of MSYS environment for compilation of QGIS</A>
+    <LI><A HREF="#toc17">4.4. Building on Linux with mxe</A>
     </UL>
-  <LI><A HREF="#toc17">Building on MacOS X</A>
+  <LI><A HREF="#toc18">Building on MacOS X</A>
     <UL>
-    <LI><A HREF="#toc18">5.1. Install Developer Tools</A>
-    <LI><A HREF="#toc19">5.2. Install Qt4 from disk image</A>
-    <LI><A HREF="#toc20">5.3. Install CMake for OSX</A>
-    <LI><A HREF="#toc21">5.4. Install development frameworks for QGIS dependencies</A>
-    <LI><A HREF="#toc22">5.5. API documentation</A>
-    <LI><A HREF="#toc23">5.6. QGIS source</A>
-    <LI><A HREF="#toc24">5.7. Configure the build</A>
-    <LI><A HREF="#toc25">5.8. Building</A>
-    <LI><A HREF="#toc26">5.9. Post-Install</A>
+    <LI><A HREF="#toc19">5.1. Install Developer Tools</A>
+    <LI><A HREF="#toc20">5.2. Install Qt4 from disk image</A>
+    <LI><A HREF="#toc21">5.3. Install CMake for OSX</A>
+    <LI><A HREF="#toc22">5.4. Install development frameworks for QGIS dependencies</A>
+    <LI><A HREF="#toc23">5.5. API documentation</A>
+    <LI><A HREF="#toc24">5.6. QGIS source</A>
+    <LI><A HREF="#toc25">5.7. Configure the build</A>
+    <LI><A HREF="#toc26">5.8. Building</A>
+    <LI><A HREF="#toc27">5.9. Post-Install</A>
     </UL>
-  <LI><A HREF="#toc27">Setting up the WCS test server on GNU/Linux</A>
+  <LI><A HREF="#toc28">Setting up the WCS test server on GNU/Linux</A>
     <UL>
-    <LI><A HREF="#toc28">6.1. Preparation</A>
-    <LI><A HREF="#toc29">6.2. Setup mapserver</A>
-    <LI><A HREF="#toc30">6.3. Create a home page</A>
-    <LI><A HREF="#toc31">6.4. Now deploy it</A>
-    <LI><A HREF="#toc32">6.5. Debugging</A>
+    <LI><A HREF="#toc29">6.1. Preparation</A>
+    <LI><A HREF="#toc30">6.2. Setup mapserver</A>
+    <LI><A HREF="#toc31">6.3. Create a home page</A>
+    <LI><A HREF="#toc32">6.4. Now deploy it</A>
+    <LI><A HREF="#toc33">6.5. Debugging</A>
     </UL>
-  <LI><A HREF="#toc33">Setting up a Jenkins Build Server</A>
-  <LI><A HREF="#toc34">Debug output and running tests</A>
-  <LI><A HREF="#toc35">Authors and Acknowledgments</A>
+  <LI><A HREF="#toc34">Setting up a Jenkins Build Server</A>
+  <LI><A HREF="#toc35">Debug output and running tests</A>
+  <LI><A HREF="#toc36">Authors and Acknowledgments</A>
   </OL>
 
 </DIV>
@@ -1455,6 +1456,44 @@ <H3>4.3.3. Cleanup</H3>
 </P>
 
 <A NAME="toc17"></A>
+<H2>4.4. Building on Linux with mxe</H2>
+
+<P>
+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.
+</P>
+<P>
+For now, Python buildings cannot be built with mxe.
+</P>
+
+<H3>4.4.1. Initial setup</H3>
+
+<P>
+Please follow the instructions on mxe website to setup your building toolchain <A HREF="http://mxe.cc/">http://mxe.cc/</A>,
+take note of the path where you have installed mxe.
+</P>
+
+<H3>4.4.2. Building the dependencies</H3>
+
+<P>
+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.
+</P>
+
+<H3>4.4.3. Cross-Building QGIS</H3>
+
+<P>
+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.
+</P>
+
+<H3>4.4.4. Testing QGIS</H3>
+
+<P>
+Copy and unzip the release package on a Windows machine and launch it!
+</P>
+
+<A NAME="toc18"></A>
 <H1>5. Building on MacOS X</H1>
 
 <P>
@@ -1521,7 +1560,7 @@ <H1>5. Building on MacOS X</H1>
 many threads.
 </P>
 
-<A NAME="toc18"></A>
+<A NAME="toc19"></A>
 <H2>5.1. Install Developer Tools</H2>
 
 <P>
@@ -1578,7 +1617,7 @@ <H2>5.1. Install Developer Tools</H2>
 (e.g. OSG &amp; osgEarth), try using only the LLVM compilers.
 </P>
 
-<A NAME="toc19"></A>
+<A NAME="toc20"></A>
 <H2>5.2. Install Qt4 from disk image</H2>
 
 <P>
@@ -1638,7 +1677,7 @@ <H2>5.2. Install Qt4 from disk image</H2>
 CMAKE_MODULE_LINKER_FLAGS and CMAKE_EXE_LINKER_FLAGS in the cmake build.
 </P>
 
-<A NAME="toc20"></A>
+<A NAME="toc21"></A>
 <H2>5.3. Install CMake for OSX</H2>
 
 <P>
@@ -1720,7 +1759,7 @@ <H3>5.3.1. Optional setup: ccache</H3>
 osgEarth), try bypassing ccache.
 </P>
 
-<A NAME="toc21"></A>
+<A NAME="toc22"></A>
 <H2>5.4. Install development frameworks for QGIS dependencies</H2>
 
 <P>
@@ -2393,7 +2432,7 @@ <H3>5.4.13. Optional dependencies: OSG &amp; osgEarth</H3>
 And as for OSG, you can leave the bin/ executables where they are.
 </P>
 
-<A NAME="toc22"></A>
+<A NAME="toc23"></A>
 <H2>5.5. API documentation</H2>
 
 <P>
@@ -2429,7 +2468,7 @@ <H2>5.5. API documentation</H2>
 QGIS.app/Contents/Resources/doc
 </P>
 
-<A NAME="toc23"></A>
+<A NAME="toc24"></A>
 <H2>5.6. QGIS source</H2>
 
 <P>
@@ -2464,7 +2503,7 @@ <H2>5.6. QGIS source</H2>
 
 </PRE></div>
 
-<A NAME="toc24"></A>
+<A NAME="toc25"></A>
 <H2>5.7. Configure the build</H2>
 
 <P>
@@ -2604,7 +2643,7 @@ <H2>5.7. Configure the build</H2>
 -D QGIS_MACAPP_BUNDLE=2 \
 </PRE></div>
 
-<A NAME="toc25"></A>
+<A NAME="toc26"></A>
 <H2>5.8. Building</H2>
 
 <P>
@@ -2632,7 +2671,7 @@ <H2>5.8. Building</H2>
 sudo make install
 </PRE></div>
 
-<A NAME="toc26"></A>
+<A NAME="toc27"></A>
 <H2>5.9. Post-Install</H2>
 
 <P>
@@ -2668,7 +2707,7 @@ <H2>5.9. Post-Install</H2>
 installing the mod-fastcgi that is missing on Lion.
 </P>
 
-<A NAME="toc27"></A>
+<A NAME="toc28"></A>
 <H1>6. Setting up the WCS test server on GNU/Linux</H1>
 
 <P>
@@ -2679,7 +2718,7 @@ <H1>6. Setting up the WCS test server on GNU/Linux</H1>
 require slight variations in package names.
 </P>
 
-<A NAME="toc28"></A>
+<A NAME="toc29"></A>
 <H2>6.1. Preparation</H2>
 
 <P>
@@ -2699,7 +2738,7 @@ <H2>6.1. Preparation</H2>
   cd cgi-bin/
 </P>
 
-<A NAME="toc29"></A>
+<A NAME="toc30"></A>
 <H2>6.2. Setup mapserver</H2>
 
 <P>
@@ -2765,7 +2804,7 @@ <H2>6.2. Setup mapserver</H2>
   &lt;/VirtualHost&gt;
 </PRE></div>
 
-<A NAME="toc30"></A>
+<A NAME="toc31"></A>
 <H2>6.3. Create a home page</H2>
 
 <div class="code"><PRE>
@@ -2783,7 +2822,7 @@ <H2>6.3. Create a home page</H2>
   http://wcs.qgis.org/1.9.0/wcs
 </PRE></div>
 
-<A NAME="toc31"></A>
+<A NAME="toc32"></A>
 <H2>6.4. Now deploy it</H2>
 
 <div class="code"><PRE>
@@ -2796,14 +2835,14 @@ <H2>6.4. Now deploy it</H2>
   sudo /etc/init.d/apache2 reload
 </PRE></div>
 
-<A NAME="toc32"></A>
+<A NAME="toc33"></A>
 <H2>6.5. Debugging</H2>
 
 <div class="code"><PRE>
   sudo tail -f /var/log/apache2/wcs_qgis.org/error.log
 </PRE></div>
 
-<A NAME="toc33"></A>
+<A NAME="toc34"></A>
 <H1>7. Setting up a Jenkins Build Server</H1>
 
 <P>
@@ -2905,7 +2944,7 @@ <H1>7. Setting up a Jenkins Build Server</H1>
 <A HREF="http://alexott.blogspot.com/2012/03/jenkins-cmakectest.html">http://alexott.blogspot.com/2012/03/jenkins-cmakectest.html</A>
 </UL>
 
-<A NAME="toc34"></A>
+<A NAME="toc35"></A>
 <H1>8. Debug output and running tests</H1>
 
 <P>
@@ -2971,7 +3010,7 @@ <H1>8. Debug output and running tests</H1>
 ctest --verbose --tests-regex SomeTestName
 </PRE></div>
 
-<A NAME="toc35"></A>
+<A NAME="toc36"></A>
 <H1>9. Authors and Acknowledgments</H1>
 
 <P>
@@ -3037,5 +3076,5 @@ <H1>9. Authors and Acknowledgments</H1>
 
 </DIV>
 <!-- html code generated by txt2tags 2.6 (http://txt2tags.org) -->
-<!-- cmdline: txt2tags -\-encoding=utf-8 -o/home/fischer/src/qgis/debian/build-master-release/doc/INSTALL.html -t html /home/fischer/src/qgis/doc/INSTALL.t2t -->
+<!-- cmdline: txt2tags -\-encoding=utf-8 -o/home/fischer/src/qgis/debian/build/doc/INSTALL.html -t html /home/fischer/src/qgis/doc/INSTALL.t2t -->
 </BODY></HTML>

doc/INSTALL.t2t

@@ -104,6 +104,7 @@ source directory.
 = Building on Windows =
 %!include: msvc.t2t
 %!include: msys.t2t
+%!include: mxe.t2t
 
 %!include: osx.t2t
 

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!