mewin/scons-plus-plus
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://git.mewin.de/mewin/scons-plus-plus

Browse Source
This commit is contained in:
Patrick Wuttke 2025-07-08 14:34:23 +02:00
commit 8371f96d4a
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SConscript
View File

@ -1071,6 +1071,10 @@ vars.Add('COMPILATIONDB_FILTER_FILES', 'Removes source files from the compilatio
vars.Add('SHOW_INCLUDES', 'Show include hierarchy (for debugging).', False) vars.Add('SHOW_INCLUDES', 'Show include hierarchy (for debugging).', False)
vars.Add('ENABLE_ASAN', 'Enable address sanitization.', bool(enable_asan)) vars.Add('ENABLE_ASAN', 'Enable address sanitization.', bool(enable_asan))
if 'VARIABLES' in config:
for vardef in config['VARIABLES']:
vars.Add(*vardef)
tools = ['default', 'compilation_db', 'unity_build'] tools = ['default', 'compilation_db', 'unity_build']
if 'TOOLS' in config: if 'TOOLS' in config:
tools.extend(config['TOOLS']) tools.extend(config['TOOLS'])

5
addons/gitbranch.py
View File

@ -50,7 +50,10 @@ def _git_branch(env: Environment, repo_name: str, remote_url: str, git_ref: str
def _git_tags(env: Environment, repo_name: str, remote_url: str, force_fetch: bool = False) -> 'list[str]': def _git_tags(env: Environment, repo_name: str, remote_url: str, force_fetch: bool = False) -> 'list[str]':
repo, origin = _clone(env, repo_name, remote_url) repo, origin = _clone(env, repo_name, remote_url)
if force_fetch or env['UPDATE_REPOSITORIES']: if force_fetch or env['UPDATE_REPOSITORIES']:
origin.fetch(tags=True) try:
origin.fetch(tags=True)
except GitError:
env.Warn(f'Error fetching tags from {repo_name} ({remote_url})')
return [t.name for t in repo.tags] return [t.name for t in repo.tags]
def _make_callable(val): def _make_callable(val):