Skip to content

Commit b5b864e

Browse files
jef-njef-n
committed
some windows related INSTALL updates
1 parent 36988f1 commit b5b864e

File tree

3 files changed

+61
-66
lines changed

3 files changed

+61
-66
lines changed

‎INSTALL

+17-18
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
QGIS
22
Building QGIS from source - step by step
3-
Thursday March 06, 2014
3+
Wednesday June 18, 2014
44

55

6-
Last Updated: Thursday March 06, 2014
7-
Last Change : Thursday March 06, 2014
6+
Last Updated: Wednesday June 18, 2014
7+
Last Change : Wednesday June 18, 2014
88

99

1010
1. Introduction
@@ -559,16 +559,17 @@ build QGIS.
559559

560560
The free (as in free beer) Express Edition installer is available under:
561561

562+
Currently we use Visual C++ 2008 Express for 32bit builds:
563+
562564
http://download.microsoft.com/download/d/c/3/dc3439e7-5533-4f4c-9ba0-8577685b6e7e/vcsetup.exe
563565

564-
The optional products are not necessary. In the process the Windows SDKs for
565-
Visual Studio 2008 will also be downloaded and installed.
566+
And Visual C++ 2010 Express for 64bit builds:
566567

567-
You also need the Microsoft Windows Server(R) 2003 R2 Platform SDK (for setupapi):
568+
http://download.microsoft.com/download/c/d/7/cd7d4dfb-5290-4cc7-9f85-ab9e3c9af796/vc_web.exe
568569

569-
http://download.microsoft.com/download/f/a/d/fad9efde-8627-4e7a-8812-c351ba099151/PSDK-x86.exe
570+
You also need the Windows SDK for Windows 7 and .NET Framework 4:
570571

571-
You only need Microsoft Windows Core SDK / Build Environment (x86 32-Bit).
572+
http://download.microsoft.com/download/A/6/A/A6AC035D-DA3F-4F0C-ADA4-37C8E5D34E3D/winsdk_web.exe
572573

573574

574575
4.1.2. Other tools and dependencies
@@ -577,15 +578,18 @@ You only need Microsoft Windows Core SDK / Build Environment (x86 32-Bit).
577578
Download and install following packages:
578579

579580
|| Tool | Website |
580-
| CMake | http://www.cmake.org/files/v2.8/cmake-2.8.4-win32-x86.exe |
581+
| CMake | http://www.cmake.org/files/v2.8/cmake-2.8.12.2-win32-x86.exe |
581582
| Flex | http://gnuwin32.sourceforge.net/downlinks/flex.php |
582583
| Bison | http://gnuwin32.sourceforge.net/downlinks/bison.php |
583-
| SVN | http://sourceforge.net/projects/win32svn/files/1.6.13/Setup-Subversion-1.6.13.msi/download |
584-
| or GIT | http://msysgit.googlecode.com/files/Git-1.7.4-preview20110204.exe |
585-
| OSGeo4W | http://download.osgeo.org/osgeo4w/osgeo4w-setup.exe |
584+
| GIT | https://github.com/msysgit/msysgit/releases/download/Git-1.9.4-preview20140611/Git-1.9.4-preview20140611.exe |
585+
| OSGeo4W | http://download.osgeo.org/osgeo4w/osgeo4w-setup-x86.exe (32bit) or http://download.osgeo.org/osgeo4w/osgeo4w-setup-x86_64.exe (64bit) |
586+
587+
You can also use flex, bison & git from
588+
589+
http://cygwin.com
586590

587591
OSGeo4W does not only provide ready packages for the current QGIS release and
588-
nightly builds of the trunk, but also offers most of the dependencies needs to
592+
nightly builds of master, but also offers most of the dependencies needs to
589593
build it.
590594

591595
For the QGIS build you need to install following packages from OSGeo4W (select
@@ -607,11 +611,6 @@ Advanced Installation):
607611

608612
This will also select packages the above packages depend on.
609613

610-
Additionally QGIS also needs the include file unistd.h, which normally
611-
doesn't exist on Windows. It's shipped with Flex/Bison in GnuWin32\include
612-
and needs to be copied into the VC\include directory of your Visual C++
613-
installation.
614-
615614
Earlier versions of this document also covered how to build all above
616615
dependencies. If you're interested in that, check the history of this page in the Wiki
617616
or the SVN repository.

‎doc/INSTALL.html

+26-31
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>Thursday March 06, 2014</H3>
80+
<H3>Wednesday June 18, 2014</H3>
8181
</DIV>
8282

8383
<DIV CLASS="body" ID="body">
8484
<P>
85-
Last Updated: Thursday March 06, 2014
86-
Last Change : Thursday March 06, 2014
85+
Last Updated: Wednesday June 18, 2014
86+
Last Change : Wednesday June 18, 2014
8787
</P>
8888
<DIV CLASS="toc">
8989

@@ -880,23 +880,25 @@ <H3>4.1.1. Visual C++ Express Edition</H3>
880880

