Merge pull request easybuilders#1056 from pescobar/binary_block_skip_…

…rpath_sanity_check

skip RPATH sanity check for binary installations

easybuild/easyblocks/a/ansys.py

@@ -31,27 +31,19 @@
 import os
 import stat
 
-from easybuild.framework.easyblock import EasyBlock
+from easybuild.easyblocks.generic.packedbinary import PackedBinary
 from easybuild.tools.run import run_cmd
 from easybuild.tools.filetools import adjust_permissions
 
 
-class EB_ANSYS(EasyBlock):
+class EB_ANSYS(PackedBinary):
     """Support for installing ANSYS."""
 
     def __init__(self, *args, **kwargs):
         """Initialize ANSYS-specific variables."""
         super(EB_ANSYS, self).__init__(*args, **kwargs)
         self.ansysver = "v%s" % ''.join(self.version.split('.')[0:2])
 
-    def configure_step(self):
-        """No configuration for ANSYS."""
-        pass
-
-    def build_step(self):
-        """No building for ANSYS."""
-        pass
-
     def install_step(self):
         """Custom install procedure for ANSYS."""
         licserv = self.cfg['license_server']

easybuild/easyblocks/a/ant.py

@@ -31,23 +31,15 @@
 import os
 import shutil
 
-from easybuild.framework.easyblock import EasyBlock
+from easybuild.easyblocks.generic.packedbinary import PackedBinary
 from easybuild.tools.build_log import EasyBuildError
 from easybuild.tools.modules import get_software_root, get_software_version
 from easybuild.tools.run import run_cmd
 
 
-class EB_ant(EasyBlock):
+class EB_ant(PackedBinary):
     """Support for building and installing ant."""
 
-    def configure_step(self):
-        """No configure step for ant."""
-        pass
-
-    def build_step(self):
-        """No build step for ant."""
-        pass
-
     def install_step(self):
         """Custom install procedure for ant."""
 

easybuild/easyblocks/b/bisearch.py

@@ -33,43 +33,32 @@
 """
 import os
 
-from easybuild.framework.easyblock import EasyBlock
+from easybuild.easyblocks.generic.packedbinary import PackedBinary
 from easybuild.tools.run import run_cmd_qa
 
 
-class EB_BiSearch(EasyBlock):
+class EB_BiSearch(PackedBinary):
     """
     Support for building BiSearch.
     Basically just run the interactive installation script install.sh.
     """
 
-    def configure_step(self):
-        """(no configure)"""
-        pass
-
-    def build_step(self):
-        """(empty, building is performed in make_install step)"""
-        pass
-
     def install_step(self):
         cmd = "./install.sh"
 
         qanda = {
-                 'Please enter the BiSearch root directory: ': self.installdir,
-                 'Please enter the path of c++ compiler [/usr/bin/g++]: ': os.getenv('CXX')
-                }
+            'Please enter the BiSearch root directory: ': self.installdir,
+            'Please enter the path of c++ compiler [/usr/bin/g++]: ': os.getenv('CXX')
+        }
 
         no_qa = [r'Compiling components\s*\.*']
 
         run_cmd_qa(cmd, qanda, no_qa=no_qa, log_all=True, simple=True)
 
     def sanity_check_step(self):
         """Custom sanity check for BiSearch."""
-
         custom_paths = {
-                        'files':["bin/%s" % x for x in ["fpcr", "indexing_cdna",
-                                                        "indexing_genome", "makecomp"]],
-                        'dirs':[]
-                       }
-
+            'files':['bin/%s' % x for x in ['fpcr', 'indexing_cdna', 'indexing_genome', 'makecomp']],
+            'dirs':[],
+        }
         super(EB_BiSearch, self).sanity_check_step(custom_paths=custom_paths)

easybuild/easyblocks/c/chimera.py

@@ -8,29 +8,21 @@
 
 import os
 
-from easybuild.framework.easyblock import EasyBlock
+from easybuild.easyblocks.generic.packedbinary import PackedBinary
 from easybuild.tools.build_log import EasyBuildError
 from easybuild.tools.run import run_cmd
 
 
-class EB_Chimera(EasyBlock):
+class EB_Chimera(PackedBinary):
     """Support for installing Chimera."""
-    
+
     def extract_step(self, verbose=False):
         """Custom extraction of sources for Chimera: unpack installation file
         to obtain chimera.bin installer."""
-   
+
         cmd = "unzip -d %s %s" % (self.builddir, self.src[0]['path'])
         run_cmd(cmd, log_all=True, simple=True)
-
-    def configure_step(self, cmd_prefix=''):
-        """ skip configure """
-        pass
-
-    def build_step(self, verbose=False):
-        """ skip build """
-        pass
-
+
     def install_step(self):
         """Install using chimera.bin."""
 

easybuild/easyblocks/e/eigen.py

@@ -21,28 +21,16 @@
 import shutil
 from distutils.version import LooseVersion
 
-from easybuild.framework.easyblock import EasyBlock
+from easybuild.easyblocks.generic.tarball import Tarball
 from easybuild.tools.build_log import EasyBuildError
 from easybuild.tools.filetools import mkdir
 
 
-class EB_Eigen(EasyBlock):
+class EB_Eigen(Tarball):
     """
     Support for building Eigen.
     """
 
-    def configure_step(self):
-        """
-        No configure for Eigen.
-        """
-        pass
-
-    def build_step(self):
-        """
-        No build for Eigen.
-        """
-        pass
-
     def install_step(self):
         """
         Install by copying files to install dir

