diff --git a/Makefile b/Makefile index 658abb79..d5169012 100644 --- a/Makefile +++ b/Makefile @@ -28,10 +28,9 @@ build: golang go build -ldflags "${LFLAGS}" -o bin/${NAME} release: clean golang deps - @mkdir -p release + mkdir -p release $(foreach GOOS, $(PLATFORMS),\ - $(foreach GOARCH, $(ARCHITECTURES), $(shell [ $(GOOS) = "windows" ] && EXT=".exe"; env GOOS=$(GOOS) GOARCH=$(GOARCH) CGO_ENABLED=0; \ - go build -a -tags netgo -ldflags "-w ${LFLAGS}" -o bin/${NAME}$$EXT; \ + $(foreach GOARCH, $(ARCHITECTURES), $(shell [ $(GOOS) = "windows" ] && EXT=".exe"; env GOOS=$(GOOS) GOARCH=$(GOARCH) CGO_ENABLED=0 go build -a -tags netgo -ldflags "-w ${LFLAGS}" -o bin/${NAME}$$EXT; \ tar -czvf release/${NAME}-$(GOOS)-$(GOARCH).tar.gz -C bin/ ${NAME}$$EXT >/dev/null; \ sha1sum release/${NAME}-$(GOOS)-$(GOARCH).tar.gz | cut -d " " -f1 > release/${NAME}-$(GOOS)-$(GOARCH).tar.gz.sha1 ))) @@ -85,13 +84,13 @@ authors: git log --format='%aN <%aE>' | sort -u > AUTHORS dep-install: - @echo "--> Installing dependencies" - @dep ensure + echo "--> Installing dependencies" + dep ensure deps: - @echo "--> Installing build dependencies" - @go get -u github.com/golang/dep/cmd/dep - @$(MAKE) dep-install + echo "--> Installing build dependencies" + go get -u github.com/golang/dep/cmd/dep + $(MAKE) dep-install vet: @echo "--> Running go vet $(VETARGS) ." diff --git a/release.sh b/release.sh index 7770b227..738d27d0 100755 --- a/release.sh +++ b/release.sh @@ -15,14 +15,14 @@ echo "-------------------------------------------------------------------------- echo "Building:" echo "" -make release --trace +make release echo "------------------------------------------------------------------------------------------------------------" echo "Upload to jboss.org:" echo "" -rsync -rv --protocol=28 $RELDIR/keycloak-gatekeeper/release/* keycloak@filemgmt.jboss.org:/downloads_htdocs/keycloak/$VERSION/gatekeeper/ +rsync -rv --protocol=28 $DIR/release/* keycloak@filemgmt.jboss.org:/downloads_htdocs/keycloak/$VERSION/gatekeeper/ echo "------------------------------------------------------------------------------------------------------------"