Update build script

- GOPATH is no longer required
- fzf repository does not have to be in GOPATH
- Build Linux binary with Go 1.5.3

6 files changed, 46 insertions, 54 deletions

diff --git a/.gitignore b/.gitignore
index 09154676..d2372a95 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 bin
-src/fzf/fzf_*
+src/fzf/fzf-*
+gopath
 pkg
 Gemfile.lock
 .DS_Store
diff --git a/src/Dockerfile.android b/src/Dockerfile.android
index 540858fd..d6a0ba40 100644
--- a/src/Dockerfile.android
+++ b/src/Dockerfile.android
@@ -11,7 +11,6 @@ RUN cd / && curl \
     tar -xz && mv go go1.4 && \
     sed -i 's@#define PTHREAD_KEYS_MAX 128@@' /go1.4/src/runtime/cgo/gcc_android_arm.c
 
-ENV GOPATH /go
 ENV GOROOT /go1.4
 ENV PATH /go1.4/bin:$PATH
 
@@ -37,8 +36,5 @@ RUN cd / && curl \
     make install && \
     mv /ndk/sysroot/usr/lib/libncursesw.a /ndk/sysroot/usr/lib/libncurses.a
 
-# Volume
-VOLUME /go
-
 # Default CMD
-CMD cd /go/src/github.com/junegunn/fzf/src && /bin/bash
+CMD cd /fzf/src && /bin/bash
diff --git a/src/Dockerfile.arch b/src/Dockerfile.arch
index d014651b..77df9e45 100644
--- a/src/Dockerfile.arch
+++ b/src/Dockerfile.arch
@@ -10,7 +10,6 @@ RUN cd / && curl \
     https://storage.googleapis.com/golang/go1.4.2.linux-amd64.tar.gz | \
     tar -xz && mv go go1.4
 
-ENV GOPATH /go
 ENV GOROOT /go1.4
 ENV PATH /go1.4/bin:$PATH
 
@@ -20,9 +19,6 @@ RUN echo '[multilib]' >> /etc/pacman.conf && \
     pacman-db-upgrade && yes | pacman -Sy gcc-multilib lib32-ncurses && \
     cd $GOROOT/src && GOARCH=386 ./make.bash
 
-# Volume
-VOLUME /go
-
 # Default CMD
-CMD cd /go/src/github.com/junegunn/fzf/src && /bin/bash
+CMD cd /fzf/src && /bin/bash
 
diff --git a/src/Dockerfile.centos b/src/Dockerfile.centos
index 416d547a..a754491d 100644
--- a/src/Dockerfile.centos
+++ b/src/Dockerfile.centos
@@ -13,20 +13,16 @@ RUN cd / && curl \
 
 # Install Go 1.5
 RUN cd / && curl \
-    https://storage.googleapis.com/golang/go1.5.1.linux-amd64.tar.gz | \
+    https://storage.googleapis.com/golang/go1.5.3.linux-amd64.tar.gz | \
     tar -xz && mv go go1.5
 
 ENV GOROOT_BOOTSTRAP /go1.4
 ENV GOROOT /go1.5
-ENV GOPATH /go
 ENV PATH /go1.5/bin:$PATH
 
 # For i386 build
 RUN cd $GOROOT/src && GOARCH=386 ./make.bash
 
-# Volume
-VOLUME /go
-
 # Default CMD
-CMD cd /go/src/github.com/junegunn/fzf/src && /bin/bash
+CMD cd /fzf/src && /bin/bash
 
diff --git a/src/Dockerfile.ubuntu b/src/Dockerfile.ubuntu
index d9de1208..b0ae875d 100644
--- a/src/Dockerfile.ubuntu
+++ b/src/Dockerfile.ubuntu
@@ -10,7 +10,6 @@ RUN cd / && curl \
     https://storage.googleapis.com/golang/go1.4.2.linux-amd64.tar.gz | \
     tar -xz && mv go go1.4
 
-ENV GOPATH /go
 ENV GOROOT /go1.4
 ENV PATH /go1.4/bin:$PATH
 
@@ -18,9 +17,6 @@ ENV PATH /go1.4/bin:$PATH
 RUN apt-get install -y lib32ncurses5-dev && \
     cd $GOROOT/src && GOARCH=386 ./make.bash
 
-# Volume
-VOLUME /go
-
 # Default CMD
-CMD cd /go/src/github.com/junegunn/fzf/src && /bin/bash
+CMD cd /fzf/src && /bin/bash
 
diff --git a/src/Makefile b/src/Makefile
index 7eb67f77..d8b7d800 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,7 +1,3 @@
-ifndef GOPATH
-$(error GOPATH is undefined)
-endif
-
 ifndef GOOS
 UNAME_S := $(shell uname -s)
 ifeq ($(UNAME_S),Darwin)
@@ -15,33 +11,44 @@ ifneq ($(shell uname -m),x86_64)
 $(error "Build on $(UNAME_M) is not supported, yet.")
 endif
 
-SOURCES   := $(wildcard *.go */*.go)
-BINDIR    := ../bin
-
+SOURCES     := $(wildcard *.go */*.go)
+ROOTDIR     := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
+BINDIR      := $(shell dirname $(ROOTDIR))/bin
+GOPATH      := $(shell dirname $(ROOTDIR))/gopath
+SRCDIR      := $(GOPATH)/src/github.com/junegunn/fzf/src
+DOCKEROPTS  := -i -t -v $(ROOTDIR):/fzf/src
 BINARY32    := fzf-$(GOOS)_386
 BINARY64    := fzf-$(GOOS)_amd64
 BINARYARM7  := fzf-$(GOOS)_arm7
 VERSION     := $(shell awk -F= '/version =/ {print $$2}' constants.go | tr -d "\" ")
