Skip to content

Commit 37443b7

Browse files
committed
update makefile, bump changelog, rebuild
1 parent 242218d commit 37443b7

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

CHANGELOG.adoc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ toc::[]
1919

2020
== HEAD
2121

22+
== v2.1.4 - 2020-02-18
23+
* Rebuild release with go-1.13.8
24+
* Experimental windows build
25+
2226
== v2.1.3 - 2019-12-18
2327
* Rebuild release with go-1.13.5
2428

Makefile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ GOBUILD_LDFLAGS ?= -s -w
1919
GOBUILD_FLAGS := ${GOBUILD_DEPFLAGS} ${GOBUILD_OPTIONS} -ldflags "${GOBUILD_LDFLAGS} -X ${VERSION_VAR}=${APP_VER}"
2020

2121
# cross compile defs
22-
CC_BUILD_ARCHES = darwin/amd64 freebsd/amd64 linux/amd64
22+
CC_BUILD_ARCHES = darwin/amd64 freebsd/amd64 linux/amd64 windows/amd64
2323
CC_OUTPUT_TPL := ${BUILDDIR}/bin/{{.Dir}}.{{.OS}}-{{.Arch}}
2424

2525
# some exported vars (pre-configure go build behavior)
@@ -116,11 +116,13 @@ cross-tar: man setup setup-gox
116116
@echo "...creating tar files..."
117117
@(for x in $(subst /,-,${CC_BUILD_ARCHES}); do \
118118
echo "making tar for ${APP_NAME}.$${x}"; \
119+
EXT=""; \
120+
if echo "$${x}" | grep -q 'windows-'; then EXT=".exe"; fi; \
119121
XDIR="${GOVER}.$${x}"; \
120122
ODIR="${TARBUILDDIR}/$${XDIR}/${APP_NAME}-${APP_VER}"; \
121123
mkdir -p $${ODIR}/{bin,man}/; \
122-
cp ${BUILDDIR}/bin/${APP_NAME}.$${x} $${ODIR}/bin/${APP_NAME}; \
123-
cp ${BUILDDIR}/bin/url-tool.$${x} $${ODIR}/bin/url-tool; \
124+
cp ${BUILDDIR}/bin/${APP_NAME}.$${x}$${EXT} $${ODIR}/bin/${APP_NAME}$${EXT}; \
125+
cp ${BUILDDIR}/bin/url-tool.$${x}$${EXT} $${ODIR}/bin/url-tool$${EXT}; \
124126
cp ${BUILDDIR}/man/*.[1-9] $${ODIR}/man/; \
125127
tar -C ${TARBUILDDIR}/$${XDIR} -czf ${TARBUILDDIR}/${APP_NAME}-${APP_VER}.$${XDIR}.tar.gz ${APP_NAME}-${APP_VER}; \
126128
rm -rf "${TARBUILDDIR}/$${XDIR}/"; \
@@ -137,4 +139,5 @@ release-sign:
137139
-x SHA256.sig -m SHA256; \
138140
)
139141

142+
release: cross-tar release-sign
140143
all: build man

0 commit comments

Comments
 (0)