forked from platformio/platformio-core
Allowed to change default ".pioenvs" directory with global env "export $PIOENVS_DIR"
This commit is contained in:
@@ -6,7 +6,8 @@ from os.path import isdir, join
|
|||||||
from SCons.Script import (DefaultEnvironment, Exit, SConscript,
|
from SCons.Script import (DefaultEnvironment, Exit, SConscript,
|
||||||
SConscriptChdir, Variables)
|
SConscriptChdir, Variables)
|
||||||
|
|
||||||
from platformio.util import get_home_dir, get_project_dir, get_source_dir
|
from platformio.util import (get_home_dir, get_pioenvs_dir, get_project_dir,
|
||||||
|
get_source_dir)
|
||||||
|
|
||||||
# AllowSubstExceptions()
|
# AllowSubstExceptions()
|
||||||
|
|
||||||
@@ -37,13 +38,14 @@ DefaultEnvironment(
|
|||||||
|
|
||||||
PIOBUILDER_DIR=join(get_source_dir(), "builder"),
|
PIOBUILDER_DIR=join(get_source_dir(), "builder"),
|
||||||
PROJECT_DIR=get_project_dir(),
|
PROJECT_DIR=get_project_dir(),
|
||||||
|
PIOENVS_DIR=get_pioenvs_dir(),
|
||||||
|
|
||||||
PLATFORMIOHOME_DIR=get_home_dir(),
|
PLATFORMIOHOME_DIR=get_home_dir(),
|
||||||
PLATFORM_DIR=join("$PLATFORMIOHOME_DIR", "$PLATFORM"),
|
PLATFORM_DIR=join("$PLATFORMIOHOME_DIR", "$PLATFORM"),
|
||||||
PLATFORMFW_DIR=join("$PLATFORM_DIR", "frameworks", "$FRAMEWORK"),
|
PLATFORMFW_DIR=join("$PLATFORM_DIR", "frameworks", "$FRAMEWORK"),
|
||||||
PLATFORMTOOLS_DIR=join("$PLATFORM_DIR", "tools"),
|
PLATFORMTOOLS_DIR=join("$PLATFORM_DIR", "tools"),
|
||||||
|
|
||||||
BUILD_DIR=join("$PROJECT_DIR", ".pioenvs", "$PIOENV"),
|
BUILD_DIR=join("$PIOENVS_DIR", "$PIOENV"),
|
||||||
LIBSOURCE_DIRS=[
|
LIBSOURCE_DIRS=[
|
||||||
join("$PROJECT_DIR", "lib"),
|
join("$PROJECT_DIR", "lib"),
|
||||||
join("$PLATFORMFW_DIR", "libraries"),
|
join("$PLATFORMFW_DIR", "libraries"),
|
||||||
|
@@ -1,16 +1,17 @@
|
|||||||
# Copyright (C) Ivan Kravets <me@ikravets.com>
|
# Copyright (C) Ivan Kravets <me@ikravets.com>
|
||||||
# See LICENSE for details.
|
# See LICENSE for details.
|
||||||
|
|
||||||
from os import getcwd, listdir, utime
|
|
||||||
from os import name as os_name
|
from os import name as os_name
|
||||||
|
from os import getcwd, getenv, listdir, utime
|
||||||
from os.path import dirname, expanduser, isfile, join, realpath
|
from os.path import dirname, expanduser, isfile, join, realpath
|
||||||
from platform import architecture, system
|
from platform import architecture, system
|
||||||
from subprocess import PIPE, Popen
|
from subprocess import PIPE, Popen
|
||||||
from time import sleep
|
from time import sleep
|
||||||
|
|
||||||
from platformio.exception import NotPlatformProject
|
|
||||||
from serial import Serial
|
from serial import Serial
|
||||||
|
|
||||||
|
from platformio.exception import GetSerialPortsError, NotPlatformProject
|
||||||
|
|
||||||
try:
|
try:
|
||||||
from configparser import ConfigParser
|
from configparser import ConfigParser
|
||||||
except ImportError:
|
except ImportError:
|
||||||
@@ -33,6 +34,10 @@ def get_project_dir():
|
|||||||
return getcwd()
|
return getcwd()
|
||||||
|
|
||||||
|
|
||||||
|
def get_pioenvs_dir():
|
||||||
|
return getenv("PIOENVS_DIR", join(get_project_dir(), ".pioenvs"))
|
||||||
|
|
||||||
|
|
||||||
def get_project_config():
|
def get_project_config():
|
||||||
path = join(get_project_dir(), "platformio.ini")
|
path = join(get_project_dir(), "platformio.ini")
|
||||||
if not isfile(path):
|
if not isfile(path):
|
||||||
|
Reference in New Issue
Block a user