summarylogtreecommitdiffstats
path: root/patch2.diff
blob: 09d9be2aa90da093bd1cffd5acea66d766c28f3f (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
diff --git a/calc_hash.sh b/calc_hash.sh
new file mode 100644
index 0000000..e230e21
--- /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 5d52bd1..b014be5 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 fc7ffac..3c5da50 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 2552d95..abc1209 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 deed81d..ea61c09 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 6491cf3..3f2c426 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 94af9ef..88d1100 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)\""