mk: fix maketarball to work with gomod
License: MIT Signed-off-by: Jakub Sztandera <kubuxu@protonmail.ch>
Jakub Sztandera committed
Mar 13, 2019 at 23:05 UTC
a6053d631a82bb71b70db5927fec5f0e0ec4e49d
2 files changed
+13
-11
bin/maketarball.sh
+9
-11
@@ -8,19 +8,17 @@ IFS=$'\n\t'
8
# readlink doesn't work on macos
9
OUTPUT="${1:-go-ipfs-source.tar.gz}"
10
if ! [[ "$OUTPUT" = /* ]]; then
11
- OUTPUT="$PWD/$OUTPUT"
11
+ OUTPUT="$PWD/$OUTPUT"
12
fi
13
14
TMPDIR="$(mktemp -d)"
15
-NEWIPFS="$TMPDIR/src/github.com/ipfs/go-ipfs"
16
-mkdir -p "$NEWIPFS"
17
-cp -r . "$NEWIPFS"
18
-( cd "$NEWIPFS" &&
19
- echo $PWD &&
20
- GOPATH="$TMPDIR" gx install --local &&
21
- (git rev-parse --short HEAD || true) > .tarball &&
22
- chmod -R u=rwX,go=rX "$NEWIPFS" # normalize permissions
23
- tar -czf "$OUTPUT" --exclude="./.git" .
24
-)
15
+cp -r . "$TMPDIR"
16
+( cd "$TMPDIR" &&
17
+ echo $PWD &&
18
+ go mod vendor &&
19
+ (git describe --always --match=NeVeRmAtCh --dirty 2>/dev/null || true) > .tarball &&
20
+ chmod -R u=rwX,go=rX "$TMPDIR" # normalize permissions
21
+ tar -czf "$OUTPUT" --exclude="./.git" .
22
+ )
23
24
rm -rf "$TMPDIR"
mk/golang.mk
+4
@@ -10,6 +10,10 @@ unexport GOFLAGS
10
GOFLAGS ?=
11
GOTFLAGS ?=
12
13
+ifeq ($(tarball-is),1)
14
+ GOFLAGS += -mod=vendor
15
+endif
16
+
17
# match Go's default GOPATH behaviour
18
export GOPATH ?= $(shell $(GOCC) env GOPATH)
19