Fix fetch-makefile generation

Now modules to be fetched are recognized properly

synthesis/fetch.py

@@ -270,6 +270,9 @@ class ModulePool(list):
             raise RuntimeError("Expecting a Module instance")
         if self.__contains(new_module):
             return
+        for mod in new_module.submodules():
+            self.add(mod)
+
         if new_module.isfetched:
             self.modules.append(new_module)
         return True

synthesis/hdlmake_kernel.py

@@ -208,9 +208,6 @@ class HdlmakeKernel(object):
         os.chdir("..")
         ssh.transfer_files_back(what=dest_folder+cwd, where=".")
         os.chdir(cur_dir)
-     #   if global_mod.options.del == True:
-     #       p.echo("Deleting synthesis folder")
-     #       ssh.system('rm -rf ' + dest_folder)
 
     def __search_tcl_file(self, directory = None):
         import re

synthesis/makefile_writer.py

@@ -152,9 +152,9 @@ mrproper:
                 file.write("cd " + rp(module.fetchto) + '; ')
                 c = "svn checkout {0} {1};"
                 if module.revision:
-                    c.format(module.url, module.revision)
+                    c=c.format(module.url, module.revision)
                 else:
-                    c.format(module.url, "")
+                    c=c.format(module.url, "")
                 file.write(c)
                 file.write("cd $(PWD) \n\n")
 

synthesis/module.py

@@ -123,6 +123,9 @@ class Module(object):
     def __str__(self):
         return self.url
 
+    def submodules(self):
+        return self.local + self.git + self.svn
+
     def basename(self):
         import path
         return path.url_basename(self.url)