Skip to content

Commit

Permalink
in the doc, gets the version from cmake instaed of hard coded value
Browse files Browse the repository at this point in the history
Signed-off-by: Matthieu Gallien <[email protected]>
  • Loading branch information
mgallien committed May 3, 2021
1 parent b27c9ae commit bd2aa8b
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
2 changes: 1 addition & 1 deletion doc/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ if(SPHINX_FOUND)
install(DIRECTORY ${SPHINX_PDF_DIR} DESTINATION ${APPLICATION_DOC_DIR} OPTIONAL)
install(DIRECTORY ${SPHINX_QCH_DIR} DESTINATION ${APPLICATION_DOC_DIR} OPTIONAL)

configure_file("${CMAKE_CURRENT_SOURCE_DIR}/conf.py" conf.py COPYONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/conf.py.in conf.py)

if(WITH_DOC)
add_custom_target(doc ALL DEPENDS doc-html COMMENT "Building documentation...")
Expand Down
8 changes: 6 additions & 2 deletions doc/conf.py → doc/conf.py.in
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,13 @@
# built documents.
#
# The short X.Y version.
version = '3.2'
version = '@MIRALL_VERSION_MAJOR@.@MIRALL_VERSION_MINOR@'
# The full version, including alpha/beta/rc tags.
release = '3.2.1'
release = '@MIRALL_VERSION@'
# The minimum and maximum server major supported version
rst_prolog = """
.. |minimum_server_version| replace:: @NEXTCLOUD_SERVER_VERSION_MIN_SUPPORTED_MAJOR@
.. |maximum_server_version| replace:: """ + str(@NEXTCLOUD_SERVER_VERSION_MIN_SUPPORTED_MAJOR@ + 2)

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 1 addition & 1 deletion doc/installing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ There are clients for Linux, macOs, and Microsoft Windows.

The currently supported server releases are the latest three stable versions
at time of publication. It means that the |version| release series is supporting
server major version 19, 20 and 21.
server major versions |minimum_server_version| up to |maximum_server_version|.

Installation on Mac OS X and Windows is the same as for any software
application: download the program and then double-click it to launch the
Expand Down

0 comments on commit bd2aa8b

Please sign in to comment.