INSTALL: update required flex version to 2.5.6 and links to windows version

jef-n · jef-n · commit 7ef50928ac23 · 2014-11-24T16:33:51.000+01:00
diff --git a/INSTALL b/INSTALL
@@ -1,10 +1,10 @@
 QGIS
 Building QGIS from source - step by step
-Saturday November 22, 2014
+Monday November 24, 2014
 
 
-Last Updated: Saturday November 22, 2014
-Last Change : Saturday November 22, 2014
+Last Updated: Monday November 24, 2014
+Last Change : Monday November 24, 2014
 
 
   1. Introduction
@@ -92,7 +92,7 @@ Following a summary of the required dependencies for building:
 Required build tools:
 
 - CMake >= 2.8.6
-- Flex
+- Flex >= 2.5.6
 - Bison >= 2.4
 
 Required build dependencies:
@@ -349,22 +349,21 @@ You also need the Windows SDK for Windows 7 and .NET Framework 4:
 Download and install following packages:
 
   || Tool | Website |
-  | CMake | http://www.cmake.org/files/v2.8/cmake-2.8.12.2-win32-x86.exe |
-  | Flex | http://gnuwin32.sourceforge.net/downlinks/flex.php |
-  | Bison | http://gnuwin32.sourceforge.net/downlinks/bison.php |
-  | GIT | https://github.com/msysgit/msysgit/releases/download/Git-1.9.4-preview20140611/Git-1.9.4-preview20140611.exe | 
+  | CMake | http://www.cmake.org/files/v3.0/cmake-3.0.2-win32-x86.exe |
+  | GNU flex, GNU bison and GIT | http://cygwin.com/setup-x86.exe (32bit) or http://cygwin.com/setup-x86_64.exe (64bit) |
   | OSGeo4W | http://download.osgeo.org/osgeo4w/osgeo4w-setup-x86.exe (32bit) or http://download.osgeo.org/osgeo4w/osgeo4w-setup-x86_64.exe (64bit) |
 
-You can also use flex, bison & git from
-
-  http://cygwin.com
-
 OSGeo4W does not only provide ready packages for the current QGIS release and
 nightly builds of master, but also offers most of the dependencies needs to
 build it.
 
-For the QGIS build you need to install following packages from OSGeo4W (select
-Advanced Installation):
+For the QGIS build you need to install following packages from cygwin:
+
+- bison
+- flex
+- git
+
+and from OSGeo4W (select Advanced Installation):
 
 - expat
 - fcgi
@@ -408,7 +407,7 @@ installed in the default locations):
   
   set OSGEO4W_ROOT=C:\OSGeo4W
   call "%OSGEO4W_ROOT%\bin\o4w_env.bat"
-  path %PATH%;%PROGRAMFILES%\CMake 2.8\bin;%PROGRAMFILES%\GnuWin32\bin
+  path %PATH%;%PROGRAMFILES%\CMake\bin;c:\cygwin\bin
   
   @set GRASS_PREFIX=c:/OSGeo4W/apps/grass/grass-6.4.4
   @set INCLUDE=%INCLUDE%;%OSGEO4W_ROOT%\include
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>Saturday November 22, 2014</H3>
+<H3>Monday November 24, 2014</H3>
 </DIV>
 
 <DIV CLASS="body" ID="body">
 <P>
-Last Updated: Saturday November 22, 2014
-Last Change : Saturday November 22, 2014
+Last Updated: Monday November 24, 2014
+Last Change : Monday November 24, 2014
 </P>
 <DIV CLASS="toc">
 
@@ -195,7 +195,7 @@ <H1>2. Overview</H1>
 
 <UL>
 <LI>CMake &gt;= 2.8.6
-<LI>Flex
+<LI>Flex &gt;= 2.5.6
 <LI>Bison &gt;= 2.4
 </UL>
 
@@ -571,40 +571,35 @@ <H3>4.1.2. Other tools and dependencies</H3>
 </TR>
 <TR>
 <TD>CMake</TD>
-<TD><A HREF="http://www.cmake.org/files/v2.8/cmake-2.8.12.2-win32-x86.exe">http://www.cmake.org/files/v2.8/cmake-2.8.12.2-win32-x86.exe</A></TD>
+<TD><A HREF="http://www.cmake.org/files/v3.0/cmake-3.0.2-win32-x86.exe">http://www.cmake.org/files/v3.0/cmake-3.0.2-win32-x86.exe</A></TD>
 </TR>
 <TR>
