Skip to content

Commit ffa49ee

Browse files
committed
Renamed settings file and added file to ingores[] explicitly
1 parent 3591468 commit ffa49ee

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

mbed/mbed.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858
"*.htm",
5959

6060
# Settings files
61+
".mbed",
6162
"*.settings",
6263
"mbed_settings.py",
6364

@@ -1184,7 +1185,7 @@ def compile(toolchain=None, mcu=None, source=False, build=False, compile_library
11841185
error('The mbed-os codebase and tools were not found.', -1)
11851186

11861187
repo = Repo.fromrepo()
1187-
file = os.path.join('.mbed.settings')
1188+
file = os.path.join('.mbed')
11881189

11891190
target = mcu if mcu else get_cfg(file, 'TARGET')
11901191
if target is None:
@@ -1308,7 +1309,7 @@ def export(ide=None, mcu=None):
13081309

13091310
args = remainder
13101311
repo = Repo.fromrepo()
1311-
file = os.path.join('.mbed.settings')
1312+
file = os.path.join('.mbed')
13121313

13131314
target = mcu if mcu else get_cfg(file, 'TARGET')
13141315
if target is None:
@@ -1336,7 +1337,7 @@ def target(name=None):
13361337
root_path = Repo.findroot(os.getcwd())
13371338
with cd(root_path):
13381339
repo = Repo.fromrepo()
1339-
file = os.path.join('.mbed.settings')
1340+
file = os.path.join('.mbed')
13401341
if name is None:
13411342
name = get_cfg(file, 'TARGET')
13421343
action(('The default target for program "%s" is "%s"' % (repo.name, name)) if name else 'No default target is specified for program "%s"' % repo.name)
@@ -1351,7 +1352,7 @@ def toolchain(name=None):
13511352
root_path = Repo.findroot(os.getcwd())
13521353
with cd(root_path):
13531354
repo = Repo.fromrepo()
1354-
file = os.path.join('.mbed.settings')
1355+
file = os.path.join('.mbed')
13551356
if name is None:
13561357
name = get_cfg(file, 'TOOLCHAIN')
13571358
action(('The default toolchain for program "%s" is "%s"' % (repo.name, name)) if name else 'No default toolchain is specified for program "%s"' % repo.name)

0 commit comments

Comments
 (0)