Skip to content

H
Hdlmake
Commit 15c57029 authored by Tristan Gingold's avatar Tristan Gingold
Browse files
Options

xilinx_prj.py: use single quote instead of double quotes. 

Simplify the code.
Adjust baselines
parent 7a78578e
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 27 deletions
hdlmake/tools/xilinx_prj.py
View file @ 15c57029
......@@ -59,14 +59,13 @@ class ToolXilinxProject:
fileset_dict = {}
fileset_dict.update(self.HDL_FILES)
fileset_dict.update(self.SUPPORTED_FILES)
q = '' if shell.check_windows_commands() else '"'
# Add all files at once.
self.writeln('\t@echo add_files -norecurse {q}{{{q} >> $@'.format(q=q))
self.writeln("\t@echo add_files -norecurse '{' >> $@")
for srcfile in self.fileset.sort():
if type(srcfile) in fileset_dict:
self.writeln('\t@echo {q}{srcfile}{q} >> $@'.format(
q=q, srcfile=shell.tclpath(srcfile.rel_path())))
self.writeln('\t@echo {q}}}{q} >> $@'.format(q=q))
self.writeln("\t@echo '{}' >> $@".format(
shell.tclpath(srcfile.rel_path())))
self.writeln("\t@echo '}' >> $@")
# Add per file properties (like library)
for srcfile in self.fileset.sort():
command = fileset_dict.get(type(srcfile))
......@@ -82,5 +81,4 @@ class ToolXilinxProject:
cmd = command.format(srcfile=shell.tclpath(srcfile.rel_path()),
library=library)
if cmd:
self.writeln('\t@echo {q}{cmd}{q} >> $@'.format(
q=q, cmd=cmd))
self.writeln("\t@echo '{}' >> $@".format(cmd))
testsuite/014planahead/Makefile.ref
View file @ 15c57029
......@@ -28,9 +28,9 @@ endif
all: bitstream
files.tcl:
@echo add_files -norecurse "{" >> $@
@echo "../files/gate.vhdl" >> $@
@echo "}" >> $@
@echo add_files -norecurse '{' >> $@
@echo '../files/gate.vhdl' >> $@
@echo '}' >> $@
SYN_PRE_PROJECT_CMD :=
SYN_POST_PROJECT_CMD :=
......
testsuite/018vivado/Makefile.ref
View file @ 15c57029
......@@ -28,9 +28,9 @@ endif
all: bitstream
files.tcl:
@echo add_files -norecurse "{" >> $@
@echo "../files/gate.vhdl" >> $@
@echo "}" >> $@
@echo add_files -norecurse '{' >> $@
@echo '../files/gate.vhdl' >> $@
@echo '}' >> $@
SYN_PRE_PROJECT_CMD :=
SYN_POST_PROJECT_CMD :=
......
testsuite/019vsim/Makefile.ref
View file @ 15c57029
......@@ -24,10 +24,10 @@ work/gate/.gate_vhdl: ../files/gate.vhdl
project.tcl: Makefile
@echo "create_project -force $(TOP_MODULE)_prj ./" > $@
@echo add_files -norecurse "{" >> $@
@echo "../files/gate.vhdl" >> $@
@echo "}" >> $@
@echo "set_property LIBRARY work [get_files ../files/gate.vhdl]" >> $@
@echo add_files -norecurse '{' >> $@
@echo '../files/gate.vhdl' >> $@
@echo '}' >> $@
@echo 'set_property LIBRARY work [get_files ../files/gate.vhdl]' >> $@
@echo "exit" >> $@
project: project.tcl
......
testsuite/023xci/Makefile.ref
View file @ 15c57029
......@@ -28,9 +28,9 @@ endif
all: bitstream
files.tcl:
@echo add_files -norecurse "{" >> $@
@echo "../files/gate.vhdl" >> $@
@echo "}" >> $@
@echo add_files -norecurse '{' >> $@
@echo '../files/gate.vhdl' >> $@
@echo '}' >> $@
SYN_PRE_PROJECT_CMD :=
SYN_POST_PROJECT_CMD :=
......
testsuite/054vivado_props/Makefile.ref
View file @ 15c57029
......@@ -28,9 +28,9 @@ endif
all: bitstream
files.tcl:
@echo add_files -norecurse "{" >> $@
@echo "../files/gate.vhdl" >> $@
@echo "}" >> $@
@echo add_files -norecurse '{' >> $@
@echo '../files/gate.vhdl' >> $@
@echo '}' >> $@
SYN_PRE_PROJECT_CMD :=
SYN_POST_PROJECT_CMD :=
......
testsuite/104xci/Makefile.ref
View file @ 15c57029
......@@ -28,10 +28,10 @@ endif
all: bitstream
files.tcl:
@echo add_files -norecurse "{" >> $@
@echo "vio_din2_w64_dout2_w64.xci" >> $@
@echo "xci_test.vhd" >> $@
@echo "}" >> $@
@echo add_files -norecurse '{' >> $@
@echo 'vio_din2_w64_dout2_w64.xci' >> $@
@echo 'xci_test.vhd' >> $@
@echo '}' >> $@
SYN_PRE_PROJECT_CMD :=
SYN_POST_PROJECT_CMD :=
......
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