sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-14 00:07:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

run t2t

Browse Source
This commit is contained in:
Juergen E. Fischer 2017-02-23 20:23:28 +01:00
parent ccfbaf82f0
commit cec5aaa503
4 changed files with 71 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
INSTALL
View File

@ -1,10 +1,10 @@
QGIS
Building QGIS from source - step by step
Wednesday January 25, 2017
Wednesday February 22, 2017
Last Updated: Wednesday January 25, 2017
Last Change : Friday January 20, 2017
Last Updated: Wednesday February 22, 2017
Last Change : Thursday January 12, 2017
1. Introduction
@ -412,16 +412,12 @@ This section describes the setup required to allow Visual Studio to be used to
build QGIS.
4.1.1. Visual C++ Express Edition
=================================
4.1.1. Visual C++ Community Edition
===================================
The free (as in free beer) Express Edition installer is available under:
The free (as in free beer) Community installer is available under:
http://download.microsoft.com/download/c/d/7/cd7d4dfb-5290-4cc7-9f85-ab9e3c9af796/vc_web.exe
You also need the Windows SDK for Windows 7 and .NET Framework 4:
http://download.microsoft.com/download/A/6/A/A6AC035D-DA3F-4F0C-ADA4-37C8E5D34E3D/winsdk_web.exe
http://download.microsoft.com/download/D/2/3/D23F4D0F-BA2D-4600-8725-6CCECEA05196/vs_community_ENU.exe
4.1.2. Other tools and dependencies
@ -430,7 +426,7 @@ 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/v3.0/cmake-3.0.2-win32-x86.exe |
| CMake | https://cmake.org/files/v3.7/cmake-3.7.2-win64-x64.msi |
| 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) |
@ -452,13 +448,24 @@ and from OSGeo4W (select Advanced Installation):
- grass
- gsl-devel
- iconv
- pyqt4
- qt4-devel
- qwt5-devel-qt4
- sip
- spatialite
- libspatialindex-devel
- python-qscintilla
- pyqt5
- python3-devel
- python3-qscintilla
- python3-nose2
- python3-future
- python3-pyyaml
- python3-mock
- 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
This will also select packages the above packages depend on.

8
NEWS
View File

