SimplHDL 0.5.0__tar.gz → 0.5.2__tar.gz

{simplhdl-0.5.0 → simplhdl-0.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: SimplHDL
-Version: 0.5.0
+Version: 0.5.2
 Summary: A framework for simulating and implementing HDL designs
 Author-email: Rasmus Grøndahl Olsen <simplhdl@gmail.com>
 Maintainer-email: Rasmus Grøndahl Olsen <simplhdl@gmail.com>
@@ -56,6 +56,7 @@ Requires-Dist: rich
 Requires-Dist: vsg
 Requires-Dist: flake8
 Requires-Dist: black
+Dynamic: license-file
 
 ## Introduction
 

{simplhdl-0.5.0 → simplhdl-0.5.2}/src/SimplHDL.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: SimplHDL
-Version: 0.5.0
+Version: 0.5.2
 Summary: A framework for simulating and implementing HDL designs
 Author-email: Rasmus Grøndahl Olsen <simplhdl@gmail.com>
 Maintainer-email: Rasmus Grøndahl Olsen <simplhdl@gmail.com>
@@ -56,6 +56,7 @@ Requires-Dist: rich
 Requires-Dist: vsg
 Requires-Dist: flake8
 Requires-Dist: black
+Dynamic: license-file
 
 ## Introduction
 

simplhdl-0.5.2/src/simplhdl/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.5.2"

{simplhdl-0.5.0 → simplhdl-0.5.2}/src/simplhdl/__main__.py

@@ -65,7 +65,7 @@ def main():
     try:
         load_plugins()
         args = parse_arguments()
-        levels = [logging.WARNING, logging.INFO, logging.DEBUG, logging.NOTSET]
+        levels = [logging.INFO, logging.DEBUG, logging.NOTSET]
         level = levels[min(args.verbose, len(levels)-1)]
         logging.basicConfig(level=level)
         simpl = Simplhdl(args)

{simplhdl-0.5.0 → simplhdl-0.5.2}/src/simplhdl/flows/quartusexport/quartusexportflow.py

@@ -1,6 +1,7 @@
 import shutil
 import logging
 import zipfile
+import os
 
 from argparse import Namespace
 from pathlib import Path
@@ -56,38 +57,45 @@ class QuartusExportFlow(ImplementationFlow):
         self.vendors = ['mentor', 'synopsys']
         self.templates = templates
         self.tools.add(FlowTools.QUARTUS)
+        self.rootdir = self.directory_root()
+
+    def directory_root(self):
+        files = list()
+        for file in [f for f in self.project.DefaultDesign.Files() if 'implementation' in f[UsedIn]]:
+            if isinstance(file, SettingFile):
+                continue
+            elif isinstance(file, (ConstraintFile, QuartusQIPSpecificationFile)):
+                pass
+            elif isinstance(file, (HDLSearchPath, QuartusIPSpecificationFile)):
+                continue
+            files.append(file.Path.absolute())
+        return Path(os.path.commonpath(files))
 
     def copy_files(self):
         seen = dict()
         files = [f for f in self.project.DefaultDesign.Files() if 'implementation' in f[UsedIn]]
         for file in files:
             fileid = str(file.Path.resolve())
+            dest = self.builddir.joinpath('src', file.Path.relative_to(self.rootdir))
             if fileid in seen:
                 file._path = seen.get(fileid)._path
                 continue
             elif isinstance(file, SettingFile):
                 continue
             elif isinstance(file, (ConstraintFile, QuartusQIPSpecificationFile)):
-                dest = self.builddir.joinpath('constraints', file.Path.name)
                 dest.parent.mkdir(parents=True, exist_ok=True)
                 shutil.copyfile(file.Path, dest)
             elif isinstance(file, (HDLSearchPath, QuartusIPSpecificationFile)):
                 dest = file.Path
             elif isinstance(file, (HDLSourceFile, HDLIncludeFile)):
-                if isinstance(file, HDLSourceFile):
-                    dest = self.builddir.joinpath('rtl', file.Path.name)
-                else:
-                    dest = self.builddir.joinpath('rtl', 'include', file.Path.name)
                 dest.parent.mkdir(parents=True, exist_ok=True)
                 if self.args.encrypt:
                     encrypt(file.Path, dest, language=get_language(file), vendors=self.vendors)
                 else:
                     shutil.copyfile(file.Path, dest)
             else:
-                dest = self.builddir.joinpath('misc', file.Path.name)
                 dest.parent.mkdir(parents=True, exist_ok=True)
                 shutil.copyfile(file.Path, dest)
-                file._path = dest.absolute().relative_to(self.builddir.absolute())
             # Convert to relative path
             file._path = dest.absolute().relative_to(self.builddir.absolute())
             seen[fileid] = file
@@ -96,14 +104,25 @@ class QuartusExportFlow(ImplementationFlow):
         args = Namespace(step='project', archive=False, gui=False)
         quartus = QuartusFlow('quartus', args, self.project, self.builddir)
         quartus.run()
+        try:
+            shutil.rmtree(self.builddir.joinpath('dni'))
+            shutil.rmtree(self.builddir.joinpath('qdb'))
+            os.remove(self.builddir.joinpath('project.tcl'))
+        except FileNotFoundError as e:
+            pass
 
     def archive_project(self) -> None:
+        tmp = output = self.builddir.parent.joinpath(self.project.Name).with_suffix('.zip')
         if self.args.archivefile:
-            archive(self.builddir, self.args.archivefile)
+            tmp = output = self.builddir.parent.joinpath(self.args.archivefile.stem).with_suffix('.zip')
+            output = self.args.archivefile
         else:
-            output = self.builddir.parrent.joinpath(self.project.Name).with_suffix('.zip')
-            archive(self.builddir, output)
-            shutil.move(output, self.builddir)
+            tmp = output = self.builddir.parent.joinpath(self.project.Name).with_suffix('.zip')
+            output = self.builddir.joinpath(tmp.name)
+        archive(self.builddir, tmp)
+        if output.exists():
+            os.remove(output)
+        shutil.move(tmp, output)
 
     def run(self) -> None:
         self.copy_files()

{simplhdl-0.5.0 → simplhdl-0.5.2}/src/simplhdl/flows/quartusflow.py

@@ -14,11 +14,25 @@ from ..flow import FlowFactory, FlowTools
 from .implementationflow import ImplementationFlow
 from ..resources.templates import quartus as templates
 from ..utils import sh, generate_from_template
-from ..pyedaa import (QuartusIPSpecificationFile, VerilogIncludeFile, VerilogSourceFile,
-                      SystemVerilogSourceFile, VHDLSourceFile, ConstraintFile,
-                      EDIFNetlistFile, NetlistFile, SettingFile, QuartusSignalTapFile,
-                      QuartusIniFile, QuartusQIPSpecificationFile, QuartusQSYSSpecificationFile,
-                      HDLSearchPath, VerilogIncludeSearchPath, MemoryInitFile)
+from ..pyedaa import (
+    VerilogIncludeFile,
+    VerilogSourceFile,
+    SystemVerilogSourceFile,
+    VHDLSourceFile,
+    ConstraintFile,
+    EDIFNetlistFile,
+    NetlistFile,
+    SettingFile,
+    HDLSearchPath,
+    VerilogIncludeSearchPath,
+    MemoryInitFile,
+    QuartusSignalTapFile,
+    QuartusIniFile,
+    QuartusQIPSpecificationFile,
+    QuartusQSYSSpecificationFile,
+    QuartusIPSpecificationFile,
+    QuartusSourceTCLFile
+)
 from ..pyedaa.project import Project
 from ..pyedaa.attributes import UsedIn
 
@@ -112,6 +126,7 @@ class QuartusFlow(ImplementationFlow):
             QuartusSignalTapFile=QuartusSignalTapFile,
             QuartusQIPSpecificationFile=QuartusQIPSpecificationFile,
             QuartusQSYSSpecificationFile=QuartusQSYSSpecificationFile,
+            QuartusSourceTCLFile=QuartusSourceTCLFile,
             QuartusIniFile=QuartusIniFile,
             MemoryInitFile=MemoryInitFile,
             project=self.project,

{simplhdl-0.5.0 → simplhdl-0.5.2}/src/simplhdl/flows/questasim/questasimflow.py

@@ -16,6 +16,7 @@ from jinja2 import Template
 from simplhdl.pyedaa.project import Project
 from simplhdl.utils import sh, escape
 from simplhdl.flow import FlowFactory, FlowTools
+from simplhdl.info import Info
 from simplhdl.resources.templates import questasim as questasimtemplates
 from simplhdl.flows.simulationflow import SimulationFlow, FileSetWalker
 from simplhdl.utils import generate_from_template
@@ -45,6 +46,11 @@ class QuestaSimFlow(SimulationFlow):
             default='',
             help="flow step to run"
         )
