Merge pull request #4920 from ipfs/feat/tarball

mk: add tarball support

.gitignore

@@ -17,3 +17,8 @@ gx-workspace-update.json
 bin/gx
 bin/gx*
 bin/tmp
+
+
+vendor
+.tarball
+go-ipfs-source.tar.gz

Rules.mk

@@ -8,6 +8,8 @@ TEST_SHORT :=
 all: help    # all has to be first defined target
 .PHONY: all
 
+include mk/git.mk # has to be before tarball.mk
+include mk/tarball.mk
 include mk/util.mk
 include mk/golang.mk
 include mk/gx.mk

bin/maketarball.sh

+#!/usr/bin/env bash
+# vim: set expandtab sw=2 ts=2:
+
+# bash safe mode
+set -euo pipefail
+IFS=$'\n\t'
+
+
+OUTPUT=$(realpath ${1:-go-ipfs-source.tar.gz})
+
+TMPDIR="$(mktemp -d)"
+NEWIPFS="$TMPDIR/github.com/ipfs/go-ipfs"
+mkdir -p "$NEWIPFS"
+cp -r . "$NEWIPFS"
+( cd "$NEWIPFS" &&
+  echo $PWD &&
+  GOPATH="$TMPDIR" gx install --local &&
+  (git rev-parse --short HEAD || true) > .tarball &&
+  tar -czf "$OUTPUT" --exclude="./.git" .
+)
+
+rm -rf "$TMPDIR"

cmd/ipfs/Rules.mk

@@ -13,7 +13,7 @@ PATH := $(realpath $(d)):$(PATH)
 # DEPS_OO_$(d) += merkledag/pb/merkledag.pb.go namesys/pb/namesys.pb.go
 # DEPS_OO_$(d) += pin/internal/pb/header.pb.go unixfs/pb/unixfs.pb.go
 
-$(d)_flags =-ldflags="-X "github.com/ipfs/go-ipfs/repo/config".CurrentCommit=$(shell git rev-parse --short HEAD)" 
+$(d)_flags =-ldflags="-X "github.com/ipfs/go-ipfs/repo/config".CurrentCommit=$(git-hash)"
 
 $(d)-try-build $(IPFS_BIN_$(d)): GOFLAGS += $(cmd/ipfs_flags)
 

mk/git.mk

+git-commit:=$(shell git rev-parse --short HEAD 2>/dev/null)

mk/gx.mk

@@ -7,5 +7,8 @@ gx-deps:
 ifneq ($(IPFS_GX_USE_GLOBAL),1)
 gx-deps: bin/gx bin/gx-go
 endif
+.PHONY: gx-deps
 
+ifeq ($(tarball-is),0)
 DEPS_GO += gx-deps
+endif

mk/tarball.mk

+
+
+ifeq (,$(wildcard .tarball))
+tarball-is:=0
+else
+tarball-is:=1
+# override git hash
+git-hash:=$(shell cat .tarball)
+endif
+
+
+go-ipfs-source.tar.gz: distclean
+	bin/maketarball.sh $@