Commit dd4824e9 authored by Tristan Gingold's avatar Tristan Gingold

Do not generate PWD assignment in Makefiles. Update baselines.

parent cd9088c2
......@@ -87,7 +87,6 @@ class ToolISim(ToolSim):
# Ensure the path is absolute and normalized
return os.path.abspath(xilinx_ini_path)
self.writeln("""## variables #############################
PWD := $(shell pwd)
TOP_MODULE := """ + self.manifest_dict.get("sim_top", '') + """
FUSE_OUTPUT ?= isim_proj
......
......@@ -44,7 +44,6 @@ class ToolSim(ToolMakefile):
"""Generic method to write the simulation Makefile top section"""
top_parameter = """\
TOP_MODULE := {top_module}
PWD := $(shell pwd)
"""
self.writeln(top_parameter.format(
top_module=self.manifest_dict["sim_top"]))
......
......@@ -54,7 +54,6 @@ class ToolSyn(ToolMakefile):
tcl_interpreter = self._tool_info["linux_bin"]
top_parameter = """\
TOP_MODULE := {top_module}
PWD := $(shell pwd)
PROJECT := {project_name}
PROJECT_FILE := $(PROJECT).{project_ext}
TOOL_PATH := {tool_path}
......
......@@ -4,7 +4,6 @@
########################################
TOP_MODULE := gate
PWD := $(shell pwd)
PROJECT := gate
PROJECT_FILE := $(PROJECT).xise
TOOL_PATH :=
......
......@@ -4,7 +4,6 @@
########################################
TOP_MODULE := gate
PWD := $(shell pwd)
MODELSIM_INI_PATH := ../linux_fakebin/..
......
......@@ -4,7 +4,6 @@
########################################
TOP_MODULE := gate
PWD := $(shell pwd)
MODELSIM_INI_PATH := my_ini
......
......@@ -4,7 +4,6 @@
########################################
TOP_MODULE := gate
PWD := $(shell pwd)
MODELSIM_INI_PATH := fake_bin/..
......
......@@ -4,7 +4,6 @@
########################################
TOP_MODULE := gate
PWD := $(shell pwd)
#target for performing local simulation
local: sim_pre_cmd simulation sim_post_cmd
......
......@@ -4,7 +4,6 @@
########################################
TOP_MODULE := gate
PWD := $(shell pwd)
PROJECT := gate
PROJECT_FILE := $(PROJECT).ldf
TOOL_PATH :=
......
......@@ -4,7 +4,6 @@
########################################
TOP_MODULE := gate3
PWD := $(shell pwd)
GHDL := ghdl
GHDL_OPT :=
......
......@@ -4,7 +4,6 @@
########################################
TOP_MODULE := gate2
PWD := $(shell pwd)
PROJECT := gate2
PROJECT_FILE := $(PROJECT).
TCL_INTERPRETER := yosys -c
......
......@@ -4,7 +4,6 @@
########################################
## variables #############################
PWD := $(shell pwd)
TOP_MODULE := gate3_tb
FUSE_OUTPUT ?= isim_proj
......
......@@ -4,7 +4,6 @@
########################################
TOP_MODULE := gate
PWD := $(shell pwd)
PROJECT := gate
PROJECT_FILE := $(PROJECT).xise
TOOL_PATH :=
......
......@@ -6,7 +6,6 @@
extra_line: makefile differs...
TOP_MODULE := gate
PWD := $(shell pwd)
PROJECT := gate
PROJECT_FILE := $(PROJECT).xise
TOOL_PATH :=
......
......@@ -4,7 +4,6 @@
########################################
TOP_MODULE := gate2
PWD := $(shell pwd)
IVERILOG_OPT :=
......
......@@ -4,7 +4,6 @@
########################################
TOP_MODULE := gate
PWD := $(shell pwd)
PROJECT := gate
PROJECT_FILE := $(PROJECT).prjx
TOOL_PATH :=
......
......@@ -4,7 +4,6 @@
########################################
TOP_MODULE := gate
PWD := $(shell pwd)
PROJECT := gate
PROJECT_FILE := $(PROJECT).ppr
TOOL_PATH :=
......
......@@ -4,7 +4,6 @@
########################################
TOP_MODULE := gate
PWD := $(shell pwd)
PROJECT := gate_prj
PROJECT_FILE := $(PROJECT).qpf
TOOL_PATH :=
......
......@@ -4,7 +4,6 @@
########################################
TOP_MODULE := gate
PWD := $(shell pwd)
PROJECT := gate_prj
PROJECT_FILE := $(PROJECT).qpf
TOOL_PATH :=
......
......@@ -4,7 +4,6 @@
########################################
TOP_MODULE := gate
PWD := $(shell pwd)
VCOM_FLAGS := -quiet -2008
......
......@@ -4,7 +4,6 @@
########################################
TOP_MODULE := gate
PWD := $(shell pwd)
PROJECT := gate
PROJECT_FILE := $(PROJECT).xpr
TOOL_PATH :=
......
......@@ -4,7 +4,6 @@
########################################
TOP_MODULE := gate
PWD := $(shell pwd)
#target for performing local simulation
local: sim_pre_cmd simulation sim_post_cmd
......
......@@ -4,7 +4,6 @@
########################################
TOP_MODULE := gate
PWD := $(shell pwd)
PROJECT := gate
PROJECT_FILE := $(PROJECT).xpr
TOOL_PATH :=
......
......@@ -4,7 +4,6 @@
########################################
TOP_MODULE := gate
PWD := $(shell pwd)
MODELSIM_INI_PATH := ../linux_fakebin/..
......
......@@ -4,7 +4,6 @@
########################################
TOP_MODULE := gate
PWD := $(shell pwd)
MODELSIM_INI_PATH := ../linux_fakebin/..
......
......@@ -4,7 +4,6 @@
########################################
TOP_MODULE := gate
PWD := $(shell pwd)
MODELSIM_INI_PATH := ../linux_fakebin/..
......
......@@ -4,7 +4,6 @@
########################################
TOP_MODULE := gate
PWD := $(shell pwd)
MODELSIM_INI_PATH := ../linux_fakebin/..
......
......@@ -4,7 +4,6 @@
########################################
TOP_MODULE := gate
PWD := $(shell pwd)
PROJECT := gate_prj
PROJECT_FILE := $(PROJECT).qpf
TOOL_PATH :=
......
......@@ -4,7 +4,6 @@
########################################
TOP_MODULE := gate
PWD := $(shell pwd)
PROJECT := gate_prj
PROJECT_FILE := $(PROJECT).qpf
TOOL_PATH :=
......
......@@ -4,7 +4,6 @@
########################################
TOP_MODULE := gate
PWD := $(shell pwd)
PROJECT := gate_prj
PROJECT_FILE := $(PROJECT).qpf
TOOL_PATH :=
......
......@@ -4,7 +4,6 @@
########################################
TOP_MODULE := mod2
PWD := $(shell pwd)
PROJECT := gate
PROJECT_FILE := $(PROJECT).xise
TOOL_PATH :=
......
......@@ -4,7 +4,6 @@
########################################
TOP_MODULE := gate
PWD := $(shell pwd)
MODELSIM_INI_PATH := ../linux_fakebin/..
......
......@@ -4,7 +4,6 @@
########################################
TOP_MODULE := gate
PWD := $(shell pwd)
MODELSIM_INI_PATH := ../linux_fakebin/..
......
......@@ -6,7 +6,6 @@
include .
TOP_MODULE := gate
PWD := $(shell pwd)
MODELSIM_INI_PATH := ../linux_fakebin/..
......
......@@ -7,7 +7,6 @@ include a.mk
include b.mk
TOP_MODULE := gate
PWD := $(shell pwd)
MODELSIM_INI_PATH := ../linux_fakebin/..
......
......@@ -4,7 +4,6 @@
########################################
TOP_MODULE := gate
PWD := $(shell pwd)
MODELSIM_INI_PATH := ../linux_fakebin/..
......
......@@ -4,7 +4,6 @@
########################################
TOP_MODULE := gate
PWD := $(shell pwd)
PROJECT := gate
PROJECT_FILE := $(PROJECT).xpr
TOOL_PATH :=
......
......@@ -4,7 +4,6 @@
########################################
TOP_MODULE := gate
PWD := $(shell pwd)
MODELSIM_INI_PATH := ..
......
......@@ -4,7 +4,6 @@
########################################
## variables #############################
PWD := $(shell pwd)
TOP_MODULE := gate3_tb
FUSE_OUTPUT ?= isim_proj
......
......@@ -4,7 +4,6 @@
########################################
## variables #############################
PWD := $(shell pwd)
TOP_MODULE := gate3_tb
FUSE_OUTPUT ?= isim_proj
......
......@@ -4,7 +4,6 @@
########################################
TOP_MODULE := None
PWD := $(shell pwd)
PROJECT := gate
PROJECT_FILE := $(PROJECT).xise
TOOL_PATH :=
......
......@@ -4,7 +4,6 @@
########################################
TOP_MODULE := gate
PWD := $(shell pwd)
PROJECT := gate
PROJECT_FILE := $(PROJECT).xise
TOOL_PATH :=
......
......@@ -4,7 +4,6 @@
########################################
TOP_MODULE := gate_tb
PWD := $(shell pwd)
MODELSIM_INI_PATH := ../linux_fakebin/..
......
......@@ -4,7 +4,6 @@
########################################
TOP_MODULE := gate
PWD := $(shell pwd)
MODELSIM_INI_PATH := ../linux_fakebin/..
......
......@@ -4,7 +4,6 @@
########################################
TOP_MODULE := gate
PWD := $(shell pwd)
MODELSIM_INI_PATH := ../linux_fakebin/..
......
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