Skip to content

Commit f812df2

Browse files
committed
Merge pull request #111 from thegecko/master
Moved settings file out of source control folder
2 parents 4456022 + ffa49ee commit f812df2

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

mbed/mbed.py

Lines changed: 5 additions & 6 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

@@ -222,7 +223,6 @@ def scm(cls):
222223
@staticclass
223224
class Hg(object):
224225
name = 'hg'
225-
store = '.hg'
226226

227227
def isurl(url):
228228
m_url = re.match(regex_url_ref, url.strip().replace('\\', '/'))
@@ -406,7 +406,6 @@ def unignore(repo, file):
406406
@staticclass
407407
class Git(object):
408408
name = 'git'
409-
store = '.git'
410409

411410
def isurl(url):
412411
m_url = re.match(regex_url_ref, url.strip().replace('\\', '/'))
@@ -1186,7 +1185,7 @@ def compile(toolchain=None, mcu=None, source=False, build=False, compile_library
11861185
error('The mbed-os codebase and tools were not found.', -1)
11871186

11881187
repo = Repo.fromrepo()
1189-
file = os.path.join(repo.scm.store, 'mbed')
1188+
file = os.path.join('.mbed')
11901189

11911190
target = mcu if mcu else get_cfg(file, 'TARGET')
11921191
if target is None:
@@ -1310,7 +1309,7 @@ def export(ide=None, mcu=None):
13101309

13111310
args = remainder
13121311
repo = Repo.fromrepo()
1313-
file = os.path.join(repo.scm.store, 'mbed')
1312+
file = os.path.join('.mbed')
13141313

13151314
target = mcu if mcu else get_cfg(file, 'TARGET')
13161315
if target is None:
@@ -1338,7 +1337,7 @@ def target(name=None):
13381337
root_path = Repo.findroot(os.getcwd())
13391338
with cd(root_path):
13401339
repo = Repo.fromrepo()
1341-
file = os.path.join(repo.scm.store, 'mbed')
1340+
file = os.path.join('.mbed')
13421341
if name is None:
13431342
name = get_cfg(file, 'TARGET')
13441343
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)
@@ -1353,7 +1352,7 @@ def toolchain(name=None):
13531352
root_path = Repo.findroot(os.getcwd())
13541353
with cd(root_path):
13551354
repo = Repo.fromrepo()
1356-
file = os.path.join(repo.scm.store, 'mbed')
1355+
file = os.path.join('.mbed')
13571356
if name is None:
13581357
name = get_cfg(file, 'TOOLCHAIN')
13591358
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)