Skip to content

Commit

Permalink
Merge pull request #5276 from nyalldawson/build_dep
Browse files Browse the repository at this point in the history 
Update some Windows build instructions
  • Loading branch information
@nyalldawson
nyalldawson committed Oct 3, 2017
2 parents f3a4a6b + 2326334 commit 58f64bb
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 35 deletions.
44 changes: 22 additions & 22 deletions doc/INSTALL.html
View file
Expand Up @@ -77,13 +77,13 @@
<DIV CLASS="header" ID="header">
<H1>QGIS</H1>
<H2>Building QGIS from source - step by step</H2>
<H3>Saturday September 23, 2017</H3>
<H3>Monday October 02, 2017</H3>
</DIV>

<DIV CLASS="body" ID="body">
<P>
Last Updated: Saturday September 23, 2017
Last Change : Saturday September 23, 2017
Last Updated: Monday October 02, 2017
Last Change : Monday October 02, 2017
</P>
<DIV CLASS="toc">

Expand Down Expand Up @@ -596,7 +596,7 @@ <H2>3.9. On Fedora Linux</H2>
<H3>3.9.1. Install build dependencies</H3>

<div class="code"><PRE>
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
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 libzip-devel
</PRE></div>

<P>
Expand Down Expand Up @@ -751,6 +751,7 @@ <H3>4.1.2. Other tools and dependencies</H3>
<LI>python3-future
<LI>python3-pyyaml
<LI>python3-mock
<LI>python3-six
<LI>qca-qt5-devel
<LI>qca-qt5-libs
<LI>qscintilla-qt5
Expand Down Expand Up @@ -1002,7 +1003,7 @@ <H3>4.2.2. Qt</H3>
When Qt installation is complete:
</P>
<P>
Edit C:\Qt\4.8.0\bin\qtvars.bat and add the following lines:
Edit C:\Qt\5.9.1\bin\qtvars.bat and add the following lines:
</P>

<div class="code"><PRE>
Expand All @@ -1011,12 +1012,12 @@ <H3>4.2.2. Qt</H3>
</PRE></div>

<P>
I suggest you also add C:\Qt\4.8.0\bin\ to your Environment Variables Path in
I suggest you also add C:\Qt\5.9.1\bin\ to your Environment Variables Path in
the windows system preferences.
</P>
<P>
If you plan to do some debugging, you'll need to compile debug version of Qt:
C:\Qt\4.8.0\bin\qtvars.bat compile_debug
C:\Qt\5.9.1\bin\qtvars.bat compile_debug
</P>
<P>
Note: there is a problem when compiling debug version of Qt 4.7, the script ends with
Expand All @@ -1026,7 +1027,7 @@ <H3>4.2.2. Qt</H3>
</P>

<div class="code"><PRE>
c:\Qt\4.8.0 make
c:\Qt\5.9.1 make
</PRE></div>

<H3>4.2.3. Flex and Bison</H3>
Expand All @@ -1036,15 +1037,16 @@ <H3>4.2.3. Flex and Bison</H3>
<A HREF="http://sourceforge.net/project/showfiles.php?group_id=23617&amp;package_id=16424">http://sourceforge.net/project/showfiles.php?group_id=23617&amp;package_id=16424</A>
(the zip bin) and extract it into c:\msys\mingw\bin
</P>

<H3>4.2.4. Python stuff (optional)</H3>

<H3>4.2.4. Python</H3>
<P>
Follow this section in case you would like to use Python bindings for QGIS. To
be able to compile bindings, you need to compile SIP and PyQt4 from sources as
be able to compile bindings, you need to compile SIP and PyQt5 from sources as
their installer doesn't include some development files which are necessary.
</P>

<P>
Note that even if you compile without the Python bindings, Python3 is still
a necessary dependency for building QGIS.
</P>
<H4>4.2.4.1. Download and install Python - use Windows installer</H4>

<P>
Expand All @@ -1053,9 +1055,7 @@ <H4>4.2.4.1. Download and install Python - use Windows installer</H4>
<P>
<A HREF="http://python.org/download/">http://python.org/download/</A>
</P>

<H4>4.2.4.2. Download SIP and PyQt4 sources</H4>

<H4>4.2.4.2. Download SIP and PyQt5 sources</H4>
<P>
<A HREF="http://www.riverbankcomputing.com/software/sip/download">http://www.riverbankcomputing.com/software/sip/download</A>
<A HREF="http://www.riverbankcomputing.com/software/pyqt/download">http://www.riverbankcomputing.com/software/pyqt/download</A>
Expand All @@ -1068,7 +1068,7 @@ <H4>4.2.4.2. Download SIP and PyQt4 sources</H4>
<H4>4.2.4.3. Compile SIP</H4>

<div class="code"><PRE>
c:\Qt\4.8.0\bin\qtvars.bat
c:\Qt\5.9.1\bin\qtvars.bat
python configure.py -p win32-g++
make
make install
Expand All @@ -1077,7 +1077,7 @@ <H4>4.2.4.3. Compile SIP</H4>
<H4>4.2.4.4. Compile PyQt</H4>

