From f326cad7865b62fe5192c3fa209a2ba9a10e0a48 Mon Sep 17 00:00:00 2001
From: Sebastian Wilzbach <seb@wilzba.ch>
Date: Wed, 28 Mar 2018 06:36:20 +0200
Subject: [PATCH] Improve the binary release building (Linux, OSX)

---
 .travis.yml | 41 ++++++++++++++++++++++++++++-------------
 makefile    | 24 ++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3e646df..2a33498 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,16 +15,31 @@ env:
 script: "./.travis.sh"
 jobs:
   include:
-  - stage: GitHub Release
-    d: ldc
-    os: linux
-    script: echo "Deploying to GitHub releases ..." && make ldcbuild
-    deploy:
-      provider: releases
-      api_key:
-        secure: pbrrm6E0SPfVwt9g+e/ZFQfrmRuGBNA6KwMMLUhI+2+kbRzNquxvrYAUC7YcRX7xiRL/gugKHmOXEi1Dv9IEdSQ732M06H7ikZT9T9oQWYbsZzmVICBWgIovyM8XIPpVAwP8D7jq0JgMiBicqfEZfoz2SIJjo6aYbyQbCASCu8U=
-      file: bin/dscanner
-      skip_cleanup: true
-      on:
-        repo: dlang-community/D-Scanner
-        tags: true
+    - stage: GitHub Release
+      if: tag IS present
+      d: ldc
+      os: linux
+      script: echo "Deploying to GitHub releases ..." && make release
+      deploy:
+        provider: releases
+        api_key: $GH_REPO_TOKEN
+        file_glob: true
+        file: bin/dscanner-*.tar.gz
+        skip_cleanup: true
+        on:
+          repo: dlang-community/D-Scanner
+          tags: true
+    - stage: GitHub Release
+      if: tag IS present
+      d: ldc
+      os: osx
+      script: echo "Deploying to GitHub releases ..." && make release
+      deploy:
+        provider: releases
+        api_key: $GH_REPO_TOKEN
+        file_glob: true
+        file: bin/dscanner-*.tar.gz
+        skip_cleanup: true
+        on:
+          repo: dlang-community/D-Scanner
+          tags: true
diff --git a/makefile b/makefile
index 8fe0445..814e892 100644
--- a/makefile
+++ b/makefile
@@ -72,3 +72,27 @@ clean:
 report: all
 	dscanner --report src > src/dscanner-report.json
 	sonar-runner
+
+.ONESHELL:
+release:
+	@set -eux -o pipefail
+	VERSION=$$(git describe --abbrev=0 --tags)
+	ARCH="$${ARCH:-64}"
+	unameOut="$$(uname -s)"
+	case "$$unameOut" in
+	    Linux*) OS=linux; ;;
+	    Darwin*) OS=osx; ;;
+	    *) echo "Unknown OS: $$unameOut"; exit 1
+	esac
+
+	case "$$ARCH" in
+	    64) ARCH_SUFFIX="x86_64";;
+	    32) ARCH_SUFFIX="x86";;
+	    *) echo "Unknown ARCH: $$ARCH"; exit 1
+	esac
+
+	archiveName="dscanner-$$VERSION-$$OS-$$ARCH_SUFFIX.tar.gz"
+
+	echo "Building $$archiveName"
+	${MAKE} ldcbuild
+	tar cvfz "bin/$$archiveName" -C bin dscanner