INSTALL: use meta package to install osgeo4w build dependencies

qgis · Feb 2, 2018 · 98a8bc1 · 98a8bc1
1 parent ad21d37
commit 98a8bc1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 98 deletions.
diff --git a/INSTALL b/INSTALL
@@ -1,10 +1,10 @@
 QGIS
 Building QGIS from source - step by step
-Thursday November 02, 2017
+Friday February 02, 2018
 
 
-Last Updated: Thursday November 02, 2017
-Last Change : Thursday November 02, 2017
+Last Updated: Friday February 02, 2018
+Last Change : Friday February 02, 2018
 
 
   1. Introduction
@@ -100,7 +100,7 @@ Required build dependencies:
 - Proj >= 4.4.x
 - GEOS >= 3.4
 - Sqlite3 >= 3.0.0
-- SpatiaLite
+- SpatiaLite >= 4.2.0
 - libspatialindex
 - GDAL/OGR >= 2.1
 - Qwt >= 5.0 & (< 6.1 with internal QwtPolar)
@@ -456,35 +456,7 @@ For the QGIS build you need to install following packages from cygwin:
 
 and from OSGeo4W (select Advanced Installation):
 
-- expat
-- fcgi
-- gdal
-- grass
-- gsl-devel
-- iconv
-- libzip-devel
-- libspatialindex-devel
-- pyqt5
-- python3-devel
-- python3-qscintilla
-- python3-nose2
-- python3-future
-- python3-pyyaml
-- python3-mock
-- python3-six
-- qca-qt5-devel
-- qca-qt5-libs
-- qscintilla-qt5
-- qt5-devel
-- qt5-libs-debug
-- qtwebkit-qt5-devel
-- qtwebkit-qt5-libs-debug
-- qwt-devel-qt5
-- sip-qt5
-- spatialite
-- oci
-- qtkeychain
-- libzip
+- qgis-dev-deps
 
 This will also select packages the above packages depend on.
 

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>Thursday November 02, 2017</H3>
+<H3>Friday February 02, 2018</H3>
 </DIV>
 
 <DIV CLASS="body" ID="body">
 <P>
-Last Updated: Thursday November 02, 2017
-Last Change : Thursday November 02, 2017
+Last Updated: Friday February 02, 2018
+Last Change : Friday February 02, 2018
 </P>
 <DIV CLASS="toc">
 
@@ -206,7 +206,7 @@ <H1>2. Overview</H1>
 <LI>Proj &gt;= 4.4.x
 <LI>GEOS &gt;= 3.4
 <LI>Sqlite3 &gt;= 3.0.0
-<LI>SpatiaLite
+<LI>SpatiaLite &gt;= 4.2.0
 <LI>libspatialindex
 <LI>GDAL/OGR &gt;= 2.1
 <LI>Qwt &gt;= 5.0 &amp; (&lt; 6.1 with internal QwtPolar)
@@ -741,35 +741,7 @@ <H3>4.1.2. Other tools and dependencies</H3>
 </P>
 
 <UL>
-<LI>expat
-<LI>fcgi
-<LI>gdal
-<LI>grass
-<LI>gsl-devel
-<LI>iconv
-<LI>libzip-devel
-<LI>libspatialindex-devel
-<LI>pyqt5
-<LI>python3-devel
-<LI>python3-qscintilla
-<LI>python3-nose2
-<LI>python3-future
-<LI>python3-pyyaml
-<LI>python3-mock
-<LI>python3-six
-<LI>qca-qt5-devel
-<LI>qca-qt5-libs
-<LI>qscintilla-qt5
-<LI>qt5-devel
-<LI>qt5-libs-debug
-<LI>qtwebkit-qt5-devel
-<LI>qtwebkit-qt5-libs-debug
-<LI>qwt-devel-qt5
-<LI>sip-qt5
-<LI>spatialite
-<LI>oci
-<LI>qtkeychain
-<LI>libzip
+<LI>qgis-dev-deps
 </UL>
 
 <P>
@@ -3065,5 +3037,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-qt5/doc/INSTALL.html -t html /home/fischer/src/qgis/doc/INSTALL.t2t -->
+<!-- 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 -->
 </BODY></HTML>
diff --git a/doc/msvc.t2t b/doc/msvc.t2t
@@ -36,39 +36,9 @@ For the QGIS build you need to install following packages from cygwin:
 
 and from OSGeo4W (select //Advanced Installation//):
 
-- expat
-- fcgi
-- gdal
-- grass
-- gsl-devel
-- iconv
-- libzip-devel
-- libspatialindex-devel
-- pyqt5
-- python3-devel
-- python3-qscintilla
-- python3-nose2
-- python3-future
-- python3-pyyaml
-- python3-mock
-- python3-six
-- qca-qt5-devel
-- qca-qt5-libs
-- qscintilla-qt5
-- qt5-devel
-- qt5-libs-debug
-- qtwebkit-qt5-devel
-- qtwebkit-qt5-libs-debug
-- qwt-devel-qt5
-- sip-qt5
-- spatialite
-- oci
-- qtkeychain
-- libzip
+- qgis-dev-deps
 -
 
-
-
 This will also select packages the above packages depend on.
 
 If you install other packages, this might cause issues. Particularly, make sure