From e6ef40be129a19242942ab044a188d0ed18f8984 Mon Sep 17 00:00:00 2001 From: Er2 Date: Wed, 10 Nov 2021 12:19:29 +0300 Subject: [PATCH] packaging number ... --- .gitignore | 2 +- INSTALL | 14 ++++++++++++++ Makefile | 25 +++++++++++++++++++------ readme.org | 14 ++++++-------- 4 files changed, 40 insertions(+), 15 deletions(-) create mode 100644 INSTALL diff --git a/.gitignore b/.gitignore index 60c834d..4323efa 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ *~ build/ -dist/*er2cord* +er2cord.* # may be in fatpak, maybe not .flatpak-builder diff --git a/INSTALL b/INSTALL new file mode 100644 index 0000000..c336433 --- /dev/null +++ b/INSTALL @@ -0,0 +1,14 @@ +Er2Cord 0.1.0 + +Installation + +Debian: make deb + apt install ./er2cord.deb + +tarball: make install + +Deinstallation + +Debian: apt remove er2cord +tarball: make uninstall + diff --git a/Makefile b/Makefile index 3c4bbc1..4ea733d 100644 --- a/Makefile +++ b/Makefile @@ -1,22 +1,35 @@ # You can still use meson, but can make NAME = er2cord -DESTDIR ?= / +IPAT ?= /usr +TMP = ./.$(NAME) +#$(abspath ./.$(NAME)) all: build build: build/$(NAME) build/$(NAME): - meson build + meson build --prefix="$(IPAT)" ninja -C build +deb: clean + make DESTDIR="$(TMP)" install + cp -r tools/DEBIAN $(TMP) + chmod 755 $(TMP)/DEBIAN/postinst + @dpkg-deb -b $(TMP) er2cord.deb + rm -rf $(TMP) + install: build - ninja -C build install + DESTDIR="../$(DESTDIR)" ninja -C build install + find "$(DESTDIR)" -exec chmod 755 {} \; + +uninstall: build + ninja -C build uninstall docs: build - mkdir -p "$(DESTDIR)" - find dist/ ! -name '*er2cord*' -exec cp -f "{}" "$(DESTDIR)" \; + mkdir -p "$(IPAT)" + find dist/ ! -name '*er2cord*' -exec cp -f "{}" "$(IPAT)" \; clean: - rm -rf build + rm -rf build $(TMP) diff --git a/readme.org b/readme.org index 187d4e5..5009078 100644 --- a/readme.org +++ b/readme.org @@ -7,16 +7,14 @@ Er2Cord is a Work In Progress (WIP) chat written in Vala. * Installation - + Install ~valac meson ninja libgtk-4-dev~ + + Dependencies ~valac meson ninja libgtk-4-dev~ - + ~mkdir -p build && meson ..~ - - + Just build: ~ninja && ./er2cord~ - - or install: ~ninja install && er2cord~ + + ~make install~ * Packaging -If you want to install from deb or tarball -or you just a maintainer, you can use ~make~. +Only deb packaging was tested (~make deb~) + +Other isn't tested and can be just broken, +but you can use tarballs anyway.