Skip to content

Allow tool to set its path via <tool ...path="path"/> #88

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
smuzaffar merged 1 commit into from
Apr 28, 2026
Merged

Allow tool to set its path via <tool ...path="path"/> #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion SCRAM/BuildSystem/SimpleDoc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def __init__(self, valid_attribs={}):
"classpath": ["path"],
"flags": ["*"],
"client": [],
"tool": ["name", "version", "type", "revision"],
"tool": ["name", "version", "type", "revision", "path"],
"info": ["url"],
"runtime": ["name", "value", "type", "default", "handler", "join"],
"project": ["name", "version"],
Expand Down
15 changes: 14 additions & 1 deletion SCRAM/BuildSystem/ToolFile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,10 @@ def _clean(self, filename=None):
'VARIABLES': [], 'LIBTYPES': [], 'RUNTIME': {}, 'FLAGS': {}}
self.env = {}
self.menv = {}
self.variables = {}

def _update_env(self, data):
if data.tag == 'environment':
if data.tag.lower() == 'environment':
key = 'default'
if 'value' in data.attrib:
key = 'value'
Expand All @@ -63,6 +64,14 @@ def _update_env(self, data):
self.menv[var] = []
self.env[var] = val
self.menv[var].append(val)
if data.tag == 'tool' and 'path' in data.attrib:
var = '%s_BASE' % data.attrib['name'].upper().replace('-', '_')
value = data.attrib['path']
self.contents['VARIABLES'].append(var)
self.env[var] = value
self.menv[var] = [self.env[var]]
self.variables['TOOL_BASE'] = value
self.contents[var] = value
for child in list(data):
self._update_env(child)

Expand All @@ -78,6 +87,8 @@ def _fix_data(self, data, sep=''):
value = ''
if key in self.env:
value = self.env[key] if not sep else sep.join(self.menv[key])
elif key in self.variables:
value = self.variables[key] if not sep else sep.join(self.variables[key])
elif key in environ:
value = environ[key]
else:
Expand Down Expand Up @@ -153,6 +164,8 @@ def _update_contents(self, data):
self.contents[tag].append(value)
else:
self.contents[tag] = value
elif tag == 'SET':
self.variables[data.attrib['name'].upper()] = self._fix_data(data.attrib['value'])
elif tag == 'FLAGS':
flag_name = list(data.attrib)[0]
tag = flag_name.upper()
Expand Down