apple/foundationdb
1
0
Fork 0
mirror of https://github.com/apple/foundationdb.git synced 2025-05-18 03:42:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use path relative to Python binary

Browse Source
This commit is contained in:
Lukas Joswiak 2021-11-11 01:02:24 -08:00
parent 8d4ec8562d
commit fc08313925
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
documentation/CMakeLists.txt
View File

@ -49,7 +49,6 @@ function(add_documentation_target)
add_custom_command( add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${target}_done OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${target}_done
COMMAND ${CMAKE_COMMAND} -E make_directory ${out_dir} && COMMAND ${CMAKE_COMMAND} -E make_directory ${out_dir} &&
FDB_VERSIONS_TARGET_PATH=${CMAKE_BINARY_DIR}/versions.target
${python_command} ${SPHINX_COMMAND} -W -b ${target} ${python_command} ${SPHINX_COMMAND} -W -b ${target}
-d ${doctree} -c ${sphinx_dir} -d ${doctree} -c ${sphinx_dir}
${sphinx_dir}/source ${sphinx_dir}/source

2
documentation/sphinx/conf.py
View File

@ -53,7 +53,7 @@ copyright = u'2013-2021 Apple, Inc and the FoundationDB project authors'
# Load the version information from 'versions.target' # Load the version information from 'versions.target'
import xml.etree.ElementTree as ET import xml.etree.ElementTree as ET
version_path = os.environ['FDB_VERSIONS_TARGET_PATH'] version_path = os.path.join(os.path.dirname(sys.executable), '..', '..', '..', 'versions.target')
tree = ET.parse(version_path) tree = ET.parse(version_path)
root = tree.getroot() root = tree.getroot()

2
packaging/msi/MSIInstaller.wixproj
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(OutDir)versions.target" /> <Import Project="$(SolutionDir)versions.target" />
<PropertyGroup Condition="'$(Release)' != 'true' "> <PropertyGroup Condition="'$(Release)' != 'true' ">
<SuppressValidation>true</SuppressValidation> <SuppressValidation>true</SuppressValidation>
<PreReleaseDecoration>-PRERELEASE</PreReleaseDecoration> <PreReleaseDecoration>-PRERELEASE</PreReleaseDecoration>