diff options
| author | Junegunn Choi <junegunn.c@gmail.com> | 2015-11-30 18:41:53 +0900 |
|---|---|---|
| committer | Junegunn Choi <junegunn.c@gmail.com> | 2015-11-30 18:41:53 +0900 |
| commit | d4e26707c7199aa8e048f94bfd8ceab5fafe42b6 (patch) | |
| tree | e850c1ee4ef7302dad2c4bce4a68aaf257eb5be9 | |
| parent | 99ea1056acb622573fbb62c5b7181f3137005b3e (diff) | |
GO15VENDOREXPERIMENT=1 (#430)
| -rw-r--r-- | .gitmodules | 6 | ||||
| -rw-r--r-- | src/Dockerfile.centos | 11 | ||||
| -rw-r--r-- | src/Makefile | 8 | ||||
| m--------- | src/vendor/github.com/junegunn/go-runewidth | 0 | ||||
| m--------- | src/vendor/github.com/junegunn/go-shellwords | 0 |
5 files changed, 19 insertions, 6 deletions
diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..c9f17b49 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,6 @@ +[submodule "src/vendor/github.com/junegunn/go-shellwords"] + path = src/vendor/github.com/junegunn/go-shellwords + url = https://github.com/junegunn/go-shellwords.git +[submodule "src/vendor/github.com/junegunn/go-runewidth"] + path = src/vendor/github.com/junegunn/go-runewidth + url = https://github.com/junegunn/go-runewidth.git diff --git a/src/Dockerfile.centos b/src/Dockerfile.centos index aed4120d..5a685cd6 100644 --- a/src/Dockerfile.centos +++ b/src/Dockerfile.centos @@ -11,9 +11,16 @@ RUN cd / && curl \ https://storage.googleapis.com/golang/go1.4.2.linux-amd64.tar.gz | \ tar -xz && mv go go1.4 +# Install Go 1.5 +RUN cd / && curl \ + https://storage.googleapis.com/golang/go1.5.1.linux-amd64.tar.gz | \ + tar -xz && mv go go1.5 + +ENV GO15VENDOREXPERIMENT 1 +ENV GOROOT_BOOTSTRAP /go1.4 +ENV GOROOT /go1.5 ENV GOPATH /go -ENV GOROOT /go1.4 -ENV PATH /go1.4/bin:$PATH +ENV PATH /go1.5/bin:$PATH # For i386 build RUN cd $GOROOT/src && GOARCH=386 ./make.bash diff --git a/src/Makefile b/src/Makefile index 6b564fcf..e125283c 100644 --- a/src/Makefile +++ b/src/Makefile @@ -41,8 +41,8 @@ android-build: rm -f $(RELEASEARM7) test: - go get - go test -v ./... + GO15VENDOREXPERIMENT=1 go get + GO15VENDOREXPERIMENT=1 SHELL=/bin/sh go test -v ./... install: $(BINDIR)/fzf @@ -53,10 +53,10 @@ clean: cd fzf && rm -f fzf-* fzf/$(BINARY32): $(SOURCES) - cd fzf && GOARCH=386 CGO_ENABLED=1 go build -a -o $(BINARY32) + cd fzf && GO15VENDOREXPERIMENT=1 GOARCH=386 CGO_ENABLED=1 go build -a -o $(BINARY32) fzf/$(BINARY64): $(SOURCES) - cd fzf && go build -a -tags "$(TAGS)" -o $(BINARY64) + cd fzf && GO15VENDOREXPERIMENT=1 go build -a -tags "$(TAGS)" -o $(BINARY64) $(BINDIR)/fzf: fzf/$(BINARY64) | $(BINDIR) cp -f fzf/$(BINARY64) $(BINDIR) diff --git a/src/vendor/github.com/junegunn/go-runewidth b/src/vendor/github.com/junegunn/go-runewidth new file mode 160000 +Subproject 63c378b851290989b19ca955468386485f118c6 diff --git a/src/vendor/github.com/junegunn/go-shellwords b/src/vendor/github.com/junegunn/go-shellwords new file mode 160000 +Subproject 35d512af75e283aae4ca1fc3d44b159ed66189a |