diff --git a/CMakeLists.txt b/CMakeLists.txt index 678471319..e73c4f987 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -134,6 +134,15 @@ if(NOT WITHOUT_MAXADMIN) endif() +execute_process(COMMAND perl ${CMAKE_SOURCE_DIR}/Documentation/format.pl +${CMAKE_SOURCE_DIR}/Documentation/Changelog.md +${CMAKE_BINARY_DIR}/Changelog.txt) +execute_process(COMMAND perl ${CMAKE_SOURCE_DIR}/Documentation/format.pl +${CMAKE_SOURCE_DIR}/Documentation/Release-Notes/MaxScale-1.1-Release-Notes.md + ${CMAKE_BINARY_DIR}/ReleaseNotes.txt) +install(FILES ${CMAKE_BINARY_DIR}/Changelog.txt DESTINATION .) +install(FILES ${CMAKE_BINARY_DIR}/ReleaseNotes.txt DESTINATION .) + message(STATUS "Installing MaxScale to: ${CMAKE_INSTALL_PREFIX}/") install(FILES server/MaxScale_template.cnf DESTINATION etc) diff --git a/macros.cmake b/macros.cmake index 785cbd5e1..c9abffd2b 100644 --- a/macros.cmake +++ b/macros.cmake @@ -12,7 +12,7 @@ macro(set_maxscale_version) set(MAXSCALE_VERSION_MINOR "1") set(MAXSCALE_VERSION_PATCH "0") set(MAXSCALE_VERSION_NUMERIC "${MAXSCALE_VERSION_MAJOR}.${MAXSCALE_VERSION_MINOR}.${MAXSCALE_VERSION_PATCH}") - set(MAXSCALE_VERSION "${MAXSCALE_VERSION_MAJOR}.${MAXSCALE_VERSION_MINOR}.${MAXSCALE_VERSION_PATCH}-unstable") + set(MAXSCALE_VERSION "${MAXSCALE_VERSION_MAJOR}.${MAXSCALE_VERSION_MINOR}.${MAXSCALE_VERSION_PATCH}") endmacro()