Skip to content

Commit

Permalink
update makefile, bump changelog, rebuild
Browse files Browse the repository at this point in the history
  • Loading branch information
dropwhile committed Feb 19, 2020
1 parent 242218d commit 37443b7
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 3 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ toc::[]

== HEAD

== v2.1.4 - 2020-02-18
* Rebuild release with go-1.13.8
* Experimental windows build

== v2.1.3 - 2019-12-18
* Rebuild release with go-1.13.5

Expand Down
9 changes: 6 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ GOBUILD_LDFLAGS ?= -s -w
GOBUILD_FLAGS := ${GOBUILD_DEPFLAGS} ${GOBUILD_OPTIONS} -ldflags "${GOBUILD_LDFLAGS} -X ${VERSION_VAR}=${APP_VER}"

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

# some exported vars (pre-configure go build behavior)
Expand Down Expand Up @@ -116,11 +116,13 @@ cross-tar: man setup setup-gox
@echo "...creating tar files..."
@(for x in $(subst /,-,${CC_BUILD_ARCHES}); do \
echo "making tar for ${APP_NAME}.$${x}"; \
EXT=""; \
if echo "$${x}" | grep -q 'windows-'; then EXT=".exe"; fi; \
XDIR="${GOVER}.$${x}"; \
ODIR="${TARBUILDDIR}/$${XDIR}/${APP_NAME}-${APP_VER}"; \
mkdir -p $${ODIR}/{bin,man}/; \
cp ${BUILDDIR}/bin/${APP_NAME}.$${x} $${ODIR}/bin/${APP_NAME}; \
cp ${BUILDDIR}/bin/url-tool.$${x} $${ODIR}/bin/url-tool; \
cp ${BUILDDIR}/bin/${APP_NAME}.$${x}$${EXT} $${ODIR}/bin/${APP_NAME}$${EXT}; \
cp ${BUILDDIR}/bin/url-tool.$${x}$${EXT} $${ODIR}/bin/url-tool$${EXT}; \
cp ${BUILDDIR}/man/*.[1-9] $${ODIR}/man/; \
tar -C ${TARBUILDDIR}/$${XDIR} -czf ${TARBUILDDIR}/${APP_NAME}-${APP_VER}.$${XDIR}.tar.gz ${APP_NAME}-${APP_VER}; \
rm -rf "${TARBUILDDIR}/$${XDIR}/"; \
Expand All @@ -137,4 +139,5 @@ release-sign:
-x SHA256.sig -m SHA256; \
)

release: cross-tar release-sign
all: build man

0 comments on commit 37443b7

Please sign in to comment.