Skip to content

Commit b416c64

Browse files
committed
Merge branch 'release-0.28'
2 parents 5972794 + 24517c9 commit b416c64

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,4 @@ script:
3838
- make test
3939
- make binary
4040
- make build-i18n
41+
- make tarball

Makefile.am

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,9 @@ test:
8888
GOPATH=$(GOPATH) $(GO) test -v $(GOTESTFLAGS) app/... ./go/...
8989

9090
dist_gopath: $(DIST_SRC)
91-
find $(SYSTEM_GOPATH) -mindepth 1 -maxdepth 1 -type d \
92-
-exec ln -sf {} $(DIST_SRC) \;
93-
91+
[ -d $(SYSTEM_GOPATH) ] && \
92+
find $(SYSTEM_GOPATH) -mindepth 1 -maxdepth 1 -type d \
93+
-exec ln -sf {} $(DIST_SRC) \; || true
9494

9595
assets: javascript fonts
9696

@@ -134,7 +134,11 @@ update-i18n:
134134
cd $(CURDIR)/src/i18n && $(MAKE) update
135135

136136
release-binary: GOPATH = "$(DIST):$(CURDIR)/vendor:$(CURDIR)"
137+
if GO_14
138+
release-binary: INTERNALLDFLAGS = -X main.version $(PACKAGE_VERSION) -X main.defaultConfig $(CONFIG_PATH)/$(CONFIG_FILE)
139+
else
137140
release-binary: INTERNALLDFLAGS = -X main.version=$(PACKAGE_VERSION) -X main.defaultConfig=$(CONFIG_PATH)/$(CONFIG_FILE)
141+
endif
138142
release-binary: OUTPUT = $(DIST_BIN)
139143
release-binary: dist_gopath $(DIST_BIN) binary
140144

configure.ac

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ AM_CONDITIONAL([DEFAULT_VENDOR_GOPATH], [test x"${VENDOR_GOPATH}" == x""])
9595
AM_CONDITIONAL([READONLY_VENDOR_GOPATH], [test -n "${VENDOR_GOPATH}" -a ! -w "${VENDOR_GOPATH}"])
9696
AM_COND_IF(DEFAULT_VENDOR_GOPATH, [AC_SUBST(VENDOR_GOPATH, $PWD/vendor)])
9797
AC_MSG_RESULT([$VENDOR_GOPATH])
98+
AM_CONDITIONAL([GO_14], [test x"${GO_VERSION}" == x"1.4"])
9899

99100
AC_PATH_PROGS([NODEJS],[nodejs node])
100101
if test x"${NODEJS}" == x"" ; then

0 commit comments

Comments
 (0)