Fixed bug - it works, but I don't know why..

src/fetch.py

@@ -4,122 +4,6 @@ import os
 import msg as p
 import path
 
-class ModuleFetcher:
-    def __init__(self):
-        pass
-
-    def fetch_single_module(self, module):
-        new_modules = []
-        p.vprint("Fetching manifest: " + str(module.manifest))
-
-        if module.source == "local":
-            p.vprint("ModPath: " + module.path);
-        if module.source == "svn":
-            p.vprint("[svn] Fetching to " + module.fetchto)
-            self.__fetch_from_svn(module)
-        if module.source == "git":
-            p.vprint("[git] Fetching to " + module.fetchto)
-            self.__fetch_from_git(module)
-
-        module.parse_manifest()
-
-        if module.root_module != None:
-            p.vprint("Encountered root manifest: " + str(root_module))
-            new_modules.append(module.root_module)
-
-        new_modules.extend(module.local)
-        new_modules.extend(module.svn)
-        new_modules.extend(module.git)
-        return new_modules 
-
-    def __fetch_from_svn(self, module):
-        fetchto = module.fetchto
-        if not os.path.exists(fetchto):
-            os.mkdir(fetchto)
-
-        cur_dir = os.getcwd()
-        os.chdir(fetchto)
-        url, rev = self.__parse_repo_url(module.url)
-
-        basename = path.url_basename(url)
-
-        cmd = "svn checkout {0} " + basename
-        if rev:
-            cmd = cmd.format(url + '@' + rev)
-        else:
-            cmd = cmd.format(url)
-
-        rval = True
-
-        p.vprint(cmd)
-        if os.system(cmd) != 0:
-            rval = False
-        os.chdir(cur_dir)
-
-        module.isfetched = True
-        module.revision = rev
-        module.path = os.path.join(fetchto, basename)
-        return rval
-
-    def __fetch_from_git(self, module):
-        fetchto = module.fetchto
-        if not os.path.exists(fetchto):
-            os.mkdir(fetchto)
-
-        cur_dir = os.getcwd()
-        os.chdir(fetchto)
-        url, rev = self.__parse_repo_url(module.url)
-
-        basename = path.url_basename(url)
-
-        if basename.endswith(".git"):
-            basename = basename[:-4] #remove trailing .git
-
-        if not os.path.exists(os.path.join(fetchto, basename)):
-            update_only = False
-        else:
-            update_only = True
-
-        if update_only:
-            cmd = "git --git-dir="+basename+"/.git pull"
-        else:
-            cmd = "git clone " + url
-
-        rval = True
-
-        p.vprint(cmd)
-        if os.system(cmd) != 0:
-            rval = False
-
-        if rev and rval:
-            os.chdir(basename)
-            cmd = "git checkout " + rev
-            p.vprint(cmd)
-            if os.system(cmd) != 0:
-                rval = False
-
-        os.chdir(cur_dir)
-        module.isfetched = True
-        module.revision = rev
-        module.path = os.path.join(fetchto, basename)
-        return rval
-
-    def __parse_repo_url(self, url) :
-        """
-        Check if link to a repo seems to be correct. Filter revision number
-        """
-        import re
-        url_pat = re.compile("[ \t]*([^ \t]+)[ \t]*(@[ \t]*(.+))?[ \t]*")
-        url_match = re.match(url_pat, url)
-
-        if url_match == None:
-            p.echo("Not a correct repo url: {0}. Skipping".format(url))
-        if url_match.group(3) != None: #there is a revision given 
-            ret = (url_match.group(1), url_match.group(3))
-        else:
-            ret = (url_match.group(1), None)
-        return ret
-
 class ModulePool(list):
     class ModuleFetcher:
         def __init__(self):
@@ -222,6 +106,22 @@ class ModulePool(list):
             module.revision = rev
             module.path = os.path.join(fetchto, basename)
             return rval
+
+        def __parse_repo_url(self, url) :
+            """
+            Check if link to a repo seems to be correct. Filter revision number
+            """
+            import re
+            url_pat = re.compile("[ \t]*([^ \t]+)[ \t]*(@[ \t]*(.+))?[ \t]*")
+            url_match = re.match(url_pat, url)
+
+            if url_match == None:
+                p.echo("Not a correct repo url: {0}. Skipping".format(url))
+            if url_match.group(3) != None: #there is a revision given 
+                ret = (url_match.group(1), url_match.group(3))
+            else:
+                ret = (url_match.group(1), None)
+            return ret
     #end class ModuleFetcher
     def __parse_repo_url(self, url) :
         """
@@ -270,20 +170,18 @@ 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)
+            for mod in new_module.submodules():
+                self.add(mod)
+        self.modules.append(new_module)
         return True
 
     def fetch_all(self):
-        fetcher = ModuleFetcher()
-        fetch_queue = [self.top_module]
+        fetcher = self.ModuleFetcher()
+        fetch_queue = [mod for mod in self.modules if not mod.isfetched]
 
         while len(fetch_queue) > 0:
             cur_mod = fetch_queue.pop()
-            self.add(cur_mod)
             new_modules = fetcher.fetch_single_module(cur_mod)
 
             for mod in new_modules:

src/hdlmake_kernel.py

@@ -21,7 +21,8 @@ class HdlmakeKernel(object):
         if tm.action == "simulation":
             self.generate_modelsim_makefile()
         elif tm.action == "synthesis":
-            self.fetch()
+            if not self.modules_pool.is_everything_fetched():
+                self.fetch()
             self.generate_ise_project()
             self.generate_ise_makefile()
             self.generate_remote_synthesis_makefile()

src/module.py

@@ -271,7 +271,7 @@ class Module(object):
     def is_fetched_recursively(self):
         if not self.isfetched:
             return False
-        for mod in self.local + self.svn + self.git:
+        for mod in self.submodules():
             if mod.is_fetched_recursively() == False:
                 return False
         return True