Skip to content

Commit cec5aaa

Browse files
jef-njef-n
committed
run t2t
1 parent ccfbaf8 commit cec5aaa

File tree

4 files changed

+71
-55
lines changed

4 files changed

+71
-55
lines changed

‎INSTALL

Lines changed: 25 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
QGIS
22
Building QGIS from source - step by step
3-
Wednesday January 25, 2017
3+
Wednesday February 22, 2017
44

55

6-
Last Updated: Wednesday January 25, 2017
7-
Last Change : Friday January 20, 2017
6+
Last Updated: Wednesday February 22, 2017
7+
Last Change : Thursday January 12, 2017
88

99

1010
1. Introduction
@@ -412,16 +412,12 @@ This section describes the setup required to allow Visual Studio to be used to
412412
build QGIS.
413413

414414

415-
4.1.1. Visual C++ Express Edition
416-
=================================
417-
418-
The free (as in free beer) Express Edition installer is available under:
419-
420-
http://download.microsoft.com/download/c/d/7/cd7d4dfb-5290-4cc7-9f85-ab9e3c9af796/vc_web.exe
415+
4.1.1. Visual C++ Community Edition
416+
===================================
421417

422-
You also need the Windows SDK for Windows 7 and .NET Framework 4:
418+
The free (as in free beer) Community installer is available under:
423419

424-
http://download.microsoft.com/download/A/6/A/A6AC035D-DA3F-4F0C-ADA4-37C8E5D34E3D/winsdk_web.exe
420+
http://download.microsoft.com/download/D/2/3/D23F4D0F-BA2D-4600-8725-6CCECEA05196/vs_community_ENU.exe
425421

426422

427423
4.1.2. Other tools and dependencies
@@ -430,7 +426,7 @@ You also need the Windows SDK for Windows 7 and .NET Framework 4:
430426
Download and install following packages:
431427

432428
|| Tool | Website |
433-
| CMake | http://www.cmake.org/files/v3.0/cmake-3.0.2-win32-x86.exe |
429+
| CMake | https://cmake.org/files/v3.7/cmake-3.7.2-win64-x64.msi |
434430
| GNU flex, GNU bison and GIT | http://cygwin.com/setup-x86.exe (32bit) or http://cygwin.com/setup-x86_64.exe (64bit) |
435431
| OSGeo4W | http://download.osgeo.org/osgeo4w/osgeo4w-setup-x86.exe (32bit) or http://download.osgeo.org/osgeo4w/osgeo4w-setup-x86_64.exe (64bit) |
436432

@@ -452,13 +448,24 @@ and from OSGeo4W (select Advanced Installation):
452448
- grass
453449
- gsl-devel
454450
- iconv
455-
- pyqt4
456-
- qt4-devel
457-
- qwt5-devel-qt4
458-
- sip
459-
- spatialite
460451
- libspatialindex-devel
461-
- python-qscintilla
452+
- pyqt5
453+
- python3-devel
454+
- python3-qscintilla
455+
- python3-nose2
456+
- python3-future
457+
- python3-pyyaml
458+
- python3-mock
459+
- qca-qt5-devel
460+
- qca-qt5-libs
461+
- qscintilla-qt5
462+
- qt5-devel
463+
- qt5-libs-debug
464+
- qtwebkit-qt5-devel
465+
- qtwebkit-qt5-libs-debug
466+
- qwt-devel-qt5
467+
- sip-qt5
468+
- spatialite
462469

463470
This will also select packages the above packages depend on.
464471

‎NEWS

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
QGIS News
22
Change history for the QGIS Project
3-
Monday January 09, 2017
3+
Wednesday February 22, 2017
44

55

66
------------------------------------------------------------------------
@@ -39,8 +39,8 @@ Monday January 09, 2017
3939
------------------------------------------------------------------------
4040

4141

42-
Last Updated: Monday January 09, 2017
43-
Last Change : Sunday January 01, 2017
42+
Last Updated: Wednesday February 22, 2017
43+
Last Change : Tuesday January 31, 2017
4444

4545

4646
1. What's new in Version 2.16 'Nødebo'?
@@ -1952,7 +1952,7 @@ Beginnings of generic vector file writer - incomplete and doesn't do anything us
19521952
to create a new point shapefile:
19531953

