From e17e02d1627a0e6aebd70523fbf76caf25e6e1b9 Mon Sep 17 00:00:00 2001 From: baldurk Date: Tue, 23 Feb 2016 01:07:49 +0100 Subject: [PATCH] Create 'safe' git hash script that works outside git repo. Refs #186 --- calc_hash.sh | 2 ++ hash_version.sh | 2 +- renderdoc/Makefile | 2 +- renderdoc/driver/gl/Makefile | 2 +- renderdoc/driver/shaders/spirv/Makefile | 2 +- renderdoc/driver/vulkan/Makefile | 2 +- renderdoccmd/Makefile | 2 +- 7 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 calc_hash.sh diff --git a/calc_hash.sh b/calc_hash.sh new file mode 100644 index 000000000..e230e214d --- /dev/null +++ b/calc_hash.sh @@ -0,0 +1,2 @@ +#!/bin/bash +git status > /dev/null 2>&1 && git rev-parse HEAD || echo NO_GIT_COMMIT_HASH_DEFINED diff --git a/hash_version.sh b/hash_version.sh index 5d52bd194..b014be5ac 100644 --- a/hash_version.sh +++ b/hash_version.sh @@ -1,6 +1,6 @@ #!/bin/bash -GIT_HASH=`git rev-parse HEAD`; +GIT_HASH=`sh ./calc_hash.sh`; rm -f ver sed -b "s/NO_GIT_COMMIT_HASH_DEFINED/$GIT_HASH$1/" renderdoc/data/resource.h > ver && mv ver renderdoc/data/resource.h diff --git a/renderdoc/Makefile b/renderdoc/Makefile index fc7ffac55..3c5da50a6 100644 --- a/renderdoc/Makefile +++ b/renderdoc/Makefile @@ -1,6 +1,6 @@ CC=gcc CPP=g++ -COMMIT=`git rev-parse HEAD` +COMMIT=`sh ../calc_hash.sh` MACROS=-DLINUX \ -DRENDERDOC_PLATFORM=linux \ -DRENDERDOC_EXPORTS \ diff --git a/renderdoc/driver/gl/Makefile b/renderdoc/driver/gl/Makefile index 2552d9543..abc1209e9 100644 --- a/renderdoc/driver/gl/Makefile +++ b/renderdoc/driver/gl/Makefile @@ -1,6 +1,6 @@ CC=gcc CPP=g++ -COMMIT=`git rev-parse HEAD` +COMMIT=`sh ../../../calc_hash.sh` MACROS=-DLINUX \ -DRENDERDOC_PLATFORM=linux \ -DRENDERDOC_EXPORTS \ diff --git a/renderdoc/driver/shaders/spirv/Makefile b/renderdoc/driver/shaders/spirv/Makefile index deed81dd2..ea61c0921 100644 --- a/renderdoc/driver/shaders/spirv/Makefile +++ b/renderdoc/driver/shaders/spirv/Makefile @@ -1,6 +1,6 @@ CC=gcc CPP=g++ -COMMIT=`git rev-parse HEAD` +COMMIT=`sh ../../../../calc_hash.sh` MACROS=-DLINUX \ -DRENDERDOC_PLATFORM=linux \ -DRENDERDOC_EXPORTS \ diff --git a/renderdoc/driver/vulkan/Makefile b/renderdoc/driver/vulkan/Makefile index 6491cf3f0..3f2c42615 100644 --- a/renderdoc/driver/vulkan/Makefile +++ b/renderdoc/driver/vulkan/Makefile @@ -1,6 +1,6 @@ CC=gcc CPP=g++ -COMMIT=`git rev-parse HEAD` +COMMIT=`sh ../../../calc_hash.sh` MACROS=-DLINUX \ -DRENDERDOC_PLATFORM=linux \ -DRENDERDOC_EXPORTS \ diff --git a/renderdoccmd/Makefile b/renderdoccmd/Makefile index 94af9eff2..88d110081 100644 --- a/renderdoccmd/Makefile +++ b/renderdoccmd/Makefile @@ -1,6 +1,6 @@ CC=gcc CPP=g++ -COMMIT=`git rev-parse HEAD` +COMMIT=`sh ../calc_hash.sh` MACROS=-DLINUX \ -DRENDERDOC_PLATFORM=linux \ -DGIT_COMMIT_HASH="\"$(COMMIT)\""