Merge pull request '[package] update' (#3) from Applications/ubl-settings-info:master into master

Reviewed-on: YanTheKaller/ubl-settings-info#3

Makefile

@@ -6,24 +6,27 @@ MAKEFILE_DIR := $(notdir $(patsubst %/,%,$(dir $(MAKEFILE_FILEPATH))))
 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
+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
+
 all: init build
 
-.PHONY: init
 init:
 	@echo "Initialize ..."; \
-	sed -r "s/(version_application = ).*/\1\"$$(grep 'VERSION' VERSION.md | cut -d" " -f2)\";/" -i source/ubl-settings-info.c; \
+	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}"
 
-.PHONY: depend
 depend:
 	@echo "Check depends ..."
 	@for FILE_DEPEND in $(DEPENDS); do \
@@ -31,27 +34,24 @@ depend:
 		echo "ERROR: Depend '$${FILE_DEPEND}' not found !"; \
 		exit 1; \
 	    fi; \
-	done
+	done; \
 	echo "Check depends: OK"
 #	$(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
 
-.PHONY: debug
 debug:
 	@echo "Debug ..."
 	if [ ! -d ${CMAKE_BUILD_DIR} ]; then \
-	    $(CMAKE_COMMAND) -S${CMAKE_SOURCE_DIR} -B${CMAKE_BUILD_DIR} -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX="/usr"; \
+	    $(CMAKE_COMMAND) -S${CMAKE_SOURCE_DIR} -B${CMAKE_BUILD_DIR} -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX="${PREFIX}"; \
 	fi; \
 	echo "Debug: OK"
 
-.PHONY: prepare
 prepare:
 	@echo "Prepare ..."; \
 	if [ ! -d ${CMAKE_BUILD_DIR} ]; then \
-	    $(CMAKE_COMMAND) -S${CMAKE_SOURCE_DIR} -B${CMAKE_BUILD_DIR} -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="/usr"; \
+	    $(CMAKE_COMMAND) -S${CMAKE_SOURCE_DIR} -B${CMAKE_BUILD_DIR} -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}"; \
 	fi; \
 	echo "Prepare: OK"
 
-.PHONY: check
 check:
 	@echo "Check ..."; \
 	if [ -f ${CMAKE_BUILD_DIR}/${PKGNAME} ]; then \
@@ -61,72 +61,72 @@ check:
 	    exit 1; \
 	fi
 
-.PHONY: build
 build: depend prepare
 	@echo "Build ..."; \
 	make --directory=${CMAKE_BUILD_DIR}; \
 	echo "Build: OK"
 
-.PHONY: uninstall
 uninstall:
 	@echo "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="/usr/share/locale/$${LANG}/LC_MESSAGES/$${FILE_MO}"; \
-	    $(RM) "/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 \
-	    $(RM) "/usr/share/icons/hicolor/$${SIZE}/apps/ru.ublinux.${PKGNAME}.svg"; \
-	    $(RM) "/usr/share/icons/hicolor/$${SIZE}/apps/ru.ublinux.${PKGNAME}.png"; \
+	    $(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}/apps/com.ublinux.${PKGNAME}.svg"; \
+	    $(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}/apps/com.ublinux.${PKGNAME}.png"; \
 	done
 	@for FILE_SVG in $(wildcard *.svg); do \
 	    for SIZE in 16x16 32x32 48x48 scalable; do \
-	        $(RM) "/usr/share/icons/hicolor/$${SIZE}/status/$${FILE_SVG%.*}".{svg,png,jpg}; \
+	        $(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}/status/$${FILE_SVG%.*}".{svg,png,jpg}; \
 	    done; \
 	done
