INSTALL updates: MSVC builds, debian builds

qgis · Aug 5, 2017 · 0395225 · 0395225
1 parent 6ed389c
commit 0395225
Show file tree

Hide file tree

Showing 4 changed files with 70 additions and 30 deletions.
diff --git a/INSTALL b/INSTALL
@@ -1,10 +1,10 @@
 QGIS
 Building QGIS from source - step by step
-Friday August 04, 2017
+Saturday August 05, 2017
 
 
-Last Updated: Friday August 04, 2017
-Last Change : Friday August 04, 2017
+Last Updated: Saturday August 05, 2017
+Last Change : Saturday August 05, 2017
 
 
   1. Introduction
@@ -186,6 +186,10 @@ Now update your local sources database:
 
 (extracted from the control.in file in debian/)
 
+See http://qgis.org/en/site/forusers/alldownloads.html#debian-ubuntu for
+currently supported distributions (plain xenial's GDAL for instance is to old
+and we build with GDAL2 from ubuntugis).
+
 
   3.4. Setup ccache (Optional)
   ============================
@@ -473,6 +477,9 @@ and from OSGeo4W (select Advanced Installation):
 - qwt-devel-qt5
 - sip-qt5
 - spatialite
+- oci
+- qtkeychain
+- libzip
 
 This will also select packages the above packages depend on.
 
@@ -499,20 +506,26 @@ 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
-
-  set INCLUDE=%INCLUDE%;%PROGRAMFILES%\Microsoft SDKs\Windows\v7.1\include
-  set LIB=%LIB%;%PROGRAMFILES%\Microsoft SDKs\Windows\v7.1\lib
-
   set OSGEO4W_ROOT=C:\OSGeo4W
   call "%OSGEO4W_ROOT%\bin\o4w_env.bat"
-  path %PATH%;%PROGRAMFILES%\CMake\bin;c:\cygwin\bin
+  call "%OSGEO4W_ROOT%\bin\py3_env.bat"
+  call "%OSGEO4W_ROOT%\bin\qt5_env.bat"
+
+  set O4W_ROOT=%OSGEO4W_ROOT:\=/%
+  set LIB_DIR=%O4W_ROOT%
 
-  @set GRASS_PREFIX=c:/OSGeo4W/apps/grass/grass-6.4.4
+  call "C:\Program Files\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
+  path %path%;C:\Program Files\Microsoft Visual Studio 14.0\VC\bin
+
+  path %PATH%;C:\Program Files\CMake\bin;c:\cygwin\bin
+
+  @set GRASS_PREFIX=c:/OSGeo4W/apps/grass/grass-7.2.1
   @set INCLUDE=%INCLUDE%;%OSGEO4W_ROOT%\include
   @set LIB=%LIB%;%OSGEO4W_ROOT%\lib;%OSGEO4W_ROOT%\lib
 
+  set LIB=%LIB%;%OSGEO4W_ROOT%\apps\Qt5\lib;%OSGEO4W_ROOT%\lib
+  set INCLUDE=%INCLUDE%;%OSGEO4W_ROOT%\apps\Qt5\include;%OSGEO4W_ROOT%\include
+
   @cmd
 
 Start the batch file and on the command prompt checkout the QGIS source from

diff --git a/doc/INSTALL.html b/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 August 04, 2017</H3>
+<H3>Saturday August 05, 2017</H3>
 </DIV>
 
 <DIV CLASS="body" ID="body">
 <P>
-Last Updated: Friday August 04, 2017
-Last Change : Friday August 04, 2017
+Last Updated: Saturday August 05, 2017
+Last Change : Saturday August 05, 2017
 </P>
 <DIV CLASS="toc">
 
@@ -332,6 +332,11 @@ <H2>3.3. Install build dependencies</H2>
 <P>
 (extracted from the control.in file in <CODE>debian/</CODE>)
 </P>
+<P>
+See <A HREF="http://qgis.org/en/site/forusers/alldownloads.html#debian-ubuntu">http://qgis.org/en/site/forusers/alldownloads.html#debian-ubuntu</A> for
+currently supported distributions (plain xenial's GDAL for instance is to old
+and we build with GDAL2 from ubuntugis).
+</P>
 
 <A NAME="toc7"></A>
 <H2>3.4. Setup ccache (Optional)</H2>
@@ -752,6 +757,9 @@ <H3>4.1.2. Other tools and dependencies</H3>
 <LI>qwt-devel-qt5
 <LI>sip-qt5
 <LI>spatialite
+<LI>oci
+<LI>qtkeychain
+<LI>libzip
 </UL>
 
 <P>
