Skip to content

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

Add an option to set the Makefile's filename

parent b6303f00
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 8 deletions
hdlmake/__main__.py
View file @ ef680b48
...@@ -332,6 +332,11 @@ def _get_parser(): ...@@ -332,6 +332,11 @@ def _get_parser():
help="prevent hdlmake from pruning unneeded files", help="prevent hdlmake from pruning unneeded files",
default=False, default=False,
action="store_true") action="store_true")
parser.add_argument(
"-f", "--filename",
help="Name for the Makefile file to be created",
default=None,
dest="filename")
parser.add_argument( parser.add_argument(
"--prefix", "--prefix",
dest="prefix_code", dest="prefix_code",
......
hdlmake/tools/make_sim.py
View file @ ef680b48
...@@ -41,7 +41,8 @@ class ToolSim(ToolMakefile): ...@@ -41,7 +41,8 @@ class ToolSim(ToolMakefile):
# Filter the not parseable files! # Filter the not parseable files!
dep_files = fset.filter(DepFile) dep_files = fset.filter(DepFile)
# dep_solver.solve(dep_files) # dep_solver.solve(dep_files)
self.makefile_setup(manifest_project_dict, dep_files) self.makefile_setup(manifest_project_dict, dep_files,
filename=pool.env.options.filename)
self.makefile_check_tool('sim_path') self.makefile_check_tool('sim_path')
self.makefile_sim_top() self.makefile_sim_top()
self.makefile_sim_options() self.makefile_sim_options()
......
hdlmake/tools/make_syn.py
View file @ ef680b48
...@@ -57,7 +57,8 @@ class ToolSyn(ToolMakefile): ...@@ -57,7 +57,8 @@ class ToolSyn(ToolMakefile):
logging.info("Detected %d supported files that are not parseable", logging.info("Detected %d supported files that are not parseable",
len(privative_files)) len(privative_files))
fileset.add(privative_files) fileset.add(privative_files)
self.makefile_setup(manifest_project_dict, fileset) self.makefile_setup(manifest_project_dict, fileset,
filename=pool.env.options.filename)
self.makefile_check_tool('syn_path') self.makefile_check_tool('syn_path')
self.makefile_includes() self.makefile_includes()
self.makefile_syn_top() self.makefile_syn_top()
......
hdlmake/tools/makefile.py
View file @ ef680b48
...@@ -35,7 +35,7 @@ class ToolMakefile(object): ...@@ -35,7 +35,7 @@ class ToolMakefile(object):
"""Class that provides the Makefile writing methods and status""" """Class that provides the Makefile writing methods and status"""
def __init__(self, filename=None): def __init__(self):
super(ToolMakefile, self).__init__() super(ToolMakefile, self).__init__()
self._file = None self._file = None
self._initialized = False self._initialized = False
...@@ -47,19 +47,18 @@ class ToolMakefile(object): ...@@ -47,19 +47,18 @@ class ToolMakefile(object):
self._standard_libs = [] self._standard_libs = []
self.fileset = None self.fileset = None
self.manifest_dict = {} self.manifest_dict = {}
if filename: self._filename = "Makefile"
self._filename = filename
else:
self._filename = "Makefile"
def __del__(self): def __del__(self):
if self._file: if self._file:
self._file.close() self._file.close()
def makefile_setup(self, manifest_project_dict, fileset): def makefile_setup(self, manifest_project_dict, fileset, filename=None):
"""Set the Makefile configuration""" """Set the Makefile configuration"""
self.manifest_dict = manifest_project_dict self.manifest_dict = manifest_project_dict
self.fileset = fileset self.fileset = fileset
if filename:
self._filename = filename
def _get_name_bin(self): def _get_name_bin(self):
"""Get the name and binary values""" """Get the name and binary values"""
......
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