+        parser.add_argument(
+            '--info',
+            action='store_true',
+            help="Print project"
+        )
         parser.add_argument(
             '-w',
             '--wavedump',
@@ -225,6 +231,12 @@ class QuestaSimFlow(SimulationFlow):
             sh(['qrun', '-clean'], cwd=self.builddir, output=True)
             return
 
+        if self.args.info:
+            args = Namespace(files=False, filesets=False, libraries=False, hooks=False)
+            info = Info(self.name, args, self.project, self.builddir)
+            info.run()
+            return
+
         self.run_hooks('pre')
 
         if step == 'generate':

{simplhdl-0.5.0 → simplhdl-0.5.2}/src/simplhdl/generators/spd.py

@@ -258,7 +258,12 @@ def parse_file(file: File, flow: FlowBase, library) -> FileSet:
         return qsys_to_fileset(file, flow, library)
     elif file.FileType == QuartusIPSpecificationFile:
         if flow.category == FlowCategory.SIMULATION:
-            return Spd(file.Path, flow)
+            spd = Spd(file.Path, flow)
+            parent = file.FileSet
+            for fileset in reversed(spd.filesets):
+                # Add fileset to parent, then set parent to fileset to make a chain
+                parent._fileSets[fileset.Name] = fileset
+                parent = fileset
         else:
             return file
     else:

simplhdl-0.5.0/src/simplhdl/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.5.0"