platformio/platformio-core
1
0
Fork 1
mirror of https://github.com/platformio/platformio-core.git synced 2025-07-30 18:17:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/ivankravets/platformio into develop

Browse Source
This commit is contained in:
Valeriy Koval
2015-02-03 14:04:29 +02:00
parent 2227267ff6 c05418f47e
commit 85afbdb8a7
7 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platformio/builder/main.py
View File

@ -48,7 +48,7 @@ commonvars.AddVariables(
) )
DefaultEnvironment( DefaultEnvironment(
tools=["gcc", "g++", "ar", "gnulink", "platformio"], tools=["gcc", "g++", "as", "ar", "gnulink", "platformio"],
toolpath=[join("$PIOBUILDER_DIR", "tools")], toolpath=[join("$PIOBUILDER_DIR", "tools")],
variables=commonvars, variables=commonvars,

8
platformio/builder/scripts/atmelavr.py
View File

@ -26,6 +26,7 @@ env.Replace(
ARFLAGS=["rcs"], ARFLAGS=["rcs"],
ASFLAGS=[ ASFLAGS=[
"-c",
"-g", # include debugging info (so errors include line numbers) "-g", # include debugging info (so errors include line numbers)
"-x", "assembler-with-cpp", "-x", "assembler-with-cpp",
"-mmcu=$BOARD_MCU" "-mmcu=$BOARD_MCU"
@ -62,13 +63,14 @@ env.Replace(
"-q", # suppress progress output "-q", # suppress progress output
"-D", # disable auto erase for flash memory "-D", # disable auto erase for flash memory
"-p", "$BOARD_MCU", "-p", "$BOARD_MCU",
"-C", join("$PIOPACKAGES_DIR", "tool-avrdude", "avrdude.conf"), "-C", '"%s"' % join("$PIOPACKAGES_DIR",
"tool-avrdude", "avrdude.conf"),
"-c", "$UPLOAD_PROTOCOL", "-c", "$UPLOAD_PROTOCOL",
"-b", "$UPLOAD_SPEED", "-b", "$UPLOAD_SPEED",
"-P", "$UPLOAD_PORT" "-P", "$UPLOAD_PORT"
], ],
UPLOADHEXCMD="$UPLOADER $UPLOADERFLAGS -U flash:w:$SOURCES:i", UPLOADHEXCMD='"$UPLOADER" $UPLOADERFLAGS -U flash:w:$SOURCES:i',
UPLOADEEPCMD="$UPLOADER $UPLOADERFLAGS -U eeprom:w:$SOURCES:i" UPLOADEEPCMD='"$UPLOADER" $UPLOADERFLAGS -U eeprom:w:$SOURCES:i'
) )
env.Append( env.Append(

2
platformio/builder/scripts/frameworks/arduino.py
View File

@ -56,4 +56,4 @@ libs.append(env.BuildLibrary(
join("$PLATFORMFW_DIR", "cores", "${BOARD_OPTIONS['build']['core']}") join("$PLATFORMFW_DIR", "cores", "${BOARD_OPTIONS['build']['core']}")
)) ))
Return("libs") Return("env libs")

2
platformio/builder/scripts/frameworks/energia.py
View File

@ -44,4 +44,4 @@ libs.append(env.BuildLibrary(
join("$PLATFORMFW_DIR", "cores", "${BOARD_OPTIONS['build']['core']}") join("$PLATFORMFW_DIR", "cores", "${BOARD_OPTIONS['build']['core']}")
)) ))
Return("libs") Return("env libs")

1
platformio/builder/scripts/timsp430.py
View File

@ -25,6 +25,7 @@ env.Replace(
ARFLAGS=["rcs"], ARFLAGS=["rcs"],
ASFLAGS=[ ASFLAGS=[
"-c",
"-g", # include debugging info (so errors include line numbers) "-g", # include debugging info (so errors include line numbers)
"-x", "-assembler-with-cpp", "-x", "-assembler-with-cpp",
"-mmcu=$BOARD_MCU" "-mmcu=$BOARD_MCU"

1
platformio/builder/scripts/titiva.py
View File

@ -24,6 +24,7 @@ env.Replace(
ARFLAGS=["rcs"], ARFLAGS=["rcs"],
ASFLAGS=[ ASFLAGS=[
"-c",
"-g", # include debugging info (so errors include line numbers) "-g", # include debugging info (so errors include line numbers)
"-x", "assembler-with-cpp", "-x", "assembler-with-cpp",
"-Wall", "-Wall",

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

@ -24,10 +24,11 @@ def ProcessGeneral(env):
env.ConvertInoToCpp() env.ConvertInoToCpp()
for f in env['FRAMEWORK'].split(","): for f in env['FRAMEWORK'].split(","):
SConscriptChdir(0) SConscriptChdir(0)
corelibs = SConscript( env, libs = SConscript(
env.subst(join("$PIOBUILDER_DIR", "scripts", env.subst(join("$PIOBUILDER_DIR", "scripts",
"frameworks", "%s.py" % f.strip().lower())), "frameworks", "%s.py" % f.strip().lower())),
exports="env") exports="env")
corelibs += libs
return corelibs return corelibs
@ -74,13 +75,18 @@ def VariantDirRecursive(env, variant_dir, src_dir, duplicate=True,
return variants return variants
def BuildLibrary(env, variant_dir, library_dir): def BuildLibrary(env, variant_dir, library_dir, ignore_files=None):
lib = env.Clone() lib = env.Clone()
vdirs = lib.VariantDirRecursive( vdirs = lib.VariantDirRecursive(
variant_dir, library_dir, ignore_pattern=(".git", ".svn", "examples")) variant_dir, library_dir, ignore_pattern=(".git", ".svn", "examples"))
srcfiles = []
for vdir in vdirs:
for item in lib.GlobCXXFiles(vdir):
if not ignore_files or item.name not in ignore_files:
srcfiles.append(item)
return lib.Library( return lib.Library(
lib.subst(variant_dir), lib.subst(variant_dir),
[lib.GlobCXXFiles(vdir) for vdir in vdirs] srcfiles
) )