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

Fix PlatformIO version

Browse Source
This commit is contained in:
Ivan Kravets
2015-12-01 16:28:47 +02:00
parent d806097b60
commit a7a82b1c0a
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platformio/__init__.py
View File

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
VERSION = (2, 4, "0.b1") VERSION = (2, 4, "0b1")
__version__ = ".".join([str(s) for s in VERSION]) __version__ = ".".join([str(s) for s in VERSION])
__title__ = "platformio" __title__ = "platformio"

6
platformio/builder/main.py
View File

@ -114,6 +114,12 @@ DefaultEnvironment(
env = DefaultEnvironment() env = DefaultEnvironment()
# Append PlatformIO version
env.Append(
CPPDEFINES=["PLATFORMIO={0:02d}{1:02d}{2:02d}".format(
*util.pioversion_to_intstr())]
)
if "BOARD" in env: if "BOARD" in env:
try: try:
env.Replace(BOARD_OPTIONS=util.get_boards(env.subst("$BOARD"))) env.Replace(BOARD_OPTIONS=util.get_boards(env.subst("$BOARD")))

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

@ -23,8 +23,6 @@ from SCons.Script import (COMMAND_LINE_TARGETS, DefaultEnvironment, Exit,
SConscript) SConscript)
from SCons.Util import case_sensitive_suffixes from SCons.Util import case_sensitive_suffixes
from platformio.util import pioversion_to_intstr
SRC_BUILD_EXT = ["c", "cpp", "S", "spp", "SPP", "sx", "s", "asm", "ASM"] SRC_BUILD_EXT = ["c", "cpp", "S", "spp", "SPP", "sx", "s", "asm", "ASM"]
SRC_HEADER_EXT = ["h", "hpp"] SRC_HEADER_EXT = ["h", "hpp"]
SRC_DEFAULT_FILTER = " ".join([ SRC_DEFAULT_FILTER = " ".join([
@ -73,11 +71,6 @@ def BuildProgram(env):
getenv("PLATFORMIO_SRC_BUILD_FLAGS"), getenv("PLATFORMIO_SRC_BUILD_FLAGS"),
]) ])
env.Append(
CPPDEFINES=["PLATFORMIO={0:02d}{1:02d}{2:02d}".format(
*pioversion_to_intstr())]
)
return env.Program( return env.Program(
join("$BUILD_DIR", env.subst("$PROGNAME")), join("$BUILD_DIR", env.subst("$PROGNAME")),
env.LookupSources( env.LookupSources(