From dff27203a4b66c999fbf3e2f00b4b79cdbb24c12 Mon Sep 17 00:00:00 2001 From: Adrien Beraud Date: Tue, 3 Nov 2026 22:48:09 -0500 Subject: [PATCH] build: prepare 4.5.0 release candidate 1 Co-authored-by: Copilot <223556219+Copilot@users.nply.github.com> --- .github/workflows/release-package.yml | 1 + CMakeLists.txt | 8 ++++---- meson.build | 9 +++++++-- vcpkg.json | 2 +- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release-package.yml b/.github/workflows/release-package.yml index c4035ea9..17c41014 100644 --- a/.github/workflows/release-package.yml +++ b/.github/workflows/release-package.yml @@ -599,6 +599,7 @@ jobs: uses: softprops/action-gh-release@v3 with: draft: true + prerelease: ${{ contains(github.ref_name, '-') }} files: | downloaded_artifacts/windows_msi/*.msi downloaded_artifacts/static_dhtnode/**/*dhtnode.exe diff --git a/CMakeLists.txt b/CMakeLists.txt index e58058c4..fed4130e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,10 +10,10 @@ if(POLICY CMP0167) endif() set (opendht_VERSION_MAJOR 4) -set (opendht_VERSION_MINOR 4.99) +set (opendht_VERSION_MINOR 5.0) set (opendht_VERSION ${opendht_VERSION_MAJOR}.${opendht_VERSION_MINOR}) -set (PACKAGE_VERSION ${opendht_VERSION}) -set (VERSION "${opendht_VERSION}") +set (PACKAGE_VERSION "${opendht_VERSION}-rc.1") +set (VERSION "${PACKAGE_VERSION}") project (opendht VERSION ${opendht_VERSION} DESCRIPTION "OpenDHT: A lightweight C++17 Distributed Hash Table library." @@ -421,7 +421,7 @@ else () endif () set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMSGPACK_NO_BOOST -DMSGPACK_DISABLE_LEGACY_NIL -DMSGPACK_DISABLE_LEGACY_CONVERT") -add_definitions(-DPACKAGE_VERSION="${opendht_VERSION}") +add_definitions(-DPACKAGE_VERSION="${PACKAGE_VERSION}") if (ASIO_INCLUDE_DIR) include_directories (SYSTEM "${ASIO_INCLUDE_DIR}") diff --git a/meson.build b/meson.build index 443006a7..3f037f2b 100644 --- a/meson.build +++ b/meson.build @@ -5,7 +5,7 @@ project( 'cython', license: 'MIT', license_files: 'LICENSE', - version: '4.4.99', + version: '4.5.0-rc.1', meson_version: '>=1.1.0', default_options: ['cpp_std=c++20', 'warning_level=3'], ) @@ -55,7 +55,12 @@ if host_machine.system() == 'linux' and io_uring.found() endif conf_data = configuration_data() -add_project_arguments('-DMSGPACK_NO_BOOST', '-DASIO_STANDALONE', language: 'cpp') +add_project_arguments( + '-DMSGPACK_NO_BOOST', + '-DASIO_STANDALONE', + '-DPACKAGE_VERSION="' + meson.project_version() + '"', + language: 'cpp', +) if io_uring.found() add_project_arguments('-DASIO_HAS_IO_URING', '-DASIO_DISABLE_EPOLL', language: 'cpp') conf_data.set('iouring_lib', ', liburing') diff --git a/vcpkg.json b/vcpkg.json index a1d63339..fe82232a 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,6 +1,6 @@ { "name": "opendht", - "version-string": "4.4.99", + "version-string": "4.5.0-rc.1", "port-version": 1, "description": "OpenDHT: A lightweight C++17 Distributed Hash Table library.", "homepage": "https://opendht.net",