diff --git a/VersionInfo/Makefile b/VersionInfo/Makefile index c6c5eed..cd9f95a 100644 --- a/VersionInfo/Makefile +++ b/VersionInfo/Makefile @@ -3,10 +3,12 @@ ifneq ("$(wildcard ../.git/index)","") @echo "#pragma once" > /tmp/$@ @echo "#include " >> /tmp/$@ @echo "const std::string gitversion(\"$(shell git rev-parse --short HEAD)\");" >> /tmp/$@ + @echo "const std::string gitBranch(\"$(shell git branch --show-current)\");" >> /tmp/$@ else @echo "#pragma once" > /tmp/$@ @echo "#include " >> /tmp/$@ @echo "const std::string gitversion(\"0000000\");" >> /tmp/$@ + @echo "const std::string gitBranch(\"UNKNOWN BRANCH\");" >> /tmp/$@ endif @cmp -s /tmp/$@ $@; \ RETVAL=$$?; \ diff --git a/VersionInfo/Version.h b/VersionInfo/Version.h index b3fa983..7d38885 100644 --- a/VersionInfo/Version.h +++ b/VersionInfo/Version.h @@ -28,5 +28,5 @@ const std::string PRODUCT_NAME("DStarGateway"); const std::string VENDOR_NAME("Geoffrey Merck F4FXL / KC3FRA and Contributors"); const std::string VERSION("1.0"); const std::string LONG_VERSION = VERSION + "-" + gitversion; -const std::string FULL_PRODUCT_NAME = PRODUCT_NAME + " v" + VERSION + "-" + gitversion; +const std::string FULL_PRODUCT_NAME = PRODUCT_NAME + " v" + VERSION + "-" + gitversion + "-" + gitBranch; const std::string SHORT_PRODUCT_NAME = "DStarGW v" + VERSION + "-" + gitversion;