From 1a8a147fe5c16fff10dc6aaebd4a8704f8e0ae46 Mon Sep 17 00:00:00 2001
From: Justin S <3630356+codeandkey@users.noreply.github.com>
Date: Fri, 10 Jul 2020 19:23:04 -0500
Subject: energyplus: add 9.3.0 (#17452)
* energyplus: add 9.3.0
* energyplus: fix version order
* energyplus: more concise links
* energyplus: avoid join_path
---
.../repos/builtin/packages/energyplus/package.py | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/var/spack/repos/builtin/packages/energyplus/package.py b/var/spack/repos/builtin/packages/energyplus/package.py
index ca534999f9..d781f24452 100644
--- a/var/spack/repos/builtin/packages/energyplus/package.py
+++ b/var/spack/repos/builtin/packages/energyplus/package.py
@@ -17,6 +17,8 @@ class Energyplus(Package):
homepage = "https://energyplus.net"
# versions require explicit URLs as they contain hashes
+ version('9.3.0', sha256='c939dc4f867224e110485a8e0712ce4cfb1e06f8462bc630b54f83a18c93876c',
+ url="https://github.com/NREL/EnergyPlus/releases/download/v9.3.0/EnergyPlus-9.3.0-baff08990c-Linux-x86_64.tar.gz")
version('8.9.0', sha256='13a5192b25815eb37b3ffd019ce3b99fd9f854935f8cc4362814f41c56e9ca98',
url="https://github.com/NREL/EnergyPlus/releases/download/v8.9.0-WithIDDFixes/EnergyPlus-8.9.0-eba93e8e1b-Linux-x86_64.tar.gz")
@@ -25,13 +27,14 @@ class Energyplus(Package):
# and then symlink the appropriate targets
# there is only one folder with a semi-predictable name so we glob it
- install_tree(glob.glob('EnergyPlus*')[0],
- join_path(prefix.lib, 'energyplus'))
+ source_dir = '.'
+
+ if spec.satisfies('@:8.9.9'):
+ source_dir = glob.glob('EnergyPlus*')[0]
+
+ install_tree(source_dir, prefix.lib.enregyplus)
mkdirp(prefix.bin)
- os.symlink(join_path(prefix.lib, 'energyplus/energyplus'),
- join_path(prefix.bin, 'energyplus'))
- os.symlink(join_path(prefix.lib, 'energyplus/EPMacro'),
- join_path(prefix.bin, 'EPMacro'))
- os.symlink(join_path(prefix.lib, 'energyplus/ExpandObjects'),
- join_path(prefix.bin, 'ExpandObjects'))
+ for b in ['energyplus', 'EPMacro', 'ExpandObjects']:
+ os.symlink(join_path(prefix.lib.energyplus, b),
+ join_path(prefix.bin, b))
--
cgit v1.2.3-70-g09d2