From 4f2bbf0b946c54fbe836d7150fff9916e78fc5a8 Mon Sep 17 00:00:00 2001
From: Joshua Groves <josh@joshgroves.com>
Date: Wed, 29 Aug 2018 12:46:40 -0600
Subject: [PATCH] Use git describe to create `commit-sha`

---
 .gitignore | 3 ++-
 Makefile   | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index de01e36..eaba898 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,8 @@ target/
 conformance/*.xml
 conformance/*.qpa
 conformance/*.txt
-package.zip
+gfx-portability-*.zip
+commit-sha
 **/*.rs.bk
 .vscode/
 .lldbinit
diff --git a/Makefile b/Makefile
index a9d8134..feea3ba 100644
--- a/Makefile
+++ b/Makefile
@@ -12,6 +12,7 @@ DEQP_DIR=$(CTS_DIR)/build/external/vulkancts/modules/vulkan/
 DEQP=cd $(DEQP_DIR) && RUST_LOG=debug LD_LIBRARY_PATH=$(FULL_LIBRARY_PATH) ./deqp-vk
 CLINK_ARGS=
 GIT_TAG=$(shell git describe --abbrev=0 --tags)
+GIT_TAG_FULL=$(shell git describe --tags)
 OS_NAME=
 
 DOTA_DIR=../dota2/bin/osx64
@@ -161,7 +162,8 @@ clean:
 	cargo clean
 
 package: version-debug version-release
-	cd target && cp ../.git/refs/heads/master commit-sha && zip ../gfx-portability-$(OS_NAME)-$(GIT_TAG).zip */libportability.$(LIB_EXTENSION) commit-sha
+	echo "$(GIT_TAG_FULL)" > commit-sha
+	cd target && zip ../gfx-portability-$(OS_NAME)-$(GIT_TAG).zip */libportability.$(LIB_EXTENSION) ../commit-sha
 
 target/debug/libvulkan.$(LIB_EXTENSION):
 	cd target/debug && ln -sf libportability.$(LIB_EXTENSION) libvulkan.$(LIB_EXTENSION)