881881
<P>
882882
The free (as in free beer) Express Edition installer is available under:
883+
</P>
884+
<P>
885+
Currently we use Visual C++ 2008 Express for 32bit builds:
883886
</P>
884887
<BLOCKQUOTE>
885888
<A HREF="http://download.microsoft.com/download/d/c/3/dc3439e7-5533-4f4c-9ba0-8577685b6e7e/vcsetup.exe">http://download.microsoft.com/download/d/c/3/dc3439e7-5533-4f4c-9ba0-8577685b6e7e/vcsetup.exe</A>
886889
</BLOCKQUOTE>
887890
<P>
888-
The optional products are not necessary. In the process the Windows SDKs for
889-
Visual Studio 2008 will also be downloaded and installed.
890-
</P>
891-
<P>
892-
You also need the Microsoft Windows Server&reg; 2003 R2 Platform SDK (for setupapi):
891+
And Visual C++ 2010 Express for 64bit builds:
893892
</P>
894893
<BLOCKQUOTE>
895-
<A HREF="http://download.microsoft.com/download/f/a/d/fad9efde-8627-4e7a-8812-c351ba099151/PSDK-x86.exe">http://download.microsoft.com/download/f/a/d/fad9efde-8627-4e7a-8812-c351ba099151/PSDK-x86.exe</A>
894+
<A HREF="http://download.microsoft.com/download/c/d/7/cd7d4dfb-5290-4cc7-9f85-ab9e3c9af796/vc_web.exe">http://download.microsoft.com/download/c/d/7/cd7d4dfb-5290-4cc7-9f85-ab9e3c9af796/vc_web.exe</A>
896895
</BLOCKQUOTE>
897896
<P>
898-
You only need Microsoft Windows Core SDK / Build Environment (x86 32-Bit).
897+
You also need the Windows SDK for Windows 7 and .NET Framework 4:
899898
</P>
899+
<BLOCKQUOTE>
900+
<A HREF="http://download.microsoft.com/download/A/6/A/A6AC035D-DA3F-4F0C-ADA4-37C8E5D34E3D/winsdk_web.exe">http://download.microsoft.com/download/A/6/A/A6AC035D-DA3F-4F0C-ADA4-37C8E5D34E3D/winsdk_web.exe</A>
901+
</BLOCKQUOTE>
900902

901903
<H3>4.1.2. Other tools and dependencies</H3>
902904

@@ -911,7 +913,7 @@ <H3>4.1.2. Other tools and dependencies</H3>
911913
</TR>
912914
<TR>
913915
<TD>CMake</TD>
914-
<TD><A HREF="http://www.cmake.org/files/v2.8/cmake-2.8.4-win32-x86.exe">http://www.cmake.org/files/v2.8/cmake-2.8.4-win32-x86.exe</A></TD>
916+
<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>
915917
</TR>
916918
<TR>
917919
<TD>Flex</TD>
@@ -922,22 +924,24 @@ <H3>4.1.2. Other tools and dependencies</H3>
922924
<TD><A HREF="http://gnuwin32.sourceforge.net/downlinks/bison.php">http://gnuwin32.sourceforge.net/downlinks/bison.php</A></TD>
923925
</TR>
924926
<TR>
925-
<TD>SVN</TD>
926-
<TD><A HREF="http://sourceforge.net/projects/win32svn/files/1.6.13/Setup-Subversion-1.6.13.msi/download">http://sourceforge.net/projects/win32svn/files/1.6.13/Setup-Subversion-1.6.13.msi/download</A></TD>
927-
</TR>
928-
<TR>
929-
<TD>or GIT</TD>
930-
<TD><A HREF="http://msysgit.googlecode.com/files/Git-1.7.4-preview20110204.exe">http://msysgit.googlecode.com/files/Git-1.7.4-preview20110204.exe</A></TD>
927+
<TD>GIT</TD>
928+
<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>
931929
</TR>
932930
<TR>
933931
<TD>OSGeo4W</TD>
934-
<TD><A HREF="http://download.osgeo.org/osgeo4w/osgeo4w-setup.exe">http://download.osgeo.org/osgeo4w/osgeo4w-setup.exe</A></TD>
932+
<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>
935933
</TR>
936934
</TABLE>
937935

