Skip to content

Commit faeb160

Browse files
jef-njef-n
committed
t2tdoc run (followup 8923aa9 & ae397bf)
1 parent 82dccf7 commit faeb160

File tree

2 files changed

+70
-49
lines changed

2 files changed

+70
-49
lines changed

‎INSTALL

+35-24
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
QGIS
22
Building QGIS from source - step by step
3-
Wednesday August 22, 2018
3+
Sunday October 14, 2018
44

55

6-
Last Updated: Wednesday August 22, 2018
7-
Last Change : Wednesday August 22, 2018
6+
Last Updated: Sunday October 14, 2018
7+
Last Change : Sunday October 14, 2018
88

99

1010
1. Introduction
@@ -317,16 +317,11 @@ Build and install with ninja:
317317
ninja (uses all cores by default; also supports the above described -jX option)
318318
ninja install
319319

320-
You can build just the targets you need using, for example :
320+
You can build just the targets you need using, for example:
321321

322322
ninja qgis
323323
ninja pycore
324324

325-
You can build just the targets you need using, for example:
326-
327-
- ninja qgis
328-
- ninja pycore
329-
330325

331326
3.8. Building Debian packages
332327
=============================
@@ -462,7 +457,7 @@ For the QGIS build you need to install following packages from cygwin:
462457

463458
and from OSGeo4W (select Advanced Installation):
464459

465-
- qgis-rel-deps
460+
- qgis-dev-deps
466461

467462
This will also select packages the above packages depend on.
468463

@@ -1046,37 +1041,53 @@ of space and it's not necessary at all.
10461041
4.4. Building on Linux with mxe
10471042
===============================
10481043

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

10521047
For now, Python buildings cannot be built with mxe.
10531048

10541049

1055-
4.4.1. Initial setup
1056-
====================
1050+
4.4.1. Building with Docker
1051+
===========================
1052+
1053+
This is the simplest way, but you need to have Docker installed
1054+
on your system.
1055+
1056+
You can use a Docker image to cross build QGIS by calling
1057+
the script ms-windows/mxe/build.sh from the root directory of QGIS repository.
1058+
1059+
=== Building without Docker ====
1060+
1061+
This requires to install mxe toolchain on your system and build
1062+
all dependencies by yourself.
1063+
1064+
1065+
4.4.1.1. Initial setup
1066+
======================
10571067

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

10611071

1062-
4.4.2. Building the dependencies
1063-
================================
1072+
4.4.1.2. Building the dependencies
1073+
==================================
10641074

1065-
Please see the README under ms-windows/mxe for a list of the dependencies that need to be
1066-
built in mxe before attempting to build QGIS.
1075+
Please see README.md under ms-windows/mxe for detailed instructions and for the
1076+
list of dependencies that need to be built in mxe before attempting to build QGIS.
10671077

10681078

1069-
4.4.3. Cross-Building QGIS
1070-
==========================
1079+
4.4.1.3. Cross-Building QGIS
1080+
============================
10711081

1072-
Edit the build-mxe.sh script and change the path where your mxe installation is located, you
1073-
can also change the build and release directory.
1082+
Edit the build-mxe.sh script and optionally adjust the path where your mxe installation is located, you
1083+
can also change the build and release directories.
10741084

10751085

1076-
4.4.4. Testing QGIS
1086+
4.4.2. Testing QGIS
10771087
===================
10781088

1079-
Copy and unzip the release package on a Windows machine and launch it!
1089+
Copy and unzip on the Windows machine package produced by the build and launch the qgis binary: no installation
1090+
is required.
10801091

10811092

10821093
5. Building on MacOS X

‎doc/INSTALL.html

+35-25
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,13 @@
7777
<DIV CLASS="header" ID="header">
7878
<H1>QGIS</H1>
7979
<H2>Building QGIS from source - step by step</H2>
80-
<H3>Wednesday August 22, 2018</H3>
80+
<H3>Sunday October 14, 2018</H3>
8181
</DIV>
8282

8383
<DIV CLASS="body" ID="body">
8484
<P>
85-
Last Updated: Wednesday August 22, 2018
86-
Last Change : Wednesday August 22, 2018
85+
Last Updated: Sunday October 14, 2018
86+
Last Change : Sunday October 14, 2018
8787
</P>
8888
<DIV CLASS="toc">
8989

