Merge pull request 'master' (#2) from Applications/ubl-settings-resourcequota:master into develop

Reviewed-on: Igor1/ubl-settings-resourcequota#2

Makefile

@@ -8,13 +8,10 @@ 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
 DEPENDS = /bin/cmake
 PREFIX ?= /usr
 PKGNAME = $(MAKEFILE_DIR)
-#PKGNAME = ubl-settings-manager
-LATEST_TAG=
+
 default_target: all
 
 .PHONY: all init depend debug prepare check build uninstall install clean help
@@ -28,7 +25,7 @@ init:
 	else \
 	    LATEST_TAG="0.0"; \
 	fi; \
-	sed -r "s/^(string version_application).*/\1=\"$${LATEST_TAG}\";/" -i source/${PKGNAME}.h; \
+	sed -r "s/^(string version_application).*/\1 = \"$${LATEST_TAG}\";/" -i source/${PKGNAME}.h; \
 	echo "-- Build path: ${CMAKE_BUILD_DIR}"
 
 depend:
@@ -39,8 +36,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: init build
 	@echo "Debug ..."; \
@@ -70,6 +67,7 @@ check:
 build: depend prepare
 	@echo "Build ..."; \
 	make --directory=${CMAKE_BUILD_DIR}; \
+	sed -r "s/^(string version_application).*/\1 = \"0\";/" -i source/${PKGNAME}.h; \
 	echo "Build: OK"
 
 uninstall:
@@ -121,7 +119,6 @@ install: check uninstall
 	@install -dm755 "${DESTDIR}${PREFIX}/share/polkit-1/actions"
 	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/polkit-1/actions/" "com.ublinux.${PKGNAME}.policy"
 	@install -Dm755 -t "${DESTDIR}${PREFIX}/bin/" "${CMAKE_BUILD_DIR}/${PKGNAME}"
-	@install -dm755 "${DESTDIR}/etc/xdg"
 	@install -dm755 "${DESTDIR}${PREFIX}/share/applications"
 	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/applications/" "${PKGNAME}.desktop"
 	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.checked.svg"
@@ -133,7 +130,6 @@ install: check uninstall
 	    [ -d "${DESTDIR}${PREFIX}/share/applications" ] && touch "${DESTDIR}${PREFIX}/share/applications" &>/dev/null || true; \
 	fi
 	@echo "Install: OK"
-	@sed -r "s/^(string version_application=\"*\").*/string version_application;/" -i source/${PKGNAME}.h; \
 
 clean:
 	@echo "Clean ..."
@@ -144,14 +140,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)"; \
@@ -161,5 +149,4 @@ help:
 	echo "... compile"; \
 	echo "... install"; \
 	echo "... uninstall"; \
-	echo "... clean"; \
-	echo "... up_ver"
+	echo "... clean"

source/ubl-settings-resourcequota.h

@@ -43,7 +43,7 @@
 #define CMD_GET_SLICE_SERVICE "systemd-cgls --no-page"
 
 typedef char *string;
-string version_application;
+string version_application = "0";
 
 static char *local;