zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New version for openCARP packages, v12.0 (#34710)

Browse Source 
Co-authored-by: openCARP consortium <info@opencarp.org>
This commit is contained in:
Marie Houillon 2023-01-17 10:31:15 +01:00 committed by GitHub
parent 39ffef8363
commit 100134a2b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
var/spack/repos/builtin/packages/meshtool/package.py
View File

@ -16,6 +16,7 @@ class Meshtool(MakefilePackage):
version("master", branch="master", preferred=True) version("master", branch="master", preferred=True)
# Version to use with openCARP releases # Version to use with openCARP releases
version("oc12.0", commit="867431d")
version("oc11.0", commit="867431d") version("oc11.0", commit="867431d")
version("oc10.0", commit="6c5cfbd067120901f15a04bf63beec409bda6dc9") version("oc10.0", commit="6c5cfbd067120901f15a04bf63beec409bda6dc9")
version("oc9.0", commit="6c5cfbd067120901f15a04bf63beec409bda6dc9") version("oc9.0", commit="6c5cfbd067120901f15a04bf63beec409bda6dc9")

12
var/spack/repos/builtin/packages/opencarp/package.py
View File

@ -18,7 +18,8 @@ class Opencarp(CMakePackage):
maintainers = ["MarieHouillon"] maintainers = ["MarieHouillon"]
version("11.0", commit="fd8419d5", submodules=False, no_cache=True, preferred=True) version("12.0", commit="a34c11af", submodules=False, no_cache=True, preferred=True)
version("11.0", commit="fd8419d5", submodules=False, no_cache=True)
version("10.0", commit="7aec7900", submodules=False, no_cache=True) version("10.0", commit="7aec7900", submodules=False, no_cache=True)
version("9.0", commit="c0167599", submodules=False, no_cache=True) version("9.0", commit="c0167599", submodules=False, no_cache=True)
version("8.2", commit="dbfd16fd", submodules=False, no_cache=True) version("8.2", commit="dbfd16fd", submodules=False, no_cache=True)
@ -29,6 +30,13 @@ class Opencarp(CMakePackage):
variant("carputils", default=False, description="Installs the carputils framework") variant("carputils", default=False, description="Installs the carputils framework")
variant("meshtool", default=False, description="Installs the meshtool software") variant("meshtool", default=False, description="Installs the meshtool software")
variant(
"build_type",
default="Release",
description="CMake build type",
values=("Debug", "Release", "RelWithDebInfo", "MinSizeRel"),
)
# Patch removing problematic steps in CMake process # Patch removing problematic steps in CMake process
patch("opencarp7.patch", when="@7.0") patch("opencarp7.patch", when="@7.0")
@ -44,7 +52,7 @@ class Opencarp(CMakePackage):
depends_on("py-carputils", when="+carputils") depends_on("py-carputils", when="+carputils")
depends_on("meshtool", when="+meshtool") depends_on("meshtool", when="+meshtool")
# Use specific versions of carputils and meshtool for releases # Use specific versions of carputils and meshtool for releases
for ver in ["11.0", "10.0", "9.0", "8.2", "7.0", "8.1"]: for ver in ["12.0", "11.0", "10.0", "9.0", "8.2", "7.0", "8.1"]:
depends_on("py-carputils@oc" + ver, when="@" + ver + " +carputils") depends_on("py-carputils@oc" + ver, when="@" + ver + " +carputils")
depends_on("meshtool@oc" + ver, when="@" + ver + " +meshtool") depends_on("meshtool@oc" + ver, when="@" + ver + " +meshtool")

1
var/spack/repos/builtin/packages/py-carputils/package.py
View File

@ -17,6 +17,7 @@ class PyCarputils(PythonPackage):
version("master", branch="master") version("master", branch="master")
# Version to use with openCARP releases # Version to use with openCARP releases
version("oc12.0", commit="4d7a1f0c604a2ad232e70cf9aa3a8daff5ffb195")
version("oc11.0", commit="a02f9b846c6e852b7315b20e925d55c355f239b8") version("oc11.0", commit="a02f9b846c6e852b7315b20e925d55c355f239b8")
version("oc10.0", commit="a02f9b846c6e852b7315b20e925d55c355f239b8") version("oc10.0", commit="a02f9b846c6e852b7315b20e925d55c355f239b8")
version("oc9.0", commit="e79e66b25c7bfaf405fad595019594ab9aa83392") version("oc9.0", commit="e79e66b25c7bfaf405fad595019594ab9aa83392")