@@ -532,23 +532,14 @@ <H2>3.7. Starting the compile</H2>
532532
</PRE></div>
533533

534534
<P>
535-
You can build just the targets you need using, for example :
535+
You can build just the targets you need using, for example:
536536
</P>
537537

538538
<div class="code"><PRE>
539539
ninja qgis
540540
ninja pycore
541541
</PRE></div>
542542

543-
<P>
544-
You can build just the targets you need using, for example:
545-
</P>
546-
547-
<UL>
548-
<LI>ninja qgis
549-
<LI>ninja pycore
550-
</UL>
551-
552543
<A NAME="toc11"></A>
553544
<H2>3.8. Building Debian packages</H2>
554545

@@ -754,7 +745,7 @@ <H3>4.1.2. Other tools and dependencies</H3>
754745
</P>
755746

756747
<UL>
757-
<LI>qgis-rel-deps
748+
<LI>qgis-dev-deps
758749
</UL>
759750

760751
<P>
@@ -1486,38 +1477,57 @@ <H3>4.3.3. Cleanup</H3>
14861477
<H2>4.4. Building on Linux with mxe</H2>
14871478

14881479
<P>
1489-
With this approach you can build a windows binary on Linux using mxe MXE (M cross environment).
1490-
You can find the build script and a README file in the ms-windows/mxe directory.
1480+
With this approach you can cross build a Windows binary on Linux using MXE (M cross environment).
1481+
You can find the build script and a README.md file in the ms-windows/mxe directory.
14911482
</P>
14921483
<P>
14931484
For now, Python buildings cannot be built with mxe.
14941485
</P>
14951486

1496-
<H3>4.4.1. Initial setup</H3>
1487+
<H3>4.4.1. Building with Docker</H3>
1488+
1489+
<P>
1490+
This is the simplest way, but you need to have Docker installed
1491+
on your system.
1492+
</P>
1493+
<P>
1494+
You can use a Docker image to cross build QGIS by calling
1495+
the script ms-windows/mxe/build.sh from the root directory of QGIS repository.
1496+
</P>
1497+
<P>
1498+
=== Building without Docker ====
1499+
</P>
1500+
<P>
1501+
This requires to install mxe toolchain on your system and build
1502+
all dependencies by yourself.
1503+
</P>
1504+
1505+
<H4>4.4.1.1. Initial setup</H4>
14971506

14981507
<P>
14991508
Please follow the instructions on mxe website to setup your building toolchain <A HREF="http://mxe.cc/">http://mxe.cc/</A>,
15001509
take note of the path where you have installed mxe.
15011510
</P>
15021511

1503-
<H3>4.4.2. Building the dependencies</H3>
1512+
<H4>4.4.1.2. Building the dependencies</H4>
15041513

15051514
<P>
1506-
Please see the README under ms-windows/mxe for a list of the dependencies that need to be
1507-
built in mxe before attempting to build QGIS.
1515+
Please see README.md under ms-windows/mxe for detailed instructions and for the
1516+
list of dependencies that need to be built in mxe before attempting to build QGIS.
15081517
</P>
15091518

1510-
<H3>4.4.3. Cross-Building QGIS</H3>
1519+
<H4>4.4.1.3. Cross-Building QGIS</H4>
15111520

15121521
<P>
1513-
Edit the build-mxe.sh script and change the path where your mxe installation is located, you
1514-
can also change the build and release directory.
1522+
Edit the build-mxe.sh script and optionally adjust the path where your mxe installation is located, you
1523+
can also change the build and release directories.
15151524
</P>
15161525

1517-
<H3>4.4.4. Testing QGIS</H3>
1526+
<H3>4.4.2. Testing QGIS</H3>
15181527

15191528
<P>
1520-
Copy and unzip the release package on a Windows machine and launch it!
1529+
Copy and unzip on the Windows machine package produced by the build and launch the qgis binary: no installation
1530+
is required.
15211531
</P>
15221532

15231533
<A NAME="toc18"></A>

0 commit comments

Comments
 (0)