Remove txt2tags dependency (use markdown instead)

qgis · Jun 10, 2020 · dcd017a · dcd017a · nirvn · Jun 10, 2020
1 parent 2bcb63e
commit dcd017a
Show file tree

Hide file tree

Showing 24 changed files with 3,885 additions and 14,778 deletions.
diff --git a/INSTALL b/INSTALL
diff --git a/INSTALL.md b/INSTALL.md
diff --git a/NEWS b/NEWS
diff --git a/doc/NEWS.t2t → NEWS.md b/doc/NEWS.t2t → NEWS.md
diff --git a/README.md b/README.md
@@ -60,9 +60,8 @@ modified.
 ## Note
 
 Please follow the installation instructions carefully.
-After extracting the distribution, you can find the HTML version of the
-installation document in `qgis/doc/index.html`. The installation document is
-also available as PDF in the same directory.
+After extracting the distribution, please check the
+[documentation](https://qgis.org/en/docs/index.html)
 
 ## Help us
 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
 
 ### Building from source
 
-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.
+The [building guide](INSTALL.md) can be used to get started with building QGIS from source.
diff --git a/cmake/Txt2Tags.cmake b/cmake/Txt2Tags.cmake
diff --git a/debian/qgis-common.install b/debian/qgis-common.install
@@ -1,15 +1,14 @@
 usr/share/qgis/doc/AUTHORS
 usr/share/qgis/doc/CONTRIBUTORS
 usr/share/qgis/doc/DONORS
-usr/share/qgis/doc/INSTALL
-usr/share/qgis/doc/INSTALL.html
+usr/share/qgis/doc/INSTALL.md
 usr/share/qgis/doc/SPONSORS
 usr/share/qgis/doc/TRANSLATORS
 usr/share/qgis/doc/developersmap.html
 usr/share/qgis/doc/favicon.ico
 usr/share/qgis/doc/images
 usr/share/qgis/doc/index.html
-usr/share/qgis/doc/NEWS
+usr/share/qgis/doc/NEWS.md
 usr/share/qgis/doc/NEWS.html
 usr/share/qgis/doc/nohelp.html
 usr/share/qgis/doc/style.css

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
@@ -1,33 +1,12 @@
 # include doxygen documentation
 SET (WITH_APIDOC FALSE CACHE BOOL "Determines whether the QGIS API doxygen documentation should be built")
 
-# include doxygen documentation
-SET (WITH_TXT2TAGS_PDF FALSE CACHE BOOL "Determines whether PDF should be generate for the txt2tags documentation")
-
 # include Qt documentation
 SET (QT_DOC_URL "https://doc.qt.io/qt-5/" CACHE STRING "URL for Qt docs")
 
-INCLUDE(Txt2Tags)
-FIND_TXT2TAGS()
-
-IF(TXT2TAGS_EXECUTABLE)
-  ADD_TXT2TAGS_FILES(QGIS_DOC_FILES INSTALL.t2t NEWS.t2t)
-  IF(WITH_TXT2TAGS_PDF)
-    ADD_TXT2TAGS_PDFS(QGIS_DOC_FILES INSTALL.t2t NEWS.t2t)
-  ENDIF(WITH_TXT2TAGS_PDF)
-  FILE(GLOB t2tfiles doc/*.t2t)
-  ADD_CUSTOM_TARGET (t2tdoc ALL DEPENDS ${QGIS_DOC_FILES} ${t2tfiles})
-ELSE(TXT2TAGS_EXECUTABLE)
-  SET(QGIS_DOC_FILES
-    ../INSTALL
-    ../NEWS
-    INSTALL.html
-    NEWS.html
-  )
-ENDIF(TXT2TAGS_EXECUTABLE)
-
 SET(QGIS_DOC_FILES
-  ${QGIS_DOC_FILES}
+  ../INSTALL
+  ../NEWS
   index.html
   developersmap.html
   nohelp.html