Skip to content

also support %(installdir)s and %(builddir)s templates for extensions #3237

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
boegel merged 4 commits into from
Mar 12, 2020
Merged

also support %(installdir)s and %(builddir)s templates for extensions #3237

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4705c02
First attempt at adding missing install/builddir templates to extensi…
akesandgren Mar 9, 2020
c774090
Drop comment about generate_template_values which is not needed.
akesandgren Mar 9, 2020
cb73209
Add test to verify that %(installdir) is actually set in an extension.
akesandgren Mar 11, 2020
c2b6934
Trying to fix too long lines.
akesandgren Mar 11, 2020
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
7 changes: 6 additions & 1 deletion easybuild/framework/extension.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
import os

from easybuild.framework.easyconfig.easyconfig import resolve_template
from easybuild.framework.easyconfig.templates import template_constant_dict
from easybuild.framework.easyconfig.templates import TEMPLATE_NAMES_EASYBLOCK_RUN_STEP, template_constant_dict
from easybuild.tools.build_log import EasyBuildError, raise_nosupport
from easybuild.tools.filetools import change_dir
from easybuild.tools.run import run_cmd
Expand Down Expand Up @@ -111,6 +111,11 @@ def __init__(self, mself, ext, extra_params=None):
# construct dict with template values that can be used
self.cfg.template_values.update(template_constant_dict({'name': name, 'version': version}))

# Add install/builddir templates, copied from update_config_template_run_step
# do we need to call self.cfg.generate_template_values() after?
Copy link
Member

@boegel boegel Mar 9, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No need to call generate_template_values, so you can drop this comment.

Copy link
Contributor Author

@akesandgren akesandgren Mar 9, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought so, since that's already done in master.

for name in TEMPLATE_NAMES_EASYBLOCK_RUN_STEP:
self.cfg.template_values[name[0]] = str(getattr(self.master, name[0], None))

# list of source/patch files: we use an empty list as default value like in EasyBlock
self.src = resolve_template(self.ext.get('src', []), self.cfg.template_values)
self.patches = resolve_template(self.ext.get('patches', []), self.cfg.template_values)
Expand Down