936+
<P>
937+
You can also use flex, bison &amp; git from
938+
</P>
939+
<BLOCKQUOTE>
940+
<A HREF="http://cygwin.com">http://cygwin.com</A>
941+
</BLOCKQUOTE>
938942
<P>
939943
OSGeo4W does not only provide ready packages for the current QGIS release and
940-
nightly builds of the trunk, but also offers most of the dependencies needs to
944+
nightly builds of master, but also offers most of the dependencies needs to
941945
build it.
942946
</P>
943947
<P>
@@ -959,22 +963,13 @@ <H3>4.1.2. Other tools and dependencies</H3>
959963
<LI>spatialite
960964
<LI>libspatialindex-devel
961965
<LI>python-qscintilla
962-
</UL>
963-
964-
<P>
966+
<P></P>
965967
This will also select packages the above packages depend on.
966-
</P>
967-
<P>
968-
Additionally QGIS also needs the include file <CODE>unistd.h</CODE>, which normally
969-
doesn't exist on Windows. It's shipped with Flex/Bison in <CODE>GnuWin32\include</CODE>
970-
and needs to be copied into the <CODE>VC\include</CODE> directory of your Visual C++
971-
installation.
972-
</P>
973-
<P>
968+
<P></P>
974969
Earlier versions of this document also covered how to build all above
975970
dependencies. If you're interested in that, check the history of this page in the Wiki
976971
or the SVN repository.
977-
</P>
972+
</UL>
978973

979974
<H3>4.1.3. Setting up the Visual Studio project with CMake</H3>
980975

‎doc/msvc.t2t

+18-17
Original file line numberDiff line numberDiff line change
@@ -11,32 +11,38 @@ build QGIS.
1111
===Visual C++ Express Edition===
1212

1313
The free (as in free beer) Express Edition installer is available under:
14-
14+
15+
Currently we use Visual C++ 2008 Express for 32bit builds:
16+
1517
http://download.microsoft.com/download/d/c/3/dc3439e7-5533-4f4c-9ba0-8577685b6e7e/vcsetup.exe
1618

17-
The optional products are not necessary. In the process the Windows SDKs for
18-
Visual Studio 2008 will also be downloaded and installed.
19+
And Visual C++ 2010 Express for 64bit builds:
20+
21+
http://download.microsoft.com/download/c/d/7/cd7d4dfb-5290-4cc7-9f85-ab9e3c9af796/vc_web.exe
1922

20-
You also need the Microsoft Windows Server(R) 2003 R2 Platform SDK (for setupapi):
2123

22-
http://download.microsoft.com/download/f/a/d/fad9efde-8627-4e7a-8812-c351ba099151/PSDK-x86.exe
24+
You also need the Windows SDK for Windows 7 and .NET Framework 4:
25+
26+
http://download.microsoft.com/download/A/6/A/A6AC035D-DA3F-4F0C-ADA4-37C8E5D34E3D/winsdk_web.exe
2327

24-
You only need Microsoft Windows Core SDK / Build Environment (x86 32-Bit).
2528

2629
===Other tools and dependencies===
2730

2831
Download and install following packages:
2932

3033
|| Tool | Website |
31-
| CMake | http://www.cmake.org/files/v2.8/cmake-2.8.4-win32-x86.exe |
34+
| CMake | http://www.cmake.org/files/v2.8/cmake-2.8.12.2-win32-x86.exe |
3235
| Flex | http://gnuwin32.sourceforge.net/downlinks/flex.php |
3336
| Bison | http://gnuwin32.sourceforge.net/downlinks/bison.php |
34-
| SVN | http://sourceforge.net/projects/win32svn/files/1.6.13/Setup-Subversion-1.6.13.msi/download |
35-
| or GIT | http://msysgit.googlecode.com/files/Git-1.7.4-preview20110204.exe |
36-
| OSGeo4W | http://download.osgeo.org/osgeo4w/osgeo4w-setup.exe |
37+
| GIT | https://github.com/msysgit/msysgit/releases/download/Git-1.9.4-preview20140611/Git-1.9.4-preview20140611.exe |
38+
| OSGeo4W | http://download.osgeo.org/osgeo4w/osgeo4w-setup-x86.exe (32bit) or http://download.osgeo.org/osgeo4w/osgeo4w-setup-x86_64.exe (64bit) |
39+
40+
You can also use flex, bison & git from
41+
42+
http://cygwin.com
3743

3844
OSGeo4W does not only provide ready packages for the current QGIS release and
39-
nightly builds of the trunk, but also offers most of the dependencies needs to
45+
nightly builds of master, but also offers most of the dependencies needs to
4046
build it.
4147

4248
For the QGIS build you need to install following packages from OSGeo4W (select
@@ -56,18 +62,13 @@ For the QGIS build you need to install following packages from OSGeo4W (select
5662
- libspatialindex-devel
5763
- python-qscintilla
5864

59-
6065
This will also select packages the above packages depend on.
6166

62-
Additionally QGIS also needs the include file ``unistd.h``, which normally
63-
doesn't exist on Windows. It's shipped with Flex/Bison in ``GnuWin32\include``
64-
and needs to be copied into the ``VC\include`` directory of your Visual C++
65-
installation.
66-
6767
Earlier versions of this document also covered how to build all above
6868
dependencies. If you're interested in that, check the history of this page in the Wiki
6969
or the SVN repository.
7070

71+
7172
=== Setting up the Visual Studio project with CMake ===
7273

7374
To start a command prompt with an environment that both has the VC++ and the OSGeo4W

0 commit comments

Comments
 (0)