Skip to content

H
Hdlmake
Commit 7f44a13c authored by William Kamp's avatar William Kamp
Browse files
Options

Fix problems after merge.

parent 340f48a2
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 8 deletions
hdlmake/main.py
View file @ 7f44a13c
......@@ -129,6 +129,9 @@ def _get_parser():
listfiles.add_argument(
"--top", dest="top", default=None,
help="print only those files required to build 'top'")
listfiles.add_argument(
"--qip", dest="qip", default=None,
help="write file list to intel/altera .qip file")
tree = subparsers.add_parser(
"tree",
help="generate a module hierarchy tree graph")
......
hdlmake/module/core.py
View file @ 7f44a13c
......@@ -54,10 +54,10 @@ class ModuleConfig(object):
if self.source == 'svn':
self.url, self.revision = path_mod.svn_parse(url)
else:
self.url, self.branch, self.revision = path_mod.url_parse(url)
self.url, self.branch, self.revision, self.library_overide = path_mod.url_parse(url)
basename = self.basename()
if self.library_overide:
basename += "-" + self.library_overide
basename += "-" + self.library_overide
path = path_mod.relpath(os.path.abspath(
os.path.join(fetchto, basename)))
......
hdlmake/srcfile.py
View file @ 7f44a13c
......@@ -279,9 +279,9 @@ class IPFile(SourceFile):
"""This is the class providing the Altera Quartus IP file"""
def __init__(self, path, module):
assert isinstance(path, six.string_types)
filename = path_mod.pathsplit(path)[-1]
library = filename[:-3] # making some poor assumptions here.
entity = filename[:-3] # and here.
filename = os.path.basename(path)
entity = filename.rsplit(".",1)[0] # making some poor assumptions here.
library = entity # and here.
SourceFile.__init__(self,
path=path,
module=module,
......@@ -296,9 +296,9 @@ class QSYSFile(SourceFile):
"""Qsys - Altera's System Integration Tool"""
def __init__(self, path, module):
assert isinstance(path, six.string_types)
filename = path_mod.pathsplit(path)[-1]
library = filename[:-5] # making some poor assumptions here.
entity = filename[:-5] # and here.
filename = os.path.basename(path)
entity = filename.rsplit(".",1)[0] # making some poor assumptions here.
library = entity # and here.
SourceFile.__init__(self,
path=path,
module=module,
......
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