diff --git a/CMakeLists.txt b/CMakeLists.txt index 710e049bec..a1f45b2a6a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -89,7 +89,7 @@ message(STATUS "Current git version ${CURRENT_GIT_VERSION}") set(FDB_PACKAGE_NAME "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}") set(FDB_VERSION ${PROJECT_VERSION}) set(FDB_VERSION_PLAIN ${FDB_VERSION}) -configure_file(${CMAKE_SOURCE_DIR}/versions.target.cmake ${CMAKE_SOURCE_DIR}/versions.target) +configure_file(${CMAKE_SOURCE_DIR}/versions.target.cmake ${CMAKE_CURRENT_BINARY_DIR}/versions.target) message(STATUS "FDB version is ${FDB_VERSION}") message(STATUS "FDB package name is ${FDB_PACKAGE_NAME}") diff --git a/documentation/CMakeLists.txt b/documentation/CMakeLists.txt index 7899af2261..083f5abca3 100644 --- a/documentation/CMakeLists.txt +++ b/documentation/CMakeLists.txt @@ -49,6 +49,7 @@ function(add_documentation_target) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${target}_done COMMAND ${CMAKE_COMMAND} -E make_directory ${out_dir} && + FDB_VERSIONS_TARGET_PATH=${CMAKE_BINARY_DIR}/versions.target ${python_command} ${SPHINX_COMMAND} -W -b ${target} -d ${doctree} -c ${sphinx_dir} ${sphinx_dir}/source diff --git a/documentation/sphinx/conf.py b/documentation/sphinx/conf.py index a026e213c6..75270bcd55 100644 --- a/documentation/sphinx/conf.py +++ b/documentation/sphinx/conf.py @@ -53,7 +53,7 @@ copyright = u'2013-2021 Apple, Inc and the FoundationDB project authors' # Load the version information from 'versions.target' import xml.etree.ElementTree as ET -version_path = os.path.join(os.path.dirname(__file__), '..', '..', 'versions.target') +version_path = os.environ['FDB_VERSIONS_TARGET_PATH'] tree = ET.parse(version_path) root = tree.getroot() diff --git a/packaging/msi/MSIInstaller.wixproj b/packaging/msi/MSIInstaller.wixproj index da46fbc9ba..0950120031 100644 --- a/packaging/msi/MSIInstaller.wixproj +++ b/packaging/msi/MSIInstaller.wixproj @@ -1,6 +1,6 @@ - + true -PRERELEASE