@@ -785,20 +793,26 @@ <H3>4.1.3. Setting up the Visual Studio project with CMake</H3>
 
 <div class="code"><PRE>
 @echo off
-set VS90COMNTOOLS=%PROGRAMFILES%\Microsoft Visual Studio 9.0\Common7\Tools\
-call "%PROGRAMFILES%\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" x86
-
-set INCLUDE=%INCLUDE%;%PROGRAMFILES%\Microsoft SDKs\Windows\v7.1\include
-set LIB=%LIB%;%PROGRAMFILES%\Microsoft SDKs\Windows\v7.1\lib
-
 set OSGEO4W_ROOT=C:\OSGeo4W
 call "%OSGEO4W_ROOT%\bin\o4w_env.bat"
-path %PATH%;%PROGRAMFILES%\CMake\bin;c:\cygwin\bin
+call "%OSGEO4W_ROOT%\bin\py3_env.bat"
+call "%OSGEO4W_ROOT%\bin\qt5_env.bat"
 
-@set GRASS_PREFIX=c:/OSGeo4W/apps/grass/grass-6.4.4
+set O4W_ROOT=%OSGEO4W_ROOT:\=/%
+set LIB_DIR=%O4W_ROOT%
+
+call "C:\Program Files\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
+path %path%;C:\Program Files\Microsoft Visual Studio 14.0\VC\bin
+
+path %PATH%;C:\Program Files\CMake\bin;c:\cygwin\bin
+
+@set GRASS_PREFIX=c:/OSGeo4W/apps/grass/grass-7.2.1
 @set INCLUDE=%INCLUDE%;%OSGEO4W_ROOT%\include
 @set LIB=%LIB%;%OSGEO4W_ROOT%\lib;%OSGEO4W_ROOT%\lib
 
+set LIB=%LIB%;%OSGEO4W_ROOT%\apps\Qt5\lib;%OSGEO4W_ROOT%\lib
+set INCLUDE=%INCLUDE%;%OSGEO4W_ROOT%\apps\Qt5\include;%OSGEO4W_ROOT%\include
+
 @cmd
 </PRE></div>
 

diff --git a/doc/linux.t2t b/doc/linux.t2t
@@ -52,6 +52,10 @@ sudo apt-get update
 
 (extracted from the control.in file in ``debian/``)
 
+See http://qgis.org/en/site/forusers/alldownloads.html#debian-ubuntu for
+currently supported distributions (plain xenial's GDAL for instance is to old
+and we build with GDAL2 from ubuntugis).
+
 
 == Setup ccache (Optional) ==
 

diff --git a/doc/msvc.t2t b/doc/msvc.t2t
@@ -61,6 +61,9 @@ and from OSGeo4W (select //Advanced Installation//):
 - qwt-devel-qt5
 - sip-qt5
 - spatialite
+- oci
+- qtkeychain
+- libzip
 -
 
 
@@ -90,20 +93,26 @@ 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
-
-set INCLUDE=%INCLUDE%;%PROGRAMFILES%\Microsoft SDKs\Windows\v7.1\include
-set LIB=%LIB%;%PROGRAMFILES%\Microsoft SDKs\Windows\v7.1\lib
-
 set OSGEO4W_ROOT=C:\OSGeo4W
 call "%OSGEO4W_ROOT%\bin\o4w_env.bat"
-path %PATH%;%PROGRAMFILES%\CMake\bin;c:\cygwin\bin
+call "%OSGEO4W_ROOT%\bin\py3_env.bat"
+call "%OSGEO4W_ROOT%\bin\qt5_env.bat"
+
+set O4W_ROOT=%OSGEO4W_ROOT:\=/%
+set LIB_DIR=%O4W_ROOT%
 
-@set GRASS_PREFIX=c:/OSGeo4W/apps/grass/grass-6.4.4
+call "C:\Program Files\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
+path %path%;C:\Program Files\Microsoft Visual Studio 14.0\VC\bin
+
+path %PATH%;C:\Program Files\CMake\bin;c:\cygwin\bin
+
+@set GRASS_PREFIX=c:/OSGeo4W/apps/grass/grass-7.2.1
 @set INCLUDE=%INCLUDE%;%OSGEO4W_ROOT%\include
 @set LIB=%LIB%;%OSGEO4W_ROOT%\lib;%OSGEO4W_ROOT%\lib
 
+set LIB=%LIB%;%OSGEO4W_ROOT%\apps\Qt5\lib;%OSGEO4W_ROOT%\lib
+set INCLUDE=%INCLUDE%;%OSGEO4W_ROOT%\apps\Qt5\include;%OSGEO4W_ROOT%\include
+
 @cmd
 ```