deblan-mirror/nextcloud-spreed-signaling
deblan-mirror/nextcloud-spreed-signaling
1
0
Fork 0
mirror of https://github.com/strukturag/nextcloud-spreed-signaling synced 2024-05-03 22:33:10 +02:00
Code Issues Releases Wiki Activity

make: Update for Go 1.17+

Browse source
This commit is contained in:
Joachim Bauch 2022-04-05 10:17:33 +02:00
parent 3cc074896a
commit 320f643a87
No known key found for this signature in database
GPG key ID: 77C1D22D53E15F02
1 changed files with 17 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
Makefile
View file

@ -1,7 +1,7 @@
all: build
GO := $(shell which go)
GOPATH := "$(CURDIR)/vendor:$(CURDIR)"
GOPATH := $(shell "$(GO)" env GOPATH)
GOFMT := "$(shell dirname "$(GO)")/gofmt"
GOOS ?= linux
GOARCH ?= amd64
@ -43,19 +43,17 @@ TESTARGS := $(TESTARGS) -count $(COUNT)
endif
ifeq ($(GOARCH), amd64)
VENDORBIN := $(CURDIR)/vendor/bin
GOPATHBIN := $(GOPATH)/bin
else
VENDORBIN := $(CURDIR)/vendor/bin/$(GOOS)_$(GOARCH)
GOPATHBIN := $(GOPATH)/bin/$(GOOS)_$(GOARCH)
endif
hook:
[ ! -d "$(CURDIR)/.git/hooks" ] || ln -sf "$(CURDIR)/scripts/pre-commit.hook" "$(CURDIR)/.git/hooks/pre-commit"
./vendor/bin/easyjson:
GOPATH=$(GOPATH) $(GO) get -u github.com/mailru/easyjson/...
@if dpkg --compare-versions "$(GOVERSION)" "ge" "1.17" ; then \
GOPATH=$(GOPATH) $(GO) install github.com/mailru/easyjson/...; \
fi
$(GOPATHBIN)/bin/easyjson:
$(GO) get -u -d github.com/mailru/easyjson/...
$(GO) install github.com/mailru/easyjson/...
continentmap.go:
$(CURDIR)/scripts/get_continent_map.py $@
@ -69,7 +67,7 @@ check-continentmap:
rm -rf $$TMP
get:
GOPATH=$(GOPATH) $(GO) get $(PACKAGE)
$(GO) get $(PACKAGE)
fmt: hook
$(GOFMT) -s -w *.go client proxy server
@ -82,18 +80,18 @@ test: vet common
cover: vet common
rm -f cover.out && \
GOPATH=$(GOPATH) $(GO) test -v -timeout $(TIMEOUT) -coverprofile cover.out $(ALL_PACKAGES) && \
$(GO) test -v -timeout $(TIMEOUT) -coverprofile cover.out $(ALL_PACKAGES) && \
sed -i "/_easyjson/d" cover.out && \
GOPATH=$(GOPATH) $(GO) tool cover -func=cover.out
$(GO) tool cover -func=cover.out
coverhtml: vet common
rm -f cover.out && \
GOPATH=$(GOPATH) $(GO) test -v -timeout $(TIMEOUT) -coverprofile cover.out $(ALL_PACKAGES) && \
$(GO) test -v -timeout $(TIMEOUT) -coverprofile cover.out $(ALL_PACKAGES) && \
sed -i "/_easyjson/d" cover.out && \
GOPATH=$(GOPATH) $(GO) tool cover -html=cover.out -o coverage.html
$(GO) tool cover -html=cover.out -o coverage.html
%_easyjson.go: %.go ./vendor/bin/easyjson
PATH=$(shell dirname $(GO)):$(PATH) GOPATH=$(GOPATH) "$(VENDORBIN)/easyjson" -all $*.go
%_easyjson.go: %.go $(GOPATHBIN)/bin/easyjson
"$(GOPATHBIN)/easyjson" -all $*.go
common: \
api_signaling_easyjson.go \
@ -101,18 +99,19 @@ common: \
api_proxy_easyjson.go \
natsclient_easyjson.go \
room_easyjson.go
$(GO) mod tidy
$(BINDIR):
mkdir -p $(BINDIR)
client: common $(BINDIR)
GOPATH=$(GOPATH) $(GO) build $(BUILDARGS) -ldflags '$(INTERNALLDFLAGS)' -o $(BINDIR)/client ./client/...
$(GO) build $(BUILDARGS) -ldflags '$(INTERNALLDFLAGS)' -o $(BINDIR)/client ./client/...
server: common $(BINDIR)
GOPATH=$(GOPATH) $(GO) build $(BUILDARGS) -ldflags '$(INTERNALLDFLAGS)' -o $(BINDIR)/signaling ./server/...
$(GO) build $(BUILDARGS) -ldflags '$(INTERNALLDFLAGS)' -o $(BINDIR)/signaling ./server/...
proxy: common $(BINDIR)
GOPATH=$(GOPATH) $(GO) build $(BUILDARGS) -ldflags '$(INTERNALLDFLAGS)' -o $(BINDIR)/proxy ./proxy/...
$(GO) build $(BUILDARGS) -ldflags '$(INTERNALLDFLAGS)' -o $(BINDIR)/proxy ./proxy/...
clean:
rm -f *_easyjson.go