From 502877c51528c403c01fbe01c5b62dd0e724c5c2 Mon Sep 17 00:00:00 2001 From: Unbewohnte Date: Tue, 16 Nov 2021 09:02:01 +0300 Subject: [PATCH] [main] changed version string; [make] pkgrelease for easy cross-building --- Makefile | 29 +++++++++++++++++++++++++---- src/main.go | 2 +- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 04d70d3..494b6f7 100644 --- a/Makefile +++ b/Makefile @@ -3,14 +3,35 @@ SRC_DIR := src/ EXE_NAME := ftu INSTALLATION_DIR := /usr/local/bin/ +RELEASE_DIR := release +LICENSE_FILE := COPYING +INSTALLATION_SCRIPT := install.sh all: cd $(SRC_DIR) && go build && mv $(EXE_NAME) .. -cross: - cd $(SRC_DIR) && CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o ftu_linux_amd64 && mv ftu_linux_amd64 .. - cd $(SRC_DIR) && CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -o ftu_darwin_amd64 && mv ftu_darwin_amd64 .. - cd $(SRC_DIR) && CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -o ftu_windows_amd64.exe && mv ftu_windows_amd64.exe .. +pkgrelease: + rm -rf $(RELEASE_DIR) + + mkdir $(RELEASE_DIR) + mkdir $(RELEASE_DIR)/linux_amd64 + mkdir $(RELEASE_DIR)/darwin_amd64 + mkdir $(RELEASE_DIR)/windows_amd64 + + cd $(SRC_DIR) && CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o ftu_linux_amd64 && mv ftu_linux_amd64 ../$(RELEASE_DIR)/linux_amd64 + cd $(SRC_DIR) && CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -o ftu_darwin_amd64 && mv ftu_darwin_amd64 ../$(RELEASE_DIR)/darwin_amd64 + cd $(SRC_DIR) && CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -o ftu_windows_amd64.exe && mv ftu_windows_amd64.exe ../$(RELEASE_DIR)/windows_amd64 + + cp $(LICENSE_FILE) $(RELEASE_DIR)/linux_amd64 + cp $(INSTALLATION_SCRIPT) $(RELEASE_DIR)/linux_amd64 + + cp $(LICENSE_FILE) $(RELEASE_DIR)/darwin_amd64 + cp $(LICENSE_FILE) $(RELEASE_DIR)/windows_amd64 + + cd $(RELEASE_DIR) && zip -r linux_amd64 linux_amd64/ + cd $(RELEASE_DIR) && zip -r darwin_amd64 darwin_amd64/ + cd $(RELEASE_DIR) && zip -r windows_amd64 windows_amd64/ + race: cd $(SRC_DIR) && go build -race && mv $(EXE_NAME) .. diff --git a/src/main.go b/src/main.go index ffca606..c4b690f 100644 --- a/src/main.go +++ b/src/main.go @@ -30,7 +30,7 @@ import ( ) var ( - VERSION string = "v2.1.0" + VERSION string = "v2.1.1" versionInformation string = fmt.Sprintf("ftu %s\n\nCopyright (C) 2021 Kasyanov Nikolay Alexeevich (Unbewohnte (https://unbewohnte.xyz/))\nThis program comes with ABSOLUTELY NO WARRANTY.\nThis is free software, and you are welcome to redistribute it under certain conditions; type \"ftu -l\" for details.\n", VERSION)