Spec: Add a new virtual-customizable home attribute (#30917)

* Spec: Add a new virtual-customizable home attribute

* java: Use the new builtin home attribute

* python: Use the new builtin home attribute
This commit is contained in:
Chuck Atkins
2022-06-17 10:29:08 -04:00
committed by GitHub
parent 667c39987c
commit 85dc20cb55
11 changed files with 413 additions and 40 deletions

View File

@@ -1447,6 +1447,10 @@ def prefix(self):
"""Get the prefix into which this package should be installed."""
return self.spec.prefix
@property
def home(self):
return self.prefix
@property # type: ignore[misc]
@memoized
def compiler(self):

View File

@@ -896,7 +896,7 @@ def clear(self):
def _command_default_handler(descriptor, spec, cls):
"""Default handler when looking for the 'command' attribute.
Tries to search for ``spec.name`` in the ``spec.prefix.bin`` directory.
Tries to search for ``spec.name`` in the ``spec.home.bin`` directory.
Parameters:
descriptor (ForwardQueryToPackage): descriptor that triggered the call
@@ -910,20 +910,21 @@ def _command_default_handler(descriptor, spec, cls):
Raises:
RuntimeError: If the command is not found
"""
path = os.path.join(spec.prefix.bin, spec.name)
home = getattr(spec.package, 'home')
path = os.path.join(home.bin, spec.name)
if fs.is_exe(path):
return spack.util.executable.Executable(path)
else:
msg = 'Unable to locate {0} command in {1}'
raise RuntimeError(msg.format(spec.name, spec.prefix.bin))
raise RuntimeError(msg.format(spec.name, home.bin))
def _headers_default_handler(descriptor, spec, cls):
"""Default handler when looking for the 'headers' attribute.
Tries to search for ``*.h`` files recursively starting from
``spec.prefix.include``.
``spec.package.home.include``.
Parameters:
descriptor (ForwardQueryToPackage): descriptor that triggered the call
@@ -937,21 +938,22 @@ def _headers_default_handler(descriptor, spec, cls):
Raises:
NoHeadersError: If no headers are found
"""
headers = fs.find_headers('*', root=spec.prefix.include, recursive=True)
home = getattr(spec.package, 'home')
headers = fs.find_headers('*', root=home.include, recursive=True)
if headers:
return headers
else:
msg = 'Unable to locate {0} headers in {1}'
raise spack.error.NoHeadersError(
msg.format(spec.name, spec.prefix.include))
msg.format(spec.name, home))
def _libs_default_handler(descriptor, spec, cls):
"""Default handler when looking for the 'libs' attribute.
Tries to search for ``lib{spec.name}`` recursively starting from
``spec.prefix``. If ``spec.name`` starts with ``lib``, searches for
``spec.package.home``. If ``spec.name`` starts with ``lib``, searches for
``{spec.name}`` instead.
Parameters:
@@ -978,6 +980,7 @@ def _libs_default_handler(descriptor, spec, cls):
# get something like 'libabcXabc.so, but for now we consider this
# unlikely).
name = spec.name.replace('-', '?')
home = getattr(spec.package, 'home')
# Avoid double 'lib' for packages whose names already start with lib
if not name.startswith('lib'):
@@ -990,12 +993,12 @@ def _libs_default_handler(descriptor, spec, cls):
for shared in search_shared:
libs = fs.find_libraries(
name, spec.prefix, shared=shared, recursive=True)
name, home, shared=shared, recursive=True)
if libs:
return libs
msg = 'Unable to recursively locate {0} libraries in {1}'
raise spack.error.NoLibrariesError(msg.format(spec.name, spec.prefix))
raise spack.error.NoLibrariesError(msg.format(spec.name, home))
class ForwardQueryToPackage(object):
@@ -1116,6 +1119,9 @@ def __set__(self, instance, value):
class SpecBuildInterface(lang.ObjectWrapper):
# home is available in the base Package so no default is needed
home = ForwardQueryToPackage('home', default_handler=None)
command = ForwardQueryToPackage(
'command',
default_handler=_command_default_handler

View File

@@ -53,6 +53,50 @@ def test_install_and_uninstall(install_mockery, mock_fetch, monkeypatch):
raise
def test_pkg_attributes(install_mockery, mock_fetch, monkeypatch):
# Get a basic concrete spec for the dummy package.
spec = Spec('attributes-foo-app ^attributes-foo')
spec.concretize()
assert spec.concrete
pkg = spec.package
pkg.do_install()
foo = 'attributes-foo'
assert spec['bar'].prefix == spec[foo].prefix
assert spec['baz'].prefix == spec[foo].prefix
assert spec[foo].home == spec[foo].prefix
assert spec['bar'].home == spec[foo].home
assert spec['baz'].home == spec[foo].prefix.baz
foo_headers = spec[foo].headers
# assert foo_headers.basenames == ['foo.h']
assert foo_headers.directories == [spec[foo].home.include]
bar_headers = spec['bar'].headers
# assert bar_headers.basenames == ['bar.h']
assert bar_headers.directories == [spec['bar'].home.include]
baz_headers = spec['baz'].headers
# assert baz_headers.basenames == ['baz.h']
assert baz_headers.directories == [spec['baz'].home.include]
if 'platform=windows' in spec:
lib_suffix = '.lib'
elif 'platform=darwin' in spec:
lib_suffix = '.dylib'
else:
lib_suffix = '.so'
foo_libs = spec[foo].libs
assert foo_libs.basenames == ['libFoo' + lib_suffix]
assert foo_libs.directories == [spec[foo].home.lib64]
bar_libs = spec['bar'].libs
assert bar_libs.basenames == ['libFooBar' + lib_suffix]
assert bar_libs.directories == [spec['bar'].home.lib64]
baz_libs = spec['baz'].libs
assert baz_libs.basenames == ['libFooBaz' + lib_suffix]
assert baz_libs.directories == [spec['baz'].home.lib]
def mock_remove_prefix(*args):
raise MockInstallError(
"Intentional error",