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

Don't use PIOBUILDFILES for LDF

Browse Source
This commit is contained in:
Ivan Kravets
2017-12-15 23:51:13 +02:00
parent 269935726d
commit abbba7fe2e
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platformio/builder/tools/piolib.py
View File

@ -619,7 +619,7 @@ class ProjectAsLibBuilder(LibBuilderBase):
return inc_dirs return inc_dirs
def get_src_files(self): def get_src_files(self):
return self.env['PIOBUILDFILES'] return self.env.get("PROJECTBUILDFILES", [])
@property @property
def lib_ldf_mode(self): def lib_ldf_mode(self):

9
platformio/builder/tools/platformio.py
View File

@ -63,7 +63,7 @@ def BuildProgram(env):
# Search for project source files # Search for project source files
env.Append( env.Append(
LIBPATH=["$BUILD_DIR"], LIBPATH=["$BUILD_DIR"],
PIOBUILDFILES=env.CollectBuildFiles( PROJECTBUILDFILES=env.CollectBuildFiles(
"$BUILDSRC_DIR", "$BUILDSRC_DIR",
"$PROJECTSRC_DIR", "$PROJECTSRC_DIR",
src_filter=env.get("SRC_FILTER"), src_filter=env.get("SRC_FILTER"),
@ -72,7 +72,7 @@ def BuildProgram(env):
if "__debug" in COMMAND_LINE_TARGETS: if "__debug" in COMMAND_LINE_TARGETS:
env.ProcessDebug() env.ProcessDebug()
if "__test" in COMMAND_LINE_TARGETS: if "__test" in COMMAND_LINE_TARGETS:
env.Append(PIOBUILDFILES=env.ProcessTest()) env.Append(PROJECTBUILDFILES=env.ProcessTest())
# build dependent libs # build dependent libs
env.Append(LIBS=env.BuildProjectLibraries()) env.Append(LIBS=env.BuildProjectLibraries())
@ -90,14 +90,15 @@ def BuildProgram(env):
# Handle SRC_BUILD_FLAGS # Handle SRC_BUILD_FLAGS
env.ProcessFlags(env.get("SRC_BUILD_FLAGS")) env.ProcessFlags(env.get("SRC_BUILD_FLAGS"))
if not env['PIOBUILDFILES'] and not COMMAND_LINE_TARGETS: if not env.get("PROJECTBUILDFILES") and not COMMAND_LINE_TARGETS:
sys.stderr.write( sys.stderr.write(
"Error: Nothing to build. Please put your source code files " "Error: Nothing to build. Please put your source code files "
"to '%s' folder\n" % env.subst("$PROJECTSRC_DIR")) "to '%s' folder\n" % env.subst("$PROJECTSRC_DIR"))
env.Exit(1) env.Exit(1)
program = env.Program( program = env.Program(
join("$BUILD_DIR", env.subst("$PROGNAME")), env['PIOBUILDFILES']) join("$BUILD_DIR", env.subst("$PROGNAME")),
env['PROJECTBUILDFILES'] + env.get("PIOBUILDFILES", []))
checksize_action = Action(env.CheckUploadSize, "Checking program size") checksize_action = Action(env.CheckUploadSize, "Checking program size")
AlwaysBuild(env.Alias("checkprogsize", program, checksize_action)) AlwaysBuild(env.Alias("checkprogsize", program, checksize_action))