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

Modified compilation and package names to conform to existing compilation options and packaging names

Browse Source 
Modifications to existing standards (even when wrong should be made outside of port to cmake)
This commit is contained in:
Alvin Moore 2019-12-15 07:13:46 -08:00
parent 952053ea9c
commit 413cafe368
5 changed files with 23 additions and 13 deletions

5
bindings/python/CMakeLists.txt

@ -59,7 +59,10 @@ if (pycodestyle)
else()
add_custom_target(fdb_python_check COMMAND ${CMAKE_COMMAND} -E echo "Skipped Python style check! Missing: pycodestyle")
endif()
set(package_file_name foundationdb-${FDB_VERSION}.tar.gz)
if(NOT FDB_RELEASE)
set(prerelease_string "a1")
endif()
set(package_file_name foundationdb-${FDB_VERSION}${prerelease_string}.tar.gz)
set(package_file ${CMAKE_BINARY_DIR}/packages/${package_file_name})
add_custom_command(OUTPUT ${package_file}
COMMAND $<TARGET_FILE:Python::Interpreter> setup.py sdist --formats=gztar &&

6
bindings/ruby/CMakeLists.txt

@ -4,7 +4,11 @@ vexillographer_compile(TARGET ruby_options LANG ruby
OUT ${CMAKE_CURRENT_SOURCE_DIR}/lib/fdboptions.rb ALL)
configure_file(fdb.gemspec.cmake fdb.gemspec)
set(gem_file fdb-${FDB_VERSION}.gem)
if(NOT FDB_RELEASE)
set(prerelease_string "PRERELEASE")
endif()
set(gem_file fdb-${FDB_VERSION}${prerelease_string}.gem)
set(gem_target ${CMAKE_BINARY_DIR}/packages/${gem_file})
add_custom_command(OUTPUT ${gem_target}
COMMAND ${GEM_COMMAND} build fdb.gemspec &&

4
cmake/CPackConfig.cmake

@ -26,9 +26,9 @@ elseif(CPACK_GENERATOR MATCHES "productbuild")
# Changing the path of this file as CMAKE_BINARY_DIR does not seem to be defined
set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_BINARY_DIR}/License.txt)
if(NOT FDB_RELEASE)
set(prerelease_string_osx "-PRERELEASE")
set(prerelease_string "-PRERELEASE")
endif()
set(CPACK_PACKAGE_FILE_NAME "FoundationDB-${PROJECT_VERSION}.${CURRENT_GIT_VERSION}${prerelease_string_osx}")
set(CPACK_PACKAGE_FILE_NAME "FoundationDB-${PROJECT_VERSION}${prerelease_string}")
elseif(CPACK_GENERATOR MATCHES "TGZ")
set(CPACK_STRIP_FILES TRUE)
set(CPACK_COMPONENTS_ALL clients-tgz server-tgz)

13
cmake/ConfigureCompiler.cmake

@ -39,7 +39,8 @@ if(NDEBUG)
endif()
if(FDB_RELEASE)
add_compile_options(-DFDB_RELEASE)
add_compile_options(-DFDB_RELEASE)
add_compile_options(-DFDB_CLEAN_BUILD)
endif()
include_directories(${CMAKE_SOURCE_DIR})
@ -83,10 +84,12 @@ set(CMAKE_CXX_STANDARD 17)
if(WIN32)
# see: https://docs.microsoft.com/en-us/windows/desktop/WinProg/using-the-windows-headers
# this sets the windows target version to Windows 7
set(WINDOWS_TARGET 0x0601)
add_compile_options(/W3 /EHsc /bigobj $<$<CONFIG:Release>:/Zi> /MP)
add_compile_definitions(_WIN32_WINNT=${WINDOWS_TARGET} BOOST_ALL_NO_LIB)
# this sets the windows target version to Windows Server 2003
set(WINDOWS_TARGET 0x0502)
add_compile_options(/W3 /EHsc /bigobj $<$<CONFIG:Release>:/Zi> /MP /FC)
add_compile_definitions(_WIN32_WINNT=${WINDOWS_TARGET} WINVER=${WINDOWS_TARGET} NTDDI_VERSION=0x05020000 BOOST_ALL_NO_LIB)
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT")
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd")
else()
set(GCC NO)
set(CLANG NO)

8
cmake/InstallLayout.cmake

@ -270,12 +270,12 @@ if(NOT FDB_RELEASE)
endif()
# RPM filenames
set(rpm-clients-filename "foundationdb-clients-${PROJECT_VERSION}.${CURRENT_GIT_VERSION}${prerelease_string}")
set(rpm-server-filename "foundationdb-server-${PROJECT_VERSION}.${CURRENT_GIT_VERSION}${prerelease_string}")
set(rpm-clients-filename "foundationdb-clients-${PROJECT_VERSION}-0.${CURRENT_GIT_VERSION}${prerelease_string}")
set(rpm-server-filename "foundationdb-server-${PROJECT_VERSION}-0.${CURRENT_GIT_VERSION}${prerelease_string}")
# Deb filenames
set(deb-clients-filename "foundationdb-clients_${PROJECT_VERSION}.${CURRENT_GIT_VERSION}${prerelease_string}")
set(deb-server-filename "foundationdb-server_${PROJECT_VERSION}.${CURRENT_GIT_VERSION}${prerelease_string}")
set(deb-clients-filename "foundationdb-clients_${PROJECT_VERSION}-0.${CURRENT_GIT_VERSION}${prerelease_string}")
set(deb-server-filename "foundationdb-server_${PROJECT_VERSION}-0.${CURRENT_GIT_VERSION}${prerelease_string}")
################################################################################
# Configuration for RPM