Skip to content

H
Hdlmake
Commit 55709f50 authored by Javier D. Garcia-Lasheras's avatar Javier D. Garcia-Lasheras
Browse files
Options

A more ordered way to process the Manifest dict using super

parent 2ba26cdf
Hide whitespace changes
Inline Side-by-side
Showing with 48 additions and 18 deletions
hdlmake/module.py
View file @ 55709f50
...@@ -154,6 +154,10 @@ class Module(ModuleCore, ModuleSynthesis, ModuleSimulation, ModuleContent, Modul ...@@ -154,6 +154,10 @@ class Module(ModuleCore, ModuleSynthesis, ModuleSimulation, ModuleContent, Modul
except OSError: # a catologue is not empty - we are done except OSError: # a catologue is not empty - we are done
break break
def process_manifest(self):
super(Module, self).process_manifest()
logging.debug("Process manifest at: " + os.path.dirname(self.path))
def parse_manifest(self): def parse_manifest(self):
""" """
Create a dictionary from the module Manifest.py and assign it to the manifest_dict property. Create a dictionary from the module Manifest.py and assign it to the manifest_dict property.
...@@ -213,15 +217,7 @@ class Module(ModuleCore, ModuleSynthesis, ModuleSimulation, ModuleContent, Modul ...@@ -213,15 +217,7 @@ class Module(ModuleCore, ModuleSynthesis, ModuleSimulation, ModuleContent, Modul
self.manifest_dict = opt_map self.manifest_dict = opt_map
# Process the parsed manifest_dict to assign the module properties # Process the parsed manifest_dict to assign the module properties
self._process_manifest_universal() self.process_manifest()
self._process_manifest_synthesis()
self._process_manifest_simulation()
self._process_manifest_includes()
self._process_manifest_files()
self._process_manifest_modules()
self._process_manifest_altera()
self._process_manifest_force_tool()
self._process_manifest_included_makefiles()
# Tag the module as parsed # Tag the module as parsed
self.isparsed = True self.isparsed = True
......
hdlmake/module_altera.py
View file @ 55709f50
import os import os
from .module_plugin import ModulePlugin
from .util import path as path_mod from .util import path as path_mod
class ModuleAltera(object): class ModuleAltera(ModulePlugin):
def __init__(self): def __init__(self):
super(ModuleAltera, self).__init__()
# Manifest Altera Properties # Manifest Altera Properties
self.quartus_preflow = None self.quartus_preflow = None
self.quartus_postmodule = None self.quartus_postmodule = None
self.quartus_postflow = None self.quartus_postflow = None
self.hw_tcl_filename = None self.hw_tcl_filename = None
super(ModuleAltera, self).__init__()
def process_manifest(self):
self._process_manifest_altera()
super(ModuleAltera, self).process_manifest()
def _process_manifest_altera(self): def _process_manifest_altera(self):
from .srcfile import TCLFile from .srcfile import TCLFile
......
hdlmake/module_content.py
View file @ 55709f50
import logging import logging
from . import fetch from . import fetch
from .module_plugin import ModulePlugin
from .util import path as path_mod from .util import path as path_mod
class ModuleContent(object): class ModuleContent(ModulePlugin):
def __init__(self): def __init__(self):
super(ModuleContent, self).__init__()
# Manifest Files Properties # Manifest Files Properties
self.files = None self.files = None
# Manifest Modules Properties # Manifest Modules Properties
...@@ -12,6 +12,12 @@ class ModuleContent(object): ...@@ -12,6 +12,12 @@ class ModuleContent(object):
self.git = [] self.git = []
self.svn = [] self.svn = []
self.git_submodules = [] self.git_submodules = []
super(ModuleContent, self).__init__()
def process_manifest(self):
self._process_manifest_files()
self._process_manifest_modules()
super(ModuleContent, self).process_manifest()
def _process_manifest_files(self): def _process_manifest_files(self):
from .srcfile import TCLFile, VerilogFile, VHDLFile, SourceFileSet from .srcfile import TCLFile, VerilogFile, VHDLFile, SourceFileSet
......
hdlmake/module_core.py
View file @ 55709f50
from .module_plugin import ModulePlugin
class ModuleCore(object): class ModuleCore(ModulePlugin):
def __init__(self): def __init__(self):
super(ModuleCore, self).__init__()
# Universal Manifest Properties # Universal Manifest Properties
self.library = "work" self.library = "work"
self.target = None self.target = None
self.action = None self.action = None
super(ModuleCore, self).__init__()
# Manifest Force tool Property # Manifest Force tool Property
self.force_tool = None self.force_tool = None
def process_manifest(self):
self._process_manifest_force_tool()
self._process_manifest_universal()
super(ModuleCore, self).process_manifest()
def _process_manifest_force_tool(self): def _process_manifest_force_tool(self):
if self.manifest_dict["force_tool"]: if self.manifest_dict["force_tool"]:
ft = self.manifest_dict["force_tool"] ft = self.manifest_dict["force_tool"]
......
hdlmake/module_plugin.py 0 → 100644
View file @ 55709f50
class ModulePlugin(object):
def process_manifest(self):
pass
hdlmake/module_simulation.py
View file @ 55709f50
from .module_plugin import ModulePlugin
class ModuleSimulation(object): class ModuleSimulation(object):
def __init__(self): def __init__(self):
super(ModuleSimulation, self).__init__()
# Manifest Simulation Properties # Manifest Simulation Properties
self.sim_top = None self.sim_top = None
self.sim_tool = None self.sim_tool = None
...@@ -16,7 +16,12 @@ class ModuleSimulation(object): ...@@ -16,7 +16,12 @@ class ModuleSimulation(object):
self.iverilog_opt = None self.iverilog_opt = None
# Includes Manifest Properties # Includes Manifest Properties
self.include_dirs = None self.include_dirs = None
super(ModuleSimulation, self).__init__()
def process_manifest(self):
self._process_manifest_simulation()
self._process_manifest_includes()
super(ModuleSimulation, self).process_manifest()
def _process_manifest_simulation(self): def _process_manifest_simulation(self):
from .srcfile import SourceFileSet from .srcfile import SourceFileSet
......
hdlmake/module_synthesis.py
View file @ 55709f50
from .module_plugin import ModulePlugin
class ModuleSynthesis(object): class ModuleSynthesis(ModulePlugin):
def __init__(self): def __init__(self):
super(ModuleSynthesis, self).__init__()
# Manifest Synthesis Properties # Manifest Synthesis Properties
self.syn_device = None self.syn_device = None
self.syn_family = None self.syn_family = None
...@@ -15,6 +15,12 @@ class ModuleSynthesis(object): ...@@ -15,6 +15,12 @@ class ModuleSynthesis(object):
self.syn_post_script = None self.syn_post_script = None
# Manifest Included Makefiles # Manifest Included Makefiles
self.incl_makefiles = [] self.incl_makefiles = []
super(ModuleSynthesis, self).__init__()
def process_manifest(self):
self._process_manifest_synthesis()
self._process_manifest_included_makefiles()
super(ModuleSynthesis, self).process_manifest()
def _process_manifest_synthesis(self): def _process_manifest_synthesis(self):
# Synthesis properties # Synthesis properties
......
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