jackcartersmith/blackmagic
1
0
Fork 0
Code Issues Pull Requests Releases Activity

tag correctly if we are on a branch

Browse Source
This commit is contained in:
Jason Kotzin 2019-05-31 00:07:20 -07:00
parent 8606b78b9e
commit 6b9b502354
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Makefile
View File

@ -87,7 +87,7 @@ clean: host_clean
all_platforms: all_platforms:
$(Q)set -e ;\ $(Q)set -e ;\
mkdir -p artifacts/$(shell git describe --always) ;\ mkdir -p artifacts/$(shell git describe --tags --always) ;\
echo "<html><body><ul>" > artifacts/index.html ;\ echo "<html><body><ul>" > artifacts/index.html ;\
for i in platforms/*/Makefile.inc ; do \ for i in platforms/*/Makefile.inc ; do \
export DIRNAME=`dirname $$i` ;\ export DIRNAME=`dirname $$i` ;\
@ -103,11 +103,11 @@ all_platforms:
fi ;\ fi ;\
done ;\ done ;\
echo "</ul></body></html>" >> artifacts/index.html ;\ echo "</ul></body></html>" >> artifacts/index.html ;\
cp artifacts/*.bin artifacts/$(shell git describe --always) cp artifacts/*.bin artifacts/$(shell git describe --tags --always)
include/version.h: FORCE include/version.h: FORCE
$(Q)echo " GIT include/version.h" $(Q)echo " GIT include/version.h"
$(Q)echo "#define FIRMWARE_VERSION \"`git describe --always --dirty`\"" > $@ $(Q)echo "#define FIRMWARE_VERSION \"`git describe --tags --always --dirty`\"" > $@
-include *.d -include *.d