easybuild/easyblocks/f/fdtd_solutions.py

@@ -30,19 +30,15 @@
 import glob
 import os
 import shutil
+from easybuild.easyblocks.generic.packedbinary import PackedBinary
 from easybuild.easyblocks.generic.rpm import rebuild_rpm
-from easybuild.framework.easyblock import EasyBlock
 from easybuild.tools.build_log import EasyBuildError
 from easybuild.tools.run import run_cmd_qa
 
 
-class EB_FDTD_underscore_Solutions(EasyBlock):
+class EB_FDTD_underscore_Solutions(PackedBinary):
     """Support for building/installing FDTD Solutions."""
 
-    def configure_step(self):
-        """No configuration for FDTD Solutions."""
-        pass
-
     def build_step(self):
         """No build step for FDTD Solutions."""
         # locate RPM and rebuild it to make it relocatable

easybuild/easyblocks/f/fluent.py

@@ -31,30 +31,21 @@
 import stat
 from distutils.version import LooseVersion
 
-from easybuild.framework.easyblock import EasyBlock
+from easybuild.easyblocks.generic.packedbinary import PackedBinary
 from easybuild.tools.filetools import adjust_permissions
 from easybuild.tools.run import run_cmd
 
 
-class EB_FLUENT(EasyBlock):
+class EB_FLUENT(PackedBinary):
     """Support for installing FLUENT."""
 
     def __init__(self, *args, **kwargs):
         """Custom constructor for FLUENT easyblock, initialize/define class parameters."""
         super(EB_FLUENT, self).__init__(*args, **kwargs)
         self.fluent_verdir = 'v%s' % ''.join(self.version.split('.')[:2])
 
-    def configure_step(self):
-        """No configuration for FLUENT."""
-        pass
-
-    def build_step(self):
-        """No building for FLUENT."""
-        pass
-
     def install_step(self):
         """Custom install procedure for FLUENT."""
-
         extra_args =''
         # only include -noroot flag for older versions
         if LooseVersion(self.version) < LooseVersion('15.0'):

easybuild/easyblocks/generic/binary.py

@@ -72,7 +72,7 @@ def __init__(self, *args, **kwargs):
             self.log.info("Performing staged installation via %s" % self.installdir)
 
     def extract_step(self):
-        """Move all source files to the build directory"""
+        """Copy all source files to the build directory"""
 
         self.src[0]['finalpath'] = self.builddir
 
@@ -124,6 +124,11 @@ def post_install_step(self):
 
         super(Binary, self).post_install_step()
 
+    def sanity_check_rpath(self):
+        """Skip the rpath sanity check, this is binary software"""
+        self.log.info("RPATH sanity check is skipped when using %s easyblock (derived from Binary)",
+                      self.__class__.__name__)
+
     def make_module_extra(self):
         """Add the install directory to the PATH."""
 

easybuild/easyblocks/generic/intelbase.py

@@ -362,6 +362,11 @@ def move_after_install(self):
             shutil.rmtree(os.path.join(self.installdir, self.name))
         except OSError, err:
             raise EasyBuildError("Failed to move contents of %s to %s: %s", subdir, self.installdir, err)
+
+    def sanity_check_rpath(self):
+        """Skip the rpath sanity check, this is binary software"""
+        self.log.info("RPATH sanity check is skipped when using %s easyblock (derived from IntelBase)",
+                      self.__class__.__name__)
 
     def make_module_extra(self):
         """Custom variable definitions in module file."""

easybuild/easyblocks/generic/tarball.py

@@ -71,3 +71,8 @@ def install_step(self, src=None):
             shutil.copytree(src, self.installdir, symlinks=self.cfg['keepsymlinks'])
         except OSError, err:
             raise EasyBuildError("Copying %s to installation dir %s failed: %s", src, self.installdir, err)
+
+    def sanity_check_rpath(self):
+        """Skip the rpath sanity check, this is binary software"""
+        self.log.info("RPATH sanity check is skipped when using %s easyblock (derived from Tarball)",
+                      self.__class__.__name__)

easybuild/easyblocks/i/ironpython.py

@@ -34,11 +34,11 @@
 
 import os
 
-from easybuild.framework.easyblock import EasyBlock
+from easybuild.easyblocks.generic.packedbinary import PackedBinary
 from easybuild.tools.run import run_cmd
 
 
