Skip to content
Permalink
Browse files

Remove txt2tags dependency (use markdown instead)

  • Loading branch information
PeterPetrik committed Jun 10, 2020
1 parent 2bcb63e commit dcd017a655f9583bb759c7d00cdc164de0a0dfa7
Showing with 3,885 additions and 14,778 deletions.
  1. +0 −1,623 INSTALL
  2. +1,554 −0 INSTALL.md
  3. +0 −3,316 NEWS
  4. +444 −572 doc/NEWS.t2t → NEWS.md
  5. +3 −4 README.md
  6. +0 −94 cmake/Txt2Tags.cmake
  7. +2 −3 debian/qgis-common.install
  8. +2 −23 doc/CMakeLists.txt
  9. +0 −2,464 doc/INSTALL.html
  10. +0 −115 doc/INSTALL.t2t
  11. +1,868 −5,001 doc/NEWS.html
  12. +0 −53 doc/debug-tests.t2t
  13. +0 −41 doc/iauthors.t2t
  14. +0 −90 doc/jenkins.t2t
  15. +0 −361 doc/linux.t2t
  16. +0 −224 doc/msvc.t2t
  17. +0 −386 doc/msys.t2t
  18. +0 −40 doc/mxe.t2t
  19. +0 −184 doc/osx.t2t
  20. +0 −53 doc/overview.t2t
  21. +0 −114 doc/wcs-test-server.t2t
  22. +0 −3 scripts/release.pl
  23. +7 −8 scripts/scandeps.pl
  24. +5 −6 scripts/update_news.pl
1,623 INSTALL

This file was deleted.

1,554 INSTALL.md

Large diffs are not rendered by default.

3,316 NEWS

This file was deleted.

Large diffs are not rendered by default.

@@ -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.

This file was deleted.

@@ -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
@@ -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

2 comments on commit dcd017a

@nirvn

This comment has been minimized.

Copy link
Contributor

@nirvn nirvn replied Jun 10, 2020

@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

This comment has been minimized.

Copy link
Contributor Author

@PeterPetrik PeterPetrik replied Jun 10, 2020

Please sign in to comment.
You can’t perform that action at this time.