From c1ad4bde28a09f39dbae0f6488dc7b7182d11f93 Mon Sep 17 00:00:00 2001
From: Todd Gamblin <tgamblin@llnl.gov>
Date: Mon, 24 Oct 2016 16:41:20 -0700
Subject: [PATCH] Rename EditableMakefile to MakefilePackage
---
lib/spack/spack/__init__.py | 4 ++--
.../spack/build_systems/{editable_makefile.py => makefile.py} | 4 ++--
var/spack/repos/builtin/packages/astyle/package.py | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
rename lib/spack/spack/build_systems/{editable_makefile.py => makefile.py} (97%)
diff --git a/lib/spack/spack/__init__.py b/lib/spack/spack/__init__.py
index 918e17323b..67c64276ee 100644
--- a/lib/spack/spack/__init__.py
+++ b/lib/spack/spack/__init__.py
@@ -189,14 +189,14 @@
__all__ = ['Package',
'CMakePackage',
'AutotoolsPackage',
- 'EditableMakefile',
+ 'MakefilePackage',
'Version',
'when',
'ver',
'alldeps',
'nolink']
from spack.package import Package, ExtensionConflictError
-from spack.build_systems.editable_makefile import EditableMakefile
+from spack.build_systems.makefile import MakefilePackage
from spack.build_systems.autotools import AutotoolsPackage
from spack.build_systems.cmake import CMakePackage
from spack.version import Version, ver
diff --git a/lib/spack/spack/build_systems/editable_makefile.py b/lib/spack/spack/build_systems/makefile.py
similarity index 97%
rename from lib/spack/spack/build_systems/editable_makefile.py
rename to lib/spack/spack/build_systems/makefile.py
index e3adea8363..dcddadeedc 100644
--- a/lib/spack/spack/build_systems/editable_makefile.py
+++ b/lib/spack/spack/build_systems/makefile.py
@@ -29,7 +29,7 @@
from spack.package import PackageBase
-class EditableMakefile(PackageBase):
+class MakefilePackage(PackageBase):
"""Specialized class for packages that are built using editable Makefiles
This class provides three phases that can be overridden:
@@ -43,7 +43,7 @@ class EditableMakefile(PackageBase):
phases = ['edit', 'build', 'install']
# To be used in UI queries that require to know which
# build-system class we are using
- build_system_class = 'EditableMakefile'
+ build_system_class = 'MakefilePackage'
def build_directory(self):
"""Directory where the main Makefile is located"""
diff --git a/var/spack/repos/builtin/packages/astyle/package.py b/var/spack/repos/builtin/packages/astyle/package.py
index fdd9c2111e..31e1efb591 100644
--- a/var/spack/repos/builtin/packages/astyle/package.py
+++ b/var/spack/repos/builtin/packages/astyle/package.py
@@ -25,7 +25,7 @@
from spack import *
-class Astyle(EditableMakefile):
+class Astyle(MakefilePackage):
"""A Free, Fast, and Small Automatic Formatter for C, C++, C++/CLI,
Objective-C, C#, and Java Source Code.
"""
--
GitLab