Move the complete module stuff to a new subpackage folder

parent 53aab390
...@@ -3,4 +3,5 @@ from .synthesis import ModuleSynthesis ...@@ -3,4 +3,5 @@ from .synthesis import ModuleSynthesis
from .simulation import ModuleSimulation from .simulation import ModuleSimulation
from .content import ModuleContent from .content import ModuleContent
from .altera import ModuleAltera from .altera import ModuleAltera
from .module import Module
...@@ -25,10 +25,10 @@ import os ...@@ -25,10 +25,10 @@ import os
import sys import sys
import logging import logging
from .manifest_parser import Manifest, ManifestParser from hdlmake.manifest_parser import Manifest, ManifestParser
from .util import path as path_mod from hdlmake.util import path as path_mod
from . import fetch from hdlmake import fetch
from .mod import ModuleCore, ModuleSynthesis, ModuleSimulation, ModuleContent, ModuleAltera from hdlmake.module import ModuleCore, ModuleSynthesis, ModuleSimulation, ModuleContent, ModuleAltera
class Module(ModuleCore, ModuleSynthesis, ModuleSimulation, ModuleContent, ModuleAltera): class Module(ModuleCore, ModuleSynthesis, ModuleSimulation, ModuleContent, ModuleAltera):
...@@ -48,7 +48,7 @@ class Module(ModuleCore, ModuleSynthesis, ModuleSimulation, ModuleContent, Modul ...@@ -48,7 +48,7 @@ class Module(ModuleCore, ModuleSynthesis, ModuleSimulation, ModuleContent, Modul
@property @property
def basename(self): def basename(self):
from .util import path from hdlmake.util import path
if self.source == fetch.SVN: if self.source == fetch.SVN:
return path.svn_basename(self.url) return path.svn_basename(self.url)
else: else:
...@@ -249,7 +249,7 @@ class Module(ModuleCore, ModuleSynthesis, ModuleSimulation, ModuleContent, Modul ...@@ -249,7 +249,7 @@ class Module(ModuleCore, ModuleSynthesis, ModuleSimulation, ModuleContent, Modul
def _create_file_list_from_paths(self, paths): def _create_file_list_from_paths(self, paths):
from .srcfile import SourceFileFactory, SourceFileSet from hdlmake.srcfile import SourceFileFactory, SourceFileSet
sff = SourceFileFactory() sff = SourceFileFactory()
srcs = SourceFileSet() srcs = SourceFileSet()
for p in paths: for p in paths:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment