summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Olesen <Mark.Olesen@gmx.net>2020-07-24 15:32:18 +0200
committerGitHub <noreply@github.com>2020-07-24 15:32:18 +0200
commitc95c183bc4533fe36eac7b30f9b453836e93d107 (patch)
tree3359dceb7bcb54b28dc4ab2c5e2bfd5501f77ad6
parented4b770e1afe3120986ae6fe81b88bafa62f70dd (diff)
downloadspack-c95c183bc4533fe36eac7b30f9b453836e93d107.tar.gz
spack-c95c183bc4533fe36eac7b30f9b453836e93d107.tar.bz2
spack-c95c183bc4533fe36eac7b30f9b453836e93d107.tar.xz
spack-c95c183bc4533fe36eac7b30f9b453836e93d107.zip
openfoam: install META-INFO directory (#17673)
Co-authored-by: Mark Olesen <Mark.Olesen@esi-group.com>
-rw-r--r--var/spack/repos/builtin/packages/openfoam-org/package.py12
-rw-r--r--var/spack/repos/builtin/packages/openfoam/package.py12
2 files changed, 14 insertions, 10 deletions
diff --git a/var/spack/repos/builtin/packages/openfoam-org/package.py b/var/spack/repos/builtin/packages/openfoam-org/package.py
index dc9b5673ee..e2859dc838 100644
--- a/var/spack/repos/builtin/packages/openfoam-org/package.py
+++ b/var/spack/repos/builtin/packages/openfoam-org/package.py
@@ -332,15 +332,17 @@ class OpenfoamOrg(Package):
# Having wmake and ~source is actually somewhat pointless...
# Install 'etc' before 'bin' (for symlinks)
- dirs = ['etc', 'bin', 'wmake']
+ # META-INFO for 1812 and later (or backported)
+ dirs = ['META-INFO', 'etc', 'bin', 'wmake']
if '+source' in spec:
dirs.extend(['applications', 'src', 'tutorials'])
for d in dirs:
- install_tree(
- d,
- join_path(self.projectdir, d),
- symlinks=True)
+ if os.path.isdir(d):
+ install_tree(
+ d,
+ join_path(self.projectdir, d),
+ symlinks=True)
dirs = ['platforms']
if '+source' in spec:
diff --git a/var/spack/repos/builtin/packages/openfoam/package.py b/var/spack/repos/builtin/packages/openfoam/package.py
index d347c61cfa..3b9ff8a7dd 100644
--- a/var/spack/repos/builtin/packages/openfoam/package.py
+++ b/var/spack/repos/builtin/packages/openfoam/package.py
@@ -773,15 +773,17 @@ class Openfoam(Package):
# Having wmake and ~source is actually somewhat pointless...
# Install 'etc' before 'bin' (for symlinks)
- dirs = ['etc', 'bin', 'wmake']
+ # META-INFO for 1812 and later (or backported)
+ dirs = ['META-INFO', 'etc', 'bin', 'wmake']
if '+source' in spec:
dirs.extend(['applications', 'src', 'tutorials'])
for d in dirs:
- install_tree(
- d,
- join_path(self.projectdir, d),
- symlinks=True)
+ if os.path.isdir(d):
+ install_tree(
+ d,
+ join_path(self.projectdir, d),
+ symlinks=True)
dirs = ['platforms']
if '+source' in spec: