From a98f9c0b16bc79099181767f809c0a4386b21528 Mon Sep 17 00:00:00 2001 From: amid Date: Fri, 19 May 2023 12:56:23 +0600 Subject: [PATCH 1/4] Bump version to 2.2 --- VERSION.md | 2 +- source/ubl-settings-datetime.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION.md b/VERSION.md index 2923038..ca75749 100644 --- a/VERSION.md +++ b/VERSION.md @@ -1 +1 @@ -VERSION 2.1 +VERSION 2.2 diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc index 6341e72..1361c8c 100644 --- a/source/ubl-settings-datetime.cc +++ b/source/ubl-settings-datetime.cc @@ -13,7 +13,7 @@ bool flag_load_global = false; bool flag_sync_hwclock = false; int socket_ext_id_I = 0; int socket_trd_id_I = 0; -string version_application = "2.1"; +string version_application = "2.2"; MainWindow* obj_main; void wrapper_synopsis_show() { obj_main->aboutWindows->hide(); From 802b9e5f7ee51407db6844f87f83e618d7beabaa Mon Sep 17 00:00:00 2001 From: amid Date: Fri, 19 May 2023 13:42:28 +0600 Subject: [PATCH 2/4] Bump version to 2.3 --- Makefile | 6 +++--- VERSION.md | 2 +- source/ubl-settings-datetime.cc | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 60bbf95..ab913e2 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,7 @@ all: init build init: @echo "Initialize ..."; \ - sed -r "s/(version_application = ).*/\1\"$$(grep 'VERSION' ${FILE_VERSION} | cut -d" " -f2)\";/" -i source/ubl-settings-datetime.cc; \ + sed -r "s/^(string version_application = ).*/\1\"$$(grep 'VERSION' ${FILE_VERSION} | cut -d" " -f2)\";/" -i source/${PKGNAME}.cc; \ echo "-- Build path: ${CMAKE_BUILD_DIR}" depend: @@ -118,8 +118,8 @@ install: check uninstall @install -Dm644 -t "${DESTDIR}${PREFIX}/share/${PKGNAME}/ui/" "${PKGNAME}.glade" @install -Dm644 -t "${DESTDIR}${PREFIX}/share/${PKGNAME}/css/" "${PKGNAME}.css" @install -Dm644 -t "${DESTDIR}${PREFIX}/share/${PKGNAME}/images/" "logo-background.png" - @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.ubl-settings-datetime.checked.svg" - @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.ubl-settings-datetime.warning.svg" + @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.checked.svg" + @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.warning.svg" @if [ -z ${DESTDIR} ]; then \ [ -d "${DESTDIR}${PREFIX}/share/icons/hicolor/" ] && gtk-update-icon-cache -fiq "${DESTDIR}${PREFIX}/share/icons/hicolor/" &>/dev/null || true; \ update-desktop-database --quiet &>/dev/null || true; \ diff --git a/VERSION.md b/VERSION.md index ca75749..15b1657 100644 --- a/VERSION.md +++ b/VERSION.md @@ -1 +1 @@ -VERSION 2.2 +VERSION 2.3 diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc index a9e5bbe..75e93f9 100644 --- a/source/ubl-settings-datetime.cc +++ b/source/ubl-settings-datetime.cc @@ -13,7 +13,7 @@ bool flag_load_global = false; bool flag_sync_hwclock = false; int socket_ext_id_I = 0; int socket_trd_id_I = 0; -string version_application = "2.2"; +string version_application = "2.3"; MainWindow* obj_main; void wrapper_help_show(GtkWidget *self, char* link, gpointer user_data) { if (self && user_data) {} From 80265630420b566df686e227f8cd8acf813f954c Mon Sep 17 00:00:00 2001 From: amid Date: Tue, 30 May 2023 20:23:06 +0600 Subject: [PATCH 3/4] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=BA=D0=BB=D1=8E?= =?UTF-8?q?=D1=87=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=B0=20=D1=83=D0=BF?= =?UTF-8?q?=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B2=D0=B5?= =?UTF-8?q?=D1=80=D1=81=D0=B8=D1=8F=D0=BC=D0=B8=20TAG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 20 ++++++++------------ VERSION.md | 1 - source/ubl-settings-datetime.cc | 2 +- 3 files changed, 9 insertions(+), 14 deletions(-) delete mode 100644 VERSION.md diff --git a/Makefile b/Makefile index ab913e2..a8ae105 100644 --- a/Makefile +++ b/Makefile @@ -15,13 +15,18 @@ PKGNAME = $(MAKEFILE_DIR) 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/^(string version_application = ).*/\1\"$$(grep 'VERSION' ${FILE_VERSION} | cut -d" " -f2)\";/" -i source/${PKGNAME}.cc; \ + 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}.cc; \ echo "-- Build path: ${CMAKE_BUILD_DIR}" depend: @@ -136,14 +141,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 +150,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 15b1657..0000000 --- a/VERSION.md +++ /dev/null @@ -1 +0,0 @@ -VERSION 2.3 diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc index 256c87f..6ec1c81 100644 --- a/source/ubl-settings-datetime.cc +++ b/source/ubl-settings-datetime.cc @@ -13,7 +13,7 @@ bool flag_load_global = false; bool flag_sync_hwclock = false; int socket_ext_id_I = 0; int socket_trd_id_I = 0; -string version_application = "2.3"; +string version_application = "2.4"; MainWindow* obj_main; void wrapper_help_show(GtkWidget *self, char* link, gpointer user_data) { if (self && user_data) {} From ec96eeba2fab096da22688cfb78a5d03cd145e4e Mon Sep 17 00:00:00 2001 From: amid Date: Tue, 30 May 2023 22:33:35 +0600 Subject: [PATCH 4/4] Delete control VERSION.md --- Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile index a8ae105..81c4d5b 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,6 @@ MAKEFILE_PATH := $(dir $(MAKEFILE_FILEPATH)) CMAKE_COMMAND = cmake CMAKE_SOURCE_DIR = $(MAKEFILE_PATH)source CMAKE_BUILD_DIR = $(MAKEFILE_PATH)compile -FILE_VERSION = VERSION.md DEPENDS = /bin/cmake PREFIX ?= /usr PKGNAME = $(MAKEFILE_DIR)