From 08b635d40523aa307d16e8dc7c725f84644e5412 Mon Sep 17 00:00:00 2001 From: Aaron Molitor Date: Tue, 23 Nov 2021 08:36:49 -0800 Subject: [PATCH] rename prerelease_string, replace PRERELEASE with SNAPSHOT --- bindings/flow/CMakeLists.txt | 6 +++--- bindings/java/CMakeLists.txt | 8 ++++---- bindings/python/CMakeLists.txt | 6 +++--- bindings/ruby/CMakeLists.txt | 6 +++--- cmake/AddFdbTest.cmake | 6 +++--- cmake/InstallLayout.cmake | 14 +++++++------- packaging/msi/CMakeLists.txt | 6 +++--- 7 files changed, 26 insertions(+), 26 deletions(-) diff --git a/bindings/flow/CMakeLists.txt b/bindings/flow/CMakeLists.txt index 27f51c6a17..b6ad0cad16 100644 --- a/bindings/flow/CMakeLists.txt +++ b/bindings/flow/CMakeLists.txt @@ -36,15 +36,15 @@ if(NOT OPEN_FOR_IDE) endforeach() if(NOT FDB_RELEASE) - set(prerelease_string "-PRERELEASE") + set(not_fdb_release_string "-SNAPSHOT") else() - set(prerelease_string "") + set(not_fdb_release_string "") endif() file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/packages) file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/packages) 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} COMMAND ${CMAKE_COMMAND} -E make_directory ${package_dir} && diff --git a/bindings/java/CMakeLists.txt b/bindings/java/CMakeLists.txt index d8696705ef..10f982aacb 100644 --- a/bindings/java/CMakeLists.txt +++ b/bindings/java/CMakeLists.txt @@ -238,11 +238,11 @@ if(NOT OPEN_FOR_IDE) add_custom_target(copy_lib DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/lib_copied) add_dependencies(copy_lib unpack_jar) if(NOT FDB_RELEASE) - set(prerelease_string "-PRERELEASE") + set(not_fdb_release_string "-SNAPSHOT") else() - set(prerelease_string "") + set(not_fdb_release_string "") 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} COMMAND ${Java_JAR_EXECUTABLE} cfm ${target_jar} ${unpack_dir}/META-INF/MANIFEST.MF . WORKING_DIRECTORY ${unpack_dir} @@ -250,7 +250,7 @@ if(NOT OPEN_FOR_IDE) COMMENT "Build ${target_jar}") add_jar(foundationdb-tests SOURCES ${JAVA_TESTS_SRCS} INCLUDE_JARS fdb-java) 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} COMMAND ${CMAKE_COMMAND} -E copy foundationdb-tests.jar "${tests_jar}" WORKING_DIRECTORY . diff --git a/bindings/python/CMakeLists.txt b/bindings/python/CMakeLists.txt index 35e78383a5..3c4ccced9c 100644 --- a/bindings/python/CMakeLists.txt +++ b/bindings/python/CMakeLists.txt @@ -60,12 +60,12 @@ else() add_custom_target(fdb_python_check COMMAND ${CMAKE_COMMAND} -E echo "Skipped Python style check! Missing: pycodestyle") endif() if(NOT FDB_RELEASE) - set(prerelease_string "a1") + set(not_fdb_release_string "a1") else() - set(prerelease_string "") + set(not_fdb_release_string "") endif() 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} COMMAND $ setup.py sdist --formats=gztar && ${CMAKE_COMMAND} -E copy dist/${setup_file_name} ${package_file} diff --git a/bindings/ruby/CMakeLists.txt b/bindings/ruby/CMakeLists.txt index 9538a540b4..c5f5bedf68 100644 --- a/bindings/ruby/CMakeLists.txt +++ b/bindings/ruby/CMakeLists.txt @@ -5,13 +5,13 @@ vexillographer_compile(TARGET ruby_options LANG ruby configure_file(fdb.gemspec.cmake fdb.gemspec) if(NOT FDB_RELEASE) - set(prerelease_string "PRERELEASE") + set(not_fdb_release_string "SNAPSHOT") else() - set(prerelease_string "") + set(not_fdb_release_string "") endif() 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} COMMAND ${GEM_COMMAND} build fdb.gemspec && ${CMAKE_COMMAND} -E copy ${setup_file} ${gem_target} diff --git a/cmake/AddFdbTest.cmake b/cmake/AddFdbTest.cmake index c68b1a5524..e9712e1bff 100644 --- a/cmake/AddFdbTest.cmake +++ b/cmake/AddFdbTest.cmake @@ -355,14 +355,14 @@ function(package_bindingtester) set(generated_binding_files python/fdb/fdboptions.py) if(WITH_JAVA_BINDING) if(NOT FDB_RELEASE) - set(prerelease_string "-PRERELEASE") + set(not_fdb_release_string "-SNAPSHOT") else() - set(prerelease_string "") + set(not_fdb_release_string "") endif() add_custom_command( TARGET copy_binding_output_files 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 COMMENT "Copy Java bindings for bindingtester") add_dependencies(copy_binding_output_files fat-jar) diff --git a/cmake/InstallLayout.cmake b/cmake/InstallLayout.cmake index a0e5285cba..e5d0434650 100644 --- a/cmake/InstallLayout.cmake +++ b/cmake/InstallLayout.cmake @@ -234,27 +234,27 @@ if(NOT FDB_RELEASE) set(git_string ".${CURRENT_GIT_VERSION}") endif() set(CPACK_RPM_PACKAGE_RELEASE 0) - set(prerelease_string "-0${git_string}.PRERELEASE") + set(not_fdb_release_string "-0${git_string}.SNAPSHOT") else() set(CPACK_RPM_PACKAGE_RELEASE 1) - set(prerelease_string "-1") + set(not_fdb_release_string "-1") endif() ############# # Filenames # ############# -set(unversioned_postfix "${PROJECT_VERSION}${prerelease_string}") +set(unversioned_postfix "${PROJECT_VERSION}${not_fdb_release_string}") # RPM filenames set(rpm-clients-filename "foundationdb-clients-${unversioned_postfix}") set(rpm-server-filename "foundationdb-server-${unversioned_postfix}") -set(rpm-clients-versioned-filename "foundationdb${PROJECT_VERSION}-clients${prerelease_string}") -set(rpm-server-versioned-filename "foundationdb${PROJECT_VERSION}-server${prerelease_string}") +set(rpm-clients-versioned-filename "foundationdb${PROJECT_VERSION}-clients${not_fdb_release_string}") +set(rpm-server-versioned-filename "foundationdb${PROJECT_VERSION}-server${not_fdb_release_string}") # Deb filenames set(deb-clients-filename "foundationdb-clients_${unversioned_postfix}") set(deb-server-filename "foundationdb-server_${unversioned_postfix}") -set(deb-clients-versioned-filename "foundationdb${PROJECT_VERSION}-clients${prerelease_string}") -set(deb-server-versioned-filename "foundationdb${PROJECT_VERSION}-server${prerelease_string}") +set(deb-clients-versioned-filename "foundationdb${PROJECT_VERSION}-clients${not_fdb_release_string}") +set(deb-server-versioned-filename "foundationdb${PROJECT_VERSION}-server${not_fdb_release_string}") ################################################################################ # Configuration for RPM diff --git a/packaging/msi/CMakeLists.txt b/packaging/msi/CMakeLists.txt index 7b5a1a1922..1550479587 100644 --- a/packaging/msi/CMakeLists.txt +++ b/packaging/msi/CMakeLists.txt @@ -29,9 +29,9 @@ if(WIX_FOUND) add_custom_target(wixobj DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/FDBInstaller.wixobj) add_dependencies(wixobj fdbserver fdbcli fdbmonitor fdb_c fdbbackup python_binding) if(NOT FDB_RELEASE) - set(prerelease_string "-PRERELEASE") + set(not_fdb_release_string "-SNAPSHOT") else() - set(prerelease_string "") + set(not_fdb_release_string "") endif() # 64 bits if(CMAKE_SIZEOF_VOID_P EQUAL 8) @@ -40,7 +40,7 @@ if(WIX_FOUND) elseif(CMAKE_SIZEOF_VOID_P EQUAL 4) set(arch_string "-x32") 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}") string(REPLACE "/" "\\" msi_out_file "${installer-filepath}")