forked from platformio/platformio-core
Add src_dir option to [platformio] section of platformio.ini which allows to redefine location to project’s source directory // Resolve #83
This commit is contained in:
1 parent
e17ce83499
commit
46ae4c1a83
9 files changed
+125
-23
No files matched your search
@@ -58,6 +58,7 @@ DefaultEnvironment(
|
||||
|
||||
PIOHOME_DIR=util.get_home_dir(),
|
||||
PROJECT_DIR=util.get_project_dir(),
|
||||
PROJECTSRC_DIR=util.get_projectsrc_dir(),
|
||||
PIOENVS_DIR=util.get_pioenvs_dir(),
|
||||
|
||||
PIOBUILDER_DIR=join(util.get_source_dir(), "builder"),
|
||||
|
||||
@@ -38,10 +38,10 @@ def ProcessGeneral(env):
|
||||
def BuildFirmware(env, corelibs):
|
||||
firmenv = env.Clone()
|
||||
vdirs = firmenv.VariantDirRecursive(
|
||||
join("$BUILD_DIR", "src"), join("$PROJECT_DIR", "src"))
|
||||
join("$BUILD_DIR", "src"), "$PROJECTSRC_DIR")
|
||||
|
||||
# build dependent libs
|
||||
deplibs = firmenv.BuildDependentLibraries(join("$PROJECT_DIR", "src"))
|
||||
deplibs = firmenv.BuildDependentLibraries("$PROJECTSRC_DIR")
|
||||
|
||||
# append specified LD_SCRIPT
|
||||
if "LDSCRIPT_PATH" in firmenv:
|
||||
@@ -255,8 +255,8 @@ def ConvertInoToCpp(env):
|
||||
remove(f)
|
||||
|
||||
tmpcpp = []
|
||||
items = (env.Glob(join("$PROJECT_DIR", "src", "*.ino")) +
|
||||
env.Glob(join("$PROJECT_DIR", "src", "*.pde")))
|
||||
items = (env.Glob(join("$PROJECTSRC_DIR", "*.ino")) +
|
||||
env.Glob(join("$PROJECTSRC_DIR", "*.pde")))
|
||||
for item in items:
|
||||
cppfile = item.get_path()[:-3] + "cpp"
|
||||
if isfile(cppfile):
|
||||
|
||||
+26
-16
@@ -56,16 +56,22 @@ def get_systype():
|
||||
return ("%s_%s" % (data[0], data[4])).lower()
|
||||
|
||||
|
||||
def get_home_dir():
|
||||
home_dir = None
|
||||
|
||||
def _get_projconf_option_dir(option_name):
|
||||
try:
|
||||
config = get_project_config()
|
||||
if (config.has_section("platformio") and
|
||||
config.has_option("platformio", "home_dir")):
|
||||
home_dir = config.get("platformio", "home_dir")
|
||||
config.has_option("platformio", option_name)):
|
||||
option_dir = config.get("platformio", option_name)
|
||||
if option_dir.startswith("~"):
|
||||
option_dir = expanduser(option_dir)
|
||||
return abspath(option_dir)
|
||||
except exception.NotPlatformProject:
|
||||
pass
|
||||
return None
|
||||
|
||||
|
||||
def get_home_dir():
|
||||
home_dir = _get_projconf_option_dir("home_dir")
|
||||
|
||||
if not home_dir:
|
||||
home_dir = join(expanduser("~"), ".platformio")
|
||||
@@ -78,17 +84,12 @@ def get_home_dir():
|
||||
|
||||
|
||||
def get_lib_dir():
|
||||
try:
|
||||
config = get_project_config()
|
||||
if (config.has_section("platformio") and
|
||||
config.has_option("platformio", "lib_dir")):
|
||||
lib_dir = config.get("platformio", "lib_dir")
|
||||
if lib_dir.startswith("~"):
|
||||
lib_dir = expanduser(lib_dir)
|
||||
return abspath(lib_dir)
|
||||
except exception.NotPlatformProject:
|
||||
pass
|
||||
return join(get_home_dir(), "lib")
|
||||
lib_dir = _get_projconf_option_dir("lib_dir")
|
||||
|
||||
if not lib_dir:
|
||||
lib_dir = join(get_home_dir(), "lib")
|
||||
|
||||
return lib_dir
|
||||
|
||||
|
||||
def get_source_dir():
|
||||
@@ -99,6 +100,15 @@ def get_project_dir():
|
||||
return os.getcwd()
|
||||
|
||||
|
||||
def get_projectsrc_dir():
|
||||
src_dir = _get_projconf_option_dir("src_dir")
|
||||
|
||||
if not src_dir:
|
||||
src_dir = join(get_project_dir(), "src")
|
||||
|
||||
return src_dir
|
||||
|
||||
|
||||
def get_pioenvs_dir():
|
||||
return os.getenv("PIOENVS_DIR", join(get_project_dir(), ".pioenvs"))
|
||||
|
||||
|
||||
Reference in new issue
Block a user