Update version to v5.0.5 (#2606)

* chore(build): fix cmakelist issue when solving conflict * chore(version): update to v5.0.5 * chore(workflows): update upload-artifact version to v4
capstone-engine · Jan 17, 2025 · 5526125 · 5526125
1 parent acf11d8
commit 5526125
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 7 deletions.
diff --git a/.github/workflows/fuzz.yml b/.github/workflows/fuzz.yml
@@ -16,7 +16,7 @@ jobs:
         fuzz-seconds: 600
         dry-run: false
     - name: Upload Crash
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       if: failure()
       with:
         name: artifacts

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -21,9 +21,23 @@ cmake_policy(SET CMP0042 NEW)
 # Enable support for MSVC_RUNTIME_LIBRARY
 cmake_policy(SET CMP0091 NEW)
 
-project(capstone
-    VERSION 5.0.4
-)
+# Check if VERSION is provided externally, otherwise default to 5.0.3
+if(NOT DEFINED PROJECT_VERSION)
+    set(PROJECT_VERSION "5.0.5")
+endif()
+
+# Use PROJECT_VERSION directly for CPack
+set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION})
+
+# Remove the 'v' prefix if it exists and extract the major, minor, and patch versions
+string(REGEX MATCH "^[vV]?([0-9]+\\.[0-9]+\\.[0-9]+)" _ ${PROJECT_VERSION})
+set(PROJECT_VERSION_BASE ${CMAKE_MATCH_1})
+
+# Print the values of PROJECT_VERSION and PROJECT_VERSION_BASE
+message(STATUS "PROJECT_VERSION: ${CPACK_PACKAGE_VERSION} CAPSTONE_VERSION: ${PROJECT_VERSION_BASE}")
+
+# Set the project version without the pre-release identifier
+project(capstone VERSION ${PROJECT_VERSION_BASE})
 
 if (MSVC)
     add_compile_options(/W1 /w14189)

diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,11 @@
 This file details the changelog of Capstone.
 
+--------------------------------
+Version 5.0.5: January 16th, 2025
+
+## What's Changed
+* Fix code missing in v5.0.4
+
 --------------------------------
 Version 5.0.4: January 16th, 2025
 

diff --git a/bindings/python/capstone/__init__.py b/bindings/python/capstone/__init__.py
@@ -180,7 +180,7 @@
 # Package version
 CS_VERSION_MAJOR = CS_API_MAJOR
 CS_VERSION_MINOR = CS_API_MINOR
-CS_VERSION_EXTRA = 4
+CS_VERSION_EXTRA = 5
 
 __version__ = "%u.%u.%u" %(CS_VERSION_MAJOR, CS_VERSION_MINOR, CS_VERSION_EXTRA)
 

diff --git a/include/capstone/capstone.h b/include/capstone/capstone.h
@@ -58,7 +58,7 @@ extern "C" {
 // Capstone package version
 #define CS_VERSION_MAJOR CS_API_MAJOR
 #define CS_VERSION_MINOR CS_API_MINOR
-#define CS_VERSION_EXTRA 4
+#define CS_VERSION_EXTRA 5
 
 /// Macro for meta programming.
 /// Meant for projects using Capstone and need to support multiple

diff --git a/pkgconfig.mk b/pkgconfig.mk
@@ -6,7 +6,7 @@ PKG_MAJOR = 5
 PKG_MINOR = 0
 
 # version bugfix level. Example: PKG_EXTRA = 1
-PKG_EXTRA = 4
+PKG_EXTRA = 5
 
 # version tag. Examples: rc1, b2, post1 - or just comment out for no tag
 PKG_TAG =