Skip to content

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

Adapt the synthesis tools to use the new pure Python 'which' function

parent 0a6230de
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 11 deletions
hdlmake/tools/diamond.py
View file @ 6bcc2084
......@@ -36,8 +36,8 @@ class ToolDiamond(ToolSyn):
TOOL_INFO = {
'name': 'Diamond',
'id': 'diamond',
'windows_bin': 'pnmainc ',
'linux_bin': 'diamondc ',
'windows_bin': 'pnmainc',
'linux_bin': 'diamondc',
'project_ext': 'ldf'}
SUPPORTED_FILES = [EDFFile, LPFFile]
......
hdlmake/tools/ise.py
View file @ 6bcc2084
......@@ -54,8 +54,8 @@ class ToolISE(ToolSyn):
TOOL_INFO = {
'name': 'ISE',
'id': 'ise',
'windows_bin': 'xtclsh ',
'linux_bin': 'xtclsh ',
'windows_bin': 'xtclsh',
'linux_bin': 'xtclsh',
'project_ext': 'xise'}
STANDARD_LIBS = ['ieee', 'ieee_proposed', 'iSE', 'simprims', 'std',
......
hdlmake/tools/make_syn.py
View file @ 6bcc2084
......@@ -200,7 +200,7 @@ tcl_bitstream: tcl_par
\t\techo "$$TCL_BITSTREAM" >> run.tcl
run_tcl:
\t\t$(TCL_INTERPRETER)run.tcl
\t\t$(TCL_INTERPRETER) run.tcl
synthesize: tcl_clean tcl_open tcl_synthesize tcl_close \
syn_pre_synthesize_cmd run_tcl syn_post_synthesize_cmd
......
hdlmake/tools/planahead.py
View file @ 6bcc2084
......@@ -35,8 +35,8 @@ class ToolPlanAhead(ToolXilinx):
TOOL_INFO = {
'name': 'PlanAhead',
'id': 'planahead',
'windows_bin': 'planAhead -mode tcl -source ',
'linux_bin': 'planAhead -mode tcl -source ',
'windows_bin': 'planAhead -mode tcl -source',
'linux_bin': 'planAhead -mode tcl -source',
'project_ext': 'ppr'}
STANDARD_LIBS = ['ieee', 'ieee_proposed', 'simprims', 'std',
......
hdlmake/tools/vivado.py
View file @ 6bcc2084
......@@ -38,8 +38,8 @@ class ToolVivado(ToolXilinx, ToolSim):
TOOL_INFO = {
'name': 'vivado',
'id': 'vivado',
'windows_bin': 'vivado ',
'linux_bin': 'vivado ',
'windows_bin': 'vivado',
'linux_bin': 'vivado',
'project_ext': 'xpr'
}
......
hdlmake/util/path.py
View file @ 6bcc2084
......@@ -200,12 +200,12 @@ def mkdir_command():
def which(filename):
"""docstring for which"""
"""Implement the which function and return the paths as a string list"""
locations = os.environ.get("PATH").split(os.pathsep)
candidates = []
for location in locations:
candidate = os.path.join(location, filename)
if os.path.isfile(candidate):
if os.path.isfile(candidate.split()[0]):
candidates.append(candidate)
return candidates
......
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