forked from Archive/PX4-Autopilot
git: ignore git tags starting with 'ext/' when getting the version tag
Allows for external/extra tags
This commit is contained in:
parent
ae010ea55c
commit
bac2a02a65
|
@ -113,7 +113,7 @@ include(px4_parse_function_args)
|
||||||
include(px4_git)
|
include(px4_git)
|
||||||
|
|
||||||
execute_process(
|
execute_process(
|
||||||
COMMAND git describe --always --tags
|
COMMAND git describe --exclude ext/* --always --tags
|
||||||
OUTPUT_VARIABLE PX4_GIT_TAG
|
OUTPUT_VARIABLE PX4_GIT_TAG
|
||||||
OUTPUT_STRIP_TRAILING_WHITESPACE
|
OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||||
WORKING_DIRECTORY ${PX4_SOURCE_DIR}
|
WORKING_DIRECTORY ${PX4_SOURCE_DIR}
|
||||||
|
|
|
@ -65,7 +65,7 @@ def get_version():
|
||||||
|
|
||||||
if os.path.isdir(os.path.join(px4_dir, '.git')):
|
if os.path.isdir(os.path.join(px4_dir, '.git')):
|
||||||
# If inside a clone PX4 Firmware repository, get version from "git describe"
|
# If inside a clone PX4 Firmware repository, get version from "git describe"
|
||||||
cmd = 'git describe --abbrev=0 --tags'
|
cmd = 'git describe --exclude ext/* --abbrev=0 --tags'
|
||||||
try:
|
try:
|
||||||
version = subprocess.check_output(
|
version = subprocess.check_output(
|
||||||
cmd, cwd=px4_dir, shell=True).decode().strip()
|
cmd, cwd=px4_dir, shell=True).decode().strip()
|
||||||
|
|
|
@ -99,7 +99,7 @@ if args.summary != None:
|
||||||
if args.description != None:
|
if args.description != None:
|
||||||
desc['description'] = str(args.description)
|
desc['description'] = str(args.description)
|
||||||
if args.git_identity != None:
|
if args.git_identity != None:
|
||||||
cmd = "git --git-dir '{:}/.git' describe --always --tags".format(args.git_identity)
|
cmd = "git --git-dir '{:}/.git' describe --exclude ext/* --always --tags".format(args.git_identity)
|
||||||
p = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE).stdout
|
p = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE).stdout
|
||||||
desc['git_identity'] = str(p.read().strip())
|
desc['git_identity'] = str(p.read().strip())
|
||||||
p.close()
|
p.close()
|
||||||
|
|
|
@ -37,7 +37,7 @@ header = """
|
||||||
|
|
||||||
|
|
||||||
# PX4
|
# PX4
|
||||||
git_tag = subprocess.check_output('git describe --always --tags --dirty'.split(),
|
git_tag = subprocess.check_output('git describe --exclude ext/* --always --tags --dirty'.split(),
|
||||||
stderr=subprocess.STDOUT).decode('utf-8').strip()
|
stderr=subprocess.STDOUT).decode('utf-8').strip()
|
||||||
if validate:
|
if validate:
|
||||||
if verbose:
|
if verbose:
|
||||||
|
|
Loading…
Reference in New Issue