Fix version for Arch

Author: AdrianTM

build.cmake

@@ -55,17 +55,21 @@ function(build_compilation_setup target)
 endfunction()
 
 function(build_version_definition target definition)
-	# Get version from debian/changelog
-	execute_process(
-		COMMAND dpkg-parsechangelog -SVersion
-		WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-		OUTPUT_VARIABLE pkg_version
-		OUTPUT_STRIP_TRAILING_WHITESPACE
-		RESULT_VARIABLE dpkg_result
-	)
-	if((NOT dpkg_result EQUAL 0) OR (pkg_version STREQUAL ""))
-		message(WARNING "Failed to get version from debian/changelog using dpkg-parsechangelog")
-		set(pkg_version "${PROJECT_VERSION}")
+	if(DEFINED PROJECT_VERSION_OVERRIDE AND NOT "${PROJECT_VERSION_OVERRIDE}" STREQUAL "")
+		set(pkg_version "${PROJECT_VERSION_OVERRIDE}")
+	else()
+		# Get version from debian/changelog
+		execute_process(
+			COMMAND dpkg-parsechangelog -SVersion
+			WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+			OUTPUT_VARIABLE pkg_version
+			OUTPUT_STRIP_TRAILING_WHITESPACE
+			RESULT_VARIABLE dpkg_result
+		)
+		if((NOT dpkg_result EQUAL 0) OR (pkg_version STREQUAL ""))
+			message(WARNING "Failed to get version from debian/changelog using dpkg-parsechangelog")
+			set(pkg_version "${PROJECT_VERSION}")
+		endif()
 	endif()
 	if(pkg_version STREQUAL "")
 		message(FATAL_ERROR "Cannot add ${definition} compile definition: PROJECT_VERSION empty")

build.sh

@@ -25,17 +25,12 @@ if [ "$ARCH_BUILD" = true ]; then
 		exit 1
 	fi
 
-	if [ ! -f debian/changelog ]; then
-		echo "Error: debian/changelog not found; cannot determine version for Arch build."
-		exit 1
-	fi
-
-	ARCH_VERSION=$(sed -n '1{s/^[^(]*(\([^)]*\)).*/\1/p}' debian/changelog)
+	ARCH_VERSION=$(git describe --tags --abbrev=0 2>/dev/null)
 	if [ -z "$ARCH_VERSION" ]; then
-		echo "Error: could not parse version from debian/changelog."
+		echo "Error: no git tags found; cannot determine version for Arch build."
 		exit 1
 	fi
-	echo "Using version ${ARCH_VERSION} from debian/changelog"
+	echo "Using version ${ARCH_VERSION} from latest git tag"
 
 	ARCH_BUILDDIR=$(mktemp -d -p "$PWD" archpkgbuild.XXXXXX)
 	trap 'rm -rf "$ARCH_BUILDDIR"' EXIT

release.sh

@@ -297,10 +297,32 @@ main() {
         print_error "Usage: $0 <version> [--update|--force]"
         echo "Example: $0 1.0.0 or $0 v1.0.0"
         echo "         $0 26.01 --update"
+        echo "         $0 --update  (uses latest git tag as version)"
         exit 1
     fi
 
-    version=$1
+    # Check if first arg is a flag (no version provided)
+    if [[ "$1" == --* ]]; then
+        version=$(git describe --tags --abbrev=0 2>/dev/null)
+        if [ -z "$version" ]; then
+            print_error "No git tags found; cannot determine version"
+            exit 1
+        fi
+        print_step "Using version from latest git tag: $version"
+        case "$1" in
+            --update|--force)
+                mode="update"
+                FORCE_UPDATE=1
+                ;;
+            *)
+                print_error "Unknown option: $1"
+                exit 1
+                ;;
+        esac
+    else
+        version=$1
+    fi
+
     if [ $# -gt 1 ]; then
         case "$2" in
             --update|--force)