-	@$(RM) "/usr/bin/${PKGNAME}"
-	@$(RM) "/usr/share/applications/${PKGNAME}.desktop"
-	@$(RM) "/usr/share/${PKGNAME}/images/logo-background.png"
-	@$(RM) "/usr/share/icons/hicolor/scalable/apps/com.ublinux.${PKGNAME}.svg"
-	@$(RM) "/etc/xdg/${PKGNAME}/ubconfig-main.conf"
-	@$(RM) -rd "/usr/share/${PKGNAME}"
-	@gtk-update-icon-cache -fiq /usr/share/icons/hicolor/ &>/dev/null || true
-	@update-desktop-database --quiet &>/dev/null || true
-	@touch /usr/share/applications &>/dev/null || true
+	@$(RM) "${DESTDIR}${PREFIX}/bin/${PKGNAME}"
+	@$(RM) "${DESTDIR}${PREFIX}/share/applications/${PKGNAME}.desktop"
+	@$(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; \
+	    [ -d "${DESTDIR}${PREFIX}/share/applications" ] && touch "${DESTDIR}${PREFIX}/share/applications" &>/dev/null || true; \
+	fi
 	@echo "Uninstall: OK"
 
-.PHONY: install
 install: check uninstall
 	@echo "Install ..."
 	@for FILE_PO in $(wildcard *.po); do \
 		LANG=$${FILE_PO##*_};LANG=$${LANG%.*}; \
-		install -dm755 "${DESTDIR}/usr/share/locale/$${LANG}/LC_MESSAGES"; \
+		install -dm755 "${DESTDIR}${PREFIX}/share/locale/$${LANG}/LC_MESSAGES"; \
 		FILE_MO=$${FILE_PO##*/}; FILE_MO="$${FILE_MO%_*.po}.mo"; \
-		PATH_FILE_MO="${DESTDIR}/usr/share/locale/$${LANG}/LC_MESSAGES/$${FILE_MO}"; \
-		echo  $${FILE_PO}; \
+		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}/usr/share/icons/hicolor/$${SIZE}x$${SIZE}/apps"; \
-		rsvg-convert -w $${SIZE} -h $${SIZE} -f png --keep-image-data "com.ublinux.${PKGNAME}.svg" -o "${DESTDIR}/usr/share/icons/hicolor/$${SIZE}x$${SIZE}/apps/com.ublinux.${PKGNAME}.png"; \
+		install -dm755 "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps"; \
+		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}/usr/share/icons/hicolor/scalable/apps"
-	@install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/apps/" "com.ublinux.${PKGNAME}.svg"
-	@install -Dm755 -t "${DESTDIR}/usr/bin/" "${CMAKE_BUILD_DIR}/${PKGNAME}"
-	@install -Dm644 -t "${DESTDIR}/usr/share/applications/" "${PKGNAME}.desktop"
-	@install -dm755 "${DESTDIR}/usr/share/${PKGNAME}"/{ui,css,images}
-	@install -Dm644 -t "${DESTDIR}/usr/share/${PKGNAME}/ui/" "${PKGNAME}.glade"
-	@install -Dm644 -t "${DESTDIR}/usr/share/${PKGNAME}/css/" "${PKGNAME}.css"
-	@install -Dm644 -t "${DESTDIR}/usr/share/${PKGNAME}/images/" \
+	@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"
+	@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"
-	@gtk-update-icon-cache -fiq /usr/share/icons/hicolor/ &>/dev/null || true
-	@update-desktop-database --quiet &>/dev/null || true
-	@touch /usr/share/applications &>/dev/null || true
+	@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; \
+	    [ -d "${DESTDIR}${PREFIX}/share/applications" ] && touch "${DESTDIR}${PREFIX}/share/applications" &>/dev/null || true; \
+	fi
 	@echo "Install: OK"
 
-.PHONY: clean
 clean:
 	@echo "Clean ..."
 	@$(RM) -rd ${CMAKE_BUILD_DIR}
@@ -136,14 +136,22 @@ clean:
 	    echo "Clean: OK"; \
 	fi
 
-.PHONY: help
+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)"
-	@echo "... init"
-	@echo "... debug"
-	@echo "... prepare"
-	@echo "... compile"
-	@echo "... install"
-	@echo "... uninstall"
-	@echo "... clean"
+	@echo "The following are some of the valid targets for this Makefile:"; \
+	echo "... all (the default if no target is provided)"; \
+	echo "... init"; \
+	echo "... debug"; \
+	echo "... prepare"; \
+	echo "... compile"; \
+	echo "... install"; \
+	echo "... uninstall"; \
+	echo "... clean"; \
+	echo "... up_ver"

devel/update-version

@@ -1,18 +0,0 @@
-#!/bin/bash
-##
-## Update VERSION 1.4
-## $1 - Version
-## Default -  current Version value plus one (in minor section)
-##
-
-FILE_VERSION="VERSION.md"
-[[ $1 ]] && VER=$1
-if [[ -z ${VER} ]] ; then
-	SOURCE_FILE_VERSION=$(find ../ -maxdepth 1 -type f -iname "${FILE_VERSION}" -print -quit)
-	CURRENT=$(cat ${SOURCE_FILE_VERSION} | grep 'VERSION' | cut -d" " -f2)
-	MAJOR=$(echo ${CURRENT} | cut -d. -f1)
-	MINOR=$(echo ${CURRENT} | cut -d. -f2)
-	VER="${MAJOR}.$(echo $((${MINOR} +1)))"
-fi
-echo ":: Updated VERSION ${CURRENT} to ${VER}"
-find ../ -maxdepth 2 -type f -iname "${FILE_VERSION}" -exec echo ":: Insert version in file: {}" \; -exec sed "s/VERSION *[[:digit:]]*.*/VERSION ${VER}/" -i {} \;

source/ubl-settings-info.c

@@ -12,7 +12,7 @@
 #define LocalePath "/usr/share/locale"
 
 typedef char* string;
-string version_application = "1.2";
+string version_application = "1.3";
 
 #define _(String) gettext(String)