From 6b064cb915361c40deac6eef2e684e44c753848c Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Wed, 3 Aug 2016 19:58:35 +0300 Subject: [PATCH] Refactor DevPlatform to PioPlatform --- platformio/__init__.py | 2 +- platformio/builder/main.py | 4 ++-- platformio/builder/tools/piomisc.py | 2 +- .../tools/{devplatform.py => pioplatform.py} | 18 +++++++++--------- platformio/builder/tools/piotest.py | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) rename platformio/builder/tools/{devplatform.py => pioplatform.py} (90%) diff --git a/platformio/__init__.py b/platformio/__init__.py index 46a60abe..031e0d08 100644 --- a/platformio/__init__.py +++ b/platformio/__init__.py @@ -14,7 +14,7 @@ import sys -VERSION = (3, 0, "0.dev17") +VERSION = (3, 0, "0.dev18") __version__ = ".".join([str(s) for s in VERSION]) __title__ = "platformio" diff --git a/platformio/builder/main.py b/platformio/builder/main.py index c27e30ed..0e75f873 100644 --- a/platformio/builder/main.py +++ b/platformio/builder/main.py @@ -68,7 +68,7 @@ commonvars.AddVariables( DefaultEnvironment( tools=[ "ar", "as", "gcc", "g++", "gnulink", - "platformio", "devplatform", + "platformio", "pioplatform", "piolib", "piotest", "pioupload", "pioar", "piomisc" ], # yapf: disable toolpath=[join(util.get_source_dir(), "builder", "tools")], @@ -118,7 +118,7 @@ for opt in ("LIB_IGNORE", "LIB_FORCE", "LIB_EXTRA_DIRS"): env[opt] = [l.strip() for l in env[opt].split(",") if l.strip()] env.Prepend(LIBSOURCE_DIRS=env.get("LIB_EXTRA_DIRS", [])) -env.LoadDevPlatform(commonvars) +env.LoadPioPlatform(commonvars) env.SConscriptChdir(0) env.SConsignFile(join("$PROJECTPIOENVS_DIR", ".sconsign.dblite")) diff --git a/platformio/builder/tools/piomisc.py b/platformio/builder/tools/piomisc.py index e2153798..07a8c55f 100644 --- a/platformio/builder/tools/piomisc.py +++ b/platformio/builder/tools/piomisc.py @@ -161,7 +161,7 @@ def DumpIDEData(env): includes.extend(lb.get_inc_dirs()) # includes from toolchains - p = env.DevPlatform() + p = env.PioPlatform() for name in p.get_installed_packages(): if p.get_package_type(name) != "toolchain": continue diff --git a/platformio/builder/tools/devplatform.py b/platformio/builder/tools/pioplatform.py similarity index 90% rename from platformio/builder/tools/devplatform.py rename to platformio/builder/tools/pioplatform.py index deaa017e..521ecdec 100644 --- a/platformio/builder/tools/devplatform.py +++ b/platformio/builder/tools/pioplatform.py @@ -23,23 +23,23 @@ from platformio.managers.platform import PlatformFactory @util.memoized -def initDevPlatform(name): +def initPioPlatform(name): return PlatformFactory.newPlatform(name) -def DevPlatform(env): +def PioPlatform(env): variables = {} for key in ("board", "pioframework"): if key not in env: continue variables[key] = env[key.upper()] - p = initDevPlatform(env['PLATFORM_MANIFEST']) + p = initPioPlatform(env['PLATFORM_MANIFEST']) p.configure_default_packages(variables, COMMAND_LINE_TARGETS) return p def BoardConfig(env, board=None): - p = initDevPlatform(env['PLATFORM_MANIFEST']) + p = initPioPlatform(env['PLATFORM_MANIFEST']) try: config = p.board_config(board if board else env['BOARD']) except exception.UnknownBoard as e: @@ -48,7 +48,7 @@ def BoardConfig(env, board=None): def GetFrameworkScript(env, framework): - p = env.DevPlatform() + p = env.PioPlatform() assert p.frameworks and framework in p.frameworks script_path = env.subst(p.frameworks[framework]['script']) if not isfile(script_path): @@ -56,8 +56,8 @@ def GetFrameworkScript(env, framework): return script_path -def LoadDevPlatform(env, variables): - p = env.DevPlatform() +def LoadPioPlatform(env, variables): + p = env.PioPlatform() installed_packages = p.get_installed_packages() # Add toolchains and uploaders to $PATH @@ -99,8 +99,8 @@ def exists(_): def generate(env): - env.AddMethod(DevPlatform) + env.AddMethod(PioPlatform) env.AddMethod(BoardConfig) env.AddMethod(GetFrameworkScript) - env.AddMethod(LoadDevPlatform) + env.AddMethod(LoadPioPlatform) return env diff --git a/platformio/builder/tools/piotest.py b/platformio/builder/tools/piotest.py index af820dc4..d4fce7c7 100644 --- a/platformio/builder/tools/piotest.py +++ b/platformio/builder/tools/piotest.py @@ -62,7 +62,7 @@ def ProcessTest(env): ) unitylib = env.BuildLibrary( join("$BUILD_DIR", "UnityTestLib"), - env.DevPlatform().get_package_dir("tool-unity") + env.PioPlatform().get_package_dir("tool-unity") ) env.Prepend(LIBS=[unitylib])