-RELEASE32   = fzf-$(VERSION)-$(GOOS)_386
-RELEASE64   = fzf-$(VERSION)-$(GOOS)_amd64
-RELEASEARM7 = fzf-$(VERSION)-$(GOOS)_arm7
+RELEASE32   := fzf-$(VERSION)-$(GOOS)_386
+RELEASE64   := fzf-$(VERSION)-$(GOOS)_amd64
+RELEASEARM7 := fzf-$(VERSION)-$(GOOS)_arm7
+export GOPATH
 
 all: release
 
-release: build
+release: test build
 	-cd fzf && cp $(BINARY32) $(RELEASE32) && tar -czf $(RELEASE32).tgz $(RELEASE32)
 	cd fzf && cp $(BINARY64) $(RELEASE64) && tar -czf $(RELEASE64).tgz $(RELEASE64) && \
 	rm -f $(RELEASE32) $(RELEASE64)
 
-build: test fzf/$(BINARY32) fzf/$(BINARY64)
+build: fzf/$(BINARY32) fzf/$(BINARY64)
+
+$(SRCDIR):
+	mkdir -p $(shell dirname $(SRCDIR))
+	ln -s $(ROOTDIR) $(SRCDIR)
+
+deps: $(SRCDIR) $(SOURCES)
+	cd $(SRCDIR) && go get
 
-android-build:
-	cd fzf && GOARCH=arm GOARM=7 CGO_ENABLED=1 go build -a -ldflags="-extldflags=-pie" -o $(BINARYARM7)
-	cd fzf && cp $(BINARYARM7) $(RELEASEARM7) && tar -czf $(RELEASEARM7).tgz $(RELEASEARM7) && \
+android-build: $(SRCDIR)
+	cd $(SRCDIR) && GOARCH=arm GOARM=7 CGO_ENABLED=1 go get
+	cd $(SRCDIR)/fzf && GOARCH=arm GOARM=7 CGO_ENABLED=1 go build -a -ldflags="-extldflags=-pie" -o $(BINARYARM7)
+	cd $(SRCDIR)/fzf && cp $(BINARYARM7) $(RELEASEARM7) && tar -czf $(RELEASEARM7).tgz $(RELEASEARM7) && \
 	rm -f $(RELEASEARM7)
 
-test:
-	go get
+test: deps
 	SHELL=/bin/sh go test -v ./...
 
 install: $(BINDIR)/fzf
@@ -52,10 +59,10 @@ uninstall:
 clean:
 	cd fzf && rm -f fzf-*
 
-fzf/$(BINARY32): $(SOURCES)
+fzf/$(BINARY32): deps
 	cd fzf && GOARCH=386 CGO_ENABLED=1 go build -a -o $(BINARY32)
 
-fzf/$(BINARY64): $(SOURCES)
+fzf/$(BINARY64): deps
 	cd fzf && go build -a -tags "$(TAGS)" -o $(BINARY64)
 
 $(BINDIR)/fzf: fzf/$(BINARY64) | $(BINDIR)
@@ -78,29 +85,29 @@ docker-android:
 	docker build -t junegunn/android-sandbox - < Dockerfile.android
 
 arch: docker-arch
-	docker run -i -t -v $(GOPATH):/go junegunn/$@-sandbox \
-		sh -c 'cd /go/src/github.com/junegunn/fzf/src; /bin/bash'
+	docker run $(DOCKEROPTS) junegunn/$@-sandbox \
+		sh -c 'cd /fzf/src; /bin/bash'
 
 ubuntu: docker-ubuntu
-	docker run -i -t -v $(GOPATH):/go junegunn/$@-sandbox \
-		sh -c 'cd /go/src/github.com/junegunn/fzf/src; /bin/bash'
+	docker run $(DOCKEROPTS) junegunn/$@-sandbox \
+		sh -c 'cd /fzf/src; /bin/bash'
 
 centos: docker-centos
-	docker run -i -t -v $(GOPATH):/go junegunn/$@-sandbox \
-		sh -c 'cd /go/src/github.com/junegunn/fzf/src; /bin/bash'
+	docker run $(DOCKEROPTS) junegunn/$@-sandbox \
+		sh -c 'cd /fzf/src; /bin/bash'
 
 linux: docker-centos
-	docker run -i -t -v $(GOPATH):/go junegunn/centos-sandbox \
-		/bin/bash -ci 'cd /go/src/github.com/junegunn/fzf/src; make TAGS=static'
+	docker run $(DOCKEROPTS) junegunn/centos-sandbox \
+		/bin/bash -ci 'cd /fzf/src; make TAGS=static'
 
 ubuntu-android: docker-android
-	docker run -i -t -v $(GOPATH):/go junegunn/android-sandbox \
-		sh -c 'cd /go/src/github.com/junegunn/fzf/src; /bin/bash'
+	docker run $(DOCKEROPTS) junegunn/android-sandbox \
+		sh -c 'cd /fzf/src; /bin/bash'
 
 android: docker-android
-	docker run -i -t -v $(GOPATH):/go junegunn/android-sandbox \
-		/bin/bash -ci 'cd /go/src/github.com/junegunn/fzf/src; GOOS=android make android-build'
+	docker run $(DOCKEROPTS) junegunn/android-sandbox \
+		/bin/bash -ci 'cd /fzf/src; GOOS=android make android-build'
 
-.PHONY: all build release test install uninstall clean docker \
+.PHONY: all build deps release test install uninstall clean \
 	linux arch ubuntu centos docker-arch docker-ubuntu docker-centos \
 	android-build docker-android ubuntu-android android