Skip to content

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

Move the synthesis-related stuff at module.py to a new class

parent 1896e976
Hide whitespace changes
Inline Side-by-side
Showing with 50 additions and 45 deletions
hdlmake/action/synthesis.py
View file @ e76af3da
......@@ -27,7 +27,6 @@ import importlib
from .action import Action
class GenerateSynthesisMakefile(Action):
def _check_manifest(self):
......
hdlmake/module.py
View file @ e76af3da
......@@ -28,9 +28,10 @@ import logging
from .manifest_parser import Manifest, ManifestParser
from .util import path as path_mod
from . import fetch
from .module_synthesis import ModuleSynthesis
class Module(object):
class Module(ModuleSynthesis):
@property
def source(self):
return self._source
......@@ -58,6 +59,8 @@ class Module(object):
assert url is not None
assert source is not None
super(Module, self).__init__()
self.manifest = None
self.manifest_dict = None
self.pool = pool
......@@ -98,18 +101,6 @@ class Module(object):
# Manifest Force tool Property
self.force_tool = None
# Manifest Synthesis Properties
self.syn_device = None
self.syn_family = None
self.syn_grade = None
self.syn_package = None
self.syn_project = None
self.syn_top = None
self.syn_tool = None
self.syn_ise_version = None
self.syn_pre_script = None
self.syn_post_script = None
# Manifest Simulation Properties
self.sim_top = None
self.sim_tool = None
......@@ -286,37 +277,6 @@ class Module(object):
m.parse_manifest()
def _process_manifest_synthesis(self):
# Synthesis properties
self.syn_pre_cmd = self.manifest_dict["syn_pre_cmd"]
self.syn_pre_synthesize_cmd = self.manifest_dict["syn_pre_synthesize_cmd"]
self.syn_post_synthesize_cmd = self.manifest_dict["syn_post_synthesize_cmd"]
self.syn_pre_translate_cmd = self.manifest_dict["syn_pre_translate_cmd"]
self.syn_post_translate_cmd = self.manifest_dict["syn_post_translate_cmd"]
self.syn_pre_map_cmd = self.manifest_dict["syn_pre_map_cmd"]
self.syn_post_map_cmd = self.manifest_dict["syn_post_map_cmd"]
self.syn_pre_par_cmd = self.manifest_dict["syn_pre_par_cmd"]
self.syn_post_par_cmd = self.manifest_dict["syn_post_par_cmd"]
self.syn_pre_bitstream_cmd = self.manifest_dict["syn_pre_bitstream_cmd"]
self.syn_post_bitstream_cmd = self.manifest_dict["syn_post_bitstream_cmd"]
self.syn_post_cmd = self.manifest_dict["syn_post_cmd"]
if self.manifest_dict["syn_name"] is None and self.manifest_dict["syn_project"] is not None:
self.syn_name = self.manifest_dict["syn_project"][:-5] # cut out .xise from the end
else:
self.syn_name = self.manifest_dict["syn_name"]
self.syn_tool = self.manifest_dict["syn_tool"]
self.syn_device = self.manifest_dict["syn_device"]
self.syn_family = self.manifest_dict["syn_family"]
self.syn_grade = self.manifest_dict["syn_grade"]
self.syn_package = self.manifest_dict["syn_package"]
self.syn_project = self.manifest_dict["syn_project"]
self.syn_top = self.manifest_dict["syn_top"]
if self.manifest_dict["syn_ise_version"] is not None:
version = self.manifest_dict["syn_ise_version"]
self.syn_ise_version = str(version)
def _process_manifest_simulation(self):
from .srcfile import SourceFileSet
# Simulation properties
......
hdlmake/module_synthesis.py 0 → 100644
View file @ e76af3da
class ModuleSynthesis(object):
def __init__(self):
super(ModuleSynthesis, self).__init__()
# Manifest Synthesis Properties
self.syn_device = None
self.syn_family = None
self.syn_grade = None
self.syn_package = None
self.syn_project = None
self.syn_top = None
self.syn_tool = None
self.syn_ise_version = None
self.syn_pre_script = None
self.syn_post_script = None
def _process_manifest_synthesis(self):
# Synthesis properties
self.syn_pre_cmd = self.manifest_dict["syn_pre_cmd"]
self.syn_pre_synthesize_cmd = self.manifest_dict["syn_pre_synthesize_cmd"]
self.syn_post_synthesize_cmd = self.manifest_dict["syn_post_synthesize_cmd"]
self.syn_pre_translate_cmd = self.manifest_dict["syn_pre_translate_cmd"]
self.syn_post_translate_cmd = self.manifest_dict["syn_post_translate_cmd"]
self.syn_pre_map_cmd = self.manifest_dict["syn_pre_map_cmd"]
self.syn_post_map_cmd = self.manifest_dict["syn_post_map_cmd"]
self.syn_pre_par_cmd = self.manifest_dict["syn_pre_par_cmd"]
self.syn_post_par_cmd = self.manifest_dict["syn_post_par_cmd"]
self.syn_pre_bitstream_cmd = self.manifest_dict["syn_pre_bitstream_cmd"]
self.syn_post_bitstream_cmd = self.manifest_dict["syn_post_bitstream_cmd"]
self.syn_post_cmd = self.manifest_dict["syn_post_cmd"]
if self.manifest_dict["syn_name"] is None and self.manifest_dict["syn_project"] is not None:
self.syn_name = self.manifest_dict["syn_project"][:-5] # cut out .xise from the end
else:
self.syn_name = self.manifest_dict["syn_name"]
self.syn_tool = self.manifest_dict["syn_tool"]
self.syn_device = self.manifest_dict["syn_device"]
self.syn_family = self.manifest_dict["syn_family"]
self.syn_grade = self.manifest_dict["syn_grade"]
self.syn_package = self.manifest_dict["syn_package"]
self.syn_project = self.manifest_dict["syn_project"]
self.syn_top = self.manifest_dict["syn_top"]
if self.manifest_dict["syn_ise_version"] is not None:
version = self.manifest_dict["syn_ise_version"]
self.syn_ise_version = str(version)
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