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

Fix generic body during package creation (#12804)

Browse Source 
Fixes incomplete change in #11981 

Use the proper variable (`body_def`) during package creation for package subclasses.
This commit is contained in:
Adam J. Stewart 2019-09-17 11:37:46 -05:00 committed by Tamara Dahlgren
parent dce45aa299
commit 21e4b1752e
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/spack/spack/cmd/create.py
View File

@ -126,7 +126,7 @@ class AutotoolsPackageTemplate(PackageTemplate):
base_class_name = 'AutotoolsPackage' base_class_name = 'AutotoolsPackage'
body = """\ body_def = """\
def configure_args(self): def configure_args(self):
# FIXME: Add arguments other than --prefix # FIXME: Add arguments other than --prefix
# FIXME: If not needed delete this function # FIXME: If not needed delete this function
@ -149,7 +149,7 @@ class AutoreconfPackageTemplate(PackageTemplate):
# FIXME: Add additional dependencies if required. # FIXME: Add additional dependencies if required.
# depends_on('foo')""" # depends_on('foo')"""
body = """\ body_def = """\
def autoreconf(self, spec, prefix): def autoreconf(self, spec, prefix):
# FIXME: Modify the autoreconf method as necessary # FIXME: Modify the autoreconf method as necessary
autoreconf('--install', '--verbose', '--force') autoreconf('--install', '--verbose', '--force')
@ -166,7 +166,7 @@ class CMakePackageTemplate(PackageTemplate):
base_class_name = 'CMakePackage' base_class_name = 'CMakePackage'
body = """\ body_def = """\
def cmake_args(self): def cmake_args(self):
# FIXME: Add arguments other than # FIXME: Add arguments other than
# FIXME: CMAKE_INSTALL_PREFIX and CMAKE_BUILD_TYPE # FIXME: CMAKE_INSTALL_PREFIX and CMAKE_BUILD_TYPE
@ -180,7 +180,7 @@ class MesonPackageTemplate(PackageTemplate):
base_class_name = 'MesonPackage' base_class_name = 'MesonPackage'
body = """\ body_def = """\
def meson_args(self): def meson_args(self):
# FIXME: If not needed delete this function # FIXME: If not needed delete this function
args = [] args = []
@ -192,7 +192,7 @@ class QMakePackageTemplate(PackageTemplate):
base_class_name = 'QMakePackage' base_class_name = 'QMakePackage'
body = """\ body_def = """\
def qmake_args(self): def qmake_args(self):
# FIXME: If not needed delete this function # FIXME: If not needed delete this function
args = [] args = []
@ -204,7 +204,7 @@ class SconsPackageTemplate(PackageTemplate):
base_class_name = 'SConsPackage' base_class_name = 'SConsPackage'
body = """\ body_def = """\
def build_args(self, spec, prefix): def build_args(self, spec, prefix):
# FIXME: Add arguments to pass to build. # FIXME: Add arguments to pass to build.
# FIXME: If not needed delete this function # FIXME: If not needed delete this function
@ -217,7 +217,7 @@ class WafPackageTemplate(PackageTemplate):
base_class_name = 'WafPackage' base_class_name = 'WafPackage'
body = """\ body_def = """\
# FIXME: Override configure_args(), build_args(), # FIXME: Override configure_args(), build_args(),
# or install_args() if necessary.""" # or install_args() if necessary."""
@ -229,7 +229,7 @@ class BazelPackageTemplate(PackageTemplate):
# FIXME: Add additional dependencies if required. # FIXME: Add additional dependencies if required.
depends_on('bazel', type='build')""" depends_on('bazel', type='build')"""
body = """\ body_def = """\
def install(self, spec, prefix): def install(self, spec, prefix):
# FIXME: Add logic to build and install here. # FIXME: Add logic to build and install here.
bazel()""" bazel()"""
@ -244,7 +244,7 @@ class PythonPackageTemplate(PackageTemplate):
# depends_on('py-setuptools', type='build') # depends_on('py-setuptools', type='build')
# depends_on('py-foo', type=('build', 'run'))""" # depends_on('py-foo', type=('build', 'run'))"""
body = """\ body_def = """\
def build_args(self, spec, prefix): def build_args(self, spec, prefix):
# FIXME: Add arguments other than --prefix # FIXME: Add arguments other than --prefix
# FIXME: If not needed delete this function # FIXME: If not needed delete this function
@ -269,7 +269,7 @@ class RPackageTemplate(PackageTemplate):
# FIXME: Add dependencies if required. # FIXME: Add dependencies if required.
# depends_on('r-foo', type=('build', 'run'))""" # depends_on('r-foo', type=('build', 'run'))"""
body = """\ body_def = """\
def configure_args(self, spec, prefix): def configure_args(self, spec, prefix):
# FIXME: Add arguments to pass to install via --configure-args # FIXME: Add arguments to pass to install via --configure-args
# FIXME: If not needed delete this function # FIXME: If not needed delete this function
@ -295,7 +295,7 @@ class PerlmakePackageTemplate(PackageTemplate):
# FIXME: Add dependencies if required: # FIXME: Add dependencies if required:
# depends_on('perl-foo', type=('build', 'run'))""" # depends_on('perl-foo', type=('build', 'run'))"""
body = """\ body_def = """\
def configure_args(self): def configure_args(self):
# FIXME: Add non-standard arguments # FIXME: Add non-standard arguments
# FIXME: If not needed delete this function # FIXME: If not needed delete this function
@ -349,7 +349,7 @@ class MakefilePackageTemplate(PackageTemplate):
base_class_name = 'MakefilePackage' base_class_name = 'MakefilePackage'
body = """\ body_def = """\
def edit(self, spec, prefix): def edit(self, spec, prefix):
# FIXME: Edit the Makefile if necessary # FIXME: Edit the Makefile if necessary
# FIXME: If not needed delete this function # FIXME: If not needed delete this function
@ -362,7 +362,7 @@ class IntelPackageTemplate(PackageTemplate):
base_class_name = 'IntelPackage' base_class_name = 'IntelPackage'
body = """\ body_def = """\
# FIXME: Override `setup_environment` if necessary.""" # FIXME: Override `setup_environment` if necessary."""
@ -371,7 +371,7 @@ class SIPPackageTemplate(PackageTemplate):
base_class_name = 'SIPPackage' base_class_name = 'SIPPackage'
body = """\ body_def = """\
def configure_args(self, spec, prefix): def configure_args(self, spec, prefix):
# FIXME: Add arguments other than --bindir and --destdir # FIXME: Add arguments other than --bindir and --destdir
# FIXME: If not needed delete this function # FIXME: If not needed delete this function