Skip to content

Commit dcd017a

Browse files
PeterPetrikPeterPetrik
authoredJun 10, 2020
Remove txt2tags dependency (use markdown instead)
·
ltr-3_40final-3_14_0
1 parent 2bcb63e commit dcd017a

24 files changed

+3885
-14778
lines changed
 

‎INSTALL

Lines changed: 0 additions & 1623 deletions
This file was deleted.

‎INSTALL.md

Lines changed: 1554 additions & 0 deletions
Large diffs are not rendered by default.

‎NEWS

Lines changed: 0 additions & 3316 deletions
This file was deleted.

‎doc/NEWS.t2t renamed to ‎NEWS.md

Lines changed: 444 additions & 572 deletions
Large diffs are not rendered by default.

‎README.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,8 @@ modified.
6060
## Note
6161

6262
Please follow the installation instructions carefully.
63-
After extracting the distribution, you can find the HTML version of the
64-
installation document in `qgis/doc/index.html`. The installation document is
65-
also available as PDF in the same directory.
63+
After extracting the distribution, please check the
64+
[documentation](https://qgis.org/en/docs/index.html)
6665

6766
## Help us
6867
Please submit bug reports using the [QGIS bug tracker](https://github.com/qgis/QGIS/issues/).
@@ -93,4 +92,4 @@ If you are not a developer, there are many other possibilities which do not requ
9392

9493
### Building from source
9594

96-
The [building guide](http://htmlpreview.github.io/?https://raw.github.com/qgis/QGIS/master/doc/INSTALL.html) can be used to get started with building QGIS from source.
95+
The [building guide](INSTALL.md) can be used to get started with building QGIS from source.

‎cmake/Txt2Tags.cmake

Lines changed: 0 additions & 94 deletions
This file was deleted.

‎debian/qgis-common.install

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
usr/share/qgis/doc/AUTHORS
22
usr/share/qgis/doc/CONTRIBUTORS
33
usr/share/qgis/doc/DONORS
4-
usr/share/qgis/doc/INSTALL
5-
usr/share/qgis/doc/INSTALL.html
4+
usr/share/qgis/doc/INSTALL.md
65
usr/share/qgis/doc/SPONSORS
76
usr/share/qgis/doc/TRANSLATORS
87
usr/share/qgis/doc/developersmap.html
98
usr/share/qgis/doc/favicon.ico
109
usr/share/qgis/doc/images
1110
usr/share/qgis/doc/index.html
12-
usr/share/qgis/doc/NEWS
11+
usr/share/qgis/doc/NEWS.md
1312
usr/share/qgis/doc/NEWS.html
1413
usr/share/qgis/doc/nohelp.html
1514
usr/share/qgis/doc/style.css

‎doc/CMakeLists.txt

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,12 @@
11
# include doxygen documentation
22
SET (WITH_APIDOC FALSE CACHE BOOL "Determines whether the QGIS API doxygen documentation should be built")
33

4-
# include doxygen documentation
5-
SET (WITH_TXT2TAGS_PDF FALSE CACHE BOOL "Determines whether PDF should be generate for the txt2tags documentation")
6-
74
# include Qt documentation
85
SET (QT_DOC_URL "https://doc.qt.io/qt-5/" CACHE STRING "URL for Qt docs")
96

10-
INCLUDE(Txt2Tags)
11-
FIND_TXT2TAGS()
12-
13-
IF(TXT2TAGS_EXECUTABLE)
14-
ADD_TXT2TAGS_FILES(QGIS_DOC_FILES INSTALL.t2t NEWS.t2t)
15-
IF(WITH_TXT2TAGS_PDF)
16-
ADD_TXT2TAGS_PDFS(QGIS_DOC_FILES INSTALL.t2t NEWS.t2t)
17-
ENDIF(WITH_TXT2TAGS_PDF)
18-
FILE(GLOB t2tfiles doc/*.t2t)
19-
ADD_CUSTOM_TARGET (t2tdoc ALL DEPENDS ${QGIS_DOC_FILES} ${t2tfiles})
20-
ELSE(TXT2TAGS_EXECUTABLE)
21-
SET(QGIS_DOC_FILES
22-
../INSTALL
23-
../NEWS
24-
INSTALL.html
25-
NEWS.html
26-
)
27-
ENDIF(TXT2TAGS_EXECUTABLE)
28-
297
SET(QGIS_DOC_FILES
30-
${QGIS_DOC_FILES}
8+
../INSTALL
9+
../NEWS
3110
index.html
3211
developersmap.html
3312
nohelp.html

2 commit comments

Comments
 (2)

nirvn commented on Jun 10, 2020

@nirvn
nirvn
on Jun 10, 2020
Contributor

@PeterPetrik , @nyalldawson , commit caused a regression preventing a successful make install:

CMake Error at doc/cmake_install.cmake:41 (file):
  file INSTALL cannot find "/home/webmaster/dev/cpp/QGIS/doc/../INSTALL": No
  such file or directory.
Call Stack (most recent call first):
  cmake_install.cmake:58 (include)

PeterPetrik commented on Jun 10, 2020

@PeterPetrik
PeterPetrik
on Jun 10, 2020
ContributorAuthor

@nirvn #37087

Please sign in to comment.