SimplHDL 0.1.0__tar.gz → 0.1.2__tar.gz

{simplhdl-0.1.0 → simplhdl-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: SimplHDL
-Version: 0.1.0
+Version: 0.1.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>

{simplhdl-0.1.0 → simplhdl-0.1.2}/src/SimplHDL.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: SimplHDL
-Version: 0.1.0
+Version: 0.1.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>

simplhdl-0.1.2/src/simplhdl/__init__.py

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

{simplhdl-0.1.0 → simplhdl-0.1.2}/src/simplhdl/flows/quartusflow.py

@@ -34,7 +34,7 @@ class QuartusFlow(ImplementationFlow):
             '-s',
             '--step',
             action='store',
-            choices=['synthesis', 'implement', 'finalize', 'compile'],
+            choices=['project', 'synthesis', 'implement', 'finalize', 'compile'],
             default='compile',
             help="flow step to run"
         )
@@ -45,8 +45,12 @@ class QuartusFlow(ImplementationFlow):
         )
         parser.add_argument(
             '--archive',
-            choices=['project'],
-            help="Archive Quartus project and results"
+            choices=[
+                'project',
+                'project-service-request',
+                'project-source'
+            ],
+            help="Archive Quartus project, settings and results"
         )
 
     def __init__(self, name, args: Namespace, project: Project, builddir: Path):
@@ -64,7 +68,15 @@ class QuartusFlow(ImplementationFlow):
 
     def archive(self) -> None:
         name = self.project.Name
-        command = f"quartus_sh --archive -use_file_set full_db -revision {name} -no_discover -output {name}.qar {name}"
+        if self.args.archive == 'project':
+            fileset = 'full_db'
+        elif self.args.archive == 'project-service-request':
+            fileset = 'sr'
+        elif self.args.archive == 'project-source':
+            fileset = 'basic'
+        else:
+            raise Exception("Unknown value for argument --archive: {self.args.archive}")
+        command = f"quartus_sh --archive -use_file_set {fileset} -revision {name} -no_discover -output {name}.qar {name}"  # noqa
         sh(command.split(), output=True, cwd=self.builddir)
         raise SystemExit
 

{simplhdl-0.1.0 → simplhdl-0.1.2}/src/simplhdl/flows/vivadoflow.py

@@ -14,7 +14,7 @@ from ..resources.templates import vivado as templates
 from ..utils import sh, generate_from_template, dict2str
 from ..pyedaa import (VivadoIPSpecificationFile, VerilogIncludeFile, VerilogSourceFile,
                       SystemVerilogSourceFile, VHDLSourceFile, ConstraintFile,
-                      EDIFNetlistFile, NetlistFile)
+                      EDIFNetlistFile, NetlistFile, VivadoBDTclFile, VivadoProjectStepFile)
 from ..pyedaa.project import Project
 from ..pyedaa.attributes import UsedIn
 
@@ -101,6 +101,8 @@ class VivadoFlow(FlowBase):
                                VHDLSourceFile=VHDLSourceFile,
                                ConstraintFile=ConstraintFile,
                                VivadoIPSpecificationFile=VivadoIPSpecificationFile,
+                               VivadoProjectStepFile=VivadoProjectStepFile,
+                               VivadoBDTclFile=VivadoBDTclFile,
                                EDIFNetlistFile=EDIFNetlistFile,
                                NetlistFile=NetlistFile,
                                project=self.project,

{simplhdl-0.1.0 → simplhdl-0.1.2}/src/simplhdl/generators/ipxact.py

@@ -185,8 +185,9 @@ class VivadoIP(GeneratorBase):
             for fileset in filesets:
                 corefiles += component.files(fileset)
             for file_element in corefiles:
-                file = component.filepath(file_element)
-                if file.exists() and file.suffix == '.xml':
+                # Get the .xml file next to the .xci file
+                file = component.filepath(file_element).with_suffix('.xml')
+                if file.exists():
                     files += self.get_files(file)
         for view in component.views('.*simulation.*'):
             filesets = component.filesets(view)

{simplhdl-0.1.0 → simplhdl-0.1.2}/src/simplhdl/generators/spd.py

@@ -123,7 +123,19 @@ class QuartusIP(GeneratorBase):
         md5file = dest.with_suffix('.md5')
         ipdir.mkdir(exist_ok=True)
         if filename.FileType == QuartusQSYSSpecificationFile:
-            pass
+            update = True
+            dir = filename.Path.with_suffix('')
+            if dir.exists():
+                if md5file.exists():
+                    update = not md5check(filename.Path, dir, filename=md5file)
+            if update:
+                copy(str(filename.Path), str(dest.with_suffix('.qsys')))
+                md5write(filename.Path, filename=md5file)
+                if dir.exists():
+                    copytree(str(dir), str(dest.with_suffix('')), dirs_exist_ok=True)
+                    md5write(filename.Path, dir, filename=md5file)
+                    logger.debug(f"Copy {filename.Path} to {dest}")
+            filename._path = dest.with_suffix('.qsys').absolute()
 
         elif filename.FileType == QuartusIPCompressedSpecificationFile:
             update = True

{simplhdl-0.1.0 → simplhdl-0.1.2}/src/simplhdl/pyedaa/__init__.py

@@ -158,6 +158,14 @@ class VivadoIPSpecificationFile(IPSpecificationFile):
     pass
 
 
+class VivadoBDTclFile(TCLSourceFile):
+    pass
+
+
+class VivadoProjectStepFile(TCLSourceFile):
+    pass
+
+
 class SystemRDLSourceFile(File):
     pass
 

{simplhdl-0.1.0 → simplhdl-0.1.2}/src/simplhdl/resources/templates/quartus/run.tcl.j2

@@ -6,6 +6,9 @@ set step [lindex $argv 0]
 project_open {{project.Name}}
 
 switch $step {
+   project {
+      puts "\nINFO: Project creation was successful.\n"
+   }
    compile {
       if {[catch {execute_flow -compile} result]} {
       	puts "\nResult: $result\n"

{simplhdl-0.1.0 → simplhdl-0.1.2}/src/simplhdl/resources/templates/vivado/project.tcl.j2

@@ -99,10 +99,10 @@ add_files "{{file.Path|replace('\\', '/')}}"
 read_edif "{{file.Path|replace('\\', '/')}}"
 {% elif file.Path.suffix == '.bd' %}
 read_bd "{{file.Path|replace('\\', '/')}}"
-{% elif file.Path.name.endswith('.bd.tcl') %}
+{% elif file.FileType == VivadoBDTclFile %}
 send_msg_id {SimplHDL PRJ-3} {INFO} "Sourcing BD tcl file {{file.Path|replace('\\', '/')}}: this might take some time."
 source_script "{{file.Path|replace('\\', '/')}}"
-{% elif file.Path.name.endswith('.steps.tcl') %}
+{% elif file.FileType == VivadoProjectStepFile %}
 add_files -fileset utils_1 "{{file.Path|replace('\\', '/')}}"
 global step
 set step {project}

simplhdl-0.1.0/src/simplhdl/__init__.py

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