Skip to content

H
Hdlmake
Commit ffa53083 authored by Pawel Szostek's avatar Pawel Szostek
Browse files
Options

Implement --force switch handling

parent 1ea61641
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 17 deletions
hdlmake/action/ise_makefile.py
View file @ ffa53083
...@@ -31,8 +31,10 @@ class GenerateISEMakefile(Action): ...@@ -31,8 +31,10 @@ class GenerateISEMakefile(Action):
def run(self): def run(self):
logging.info("Generating makefile for local synthesis.") logging.info("Generating makefile for local synthesis.")
if global_mod.env["ise_path"]:
ise_path = global_mod.env["ise_path"] ise_path = global_mod.env["ise_path"]
else:
ise_path = ""
global_mod.makefile_writer.generate_ise_makefile(top_mod=self.modules_pool.get_top_module(), global_mod.makefile_writer.generate_ise_makefile(top_mod=self.modules_pool.get_top_module(),
ise_path=ise_path) ise_path=ise_path)
......
hdlmake/action/ise_project.py
View file @ ffa53083
...@@ -41,21 +41,16 @@ class GenerateISEProject(Action): ...@@ -41,21 +41,16 @@ class GenerateISEProject(Action):
def _check_env(self): def _check_env(self):
env = self.env env = self.env
if self.env["ise_path"] is None: if not self.options.force:
logging.error("Can't generate an ISE project. ISE not found.") if self.env["ise_path"] is None:
quit() logging.error("Can't generate an ISE project. ISE not found.")
else: quit()
if not env["ise_version"]: if not env["ise_version"]:
logging.error("Xilinx version cannot be deduced. Cannot generate ISE " logging.error("Xilinx version cannot be deduced. Cannot generate ISE "
"project file properly. Please use syn_ise_version in the manifest " "project file properly. Please use syn_ise_version in the manifest "
"or set") "or set")
sys.exit("Exiting") sys.exit("Exiting")
else: logging.info("Generating project for ISE v. %s" % env["ise_version"])
logging.info("Generating project for ISE v. %s" % env["ise_version"])
def _to_bcd(self, integer):
assert integer >= 0 and integer <= 0
def run(self): def run(self):
self._check_all_fetched_or_quit() self._check_all_fetched_or_quit()
......
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