From ba806ff1ba1aca15a1ec3fc26253b5cbc375a9b1 Mon Sep 17 00:00:00 2001 From: Vitaliy Filippov Date: Fri, 19 Jul 2024 13:34:00 +0300 Subject: [PATCH] Rename VERSION define to VITASTOR_VERSION --- CMakeLists.txt | 2 +- csi/Makefile | 6 +++--- patches/cinder-vitastor.py | 4 ++-- src/CMakeLists.txt | 2 +- src/blockstore/CMakeLists.txt | 2 +- src/client/CMakeLists.txt | 2 +- src/client/nbd_proxy.cpp | 2 +- src/cmd/cli.cpp | 2 +- src/disk_tool/disk_tool.cpp | 2 +- src/kv/CMakeLists.txt | 2 +- src/nfs/nfs_proxy.cpp | 2 +- src/osd/osd_main.cpp | 2 +- 12 files changed, 15 insertions(+), 15 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 43c59122..2f719690 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,6 +2,6 @@ cmake_minimum_required(VERSION 2.8.12) project(vitastor) -set(VERSION "1.7.1") +set(VITASTOR_VERSION "1.7.1") add_subdirectory(src) diff --git a/csi/Makefile b/csi/Makefile index 8c4e9608..ff183282 100644 --- a/csi/Makefile +++ b/csi/Makefile @@ -1,9 +1,9 @@ -VERSION ?= v1.7.1 +VITASTOR_VERSION ?= v1.7.1 all: build push build: - @docker build --rm -t vitalif/vitastor-csi:$(VERSION) . + @docker build --rm -t vitalif/vitastor-csi:$(VITASTOR_VERSION) . push: - @docker push vitalif/vitastor-csi:$(VERSION) + @docker push vitalif/vitastor-csi:$(VITASTOR_VERSION) diff --git a/patches/cinder-vitastor.py b/patches/cinder-vitastor.py index 7398d699..338f1fe7 100644 --- a/patches/cinder-vitastor.py +++ b/patches/cinder-vitastor.py @@ -50,7 +50,7 @@ from cinder.volume import configuration from cinder.volume import driver from cinder.volume import volume_utils -VERSION = '1.7.1' +VITASTOR_VERSION = '1.7.1' LOG = logging.getLogger(__name__) @@ -238,7 +238,7 @@ class VitastorDriver(driver.CloneableImageVD, stats = { 'vendor_name': 'Vitastor', - 'driver_version': self.VERSION, + 'driver_version': VITASTOR_VERSION, 'storage_protocol': 'vitastor', 'total_capacity_gb': 'unknown', 'free_capacity_gb': 'unknown', diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 7da82920..01e3fe88 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -19,7 +19,7 @@ if("${CMAKE_INSTALL_PREFIX}" MATCHES "^/usr/local/?$") set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") endif() -add_definitions(-DVERSION="1.7.1") +add_definitions(-DVITASTOR_VERSION="1.7.1") add_definitions(-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wall -Wno-sign-compare -Wno-comment -Wno-parentheses -Wno-pointer-arith -fdiagnostics-color=always -fno-omit-frame-pointer -I ${CMAKE_SOURCE_DIR}/src) add_link_options(-fno-omit-frame-pointer) if (${WITH_ASAN}) diff --git a/src/blockstore/CMakeLists.txt b/src/blockstore/CMakeLists.txt index ffda1a3e..b2e41581 100644 --- a/src/blockstore/CMakeLists.txt +++ b/src/blockstore/CMakeLists.txt @@ -13,7 +13,7 @@ target_link_libraries(vitastor_blk # for timerfd_manager vitastor_common ) -set_target_properties(vitastor_blk PROPERTIES VERSION ${VERSION} SOVERSION 0) +set_target_properties(vitastor_blk PROPERTIES VERSION ${VITASTOR_VERSION} SOVERSION 0) if (${WITH_FIO}) # libfio_vitastor_blk.so diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt index 68512b03..84b20488 100644 --- a/src/client/CMakeLists.txt +++ b/src/client/CMakeLists.txt @@ -29,7 +29,7 @@ target_link_libraries(vitastor_client ${LIBURING_LIBRARIES} ${IBVERBS_LIBRARIES} ) -set_target_properties(vitastor_client PROPERTIES VERSION ${VERSION} SOVERSION 0) +set_target_properties(vitastor_client PROPERTIES VERSION ${VITASTOR_VERSION} SOVERSION 0) configure_file(vitastor.pc.in vitastor.pc @ONLY) if (${WITH_FIO}) diff --git a/src/client/nbd_proxy.cpp b/src/client/nbd_proxy.cpp index e82a7892..ca1348c6 100644 --- a/src/client/nbd_proxy.cpp +++ b/src/client/nbd_proxy.cpp @@ -253,7 +253,7 @@ nla_put_failure: const char *exe_name = NULL; const char *help_text = - "Vitastor NBD proxy " VERSION "\n" + "Vitastor NBD proxy " VITASTOR_VERSION "\n" "(c) Vitaliy Filippov, 2020+ (VNPL-1.1)\n" "\n" "COMMANDS:\n" diff --git a/src/cmd/cli.cpp b/src/cmd/cli.cpp index 31b99283..9c217bb9 100644 --- a/src/cmd/cli.cpp +++ b/src/cmd/cli.cpp @@ -17,7 +17,7 @@ static const char *exe_name = NULL; static const char* help_text = - "Vitastor command-line tool " VERSION "\n" + "Vitastor command-line tool " VITASTOR_VERSION "\n" "(c) Vitaliy Filippov, 2019+ (VNPL-1.1)\n" "\n" "COMMANDS:\n" diff --git a/src/disk_tool/disk_tool.cpp b/src/disk_tool/disk_tool.cpp index a59f3955..6021d97c 100644 --- a/src/disk_tool/disk_tool.cpp +++ b/src/disk_tool/disk_tool.cpp @@ -5,7 +5,7 @@ #include "str_util.h" static const char *help_text = - "Vitastor disk management tool " VERSION "\n" + "Vitastor disk management tool " VITASTOR_VERSION "\n" "(c) Vitaliy Filippov, 2022+ (VNPL-1.1)\n" "\n" "COMMANDS:\n" diff --git a/src/kv/CMakeLists.txt b/src/kv/CMakeLists.txt index a5a43178..7a25c9b3 100644 --- a/src/kv/CMakeLists.txt +++ b/src/kv/CMakeLists.txt @@ -10,7 +10,7 @@ set_target_properties(vitastor_kv PROPERTIES PUBLIC_HEADER "kv/vitastor_kv.h") target_link_libraries(vitastor_kv vitastor_client ) -set_target_properties(vitastor_kv PROPERTIES VERSION ${VERSION} SOVERSION 0) +set_target_properties(vitastor_kv PROPERTIES VERSION ${VITASTOR_VERSION} SOVERSION 0) # vitastor-kv add_executable(vitastor-kv diff --git a/src/nfs/nfs_proxy.cpp b/src/nfs/nfs_proxy.cpp index 01718440..49c2eebf 100644 --- a/src/nfs/nfs_proxy.cpp +++ b/src/nfs/nfs_proxy.cpp @@ -53,7 +53,7 @@ nfs_proxy_t::~nfs_proxy_t() } static const char* help_text = - "Vitastor NFS 3.0 proxy " VERSION "\n" + "Vitastor NFS 3.0 proxy " VITASTOR_VERSION "\n" "(c) Vitaliy Filippov, 2021+ (VNPL-1.1)\n" "\n" "vitastor-nfs (--fs | --block) [-o ] mount \n" diff --git a/src/osd/osd_main.cpp b/src/osd/osd_main.cpp index 257c01ab..fed0e6ea 100644 --- a/src/osd/osd_main.cpp +++ b/src/osd/osd_main.cpp @@ -20,7 +20,7 @@ static void handle_sigint(int sig) } static const char* help_text = - "Vitastor OSD (block object storage daemon) " VERSION "\n" + "Vitastor OSD (block object storage daemon) " VITASTOR_VERSION "\n" "(c) Vitaliy Filippov, 2019+ (VNPL-1.1)\n" "\n" "OSDs are usually started by vitastor-disk.\n"