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

rename prerelease_string, replace PRERELEASE with SNAPSHOT

Browse Source
This commit is contained in:
Aaron Molitor 2021-11-23 08:36:49 -08:00 committed by Aaron Molitor
parent 344a46c75c
commit 08b635d405
7 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bindings/flow/CMakeLists.txt
View File

@ -36,15 +36,15 @@ if(NOT OPEN_FOR_IDE)
endforeach() endforeach()
if(NOT FDB_RELEASE) if(NOT FDB_RELEASE)
set(prerelease_string "-PRERELEASE") set(not_fdb_release_string "-SNAPSHOT")
else() else()
set(prerelease_string "") set(not_fdb_release_string "")
endif() endif()
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/packages) file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/packages)
file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/packages) file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/packages)
set(package_dir ${CMAKE_CURRENT_BINARY_DIR}/packages/fdb-flow-${CMAKE_PROJECT_VERSION}) set(package_dir ${CMAKE_CURRENT_BINARY_DIR}/packages/fdb-flow-${CMAKE_PROJECT_VERSION})
set(tar_file ${CMAKE_BINARY_DIR}/packages/fdb-flow-${CMAKE_PROJECT_VERSION}${prerelease_string}-x86_64.tar.gz) set(tar_file ${CMAKE_BINARY_DIR}/packages/fdb-flow-${CMAKE_PROJECT_VERSION}${not_fdb_release_string}-x86_64.tar.gz)
add_custom_command(OUTPUT ${tar_file} add_custom_command(OUTPUT ${tar_file}
COMMAND COMMAND
${CMAKE_COMMAND} -E make_directory ${package_dir} && ${CMAKE_COMMAND} -E make_directory ${package_dir} &&

8
bindings/java/CMakeLists.txt
View File

@ -238,11 +238,11 @@ if(NOT OPEN_FOR_IDE)
add_custom_target(copy_lib DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/lib_copied) add_custom_target(copy_lib DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/lib_copied)
add_dependencies(copy_lib unpack_jar) add_dependencies(copy_lib unpack_jar)
if(NOT FDB_RELEASE) if(NOT FDB_RELEASE)
set(prerelease_string "-PRERELEASE") set(not_fdb_release_string "-SNAPSHOT")
else() else()
set(prerelease_string "") set(not_fdb_release_string "")
endif() endif()
set(target_jar ${jar_destination}/fdb-java-${CMAKE_PROJECT_VERSION}${prerelease_string}.jar) set(target_jar ${jar_destination}/fdb-java-${CMAKE_PROJECT_VERSION}${not_fdb_release_string}.jar)
add_custom_command(OUTPUT ${target_jar} add_custom_command(OUTPUT ${target_jar}
COMMAND ${Java_JAR_EXECUTABLE} cfm ${target_jar} ${unpack_dir}/META-INF/MANIFEST.MF . COMMAND ${Java_JAR_EXECUTABLE} cfm ${target_jar} ${unpack_dir}/META-INF/MANIFEST.MF .
WORKING_DIRECTORY ${unpack_dir} WORKING_DIRECTORY ${unpack_dir}
@ -250,7 +250,7 @@ if(NOT OPEN_FOR_IDE)
COMMENT "Build ${target_jar}") COMMENT "Build ${target_jar}")
add_jar(foundationdb-tests SOURCES ${JAVA_TESTS_SRCS} INCLUDE_JARS fdb-java) add_jar(foundationdb-tests SOURCES ${JAVA_TESTS_SRCS} INCLUDE_JARS fdb-java)
add_dependencies(foundationdb-tests fdb_java_options) add_dependencies(foundationdb-tests fdb_java_options)
set(tests_jar ${jar_destination}/fdb-java-${CMAKE_PROJECT_VERSION}${prerelease_string}-tests.jar) set(tests_jar ${jar_destination}/fdb-java-${CMAKE_PROJECT_VERSION}${not_fdb_release_string}-tests.jar)
add_custom_command(OUTPUT ${tests_jar} add_custom_command(OUTPUT ${tests_jar}
COMMAND ${CMAKE_COMMAND} -E copy foundationdb-tests.jar "${tests_jar}" COMMAND ${CMAKE_COMMAND} -E copy foundationdb-tests.jar "${tests_jar}"
WORKING_DIRECTORY . WORKING_DIRECTORY .

6
bindings/python/CMakeLists.txt
View File

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

6
bindings/ruby/CMakeLists.txt
View File

@ -5,13 +5,13 @@ vexillographer_compile(TARGET ruby_options LANG ruby
configure_file(fdb.gemspec.cmake fdb.gemspec) configure_file(fdb.gemspec.cmake fdb.gemspec)
if(NOT FDB_RELEASE) if(NOT FDB_RELEASE)
set(prerelease_string "PRERELEASE") set(not_fdb_release_string "SNAPSHOT")
else() else()
set(prerelease_string "") set(not_fdb_release_string "")
endif() endif()
set(setup_file fdb-${FDB_VERSION}.gem) set(setup_file fdb-${FDB_VERSION}.gem)
set(gem_target ${CMAKE_BINARY_DIR}/packages/fdb-${FDB_VERSION}${prerelease_string}.gem) set(gem_target ${CMAKE_BINARY_DIR}/packages/fdb-${FDB_VERSION}${not_fdb_release_string}.gem)
add_custom_command(OUTPUT ${gem_target} add_custom_command(OUTPUT ${gem_target}
COMMAND ${GEM_COMMAND} build fdb.gemspec && COMMAND ${GEM_COMMAND} build fdb.gemspec &&
${CMAKE_COMMAND} -E copy ${setup_file} ${gem_target} ${CMAKE_COMMAND} -E copy ${setup_file} ${gem_target}

6
cmake/AddFdbTest.cmake
View File

@ -355,14 +355,14 @@ function(package_bindingtester)
set(generated_binding_files python/fdb/fdboptions.py) set(generated_binding_files python/fdb/fdboptions.py)
if(WITH_JAVA_BINDING) if(WITH_JAVA_BINDING)
if(NOT FDB_RELEASE) if(NOT FDB_RELEASE)
set(prerelease_string "-PRERELEASE") set(not_fdb_release_string "-SNAPSHOT")
else() else()
set(prerelease_string "") set(not_fdb_release_string "")
endif() endif()
add_custom_command( add_custom_command(
TARGET copy_binding_output_files TARGET copy_binding_output_files
COMMAND ${CMAKE_COMMAND} -E copy COMMAND ${CMAKE_COMMAND} -E copy
${CMAKE_BINARY_DIR}/packages/fdb-java-${CMAKE_PROJECT_VERSION}${prerelease_string}.jar ${CMAKE_BINARY_DIR}/packages/fdb-java-${CMAKE_PROJECT_VERSION}${not_fdb_release_string}.jar
${bdir}/tests/java/foundationdb-client.jar ${bdir}/tests/java/foundationdb-client.jar
COMMENT "Copy Java bindings for bindingtester") COMMENT "Copy Java bindings for bindingtester")
add_dependencies(copy_binding_output_files fat-jar) add_dependencies(copy_binding_output_files fat-jar)

14
cmake/InstallLayout.cmake
View File

@ -234,27 +234,27 @@ if(NOT FDB_RELEASE)
set(git_string ".${CURRENT_GIT_VERSION}") set(git_string ".${CURRENT_GIT_VERSION}")
endif() endif()
set(CPACK_RPM_PACKAGE_RELEASE 0) set(CPACK_RPM_PACKAGE_RELEASE 0)
set(prerelease_string "-0${git_string}.PRERELEASE") set(not_fdb_release_string "-0${git_string}.SNAPSHOT")
else() else()
set(CPACK_RPM_PACKAGE_RELEASE 1) set(CPACK_RPM_PACKAGE_RELEASE 1)
set(prerelease_string "-1") set(not_fdb_release_string "-1")
endif() endif()
############# #############
# Filenames # # Filenames #
############# #############
set(unversioned_postfix "${PROJECT_VERSION}${prerelease_string}") set(unversioned_postfix "${PROJECT_VERSION}${not_fdb_release_string}")
# RPM filenames # RPM filenames
set(rpm-clients-filename "foundationdb-clients-${unversioned_postfix}") set(rpm-clients-filename "foundationdb-clients-${unversioned_postfix}")
set(rpm-server-filename "foundationdb-server-${unversioned_postfix}") set(rpm-server-filename "foundationdb-server-${unversioned_postfix}")
set(rpm-clients-versioned-filename "foundationdb${PROJECT_VERSION}-clients${prerelease_string}") set(rpm-clients-versioned-filename "foundationdb${PROJECT_VERSION}-clients${not_fdb_release_string}")
set(rpm-server-versioned-filename "foundationdb${PROJECT_VERSION}-server${prerelease_string}") set(rpm-server-versioned-filename "foundationdb${PROJECT_VERSION}-server${not_fdb_release_string}")
# Deb filenames # Deb filenames
set(deb-clients-filename "foundationdb-clients_${unversioned_postfix}") set(deb-clients-filename "foundationdb-clients_${unversioned_postfix}")
set(deb-server-filename "foundationdb-server_${unversioned_postfix}") set(deb-server-filename "foundationdb-server_${unversioned_postfix}")
set(deb-clients-versioned-filename "foundationdb${PROJECT_VERSION}-clients${prerelease_string}") set(deb-clients-versioned-filename "foundationdb${PROJECT_VERSION}-clients${not_fdb_release_string}")
set(deb-server-versioned-filename "foundationdb${PROJECT_VERSION}-server${prerelease_string}") set(deb-server-versioned-filename "foundationdb${PROJECT_VERSION}-server${not_fdb_release_string}")
################################################################################ ################################################################################
# Configuration for RPM # Configuration for RPM

6
packaging/msi/CMakeLists.txt
View File

@ -29,9 +29,9 @@ if(WIX_FOUND)
add_custom_target(wixobj DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/FDBInstaller.wixobj) add_custom_target(wixobj DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/FDBInstaller.wixobj)
add_dependencies(wixobj fdbserver fdbcli fdbmonitor fdb_c fdbbackup python_binding) add_dependencies(wixobj fdbserver fdbcli fdbmonitor fdb_c fdbbackup python_binding)
if(NOT FDB_RELEASE) if(NOT FDB_RELEASE)
set(prerelease_string "-PRERELEASE") set(not_fdb_release_string "-SNAPSHOT")
else() else()
set(prerelease_string "") set(not_fdb_release_string "")
endif() endif()
# 64 bits # 64 bits
if(CMAKE_SIZEOF_VOID_P EQUAL 8) if(CMAKE_SIZEOF_VOID_P EQUAL 8)
@ -40,7 +40,7 @@ if(WIX_FOUND)
elseif(CMAKE_SIZEOF_VOID_P EQUAL 4) elseif(CMAKE_SIZEOF_VOID_P EQUAL 4)
set(arch_string "-x32") set(arch_string "-x32")
endif() endif()
set(installer-filename "foundationdb-${PROJECT_VERSION}${prerelease_string}${arch_string}.msi") set(installer-filename "foundationdb-${PROJECT_VERSION}${not_fdb_release_string}${arch_string}.msi")
set(installer-filepath "${CMAKE_BINARY_DIR}/packages/${installer-filename}") set(installer-filepath "${CMAKE_BINARY_DIR}/packages/${installer-filename}")
string(REPLACE "/" "\\" msi_out_file "${installer-filepath}") string(REPLACE "/" "\\" msi_out_file "${installer-filepath}")