SimplHDL 0.5.6__tar.gz → 0.5.8__tar.gz

{simplhdl-0.5.6 → simplhdl-0.5.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: SimplHDL
-Version: 0.5.6
+Version: 0.5.8
 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>

{simplhdl-0.5.6 → simplhdl-0.5.8}/src/SimplHDL.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: SimplHDL
-Version: 0.5.6
+Version: 0.5.8
 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>

simplhdl-0.5.8/src/simplhdl/__init__.py

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

{simplhdl-0.5.6 → simplhdl-0.5.8}/src/simplhdl/flows/encrypt/encryptflow.py

@@ -5,11 +5,13 @@ from typing import List
 from argparse import Namespace
 from pathlib import Path
 
+from simplhdl.info import Info
 from simplhdl.flow import FlowFactory, FlowTools, FlowError
 from simplhdl.flows.implementationflow import ImplementationFlow
 from simplhdl.utils import sh
 from simplhdl.pyedaa.project import Project
 from simplhdl.pyedaa import SystemVerilogSourceFile, VerilogSourceFile, VHDLSourceFile, VerilogIncludeFile
+from simplhdl.pyedaa.attributes import Encrypt
 
 logger = logging.getLogger(__name__)
 
@@ -47,6 +49,11 @@ class EncryptFlow(ImplementationFlow):
             action='store',
             help='Output directory'
         )
+        parser.add_argument(
+            '--info',
+            action='store_true',
+            help="Print project"
+        )
 
     def __init__(self, name, args: Namespace, project: Project, builddir: Path):
         super().__init__(name, args, project, builddir)
@@ -62,6 +69,12 @@ class EncryptFlow(ImplementationFlow):
         self.is_tool_setup()
 
     def execute(self):
+        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
+
         outputdir = self.args.outdir or self.builddir
         outputdir.mkdir(parents=True, exist_ok=True)
 
@@ -87,7 +100,7 @@ class EncryptFlow(ImplementationFlow):
             else:
                 vendors = VENDORS
 
-            if self.args.no_encrypt:
+            if self.args.no_encrypt or not file[Encrypt]:
                 shutil.copyfile(file.Path.absolute(), destFile.absolute())
             else:
                 encrypt(file.Path, destFile, language, vendors)

{simplhdl-0.5.6 → simplhdl-0.5.8}/src/simplhdl/flows/quartusexport/quartusexportflow.py

@@ -12,7 +12,7 @@ from simplhdl.flows.quartusflow import QuartusFlow
 from simplhdl.resources.templates import quartus as templates
 from simplhdl.flows.encrypt.encryptflow import encrypt
 from simplhdl.pyedaa.project import Project
-from simplhdl.pyedaa.attributes import UsedIn
+from simplhdl.pyedaa.attributes import UsedIn, Encrypt
 from simplhdl.pyedaa import (
     File,
     HDLSearchPath,
@@ -51,6 +51,14 @@ class QuartusExportFlow(ImplementationFlow):
             type=Path,
             help="Output zip file"
         )
+        parser.add_argument(
+            '-s',
+            '--structure',
+            action='store',
+            choices=['flat', 'hierarchy'],
+            default='hierarchy',
+            help="Output zip file"
+        )
 
     def __init__(self, name, args: Namespace, project: Project, builddir: Path):
         super().__init__(name, args, project, builddir)
@@ -77,6 +85,9 @@ class QuartusExportFlow(ImplementationFlow):
         for file in files:
             fileid = str(file.Path.resolve())
             dest = self.builddir.joinpath('src', file.Path.relative_to(self.rootdir))
+            if self.args.structure == 'flat':
+                dest = self.builddir.joinpath('src', file.Path.name)
+            print(f'{dest=}')
             if fileid in seen:
                 file._path = seen.get(fileid)._path
                 continue
@@ -89,7 +100,7 @@ class QuartusExportFlow(ImplementationFlow):
                 dest = file.Path
             elif isinstance(file, (HDLSourceFile, HDLIncludeFile)):
                 dest.parent.mkdir(parents=True, exist_ok=True)
-                if self.args.encrypt:
+                if self.args.encrypt and file[Encrypt]:
                     encrypt(file.Path, dest, language=get_language(file), vendors=self.vendors)
                 else:
                     shutil.copyfile(file.Path, dest)

{simplhdl-0.5.6 → simplhdl-0.5.8}/src/simplhdl/pyedaa/__init__.py

@@ -3,10 +3,7 @@ import pyEDAA.ProjectModel as pm
 from pathlib import Path
 from typing import Optional
 from pyTooling.MetaClasses import ExtendedType
-from .attributes import UsedIn
-
-SIMULATION = "simulation"
-IMPLEMENTATION = "implementation"
+from .attributes import Encrypt, UsedIn, SIMULATION, IMPLEMENTATION
 
 
 class FileMixIn(metaclass=ExtendedType, mixin=True):
@@ -31,7 +28,9 @@ class HDLLibrary(pm.VHDLLibrary):
 
 
 class HDLIncludeFile(SourceFile):
-    pass
+    def _registerAttributes(self):
+        super()._registerAttributes()
+        self[UsedIn] = {SIMULATION, IMPLEMENTATION}
 
 
 class HDLSearchPath(HDLIncludeFile):
@@ -51,6 +50,8 @@ class HDLSourceFile(pm.HDLSourceFile, FileMixIn):
     def _registerAttributes(self):
         super()._registerAttributes()
         FileMixIn._registerAttributes(self)
+        self[UsedIn] = {SIMULATION, IMPLEMENTATION}
+        self[Encrypt] = True
 
     @property
     def Library(self) -> HDLLibrary:
@@ -84,6 +85,30 @@ class VHDLSourceFile(HDLSourceFile, pm.HumanReadableContent):
     pass
 
 
+class VerilogIncludeEncryptedFile(VerilogIncludeFile):
+    def _registerAttributes(self):
+        super()._registerAttributes()
+        self[Encrypt] = False
+
+
+class VerilogEncryptedSourceFile(VerilogSourceFile):
+    def _registerAttributes(self):
+        super()._registerAttributes()
+        self[Encrypt] = False
+
+
+class SystemVerilogEncryptedSourceFile(SystemVerilogSourceFile):
+    def _registerAttributes(self):
+        super()._registerAttributes()
+        self[Encrypt] = False
+
+
+class VHDLEncryptedSourceFile(VHDLSourceFile):
+    def _registerAttributes(self):
+        super()._registerAttributes()
+        self[Encrypt] = False
+
+
 class PythonSourceFile(pm.PythonSourceFile):
     pass
 

simplhdl-0.5.8/src/simplhdl/pyedaa/attributes.py

@@ -0,0 +1,16 @@
+import pyEDAA.ProjectModel as pm
+
+from typing import Set
+
+SIMULATION = "simulation"
+IMPLEMENTATION = "implementation"
+
+
+class UsedIn(pm.Attribute):
+    NAME: 'UsedIn'
+    VALUE_TYPE: Set[str]
+
+
+class Encrypt(pm.Attribute):
+    NAME: 'Encrypt'
+    VALUE_TYPE: bool

simplhdl-0.5.6/src/simplhdl/__init__.py

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

simplhdl-0.5.6/src/simplhdl/pyedaa/attributes.py

@@ -1,8 +0,0 @@
-import pyEDAA.ProjectModel as pm
-
-from typing import Set
-
-
-class UsedIn(pm.Attribute):
-    NAME: 'UsedIn'
-    VALUE_TYPE: Set[str]