From 902a69c292be99020209cd383c0a62f898f8ac7a Mon Sep 17 00:00:00 2001 From: Joshua Groves Date: Tue, 28 Aug 2018 20:46:43 -0600 Subject: [PATCH] Use git tag in name --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 20e09ac..1c2e1b2 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ TEST_LIST_SOURCE=$(CTS_DIR)/external/vulkancts/mustpass/1.0.2/vk-default.txt 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= -COMMIT_SHA_SHORT=$(shell git rev-parse --short HEAD) +GIT_TAG=$(shell git describe --abbrev=0 --tags) OS_NAME= DOTA_DIR=../dota2/bin/osx64 @@ -59,7 +59,7 @@ FULL_LIBRARY_PATH=$(CURDIR)/target/debug LIBRARY=target/debug/libportability.$(LIB_EXTENSION) LIBRARY_FAST=target/release/libportability.$(LIB_EXTENSION) -.PHONY: all rebuild debug release version-debug version-release binding run-native cts clean cherry dota-debug dota-release dota-orig dota-bench-gfx dota-bench-orig dota-bench-gl +.PHONY: all rebuild debug release version-debug version-release binding run-native cts clean cherry dota-debug dota-release dota-orig dota-bench-gfx dota-bench-orig dota-bench-gl package all: $(NATIVE_TARGET) @@ -160,8 +160,8 @@ clean: rm -f $(NATIVE_OBJECTS) $(NATIVE_TARGET) $(BINDING) cargo clean -package.zip: version-debug version-release - cd target && zip ../gfx-portability-$(OS_NAME)-$(COMMIT_SHA_SHORT).zip */libportability.$(LIB_EXTENSION) ../.git/refs/heads/master +package: version-debug version-release + cd target && zip ../gfx-portability-$(OS_NAME)-$(GIT_TAG).zip */libportability.$(LIB_EXTENSION) ../.git/refs/heads/master target/debug/libvulkan.$(LIB_EXTENSION): cd target/debug && ln -sf libportability.$(LIB_EXTENSION) libvulkan.$(LIB_EXTENSION)