Fixed the version naming

This commit is contained in:
garfieldG
2017-07-09 13:08:49 +02:00
committed by Lorenz Meier
parent 7a9e31f440
commit 44e148151b
2 changed files with 46 additions and 11 deletions
+2 -2
View File
@@ -13,7 +13,7 @@ try:
except:
old_header = ''
git_tag = subprocess.check_output('git describe --always --tags'.split(),
git_tag = subprocess.check_output('git describe --always --tags --dirty'.split(),
stderr=subprocess.STDOUT).decode('utf-8').strip()
git_version = subprocess.check_output('git rev-parse --verify HEAD'.split(),
stderr=subprocess.STDOUT).decode('utf-8').strip()
@@ -23,7 +23,7 @@ try:
except:
git_branch_name = ''
git_version_short = git_version[0:16]
nuttx_git_tag = subprocess.check_output('git describe --always --tags'.split(),
nuttx_git_tag = subprocess.check_output('git describe --always --tags --dirty'.split(),
cwd='NuttX/nuttx', stderr=subprocess.STDOUT).decode('utf-8').strip().replace("nuttx-","v")
nuttx_git_tag = re.sub('-.*','.0',nuttx_git_tag)
nuttx_git_version = subprocess.check_output('git rev-parse --verify HEAD'.split(),