Skip to content

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

add more fine-grained make commands

parent cbe1cc21
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 14 deletions
hdlmake/__main__.py
View file @ a4315934
......@@ -188,6 +188,8 @@ def main():
]
elif options.command == "make-simulation":
action = [ GenerateSimulationMakefile ]
elif options.command == "make-synthesis":
action = [ GenerateSynthesisMakefile ]
elif options.command == "make-fetch":
action = [ GenerateFetchMakefile ]
elif options.command == "make-remote":
......@@ -202,10 +204,6 @@ def main():
action = [ ListFiles ]
elif options.command == "merge-cores":
action = [ MergeCores ]
elif options.command == "ise-project":
action = [ GenerateSynthesisProject ]
elif options.command == "quartus-project":
action = [ GenerateSynthesisProject ]
elif options.command == "project":
action = [ GenerateSynthesisProject ]
elif options.command == "tree":
......@@ -247,9 +245,12 @@ def _get_parser():
description="Look for environmental variables specific for HDLMAKE.\n"
"Hdlmake will examine presence of supported synthesis and simulation"
"tools.\n")
# check_manifest = subparsers.add_parser("check-manifest", help="check manifest for formal correctness")
# check_manifest.add_argument("--top", help="indicate path to the top manifest", default=None)
check_manifest = subparsers.add_parser("check-manifest", help="check manifest for formal correctness")
check_manifest.add_argument("--top", help="indicate path to the top manifest", default=None)
manifest_help = subparsers.add_parser("manifest-help", help="print manifest file variables description")
make_simulation = subparsers.add_parser("make-simulation", help="generate simulation makefile")
make_fetch = subparsers.add_parser("make-fetch", help="generate fetch makefile")
make_synthesis = subparsers.add_parser("make-synthesis", help="generate synthesis makefile")
fetch = subparsers.add_parser("fetch", help="fetch and/or update remote modules listed in Manifest")
fetch.add_argument("--flatten", help="`flatten' modules' hierarchy by storing everything in top module's fetchto direactoru",
......@@ -263,10 +264,6 @@ def _get_parser():
listfiles.add_argument("--delimiter", help="set delimitier for the list of files", dest="delimiter", default=' ')
merge_cores = subparsers.add_parser("merge-cores", help="Merges entire synthesizable content of an project into a pair of VHDL/Verilog files")
merge_cores.add_argument("--dest", help="name for output merged file", dest="dest", default=None)
ise_proj = subparsers.add_parser("ise-project", help="create/update an ise project including list of project")
ise_proj.add_argument("--generate-project-vhd", help="generate project.vhd file with a meta package describing the project",
dest="generate_project_vhd", default=False, action="store_true")
quartus_proj = subparsers.add_parser("quartus-project", help="create/update a quartus project including list of project")
synthesis_proj = subparsers.add_parser("project", help="create/update a project for the appropriated tool")
tree = subparsers.add_parser("tree", help="generate a module hierarchy tree")
tree.add_argument("--with-files", help="Add files to the module hierarchy tree", default=False, action="store_true", dest="withfiles")
......@@ -281,8 +278,6 @@ def _get_parser():
auto.add_argument('-v', '--version', action='version', version=parser.prog + " " + __version__)
auto.add_argument("--force", help="force hdlmake to generate the makefile, even if the specified tool is missing", default=False, action="store_true")
auto.add_argument("--noprune", help="prevent hdlmake from pruning unneeded files", default=False, action="store_true")
auto.add_argument("--generate-project-vhd", help="generate project.vhd file with a meta package describing the project",
dest="generate_project_vhd", default=False, action="store_true")
parser.add_argument("--py", dest="arbitrary_code",
default="", help="add arbitrary code when evaluation all manifests")
......
hdlmake/action/fetch_makefile.py
View file @ a4315934
......@@ -22,6 +22,7 @@
import logging
from hdlmake import global_mod
from hdlmake.makefile_writer import MakefileWriter
from .action import Action
class GenerateFetchMakefile(Action):
......@@ -34,5 +35,6 @@ class GenerateFetchMakefile(Action):
quit()
self._check_all_fetched_or_quit()
global_mod.makefile_writer.generate_fetch_makefile(pool)
logging.info("Makefile for fetching modules generated.")
\ No newline at end of file
makefile_writer = MakefileWriter()
makefile_writer.generate_fetch_makefile(pool)
logging.info("Makefile for fetching modules generated.")
hdlmake/action/synthesis.py
View file @ a4315934
......@@ -66,6 +66,10 @@ class GenerateSynthesisMakefile(Action):
version_key = tool_info['id'] + '_version'
name = tool_info['name']
env = self.env
env.check_general()
env.check_tool(tool_object)
if global_mod.env[path_key]:
tool_path = global_mod.env[path_key]
else:
......
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