-<TD>Flex</TD>
-<TD><A HREF="http://gnuwin32.sourceforge.net/downlinks/flex.php">http://gnuwin32.sourceforge.net/downlinks/flex.php</A></TD>
-</TR>
-<TR>
-<TD>Bison</TD>
-<TD><A HREF="http://gnuwin32.sourceforge.net/downlinks/bison.php">http://gnuwin32.sourceforge.net/downlinks/bison.php</A></TD>
-</TR>
-<TR>
-<TD>GIT</TD>
-<TD><A HREF="https://github.com/msysgit/msysgit/releases/download/Git-1.9.4-preview20140611/Git-1.9.4-preview20140611.exe">https://github.com/msysgit/msysgit/releases/download/Git-1.9.4-preview20140611/Git-1.9.4-preview20140611.exe</A></TD>
+<TD>GNU flex, GNU bison and GIT</TD>
+<TD><A HREF="http://cygwin.com/setup-x86.exe">http://cygwin.com/setup-x86.exe</A> (32bit) or <A HREF="http://cygwin.com/setup-x86_64.exe">http://cygwin.com/setup-x86_64.exe</A> (64bit)</TD>
 </TR>
 <TR>
 <TD>OSGeo4W</TD>
 <TD><A HREF="http://download.osgeo.org/osgeo4w/osgeo4w-setup-x86.exe">http://download.osgeo.org/osgeo4w/osgeo4w-setup-x86.exe</A> (32bit) or <A HREF="http://download.osgeo.org/osgeo4w/osgeo4w-setup-x86_64.exe">http://download.osgeo.org/osgeo4w/osgeo4w-setup-x86_64.exe</A> (64bit)</TD>
 </TR>
 </TABLE>
 
-<P>
-You can also use flex, bison &amp; git from
-</P>
-	<BLOCKQUOTE>
-	<A HREF="http://cygwin.com">http://cygwin.com</A>
-	</BLOCKQUOTE>
 <P>
 OSGeo4W does not only provide ready packages for the current QGIS release and
 nightly builds of master, but also offers most of the dependencies needs to
 build it.
 </P>
 <P>
-For the QGIS build you need to install following packages from OSGeo4W (select
-<I>Advanced Installation</I>):
+For the QGIS build you need to install following packages from cygwin:
+</P>
+
+<UL>
+<LI>bison
+<LI>flex
+<LI>git
+</UL>
+
+<P>
+and from OSGeo4W (select <I>Advanced Installation</I>):
 </P>
 
 <UL>
@@ -653,7 +648,7 @@ <H3>4.1.3. Setting up the Visual Studio project with CMake</H3>
 
 set OSGEO4W_ROOT=C:\OSGeo4W
 call "%OSGEO4W_ROOT%\bin\o4w_env.bat"
-path %PATH%;%PROGRAMFILES%\CMake 2.8\bin;%PROGRAMFILES%\GnuWin32\bin
+path %PATH%;%PROGRAMFILES%\CMake\bin;c:\cygwin\bin
 
 @set GRASS_PREFIX=c:/OSGeo4W/apps/grass/grass-6.4.4
 @set INCLUDE=%INCLUDE%;%OSGEO4W_ROOT%\include
diff --git a/doc/msvc.t2t b/doc/msvc.t2t
@@ -31,22 +31,21 @@ You also need the Windows SDK for Windows 7 and .NET Framework 4:
 Download and install following packages:
 
 || Tool | Website |
-| CMake | http://www.cmake.org/files/v2.8/cmake-2.8.12.2-win32-x86.exe |
-| Flex | http://gnuwin32.sourceforge.net/downlinks/flex.php |
-| Bison | http://gnuwin32.sourceforge.net/downlinks/bison.php |
-| GIT | https://github.com/msysgit/msysgit/releases/download/Git-1.9.4-preview20140611/Git-1.9.4-preview20140611.exe | 
+| CMake | http://www.cmake.org/files/v3.0/cmake-3.0.2-win32-x86.exe |
+| GNU flex, GNU bison and GIT | http://cygwin.com/setup-x86.exe (32bit) or http://cygwin.com/setup-x86_64.exe (64bit) |
 | OSGeo4W | http://download.osgeo.org/osgeo4w/osgeo4w-setup-x86.exe (32bit) or http://download.osgeo.org/osgeo4w/osgeo4w-setup-x86_64.exe (64bit) |
 
-You can also use flex, bison & git from
-
-	http://cygwin.com
-
 OSGeo4W does not only provide ready packages for the current QGIS release and
 nightly builds of master, but also offers most of the dependencies needs to
 build it.
 
-For the QGIS build you need to install following packages from OSGeo4W (select
-//Advanced Installation//):
+For the QGIS build you need to install following packages from cygwin:
+- bison
+- flex
+- git
+-
+
+and from OSGeo4W (select //Advanced Installation//):
 
 - expat
 - fcgi
@@ -90,7 +89,7 @@ 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 2.8\bin;%PROGRAMFILES%\GnuWin32\bin
+path %PATH%;%PROGRAMFILES%\CMake\bin;c:\cygwin\bin
 
 @set GRASS_PREFIX=c:/OSGeo4W/apps/grass/grass-6.4.4
 @set INCLUDE=%INCLUDE%;%OSGEO4W_ROOT%\include
diff --git a/doc/overview.t2t b/doc/overview.t2t
@@ -9,7 +9,7 @@ Following a summary of the required dependencies for building:
 Required build tools:
 
 - CMake >= 2.8.6
-- Flex
+- Flex >= 2.5.6
 - Bison >= 2.4
 -
 

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ Following a summary of the required dependencies for building:`
`9`	`9`	`Required build tools:`
`10`	`10`
`11`	`11`	`- CMake >= 2.8.6`
`12`		`-- Flex`
	`12`	`+- Flex >= 2.5.6`
`13`	`13`	`- Bison >= 2.4`
`14`	`14`	`-`
`15`	`15`