feedc0de/platformio-core
1
0
Fork 0
forked from platformio/platformio-core
Code Pull Requests Activity

Automatically add SCons to the packages list if it is missed in platform manifest // Issue #479

Browse Source
This commit is contained in:
Ivan Kravets
2016-05-27 14:47:22 +03:00
parent 46893e2f04
commit 825c60e2bd
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
platformio/managers/platform.py
View File

@ -309,7 +309,14 @@ class BasePlatform(PlatformPackagesMixin):
return self.get_boards(id_) return self.get_boards(id_)
def get_packages(self): def get_packages(self):
return self.manifest.get("packages", {}) packages = self.manifest.get("packages", {})
if "tool-scons" not in packages:
packages['tool-scons'] = {
"version": self.manifest.get("engines", {}).get(
"scons", ">=2.3.0,<2.6.0"),
"optional": False
}
return packages
def get_frameworks(self): def get_frameworks(self):
return self.get_manifest().get("frameworks") return self.get_manifest().get("frameworks")
@ -353,13 +360,6 @@ class BasePlatform(PlatformPackagesMixin):
_pkg_name = frameworks[framework]['package'] _pkg_name = frameworks[framework]['package']
self.get_packages()[_pkg_name]['optional'] = False self.get_packages()[_pkg_name]['optional'] = False
# append SCons tool
self.get_packages()['tool-scons'] = {
"version": self.manifest.get("engines", {}).get(
"scons", ">=2.3.0,<2.5.0"),
"optional": False
}
# enable upload tools for upload targets # enable upload tools for upload targets
if any(["upload" in t for t in targets] + ["program" in targets]): if any(["upload" in t for t in targets] + ["program" in targets]):
for _name, _opts in self.get_packages().iteritems(): for _name, _opts in self.get_packages().iteritems():
@ -413,8 +413,7 @@ class BasePlatform(PlatformPackagesMixin):
cmd = [ cmd = [
os.path.normpath(sys.executable), os.path.normpath(sys.executable),
join(util.get_home_dir(), "packages", "tool-scons", join(self.get_package_dir("tool-scons"), "script", "scons"),
"script", "scons"),
"-Q", "-Q",
"-j %d" % self.get_job_nums(), "-j %d" % self.get_job_nums(),
"--warn=no-no-parallel-support", "--warn=no-no-parallel-support",