alex/portability
1
0
Fork 0
mirror of https://github.com/italicsjenga/portability.git synced 2024-11-23 07:21:31 +11:00
Code Issues Packages Projects Releases Wiki Activity

Merge #155

Browse source 
155: Use git describe to create `commit-sha` r=kvark a=grovesNL

- `../.git/refs/heads/master` failed on CI, so just use git describe here as well
- .gitignore includes updated package names and temporary commit-sha

Co-authored-by: Joshua Groves <josh@joshgroves.com>
This commit is contained in:
bors[bot] 2018-08-29 18:49:14 +00:00
parent d4a518a04a 4f2bbf0b94
commit 90cc44adcf
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -3,7 +3,8 @@ target/
conformance/*.xml conformance/*.xml
conformance/*.qpa conformance/*.qpa
conformance/*.txt conformance/*.txt
package.zip gfx-portability-*.zip
commit-sha
**/*.rs.bk **/*.rs.bk
.vscode/ .vscode/
.lldbinit .lldbinit

4
Makefile
View file

@ -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 DEQP=cd $(DEQP_DIR) && RUST_LOG=debug LD_LIBRARY_PATH=$(FULL_LIBRARY_PATH) ./deqp-vk
CLINK_ARGS= CLINK_ARGS=
GIT_TAG=$(shell git describe --abbrev=0 --tags) GIT_TAG=$(shell git describe --abbrev=0 --tags)
GIT_TAG_FULL=$(shell git describe --tags)
OS_NAME= OS_NAME=
DOTA_DIR=../dota2/bin/osx64 DOTA_DIR=../dota2/bin/osx64
@ -161,7 +162,8 @@ clean:
cargo clean cargo clean
package: version-debug version-release 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): target/debug/libvulkan.$(LIB_EXTENSION):
cd target/debug && ln -sf libportability.$(LIB_EXTENSION) libvulkan.$(LIB_EXTENSION) cd target/debug && ln -sf libportability.$(LIB_EXTENSION) libvulkan.$(LIB_EXTENSION)