Files revert

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"
+	echo "... clean"; \
+	echo "... up_ver"

VERSION.md

@@ -0,0 +1 @@
+VERSION 1.3

gresource.xml

@@ -6,8 +6,4 @@
   <gresource prefix="/com/ublinux/css">
     <file>ubl-settings-info.css</file>
   </gresource>
-  <gresource prefix="/com/ublinux/svg">
-    <file>com.ublinux.ubl-settings-info.logo.png</file>
-    <file>com.ublinux.ubl-settings-info.logo-dark.png</file>
-  </gresource>
 </gresources>

source/CMakeLists.txt

@@ -21,8 +21,6 @@ add_custom_target(GLADE ubl-settings-info.glade)
 
 set(DEPENDFILES 
         ../ubl-settings-info.glade
-        ../icons/com.ublinux.ubl-settings-info.logo.png
-        ../icons/com.ublinux.ubl-settings-info.logo-dark.png
         ../gresource.xml
         ../ubl-settings-info.css
     )