-class EB_IronPython(EasyBlock):
+class EB_IronPython(PackedBinary):
     """Support for building/installing IronPython."""
 
     def __init__(self, *args, **kwargs):
@@ -52,14 +52,6 @@ def extract_step(self):
         self.cfg.update('unpack_options', "--strip-components=1")
         super(EB_IronPython, self).extract_step()
 
-    def configure_step(self):
-        """No dedicated configure step for IronPython."""
-        pass
-
-    def build_step(self):
-        """No dedicated build step for IronPython."""
-        pass
-
     def install_step(self):
         """Custom install step for IronPython, using xbuild command."""
 

easybuild/easyblocks/m/maple.py

@@ -35,45 +35,30 @@
 import os
 import shutil
 
-from easybuild.framework.easyblock import EasyBlock
+from easybuild.easyblocks.generic.binary import Binary
 from easybuild.tools.run import run_cmd_qa
 
 
-class EB_Maple(EasyBlock):
+class EB_Maple(Binary):
     """Support for installing Maple."""
 
-    def extract_step(self):
-        """Unpacking of files is just copying Maple binary installer to build dir."""
-
-        for f in self.src:
-            shutil.copy(f['path'], os.path.join(self.builddir, f['name']))
-            f['finalpath'] = self.builddir
-
-    def configure_step(self):
-        """No configuration needed, binary installer"""
-        pass
-
-    def build_step(self):
-        """No compilation needed, binary installer"""
-        pass
-
     def install_step(self):
         """Interactive install of Maple."""
 
         cmd = "%s/Maple%sLinuxX86_64Installer.bin" % (self.builddir, self.cfg['version'])
 
         qa = {
-              'PRESS <ENTER> TO CONTINUE:': '',
-              'DO YOU ACCEPT THE TERMS OF THIS LICENSE AGREEMENT? (Y/N):': 'Y',
-              'ENTER AN ABSOLUTE PATH, OR PRESS <ENTER> TO ACCEPT THE DEFAULT :': self.installdir,
-              'IS THIS CORRECT? (Y/N):': 'Y',
-              'Do you wish to have a shortcut installed on your desktop? ->1- Yes 2- No ENTER THE NUMBER FOR YOUR CHOICE, OR PRESS <ENTER> TO ACCEPT THE DEFAULT::': '2',
-              '->1- Single User License 2- Network License ENTER THE NUMBER FOR YOUR CHOICE, OR PRESS <ENTER> TO ACCEPT THE DEFAULT::': '2',
-              'PRESS <ENTER> TO EXIT THE INSTALLER:': '',
-              'License server (DEFAULT: ):': self.cfg['license_server'],
-              'Port number (optional) (DEFAULT: ):': '',
-              '->1- Configure toolbox for Matlab 2- Do not configure at this time ENTER THE NUMBER FOR YOUR CHOICE, OR PRESS <ENTER> TO ACCEPT THE DEFAULT::': '2'
-             }
+            'PRESS <ENTER> TO CONTINUE:': '',
+            'DO YOU ACCEPT THE TERMS OF THIS LICENSE AGREEMENT? (Y/N):': 'Y',
+            'ENTER AN ABSOLUTE PATH, OR PRESS <ENTER> TO ACCEPT THE DEFAULT :': self.installdir,
+            'IS THIS CORRECT? (Y/N):': 'Y',
+            'Do you wish to have a shortcut installed on your desktop? ->1- Yes 2- No ENTER THE NUMBER FOR YOUR CHOICE, OR PRESS <ENTER> TO ACCEPT THE DEFAULT::': '2',
+            '->1- Single User License 2- Network License ENTER THE NUMBER FOR YOUR CHOICE, OR PRESS <ENTER> TO ACCEPT THE DEFAULT::': '2',
+            'PRESS <ENTER> TO EXIT THE INSTALLER:': '',
+            'License server (DEFAULT: ):': self.cfg['license_server'],
+            'Port number (optional) (DEFAULT: ):': '',
+            '->1- Configure toolbox for Matlab 2- Do not configure at this time ENTER THE NUMBER FOR YOUR CHOICE, OR PRESS <ENTER> TO ACCEPT THE DEFAULT::': '2'
+        }
 
         no_qa = ['Graphical installers are not supported by the VM. The console mode will be used instead...',
                  'Extracting the JRE from the installer archive...',
@@ -86,10 +71,8 @@ def install_step(self):
 
     def sanity_check_step(self):
         """Custom sanity check for Maple."""
-
         custom_paths =  {
-                         'files': ['bin/maple', 'lib/maple.mla'] ,
-                         'dirs':[]
-                        }
-
+            'files': ['bin/maple', 'lib/maple.mla'] ,
+            'dirs':[]
+        }
         super(EB_Maple, self).sanity_check_step(custom_paths=custom_paths)