From 47817763363ac0631c56a20223ddc8b9aae1b25b Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 28 May 2025 10:25:43 +0600 Subject: [PATCH] Files revert --- Makefile | 82 +++++++++--------- VERSION.md | 1 + gresource.xml | 4 - ...om.ublinux.ubl-settings-info.logo-dark.png | Bin 8700 -> 0 bytes icons/com.ublinux.ubl-settings-info.logo.png | Bin 8757 -> 0 bytes source/CMakeLists.txt | 2 - 6 files changed, 44 insertions(+), 45 deletions(-) create mode 100644 VERSION.md delete mode 100644 icons/com.ublinux.ubl-settings-info.logo-dark.png delete mode 100644 icons/com.ublinux.ubl-settings-info.logo.png diff --git a/Makefile b/Makefile index 9a44772..62dc934 100644 --- a/Makefile +++ b/Makefile @@ -8,34 +8,23 @@ MAKEFILE_PATH := $(dir $(MAKEFILE_FILEPATH)) CMAKE_COMMAND = cmake CMAKE_SOURCE_DIR = $(MAKEFILE_PATH)source CMAKE_BUILD_DIR = $(MAKEFILE_PATH)compile -DEPENDS = /bin/cmake -PREFIX ?= /usr/local +#CMAKE_SOURCE_DIR = ./source +#CMAKE_BUILD_DIR = ./compile +FILE_VERSION = VERSION.md +DEPENDS = /bin/cmake /bin/screenfetch +PREFIX ?= /usr PKGNAME = $(MAKEFILE_DIR) -FILE_VER = source/${PKGNAME}.h -PKGIDENT=$(subst /,-,${PREFIX}) - -FILE_MO := $(PKGNAME).mo -LOCALE_DIR := ./locale +#PKGNAME = ublexec default_target: all -.PHONY: all init depend debug prepare check build uninstall install clean help +.PHONY: all init depend debug prepare check build uninstall install clean up_ver help all: init build init: @echo "Initialize ..."; \ - if [ -d ".git" ]; then \ - LATEST_TAG=$$(git describe --abbrev=0 --tags | sed 's/^v//'); \ - if [ -z "$${LATEST_TAG}" ]; \ - then \ - LATEST_TAG=$$"0.0"; \ - echo "$${LATEST_TAG} is empty"; \ - fi; \ - else \ - LATEST_TAG="Development"; \ - fi; \ - sed -r "s/^(string version_application).*/\1 = \"$${LATEST_TAG}\";/" -i ${FILE_VER}; \ + sed -r "s/(version_application = ).*/\1\"$$(grep 'VERSION' ${FILE_VERSION} | cut -d" " -f2)\";/" -i source/ubl-settings-info.c; \ echo "-- Build path: ${CMAKE_BUILD_DIR}" depend: @@ -46,8 +35,8 @@ depend: exit 1; \ fi; \ done; \ - $(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B${CMAKE_BUILD_DIR} --check-build-system CMakeFiles/Makefile.cmake 1 || exit 1; \ echo "Check depends: OK" +# $(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1 debug: @echo "Debug ..." @@ -74,8 +63,7 @@ check: build: depend prepare @echo "Build ..."; \ - $(MAKE_COMMAND) --directory=${CMAKE_BUILD_DIR}; \ - sed -r "s/^(string version_application).*/\1;/" -i ${FILE_VER}; \ + make --directory=${CMAKE_BUILD_DIR}; \ echo "Build: OK" uninstall: @@ -83,7 +71,7 @@ uninstall: @for FILE_PO in $(wildcard *.po); do \ LANG=$${FILE_PO##*_};LANG=$${LANG%.*}; \ FILE_MO=$${FILE_PO##*/}; FILE_MO="$${FILE_MO%_*.po}.mo"; \ - PATH_FILE_MO="${DESTDIR}/usr/share/locale/$${LANG}/LC_MESSAGES/$${FILE_MO}"; \ + PATH_FILE_MO="${DESTDIR}${PREFIX}/share/locale/$${LANG}/LC_MESSAGES/$${FILE_MO}"; \ $(RM) "$${PATH_FILE_MO}"; \ done @for SIZE in 16x16 32x32 48x48 scalable; do \ @@ -97,7 +85,9 @@ uninstall: done @$(RM) "${DESTDIR}${PREFIX}/bin/${PKGNAME}" @$(RM) "${DESTDIR}${PREFIX}/share/applications/${PKGNAME}.desktop" - @$(RM) "${DESTDIR}/usr/share/polkit-1/actions/com.ublinux.${PKGNAME}${PKGIDENT}.policy" + @$(RM) "${DESTDIR}${PREFIX}/share/${PKGNAME}/images/logo-background.png" + @$(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/com.ublinux.${PKGNAME}.svg" + @$(RM) -rd "${DESTDIR}${PREFIX}/share/${PKGNAME}" @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; \ @@ -107,28 +97,33 @@ uninstall: install: check uninstall @echo "Install ..." - @for po in $(LOCALE_DIR)/$(PKGNAME)_*.po; do \ - lang=$$(basename $$po | sed -E 's/^$(PKGNAME)_([^.]+)\.po$$/\1/'); \ - file=$$(find ./locale/ -name '*_'"$$lang"'.po'); \ - msgfmt $$file -v -f -o ${DESTDIR}/usr/share/locale/$$lang/LC_MESSAGES/$(FILE_MO); \ + @for FILE_PO in $(wildcard *.po); do \ + LANG=$${FILE_PO##*_};LANG=$${LANG%.*}; \ + install -dm755 "${DESTDIR}${PREFIX}/share/locale/$${LANG}/LC_MESSAGES"; \ + FILE_MO=$${FILE_PO##*/}; FILE_MO="$${FILE_MO%_*.po}.mo"; \ + PATH_FILE_MO="${DESTDIR}${PREFIX}/share/locale/$${LANG}/LC_MESSAGES/$${FILE_MO}"; \ + echo "$${FILE_PO}"; \ + msgfmt "$${FILE_PO}" -v -f -o "$${PATH_FILE_MO}"; \ done - @for SIZE in 16 32 48; do \ install -dm755 "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps"; \ - rsvg-convert -w $${SIZE} -h $${SIZE} -f svg --keep-image-data "icons/apps/com.ublinux.${PKGNAME}.svg" -o "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps/com.ublinux.${PKGNAME}.svg"; \ - done - @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/apps/" "icons/apps/com.ublinux.${PKGNAME}.svg" - @for FILE_ICON in $(wildcard icons/*/*.svg); do \ - SUB_NAME=$${FILE_ICON#*/}; SUB_NAME=$${SUB_NAME%/*}; \ - install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/$${SUB_NAME}" $${FILE_ICON}; \ + rsvg-convert -w $${SIZE} -h $${SIZE} -f png --keep-image-data "com.ublinux.${PKGNAME}.svg" -o "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps/com.ublinux.${PKGNAME}.png"; \ done + @install -dm755 "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps" + @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/" "com.ublinux.${PKGNAME}.svg" @install -Dm755 -t "${DESTDIR}${PREFIX}/bin/" "${CMAKE_BUILD_DIR}/${PKGNAME}" + @install -dm755 "${DESTDIR}${PREFIX}/share/applications" @install -Dm644 -t "${DESTDIR}${PREFIX}/share/applications/" "${PKGNAME}.desktop" - @ldconfig -n /usr/local/lib + @install -dm755 "${DESTDIR}${PREFIX}/share/${PKGNAME}"/{ui,css,images} + @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" \ + "ublinux-logo.svg" @if [ -z ${DESTDIR} ]; then \ - [ -d "${DESTDIR}/usr/share/icons/hicolor/" ] && gtk-update-icon-cache -fiq "${DESTDIR}/usr/share/icons/hicolor/" &>/dev/null || true; \ + [ -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; \ - [ -d "${DESTDIR}/usr/share/applications" ] && touch "${DESTDIR}/usr/share/applications" &>/dev/null || true; \ + [ -d "${DESTDIR}${PREFIX}/share/applications" ] && touch "${DESTDIR}${PREFIX}/share/applications" &>/dev/null || true; \ fi @echo "Install: OK" @@ -141,6 +136,14 @@ 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)"; \ @@ -150,4 +153,5 @@ help: echo "... compile"; \ echo "... install"; \ echo "... uninstall"; \ - echo "... clean" \ No newline at end of file + echo "... clean"; \ + echo "... up_ver" \ No newline at end of file diff --git a/VERSION.md b/VERSION.md new file mode 100644 index 0000000..bd38345 --- /dev/null +++ b/VERSION.md @@ -0,0 +1 @@ +VERSION 1.3 \ No newline at end of file diff --git a/gresource.xml b/gresource.xml index 03f7e94..82adf4b 100644 --- a/gresource.xml +++ b/gresource.xml @@ -6,8 +6,4 @@ ubl-settings-info.css - - com.ublinux.ubl-settings-info.logo.png - com.ublinux.ubl-settings-info.logo-dark.png - \ No newline at end of file diff --git a/icons/com.ublinux.ubl-settings-info.logo-dark.png b/icons/com.ublinux.ubl-settings-info.logo-dark.png deleted file mode 100644 index 5e2063f42335e1dcff53a25a7d784a851a707508..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8700 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 R;LZ&|RZ$a$dSdqWe*nwQjZ^>t diff --git a/icons/com.ublinux.ubl-settings-info.logo.png b/icons/com.ublinux.ubl-settings-info.logo.png deleted file mode 100644 index 8d02cc604d3534fc409abca672a695ba1fa22ab5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8757 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 z