check for presence of particular tools

e0d8f4dd · Paweł Szostek · f43e660a · e0d8f4dd
Commit e0d8f4dd authored Aug 16, 2013 by Paweł Szostek
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 12 deletions

simulation.py hdlmake/action/simulation.py +13 -12

No files found.
--- a/hdlmake/action/simulation.py
+++ b/hdlmake/action/simulation.py
@@ -49,23 +49,24 @@ class GenerateSimulationMakefile(Action):
            sys.exit("Exiting")

    def _generate_vsim_makefile(self):
-#        p.info("Generating makefile for simulation.")
-        # if self.env["modelsim_path"] is None:
-        #     logging.error("Can't generate a Modelsim makefile. Modelsim not found.")
-        #     sys.exit("Exiting")
+        if self.env["modelsim_path"] is None:
+            logging.error("Can't generate a Modelsim makefile. Modelsim not found.")
+            sys.exit("Exiting")
+
+        from dep_file import DepFile
        logging.info("Generating ModelSim makefile for simulation.")

        pool = self.modules_pool
        top_module = pool.get_top_module()
        fset = pool.build_global_file_list()
        dep_solver.solve(fset)
-        global_mod.makefile_writer.generate_vsim_makefile(fset, top_module)
+        dep_files = fset.filter(DepFile)
+        global_mod.makefile_writer.generate_vsim_makefile(dep_files, top_module)

    def _generate_isim_makefile(self):
-#        p.info("Generating makefile for simulation.")
-        # if self.env["isim_path"] is None and self.env["xilinx"] is None:
-        #     logging.error("Can't generate an ISim makefile. ISim not found.")
-        #     sys.exit("Exiting")
+        if self.env["isim_path"] is None and self.env["xilinx"] is None:
+            logging.error("Can't generate an ISim makefile. ISim not found.")
+            sys.exit("Exiting")

        logging.info("Generating ISE Simulation (ISim) makefile for simulation.")

@@ -77,10 +78,10 @@ class GenerateSimulationMakefile(Action):
        global_mod.makefile_writer.generate_isim_makefile(fset, top_module)

    def _generate_iverilog_makefile(self):
-        # if self.env["iverilog_path"] is None:
-        #     logging.error("Can't generate an IVerilog makefile. IVerilog not found.")
-        #     sys.exit("Exiting")
        logging.info("Generating IVerilog makefile for simulation.")
+        if self.env["iverilog_path"] is None:
+            logging.error("Can't generate an IVerilog makefile. IVerilog not found.")
+            sys.exit("Exiting")

        pool = self.modules_pool