also create symlinks for default modules in class module folders

Author: migueldiascosta

easybuild/framework/easyblock.py

@@ -2604,7 +2604,8 @@ def _set_module_as_default(self, fake=False):
             dry_run_msg("Marked %s v%s as default version" % (self.name, version))
         else:
             mod_folderpath = os.path.dirname(self.module_generator.get_module_filepath(fake=fake))
-            self.module_generator.set_as_default(mod_folderpath, version)
+            mod_symlink_paths = ActiveMNS().det_module_symlink_paths(self.cfg)
+            self.module_generator.set_as_default(mod_folderpath, version, mod_symlink_paths, fake)
 
     def cleanup_step(self):
         """

easybuild/tools/module_generator.py

@@ -415,12 +415,13 @@ def set_alias(self, key, value):
         """
         raise NotImplementedError
 
-    def set_as_default(self, module_folder_path, module_version):
+    def set_as_default(self, module_folder_path, module_version, mod_symlink_paths=[], fake=False):
         """
         Set generated module as default module
 
         :param module_folder_path: module folder path, e.g. $HOME/easybuild/modules/all/Bison
         :param module_version: module version, e.g. 3.0.4
+        :param mod_symlink_paths: list of paths in which symlinks to module files must be created
         """
         raise NotImplementedError
 
@@ -872,18 +873,34 @@ def set_alias(self, key, value):
         # quotes are needed, to ensure smooth working of EBDEVEL* modulefiles
         return 'set-alias\t%s\t\t%s\n' % (key, quote_str(value, tcl=True))
 
-    def set_as_default(self, module_folder_path, module_version):
+    def set_as_default(self, module_folder_path, module_version, mod_symlink_paths=[], fake=False):
         """
         Create a .version file inside the package module folder in order to set the default version for TMod
 
         :param module_folder_path: module folder path, e.g. $HOME/easybuild/modules/all/Bison
         :param module_version: module version, e.g. 3.0.4
+        :param mod_symlink_paths: list of paths in which symlinks to module files must be created
         """
         txt = self.MODULE_SHEBANG + '\n'
         txt += 'set ModulesVersion %s\n' % module_version
 
         # write the file no matter what
-        write_file(os.path.join(module_folder_path, '.version'), txt)
+        dot_version_path = os.path.join(module_folder_path, '.version')
+        write_file(dot_version_path, txt)
+
+        # create symlink to .version file in class module folders
+        if not fake:
+            for mod_symlink_path in mod_symlink_paths:
+                module_name = os.path.basename(module_folder_path)
+                class_module_folder = os.path.join(install_path('mod'), mod_symlink_path, module_name)
+                dot_version_link_path = os.path.join(class_module_folder, '.version')
+                if os.path.islink(dot_version_link_path):
+                    link_target = resolve_path(dot_version_link_path)
+                    remove_file(dot_version_link_path)
+                    self.log.info("Removed default version marking from %s.", link_target)
+                elif os.path.exists(dot_version_link_path):
+                    raise EasyBuildError('Found an unexpected file named .version in dir %s' % class_module_folder)
+                symlink(dot_version_path, dot_version_link_path, use_abspath_source=True)
 
     def set_environment(self, key, value, relpath=False):
         """
@@ -1277,24 +1294,35 @@ def set_alias(self, key, value):
         # quotes are needed, to ensure smooth working of EBDEVEL* modulefiles
         return 'set_alias("%s", %s)\n' % (key, quote_str(value))
 
-    def set_as_default(self, module_folder_path, module_version):
+    def set_as_default(self, module_folder_path, module_version, mod_symlink_paths=[], fake=False):
         """
         Create a symlink named 'default' inside the package's module folder in order to set the default module version
 
         :param module_folder_path: module folder path, e.g. $HOME/easybuild/modules/all/Bison
         :param module_version: module version, e.g. 3.0.4
+        :param mod_symlink_paths: list of paths in which symlinks to module files must be created
         """
-        default_filepath = os.path.join(module_folder_path, 'default')
+        def create_default_symlink(module_folder_path):
+            default_filepath = os.path.join(module_folder_path, 'default')
 
-        if os.path.islink(default_filepath):
-            link_target = resolve_path(default_filepath)
-            remove_file(default_filepath)
-            self.log.info("Removed default version marking from %s.", link_target)
-        elif os.path.exists(default_filepath):
-            raise EasyBuildError('Found an unexpected file named default in dir %s' % module_folder_path)
+            if os.path.islink(default_filepath):
+                link_target = resolve_path(default_filepath)
+                remove_file(default_filepath)
+                self.log.info("Removed default version marking from %s.", link_target)
+            elif os.path.exists(default_filepath):
+                raise EasyBuildError('Found an unexpected file named default in dir %s' % module_folder_path)
 
-        symlink(module_version + self.MODULE_FILE_EXTENSION, default_filepath, use_abspath_source=False)
-        self.log.info("Module default version file written to point to %s", default_filepath)
+            symlink(module_version + self.MODULE_FILE_EXTENSION, default_filepath, use_abspath_source=False)
+            self.log.info("Module default version file written to point to %s", default_filepath)
+
+        create_default_symlink(module_folder_path)
+
+        # also create symlinks in class module folders
+        if not fake:
+            for mod_symlink_path in mod_symlink_paths:
+                module_name = os.path.basename(module_folder_path)
+                module_folder_path = os.path.join(install_path('mod'), mod_symlink_path, module_name)
+                create_default_symlink(module_folder_path)
 
     def set_environment(self, key, value, relpath=False):
         """