mirror of
https://github.com/strukturag/nextcloud-spreed-signaling
synced 2024-05-03 22:33:10 +02:00
make: Include vendored dependencies in tarball.
This commit is contained in:
Joachim Bauch
parent
def519b9cf
commit
3ae23f0336
35
Makefile
35
Makefile
|
|
@ -8,11 +8,14 @@ GOOS ?= linux
|
|||
GOARCH ?= amd64
|
||||
GOVERSION := $(shell "$(GO)" env GOVERSION | sed "s|go||" )
|
||||
BINDIR := "$(CURDIR)/bin"
|
||||
VENDORDIR := "$(CURDIR)/vendor"
|
||||
VERSION := $(shell "$(CURDIR)/scripts/get-version.sh")
|
||||
TARVERSION := $(shell "$(CURDIR)/scripts/get-version.sh" --tar)
|
||||
PACKAGENAME := github.com/strukturag/nextcloud-spreed-signaling
|
||||
ALL_PACKAGES := $(PACKAGENAME) $(PACKAGENAME)/client $(PACKAGENAME)/proxy $(PACKAGENAME)/server
|
||||
|
||||
PROTOC_GEN_GRPC_VERSION := v1.2.0
|
||||
|
||||
ifneq ($(VERSION),)
|
||||
INTERNALLDFLAGS := -X main.version=$(VERSION)
|
||||
else
|
||||
|
|
@ -53,15 +56,14 @@ hook:
|
|||
[ ! -d "$(CURDIR)/.git/hooks" ] || ln -sf "$(CURDIR)/scripts/pre-commit.hook" "$(CURDIR)/.git/hooks/pre-commit"
|
||||
|
||||
$(GOPATHBIN)/easyjson:
|
||||
$(GO) get -u -d github.com/mailru/easyjson/...
|
||||
[ "$(GOPROXY)" = "off" ] || $(GO) get -u -d github.com/mailru/easyjson/...
|
||||
$(GO) install github.com/mailru/easyjson/...
|
||||
|
||||
$(GOPATHBIN)/protoc-gen-go:
|
||||
$(GO) get -u -d google.golang.org/protobuf/cmd/protoc-gen-go
|
||||
$(GO) install google.golang.org/protobuf/cmd/protoc-gen-go
|
||||
|
||||
$(GOPATHBIN)/protoc-gen-go-grpc:
|
||||
$(GO) get -u -d google.golang.org/grpc/cmd/protoc-gen-go-grpc
|
||||
[ "$(GOPROXY)" = "off" ] || $(GO) get -u -d google.golang.org/grpc/cmd/protoc-gen-go-grpc
|
||||
$(GO) install google.golang.org/grpc/cmd/protoc-gen-go-grpc
|
||||
|
||||
continentmap.go:
|
||||
|
|
@ -143,13 +145,34 @@ clean:
|
|||
|
||||
build: server proxy
|
||||
|
||||
tarball:
|
||||
vendor: go.mod go.sum common
|
||||
set -e ;\
|
||||
rm -rf $(VENDORDIR)
|
||||
EASYJSON_DIR=$$($(GO) list -m -f '{{.Dir}}' github.com/mailru/easyjson); \
|
||||
PROTOBUF_DIR=$$($(GO) list -m -f '{{.Dir}}' google.golang.org/protobuf); \
|
||||
$(GO) mod tidy; \
|
||||
$(GO) mod vendor; \
|
||||
mkdir -p $(VENDORDIR)/github.com/mailru/easyjson/; \
|
||||
cp -rf --no-preserve=mode $$EASYJSON_DIR/easyjson/ $(VENDORDIR)/github.com/mailru/easyjson/; \
|
||||
mkdir -p $(VENDORDIR)/google.golang.org/grpc/cmd/protoc-gen-go-grpc/; \
|
||||
cp -rf --no-preserve=mode $(GOPATH)/pkg/mod/google.golang.org/grpc/cmd/protoc-gen-go-grpc@$(PROTOC_GEN_GRPC_VERSION)/* $(VENDORDIR)/google.golang.org/grpc/cmd/protoc-gen-go-grpc/; \
|
||||
cp -rf --no-preserve=mode $$PROTOBUF_DIR/cmd/ $(VENDORDIR)/google.golang.org/protobuf/; \
|
||||
cp -rf --no-preserve=mode $$PROTOBUF_DIR/compiler/ $(VENDORDIR)/google.golang.org/protobuf/; \
|
||||
cp -rf --no-preserve=mode $$PROTOBUF_DIR/types/ $(VENDORDIR)/google.golang.org/protobuf/; \
|
||||
|
||||
tarball: vendor
|
||||
git archive \
|
||||
--prefix=nextcloud-spreed-signaling-$(TARVERSION)/ \
|
||||
-o nextcloud-spreed-signaling-$(TARVERSION).tar.gz \
|
||||
-o nextcloud-spreed-signaling-$(TARVERSION).tar \
|
||||
HEAD
|
||||
tar rf nextcloud-spreed-signaling-$(TARVERSION).tar \
|
||||
-C $(CURDIR) \
|
||||
--mtime="$(shell git log -1 --date=iso8601-strict --format=%cd HEAD)" \
|
||||
--transform "s//nextcloud-spreed-signaling-$(TARVERSION)\//" \
|
||||
vendor
|
||||
gzip --force nextcloud-spreed-signaling-$(TARVERSION).tar
|
||||
|
||||
dist: tarball
|
||||
|
||||
.NOTPARALLEL: %_easyjson.go
|
||||
.PHONY: continentmap.go
|
||||
.PHONY: continentmap.go vendor
|
||||
|
|
|
|||
2
go.mod
2
go.mod
|
|
@ -21,6 +21,7 @@ require (
|
|||
go.etcd.io/etcd/client/v3 v3.5.4
|
||||
go.etcd.io/etcd/server/v3 v3.5.4
|
||||
google.golang.org/grpc v1.48.0
|
||||
google.golang.org/protobuf v1.28.0
|
||||
)
|
||||
|
||||
require (
|
||||
|
|
@ -79,7 +80,6 @@ require (
|
|||
golang.org/x/text v0.3.6 // indirect
|
||||
golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11 // indirect
|
||||
google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c // indirect
|
||||
google.golang.org/protobuf v1.28.0 // indirect
|
||||
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
|
||||
gopkg.in/yaml.v2 v2.4.0 // indirect
|
||||
sigs.k8s.io/yaml v1.2.0 // indirect
|
||||
|
|
|
|||
29
vendor_helper_test.go
Normal file
29
vendor_helper_test.go
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
/**
|
||||
* Standalone signaling server for the Nextcloud Spreed app.
|
||||
* Copyright (C) 2022 struktur AG
|
||||
*
|
||||
* @author Joachim Bauch <bauch@struktur.de>
|
||||
*
|
||||
* @license GNU AGPL version 3 or any later version
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package signaling
|
||||
|
||||
// Import modules that would otherwise not be detected by "go mod vendor".
|
||||
import (
|
||||
_ "github.com/mailru/easyjson/bootstrap"
|
||||
_ "github.com/mailru/easyjson/gen"
|
||||
_ "github.com/mailru/easyjson/parser"
|
||||
)
|
||||
Loading…
Reference in a new issue