integration/builder: simplify default output_dir to "build/platform".

All SoC are now based on the same base class and naming was too complicated.
This commit is contained in:
Florent Kermarrec 2020-05-19 13:59:56 +02:00
parent 55c0ddab36
commit 109fd2674a
1 changed files with 2 additions and 3 deletions

View File

@ -55,9 +55,8 @@ class Builder:
bios_options = None): bios_options = None):
self.soc = soc self.soc = soc
# From Python doc: makedirs() will become confused if the path # From Python doc: makedirs() will become confused if the path elements to create include '..'
# elements to create include '..' self.output_dir = os.path.abspath(output_dir or os.path.join("build", soc.platform.name))
self.output_dir = os.path.abspath(output_dir or "soc_{}_{}".format(soc.__class__.__name__.lower(), soc.platform.name))
self.gateware_dir = os.path.abspath(gateware_dir or os.path.join(self.output_dir, "gateware")) self.gateware_dir = os.path.abspath(gateware_dir or os.path.join(self.output_dir, "gateware"))
self.software_dir = os.path.abspath(software_dir or os.path.join(self.output_dir, "software")) self.software_dir = os.path.abspath(software_dir or os.path.join(self.output_dir, "software"))
self.include_dir = os.path.abspath(include_dir or os.path.join(self.software_dir, "include")) self.include_dir = os.path.abspath(include_dir or os.path.join(self.software_dir, "include"))