From 91fe2f642923aa77d964863e69259368e568302d Mon Sep 17 00:00:00 2001 From: amid Date: Tue, 18 Apr 2023 22:49:05 +0600 Subject: [PATCH 1/3] Bump version --- VERSION.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION.md b/VERSION.md index bd38345..046dc93 100644 --- a/VERSION.md +++ b/VERSION.md @@ -1 +1 @@ -VERSION 1.3 \ No newline at end of file +VERSION 1.4 \ No newline at end of file From 72bffdbf8d631f562da02661f4b439d41bc99239 Mon Sep 17 00:00:00 2001 From: amid Date: Thu, 11 May 2023 16:23:17 +0600 Subject: [PATCH 2/3] Bump version to 1.5 --- VERSION.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION.md b/VERSION.md index 046dc93..1694e8d 100644 --- a/VERSION.md +++ b/VERSION.md @@ -1 +1 @@ -VERSION 1.4 \ No newline at end of file +VERSION 1.5 \ No newline at end of file From bb31bb4dfc52d97d66ce3625dee5eebeccad2068 Mon Sep 17 00:00:00 2001 From: amid Date: Tue, 30 May 2023 22:23:11 +0600 Subject: [PATCH 3/3] Delete control VERSION.md --- Makefile | 24 ++++++++---------------- VERSION.md | 1 - 2 files changed, 8 insertions(+), 17 deletions(-) delete mode 100644 VERSION.md diff --git a/Makefile b/Makefile index 62dc934..667e8e6 100644 --- a/Makefile +++ b/Makefile @@ -8,23 +8,24 @@ MAKEFILE_PATH := $(dir $(MAKEFILE_FILEPATH)) CMAKE_COMMAND = cmake CMAKE_SOURCE_DIR = $(MAKEFILE_PATH)source CMAKE_BUILD_DIR = $(MAKEFILE_PATH)compile -#CMAKE_SOURCE_DIR = ./source -#CMAKE_BUILD_DIR = ./compile -FILE_VERSION = VERSION.md DEPENDS = /bin/cmake /bin/screenfetch PREFIX ?= /usr PKGNAME = $(MAKEFILE_DIR) -#PKGNAME = ublexec default_target: all -.PHONY: all init depend debug prepare check build uninstall install clean up_ver help +.PHONY: all init depend debug prepare check build uninstall install clean help all: init build init: @echo "Initialize ..."; \ - sed -r "s/(version_application = ).*/\1\"$$(grep 'VERSION' ${FILE_VERSION} | cut -d" " -f2)\";/" -i source/ubl-settings-info.c; \ + if [ -d ".git" ]; then \ + LATEST_TAG=$$(git describe --tags | sed 's/^v//'); \ + else \ + LATEST_TAG="0.0"; \ + fi; \ + sed -r "s/^(string version_application = ).*/\1\"$${LATEST_TAG}\";/" -i source/${PKGNAME}.c; \ echo "-- Build path: ${CMAKE_BUILD_DIR}" depend: @@ -136,14 +137,6 @@ clean: echo "Clean: OK"; \ fi -up_ver: - @CURRENT=$$(grep 'VERSION' ${FILE_VERSION} | cut -d" " -f2); \ - MAJOR=$$(cut -d. -f1 <<< $${CURRENT}); \ - MINOR=$$(cut -d. -f2 <<< $${CURRENT}); \ - VER="$${MAJOR}.$$(($${MINOR}+1))"; \ - sed "s/VERSION *[[:digit:]]*.*/VERSION $${VER}/" -i ${FILE_VERSION}; \ - echo "Updated version to VERSION.md: $${CURRENT} to $${VER}" - help: @echo "The following are some of the valid targets for this Makefile:"; \ echo "... all (the default if no target is provided)"; \ @@ -153,5 +146,4 @@ help: echo "... compile"; \ echo "... install"; \ echo "... uninstall"; \ - echo "... clean"; \ - echo "... up_ver" \ No newline at end of file + echo "... clean" diff --git a/VERSION.md b/VERSION.md deleted file mode 100644 index 1694e8d..0000000 --- a/VERSION.md +++ /dev/null @@ -1 +0,0 @@ -VERSION 1.5 \ No newline at end of file