Skip to content

Commit

Permalink
build: replace mkdir_noerror with os.makedirs. Closes #47
Browse files Browse the repository at this point in the history
sbourdeauducq committed Nov 5, 2016
1 parent b94d1f5 commit 9228a74
Showing 6 changed files with 6 additions and 13 deletions.
4 changes: 2 additions & 2 deletions migen/build/altera/quartus.py
Original file line number Diff line number Diff line change
@@ -100,7 +100,7 @@ def _run_quartus(build_name, quartus_path):
quartus_fit --read_settings_files=off --write_settings_files=off {build_name} -c {build_name}
quartus_asm --read_settings_files=off --write_settings_files=off {build_name} -c {build_name}
quartus_sta {build_name} -c {build_name}
quartus_cpf -c {build_name}.sof {build_name}.rbf
quartus_cpf -c {build_name}.sof {build_name}.rbf
""".format(build_name=build_name) # noqa
build_script_file = "build_" + build_name + ".sh"
@@ -116,7 +116,7 @@ class AlteraQuartusToolchain:
def build(self, platform, fragment, build_dir="build", build_name="top",
toolchain_path="/opt/Altera", run=True):
cwd = os.getcwd()
tools.mkdir_noerror(build_dir)
os.makedirs(build_dir, exist_ok=True)
os.chdir(build_dir)

if not isinstance(fragment, _Fragment):
2 changes: 1 addition & 1 deletion migen/build/lattice/diamond.py
Original file line number Diff line number Diff line change
@@ -77,7 +77,7 @@ def _run_diamond(build_name, source, ver=None):
class LatticeDiamondToolchain:
def build(self, platform, fragment, build_dir="build", build_name="top",
toolchain_path="/opt/Diamond", run=True):
tools.mkdir_noerror(build_dir)
os.makedirs(build_dir, exist_ok=True)
cwd = os.getcwd()
os.chdir(build_dir)

2 changes: 1 addition & 1 deletion migen/build/lattice/icestorm.py
Original file line number Diff line number Diff line change
@@ -92,7 +92,7 @@ def __init__(self):
# platform.device should be of the form "ice40-{1k,8k}-{tq144, etc}""
def build(self, platform, fragment, build_dir="build", build_name="top",
run=True):
tools.mkdir_noerror(build_dir)
os.makedirs(build_dir, exist_ok=True)
cwd = os.getcwd()
os.chdir(build_dir)

7 changes: 0 additions & 7 deletions migen/build/tools.py
Original file line number Diff line number Diff line change
@@ -6,13 +6,6 @@
import sys


def mkdir_noerror(d):
try:
os.mkdir(d)
except OSError:
pass


def language_by_filename(name):
extension = name.rsplit(".")[-1]
if extension in ["v", "vh", "vo"]:
2 changes: 1 addition & 1 deletion migen/build/xilinx/ise.py
Original file line number Diff line number Diff line change
@@ -159,7 +159,7 @@ def build(self, platform, fragment, build_dir="build", build_name="top",
ngdbuild_opt = self.ngdbuild_opt
vns = None

tools.mkdir_noerror(build_dir)
os.makedirs(build_dir, exist_ok=True)
cwd = os.getcwd()
os.chdir(build_dir)
try:
2 changes: 1 addition & 1 deletion migen/build/xilinx/vivado.py
Original file line number Diff line number Diff line change
@@ -141,7 +141,7 @@ def _convert_clocks(self, platform):

def build(self, platform, fragment, build_dir="build", build_name="top",
toolchain_path="/opt/Xilinx/Vivado", source=True, run=True):
tools.mkdir_noerror(build_dir)
os.makedirs(build_dir, exist_ok=True)
cwd = os.getcwd()
os.chdir(build_dir)

0 comments on commit 9228a74

Please sign in to comment.