<div class="code"><PRE>
c:\Qt\4.8.0\bin\qtvars.bat
c:\Qt\5.9.1\bin\qtvars.bat
python configure.py
make
make install
Expand All @@ -1086,7 +1086,7 @@ <H4>4.2.4.4. Compile PyQt</H4>
<H4>4.2.4.5. Final python notes</H4>

<P>
/!\ You can delete the directories with unpacked SIP and PyQt4 sources after a
/!\ You can delete the directories with unpacked SIP and PyQt5 sources after a
successful install, they're not needed anymore.
</P>

Expand All @@ -1106,7 +1106,7 @@ <H3>4.2.6. CMake</H3>
CMake is build system used by QGIS. Download it from here:
</P>
<P>
<A HREF="http://www.cmake.org/files/v2.8/cmake-2.8.2-win32-x86.exe">http://www.cmake.org/files/v2.8/cmake-2.8.2-win32-x86.exe</A>
<A HREF="https://cmake.org/files/v3.9/cmake-3.9.3-win64-x64.msi">https://cmake.org/files/v3.9/cmake-3.9.3-win64-x64.msi</A>
</P>

<H3>4.2.7. QGIS</H3>
Expand Down Expand Up @@ -1141,11 +1141,11 @@ <H3>4.2.8. Compiling</H3>
</P>

<div class="code"><PRE>
c:\Qt\4.8.0\bin\qtvars.bat
c:\Qt\5.9.1\bin\qtvars.bat
</PRE></div>

<P>
For ease of use add c:\Qt\4.8.0\bin\ to your system path in system
For ease of use add c:\Qt\5.9.1\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:
</P>
Expand Down
1 change: 1 addition & 0 deletions doc/msvc.t2t
View file
Expand Up @@ -51,6 +51,7 @@ and from OSGeo4W (select //Advanced Installation//):
- python3-future
- python3-pyyaml
- python3-mock
- python3-six
- qca-qt5-devel
- qca-qt5-libs
- qscintilla-qt5
Expand Down
29 changes: 16 additions & 13 deletions doc/msys.t2t
View file
Expand Up @@ -39,26 +39,26 @@ it, just point the installer to c:\msys\mingw

When Qt installation is complete:

Edit C:\Qt\4.8.0\bin\qtvars.bat and add the following lines:
Edit C:\Qt\5.9.1\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
I suggest you also add C:\Qt\5.9.1\bin\ to your Environment Variables Path in
the windows system preferences.

If you plan to do some debugging, you'll need to compile debug version of Qt:
C:\Qt\4.8.0\bin\qtvars.bat compile_debug
C:\Qt\5.9.1\bin\qtvars.bat compile_debug

Note: there is a problem when compiling debug version of Qt 4.7, the script ends with
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
c:\Qt\5.9.1 make
```

=== Flex and Bison ===
Expand All @@ -67,19 +67,22 @@ Get Flex
http://sourceforge.net/project/showfiles.php?group_id=23617&package_id=16424
(the zip bin) and extract it into c:\msys\mingw\bin

=== Python stuff (optional) ===
=== Python ===

Follow this section in case you would like to use Python bindings for QGIS. To
be able to compile bindings, you need to compile SIP and PyQt4 from sources as
be able to compile bindings, you need to compile SIP and PyQt5 from sources as
their installer doesn't include some development files which are necessary.

Note that even if you compile without the Python bindings, Python3 is still
a necessary dependency for building QGIS.

==== Download and install Python - use Windows installer ====

(It doesn't matter to what folder you'll install it)

http://python.org/download/

==== Download SIP and PyQt4 sources ====
==== Download SIP and PyQt5 sources ====

http://www.riverbankcomputing.com/software/sip/download
http://www.riverbankcomputing.com/software/pyqt/download
Expand All @@ -90,7 +93,7 @@ to get versions that match your current Qt installed version.
==== Compile SIP ====

```
c:\Qt\4.8.0\bin\qtvars.bat
c:\Qt\5.9.1\bin\qtvars.bat
python configure.py -p win32-g++
make
make install
Expand All @@ -99,15 +102,15 @@ make install
==== Compile PyQt ====

```
c:\Qt\4.8.0\bin\qtvars.bat
c:\Qt\5.9.1\bin\qtvars.bat
python configure.py
make
make install
```

==== Final python notes ====

/!\ You can delete the directories with unpacked SIP and PyQt4 sources after a
/!\ You can delete the directories with unpacked SIP and PyQt5 sources after a
successful install, they're not needed anymore.

=== git ===
Expand All @@ -121,7 +124,7 @@ https://git-scm.com/download/win

CMake is build system used by QGIS. Download it from here:

http://www.cmake.org/files/v2.8/cmake-2.8.2-win32-x86.exe
https://cmake.org/files/v3.9/cmake-3.9.3-win64-x64.msi

=== QGIS ===

Expand All @@ -148,10 +151,10 @@ 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
c:\Qt\5.9.1\bin\qtvars.bat
```

For ease of use add c:\Qt\4.8.0\bin\ to your system path in system
For ease of use add c:\Qt\5.9.1\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:

Expand Down

0 comments on commit 58f64bb

Please sign in to comment.