From 99c96f41d814b9faa31954b65b03b833c915971c Mon Sep 17 00:00:00 2001 From: TolaMironcenko Date: Thu, 26 Dec 2024 15:16:17 +0700 Subject: [PATCH] updated Makefile and PKGBUILD --- Makefile | 36 +++++++++++++++++++----------------- PKGBUILD | 20 ++------------------ 2 files changed, 21 insertions(+), 35 deletions(-) diff --git a/Makefile b/Makefile index 4f824ae..992cbcd 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,9 @@ CXX = g++ CXX_FLAGS = -Wall -std=c++14 -lpthread -s -DESTDIR = ./bin/ +BUILDDIR = ./build/ SRC_SERVER = ./src/server.cpp SRC_CLIENT = ./src/client.cpp -INSTALL_DIR = /usr/local/bin/ +DESTDIR = /usr/local/bin/ GREEN = \033[0;32m YELLOW = \033[0;33m @@ -15,36 +15,38 @@ ARCH = amd64 DEBPACKAGENAME = udpchat-$(DEBVERSION)-1_$(ARCH) build: - @if [ ! -d ${DESTDIR} ]; then \ - mkdir ${DESTDIR}; \ + @if [ ! -d ${BUILDDIR} ]; then \ + mkdir ${BUILDDIR}; \ fi @echo -e "$(GREEN)[ $(YELLOW)25% $(GREEN)] $(RESET)CC SERVER" - @$(CXX) -o $(DESTDIR)server $(SRC_SERVER) $(CXX_FLAGS) + @$(CXX) -o $(BUILDDIR)server $(SRC_SERVER) $(CXX_FLAGS) @echo -e "$(GREEN)[ $(YELLOW)50% $(GREEN)] $(RESET)CC CLIENT" - @$(CXX) -o $(DESTDIR)client $(SRC_CLIENT) $(CXX_FLAGS) + @$(CXX) -o $(BUILDDIR)client $(SRC_CLIENT) $(CXX_FLAGS) @echo -e "$(GREEN)[ $(YELLOW)75% $(GREEN)] $(RESET)STRIP SERVER" - @strip $(DESTDIR)server >> /dev/null + @strip $(BUILDDIR)server >> /dev/null @echo -e "$(GREEN)[ $(YELLOW)100% $(GREEN)] $(RESET)STRIP CLIENT" - @strip $(DESTDIR)client >> /dev/null + @strip $(BUILDDIR)client >> /dev/null @echo -e "$(GREEN)BUILD SUCCESS$(RESET)" clean: - @if [ -d ${DESTDIR} ]; then \ - rm -rv ${DESTDIR}; \ + @if [ -d ${BUILDDIR} ]; then \ + rm -rv ${BUILDDIR}; \ fi runserver: - @$(DESTDIR)server 127.0.0.1 43243 + @$(BUILDDIR)server 127.0.0.1 43243 runclient: - @$(DESTDIR)client 127.0.0.1 43243 + @$(BUILDDIR)client 127.0.0.1 43243 install: - @mkdir -p $(INSTALL_DIR) + @if [ ! -d ${DESTDIR} ]; then \ + mkdir -p $(DESTDIR); \ + fi @echo -e "$(GREEN)[ $(YELLOW)50% $(GREEN)] $(RESET)INSTALL SERVER" - @cp -rf $(DESTDIR)server $(INSTALL_DIR)udpchatserver + @cp -rf $(BUILDDIR)server $(DESTDIR)udpchatserver @echo -e "$(GREEN)[ $(YELLOW)100% $(GREEN)] $(RESET)INSTALL CLIENT" - @cp -rf $(DESTDIR)client $(INSTALL_DIR)udpchatclient + @cp -rf $(BUILDDIR)client $(DESTDIR)udpchatclient @echo -e "$(GREEN)INSTALL SUCCESS$(RESET)" debpkg: @@ -52,8 +54,8 @@ debpkg: @rm -rf $(DEBPACKAGENAME) @mkdir -p $(DEBPACKAGENAME)/usr/local/bin @echo -e "$(GREEN)[ $(YELLOW)45% $(GREEN)] $(RESET)COPY PACKAGE FILES" - @cp -rf $(DESTDIR)server $(DEBPACKAGENAME)/usr/local/bin/udpchatserver - @cp -rf $(DESTDIR)client $(DEBPACKAGENAME)/usr/local/bin/udpchatclient + @cp -rf $(BUILDDIR)server $(DEBPACKAGENAME)/usr/local/bin/udpchatserver + @cp -rf $(BUILDDIR)client $(DEBPACKAGENAME)/usr/local/bin/udpchatclient @echo -e "$(GREEN)[ $(YELLOW)75% $(GREEN)] $(RESET)CREATE PACKAGE METADATA" @mkdir $(DEBPACKAGENAME)/DEBIAN @touch $(DEBPACKAGENAME)/DEBIAN/control diff --git a/PKGBUILD b/PKGBUILD index 4b06405..ca43715 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,29 +2,13 @@ pkgname=udpchat pkgver=1.0.1 pkgrel=1 -epoch= -pkgdesc="" +pkgdesc="Chat server based on udp" arch=('x86_64') url="" license=('GPL') -groups=() -depends=() -makedepends=() -checkdepends=() -optdepends=() -provides=() -conflicts=() -replaces=() -backup=() -options=() -install= -changelog= -noextract=() -md5sums=() -validpgpkeys=() +source=("git+https://gitea.home.com:3000/TolaMironcenko/udpchat.git") build() { - echo $srcdir $pkgdir cd $srcdir make }