19541954
QgsVectorFileWriter myFileWriter("/tmp/test.shp", wkbPoint);
1955-
if (myFileWriter.initialize())
1955+
if (myFileWriter.initialise()) //#spellok
19561956
{
19571957
myFileWriter.createField("TestInt",OFTInteger,8,0);
19581958
myFileWriter.createField("TestRead",OFTReal,8,3);

‎doc/INSTALL.html

Lines changed: 34 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
66
<TITLE>QGIS</TITLE>
77

8-
<!-- Included doc/style.css -->
8+
<!-- Included /home/fischer/src/qgis/doc/style.css -->
99
<STYLE TYPE="text/css">
1010
body{ background: white;
1111
color: black;
@@ -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>Wednesday January 25, 2017</H3>
80+
<H3>Wednesday February 22, 2017</H3>
8181
</DIV>
8282

8383
<DIV CLASS="body" ID="body">
8484
<P>
85-
Last Updated: Wednesday January 25, 2017
86-
Last Change : Friday January 20, 2017
85+
Last Updated: Wednesday February 22, 2017
86+
Last Change : Thursday January 12, 2017
8787
</P>
8888
<DIV CLASS="toc">
8989

@@ -659,19 +659,13 @@ <H2>4.1. Building with Microsoft Visual Studio</H2>
659659
build QGIS.
660660
</P>
661661

662-
<H3>4.1.1. Visual C++ Express Edition</H3>
662+
<H3>4.1.1. Visual C++ Community Edition</H3>
663663

664664
<P>
665-
The free (as in free beer) Express Edition installer is available under:
665+
The free (as in free beer) Community installer is available under:
666666
</P>
667667
<BLOCKQUOTE>
668-
<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>
669-
</BLOCKQUOTE>
670-
<P>
671-
You also need the Windows SDK for Windows 7 and .NET Framework 4:
672-
</P>
673-
<BLOCKQUOTE>
674-
<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>
668+
<A HREF="http://download.microsoft.com/download/D/2/3/D23F4D0F-BA2D-4600-8725-6CCECEA05196/vs_community_ENU.exe">http://download.microsoft.com/download/D/2/3/D23F4D0F-BA2D-4600-8725-6CCECEA05196/vs_community_ENU.exe</A>
675669
</BLOCKQUOTE>
676670

677671
<H3>4.1.2. Other tools and dependencies</H3>
@@ -687,7 +681,7 @@ <H3>4.1.2. Other tools and dependencies</H3>
687681
</TR>
688682
<TR>
689683
<TD>CMake</TD>
690-
<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>
684+
<TD><A HREF="https://cmake.org/files/v3.7/cmake-3.7.2-win64-x64.msi">https://cmake.org/files/v3.7/cmake-3.7.2-win64-x64.msi</A></TD>
691685
</TR>
692686
<TR>
693687
<TD>GNU flex, GNU bison and GIT</TD>
@@ -725,25 +719,40 @@ <H3>4.1.2. Other tools and dependencies</H3>
725719
<LI>grass
726720
<LI>gsl-devel
727721
<LI>iconv
728-
<LI>pyqt4
729-
<LI>qt4-devel
730-
<LI>qwt5-devel-qt4
731-
<LI>sip
732-
<LI>spatialite
733722
<LI>libspatialindex-devel
734-
<LI>python-qscintilla
735-
<P></P>
723+
<LI>pyqt5
724+
<LI>python3-devel
725+
<LI>python3-qscintilla
726+
<LI>python3-nose2
727+
<LI>python3-future
728+
<LI>python3-pyyaml
729+
<LI>python3-mock
730+
<LI>qca-qt5-devel
731+
<LI>qca-qt5-libs
732+
<LI>qscintilla-qt5
733+
<LI>qt5-devel
734+
<LI>qt5-libs-debug
735+
<LI>qtwebkit-qt5-devel
736+
<LI>qtwebkit-qt5-libs-debug
737+
<LI>qwt-devel-qt5
738+
<LI>sip-qt5
739+
<LI>spatialite
740+
</UL>
741+
742+
<P>
736743
This will also select packages the above packages depend on.
737-
<P></P>
744+
</P>
745+
<P>
738746
If you install other packages, this might cause issues. Particularly, make sure
739747
<B>not</B> to install the msinttypes package. It installs a stdint.h file in
740748
OSGeo4W[64]\include, that conflicts with Visual Studio own stdint.h, which for
741749
example breaks the build of the virtuallayer provider.
742-
<P></P>
750+
</P>
751+
<P>
743752
Earlier versions of this document also covered how to build all above
744753
dependencies. If you're interested in that, check the history of this page in the Wiki
745754
or the SVN repository.
746-
</UL>
755+
</P>
747756

748757
<H3>4.1.3. Setting up the Visual Studio project with CMake</H3>
749758

@@ -3014,5 +3023,5 @@ <H1>9. Authors and Acknowledgments</H1>
30143023

30153024
</DIV>
30163025
<!-- html code generated by txt2tags 2.6 (http://txt2tags.org) -->
3017-
<!-- cmdline: txt2tags -\-encoding=utf-8 -o doc/INSTALL.html -t html doc/INSTALL.t2t -->
3026+
<!-- 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 -->
30183027
</BODY></HTML>

‎doc/news.html

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
66
<TITLE>QGIS News</TITLE>
77

8-
<!-- Included /home/fischer/src/qgis3/doc/style.css -->
8+
<!-- Included /home/fischer/src/qgis/doc/style.css -->
99
<STYLE TYPE="text/css">
1010
body{ background: white;
1111
color: black;
@@ -77,7 +77,7 @@
7777
<DIV CLASS="header" ID="header">
7878
<H1>QGIS News</H1>
7979
<H2>Change history for the QGIS Project</H2>
80-
<H3>Monday November 07, 2016</H3>
80+
<H3>Wednesday February 22, 2017</H3>
8181
</DIV>
8282

8383
<DIV CLASS="toc">
@@ -116,8 +116,8 @@ <H3>Monday November 07, 2016</H3>
116116
</DIV>
117117
<DIV CLASS="body" ID="body">
118118
<P>
119-
Last Updated: Monday November 07, 2016
120-
Last Change : Wednesday July 27, 2016
119+
Last Updated: Wednesday February 22, 2017
120+
Last Change : Tuesday January 31, 2017
121121
</P>
122122

123123
<A NAME="toc1"></A>
@@ -174,7 +174,7 @@ <H1>1. What's new in Version 2.16 'Nødebo'?</H1>
174174
<LI>Map Composer: Parametrized svg support for composer svg images
175175
<LI>Map Composer: Easier use of HTML in labels
176176
<LI>Map Composer: Relative links in composer labels
177-
<LI>Map Composer: Georeference outputs (e.g., PDF) from composer
177+
<LI>Map Composer: Georeference outputs (eg PDF) from composer
178178
<LI>Map Composer: Composer maps now auto-update with presets
179179
<LI>Analysis tools: Named parameters in expressions
180180
<LI>Analysis tools: More distance units
@@ -1183,7 +1183,7 @@ <H1>17. Whats new in Version 1.4.0 'Enceladus'?</H1>
11831183
</P>
11841184
<P>
11851185
This release includes around 200 bug fixes, nearly 30 new features and has had
1186-
a lot of love and attention poured in to it to take our favourite desktop GIS
1186+
a lot of love and attention poured in to it to take our favorite desktop GIS
11871187
application another step on the road to GIS nirvana! So much has happened in
11881188
the 3 months since our last release that it is impossible to document
11891189
everything here. Instead we will just highlight a couple of important new
@@ -2125,7 +2125,7 @@ <H1>28. 0.5</H1>
21252125
to create a new point shapefile:
21262126
<P></P>
21272127
QgsVectorFileWriter myFileWriter("/tmp/test.shp", wkbPoint);
2128-
if (myFileWriter.initialise()) <!--#spellok-->
2128+
if (myFileWriter.initialise()) //#spellok
21292129
{
21302130
myFileWriter.createField("TestInt",OFTInteger,8,0);
21312131
myFileWriter.createField("TestRead",OFTReal,8,3);
@@ -3091,5 +3091,5 @@ <H1>28. 0.5</H1>
30913091
</DIV>
30923092

30933093
<!-- html code generated by txt2tags 2.6 (http://txt2tags.org) -->
3094-
<!-- cmdline: txt2tags -\-encoding=utf-8 -o/home/fischer/src/qgis3/debian/build-master-ninja/doc/news.html -t html /home/fischer/src/qgis3/doc/news.t2t -->
3094+
<!-- cmdline: txt2tags -\-encoding=utf-8 -o/home/fischer/src/qgis/debian/build-master-qt5/doc/news.html -t html /home/fischer/src/qgis/doc/news.t2t -->
30953095
</BODY></HTML>

0 commit comments

Comments
 (0)