@ -1,6 +1,6 @@
QGIS News
Change history for the QGIS Project
Monday January 09, 2017
Wednesday February 22, 2017
------------------------------------------------------------------------
@ -39,8 +39,8 @@ Monday January 09, 2017
------------------------------------------------------------------------
Last Updated: Monday January 09, 2017
Last Change : Sunday January 01, 2017
Last Updated: Wednesday February 22, 2017
Last Change : Tuesday January 31, 2017
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
to create a new point shapefile:
QgsVectorFileWriter myFileWriter("/tmp/test.shp", wkbPoint);
if (myFileWriter.initialize())
if (myFileWriter.initialise()) //#spellok
{
myFileWriter.createField("TestInt",OFTInteger,8,0);
myFileWriter.createField("TestRead",OFTReal,8,3);

59
doc/INSTALL.html
View File

@ -5,7 +5,7 @@
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
<TITLE>QGIS</TITLE>
<!-- Included doc/style.css -->
<!-- Included /home/fischer/src/qgis/doc/style.css -->
<STYLE TYPE="text/css">
body{ background: white;
color: black;
@ -77,13 +77,13 @@ label{ background-color: #FFFFCC;
<DIV CLASS="header" ID="header">
<H1>QGIS</H1>
<H2>Building QGIS from source - step by step</H2>
<H3>Wednesday January 25, 2017</H3>
<H3>Wednesday February 22, 2017</H3>
</DIV>
<DIV CLASS="body" ID="body">
<P>
Last Updated: Wednesday January 25, 2017
Last Change : Friday January 20, 2017
Last Updated: Wednesday February 22, 2017
Last Change : Thursday January 12, 2017
</P>
<DIV CLASS="toc">
@ -659,19 +659,13 @@ This section describes the setup required to allow Visual Studio to be used to
build QGIS.
</P>
<H3>4.1.1. Visual C++ Express Edition</H3>
<H3>4.1.1. Visual C++ Community Edition</H3>
<P>
The free (as in free beer) Express Edition installer is available under:
The free (as in free beer) Community installer is available under:
</P>
<BLOCKQUOTE>
<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>
</BLOCKQUOTE>
<P>
You also need the Windows SDK for Windows 7 and .NET Framework 4:
</P>
<BLOCKQUOTE>
<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>
<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>
</BLOCKQUOTE>
<H3>4.1.2. Other tools and dependencies</H3>
@ -687,7 +681,7 @@ Download and install following packages:
</TR>
<TR>
<TD>CMake</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>
<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>
</TR>
<TR>
<TD>GNU flex, GNU bison and GIT</TD>
@ -725,25 +719,40 @@ and from OSGeo4W (select <I>Advanced Installation</I>):
<LI>grass
<LI>gsl-devel
<LI>iconv
<LI>pyqt4
<LI>qt4-devel
<LI>qwt5-devel-qt4
<LI>sip
<LI>spatialite
<LI>libspatialindex-devel
<LI>python-qscintilla
<P></P>
<LI>pyqt5
<LI>python3-devel
<LI>python3-qscintilla
<LI>python3-nose2
<LI>python3-future
<LI>python3-pyyaml
<LI>python3-mock
<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
</UL>
<P>
This will also select packages the above packages depend on.
<P></P>
</P>
<P>
If you install other packages, this might cause issues. Particularly, make sure
<B>not</B> to install the msinttypes package. It installs a stdint.h file in
OSGeo4W[64]\include, that conflicts with Visual Studio own stdint.h, which for
example breaks the build of the virtuallayer provider.
<P></P>
</P>
<P>
Earlier versions of this document also covered how to build all above
dependencies. If you're interested in that, check the history of this page in the Wiki
or the SVN repository.
</UL>
</P>
<H3>4.1.3. Setting up the Visual Studio project with CMake</H3>
@ -3014,5 +3023,5 @@ The following people have contributed to this document:
</DIV>
<!-- html code generated by txt2tags 2.6 (http://txt2tags.org) -->
<!-- cmdline: txt2tags -\-encoding=utf-8 -o doc/INSTALL.html -t html doc/INSTALL.t2t -->
<!-- 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 -->
</BODY></HTML>

16
doc/news.html
View File

@ -5,7 +5,7 @@
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
<TITLE>QGIS News</TITLE>
<!-- Included /home/fischer/src/qgis3/doc/style.css -->
<!-- Included /home/fischer/src/qgis/doc/style.css -->
<STYLE TYPE="text/css">
body{ background: white;
color: black;
@ -77,7 +77,7 @@ label{ background-color: #FFFFCC;
<DIV CLASS="header" ID="header">
<H1>QGIS News</H1>
<H2>Change history for the QGIS Project</H2>
<H3>Monday November 07, 2016</H3>
<H3>Wednesday February 22, 2017</H3>
</DIV>
<DIV CLASS="toc">
@ -116,8 +116,8 @@ label{ background-color: #FFFFCC;
</DIV>
<DIV CLASS="body" ID="body">
<P>
Last Updated: Monday November 07, 2016
Last Change : Wednesday July 27, 2016
Last Updated: Wednesday February 22, 2017
Last Change : Tuesday January 31, 2017
</P>
<A NAME="toc1"></A>
@ -174,7 +174,7 @@ This release has following new features:
<LI>Map Composer: Parametrized svg support for composer svg images
<LI>Map Composer: Easier use of HTML in labels
<LI>Map Composer: Relative links in composer labels
<LI>Map Composer: Georeference outputs (e.g., PDF) from composer
<LI>Map Composer: Georeference outputs (eg PDF) from composer
<LI>Map Composer: Composer maps now auto-update with presets
<LI>Analysis tools: Named parameters in expressions
<LI>Analysis tools: More distance units
@ -1183,7 +1183,7 @@ release series. In all other cases we recommend that you use this version.
</P>
<P>
This release includes around 200 bug fixes, nearly 30 new features and has had
a lot of love and attention poured in to it to take our favourite desktop GIS
a lot of love and attention poured in to it to take our favorite desktop GIS
application another step on the road to GIS nirvana! So much has happened in
the 3 months since our last release that it is impossible to document
everything here. Instead we will just highlight a couple of important new
@ -2125,7 +2125,7 @@ Beginnings of generic vector file writer - incomplete and doesn't do anything us
to create a new point shapefile:
<P></P>
QgsVectorFileWriter myFileWriter("/tmp/test.shp", wkbPoint);
if (myFileWriter.initialise()) <!--#spellok-->
if (myFileWriter.initialise()) //#spellok
{
myFileWriter.createField("TestInt",OFTInteger,8,0);
myFileWriter.createField("TestRead",OFTReal,8,3);
@ -3091,5 +3091,5 @@ July 6, 2002
</DIV>
<!-- html code generated by txt2tags 2.6 (http://txt2tags.org) -->
<!-- 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 -->
<!-- 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 -->
</BODY></HTML>