refactor: remove version tags, ref #180

alpaca-core · Nov 15, 2024 · 7c4b46e · 7c4b46e
1 parent 3bad767
commit 7c4b46e
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 20 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -9,8 +9,6 @@ project(ac-local
     LANGUAGES C CXX
 )
 
-set(PROJECT_VERSION_TAG dev)
-
 include(./get-ac-build.cmake)
 
 #################

diff --git a/ac-local-config-export.in.cmake b/ac-local-config-export.in.cmake
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: MIT
 #
 include("${CMAKE_CURRENT_LIST_DIR}/ac-local-targets.cmake")
-message(STATUS "ac-local @PROJECT_VERSION@@PROJECT_VERSION_TAG@ @CMAKE_BUILD_TYPE@ found in ${CMAKE_CURRENT_LIST_DIR}")
+message(STATUS "ac-local @PROJECT_VERSION@ @CMAKE_BUILD_TYPE@ found in ${CMAKE_CURRENT_LIST_DIR}")
 
 if(WIN32 AND CMAKE_RUNTIME_OUTPUT_DIRECTORY)
     # on windows we need to have the dlls in the runtime directory

diff --git a/cmake/ac_local_plugin_util.cmake b/cmake/ac_local_plugin_util.cmake
@@ -30,9 +30,8 @@ function(add_ac_local_plugin)
 #define ACLP_@nameSym@_VERSION_MAJOR @PROJECT_VERSION_MAJOR@
 #define ACLP_@nameSym@_VERSION_MINOR @PROJECT_VERSION_MINOR@
 #define ACLP_@nameSym@_VERSION_PATCH @PROJECT_VERSION_PATCH@
-#define ACLP_@nameSym@_VERSION_TAG   "@PROJECT_VERSION_TAG@"
 
-#define ACLP_@nameSym@_VERSION_STRING "@PROJECT_VERSION@@PROJECT_VERSION_TAG@"
+#define ACLP_@nameSym@_VERSION_STRING "@PROJECT_VERSION@"
 ]=]
         @ONLY
     )
@@ -128,7 +127,7 @@ namespace ac::local {
 extern "C" SYMBOL_EXPORT
 PluginInterface acLocalPluginLoad() {
     constexpr Version ownVersion(
-        ACLP_@nameSym@_VERSION_MAJOR, ACLP_@nameSym@_VERSION_MINOR, ACLP_@nameSym@_VERSION_PATCH, ACLP_@nameSym@_VERSION_TAG
+        ACLP_@nameSym@_VERSION_MAJOR, ACLP_@nameSym@_VERSION_MINOR, ACLP_@nameSym@_VERSION_PATCH
     );
 
     return {
@@ -358,4 +357,4 @@ function(make_ac_local_plugin_available)
         cfg-${pluginId}
         ac::local
     )
-endfunction()
+endfunction()
diff --git a/local/code/ac/local/Version.hpp b/local/code/ac/local/Version.hpp
@@ -3,27 +3,25 @@
 //
 #pragma once
 #include "version.h"
-#include <string_view>
+#include <compare>
 
 namespace ac::local {
 struct Version {
     int major;
     int minor;
     int patch;
-    std::string_view tag;
 
-    constexpr Version(int major, int minor, int patch, std::string_view tag)
-        : major(major), minor(minor), patch(patch), tag(tag)
+    constexpr Version(int major, int minor, int patch)
+        : major(major), minor(minor), patch(patch)
     {}
 
     auto operator<=>(const Version&) const = default;
 };
 
 inline constexpr Version Project_Version(
-    AC_VERSION_MAJOR,
-    AC_VERSION_MINOR,
-    AC_VERSION_PATCH,
-    AC_VERSION_TAG
+    AC_LOCAL_VERSION_MAJOR,
+    AC_LOCAL_VERSION_MINOR,
+    AC_LOCAL_VERSION_PATCH
 );
 
 } // namespace ac::local
diff --git a/local/code/version.in.h b/local/code/version.in.h
@@ -3,9 +3,8 @@
 //
 #pragma once
 
-#define AC_VERSION_MAJOR @PROJECT_VERSION_MAJOR@
-#define AC_VERSION_MINOR @PROJECT_VERSION_MINOR@
-#define AC_VERSION_PATCH @PROJECT_VERSION_PATCH@
-#define AC_VERSION_TAG "@PROJECT_VERSION_TAG@"
+#define AC_LOCAL_VERSION_MAJOR @PROJECT_VERSION_MAJOR@
+#define AC_LOCAL_VERSION_MINOR @PROJECT_VERSION_MINOR@
+#define AC_LOCAL_VERSION_PATCH @PROJECT_VERSION_PATCH@
 
-#define AC_VERSION_STRING "@PROJECT_VERSION@@PROJECT_VERSION_TAG@"
+#define AC_LOCAL_VERSION_STRING "@PROJECT_VERSION@"