Commit 4453ca5

authored

Properly handle ARDUINO_PARTITION define in PlatformIO (#6681)

This fixes possible issues when developers specify arbitrary partition files using relative or absolute paths. Additionally, hyphens in filenames are replaced with underscores to avoid compilation warnings "ISO C++11 requires whitespace after the macro name" Resolves platformio/platform-espressif32#787

1 parent ce2cd11 commit 4453ca5Copy full SHA for 4453ca5

File tree

4 files changed

+12

-8

lines changed

tools

4 files changed

+12

-8

lines changed

`‎tools/platformio-build-esp32.py`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`
`25`	`25`	`# Extends: https://github.com/platformio/platform-espressif32/blob/develop/builder/main.py`
`26`	`26`
`27`		`-from os.path import abspath, isdir, isfile, join`
	`27`	`+from os.path import abspath, basename, isdir, isfile, join`
`28`	`28`
`29`	`29`	`from SCons.Script import DefaultEnvironment`
`30`	`30`
`@@ -319,7 +319,8 @@`
`319`	`319`	`("ARDUINO", 10812),`
`320`	`320`	`("ARDUINO_VARIANT", '\\"%s\\"' % env.BoardConfig().get("build.variant").replace('"', "")),`
`321`	`321`	`("ARDUINO_BOARD", '\\"%s\\"' % env.BoardConfig().get("name").replace('"', "")),`
`322`		`- "ARDUINO_PARTITION_%s" % env.BoardConfig().get("build.partitions", "default.csv").replace(".csv", "")`
	`322`	`+ "ARDUINO_PARTITION_%s" % basename(env.BoardConfig().get(`
	`323`	`+ "build.partitions", "default.csv")).replace(".csv", "").replace("-", "_")`
`323`	`324`	`],`
`324`	`325`
`325`	`326`	`LIBSOURCE_DIRS=[`

`‎tools/platformio-build-esp32c3.py`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`
`25`	`25`	`# Extends: https://github.com/platformio/platform-espressif32/blob/develop/builder/main.py`
`26`	`26`
`27`		`-from os.path import abspath, isdir, isfile, join`
	`27`	`+from os.path import abspath, basename, isdir, isfile, join`
`28`	`28`
`29`	`29`	`from SCons.Script import DefaultEnvironment`
`30`	`30`
`@@ -312,7 +312,8 @@`
`312`	`312`	`("ARDUINO", 10812),`
`313`	`313`	`("ARDUINO_VARIANT", '\\"%s\\"' % env.BoardConfig().get("build.variant").replace('"', "")),`
`314`	`314`	`("ARDUINO_BOARD", '\\"%s\\"' % env.BoardConfig().get("name").replace('"', "")),`
`315`		`- "ARDUINO_PARTITION_%s" % env.BoardConfig().get("build.partitions", "default.csv").replace(".csv", "")`
	`315`	`+ "ARDUINO_PARTITION_%s" % basename(env.BoardConfig().get(`
	`316`	`+ "build.partitions", "default.csv")).replace(".csv", "").replace("-", "_")`
`316`	`317`	`],`
`317`	`318`
`318`	`319`	`LIBSOURCE_DIRS=[`

`‎tools/platformio-build-esp32s2.py`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`
`25`	`25`	`# Extends: https://github.com/platformio/platform-espressif32/blob/develop/builder/main.py`
`26`	`26`
`27`		`-from os.path import abspath, isdir, isfile, join`
	`27`	`+from os.path import abspath, basename, isdir, isfile, join`
`28`	`28`
`29`	`29`	`from SCons.Script import DefaultEnvironment`
`30`	`30`
`@@ -314,7 +314,8 @@`
`314`	`314`	`("ARDUINO", 10812),`
`315`	`315`	`("ARDUINO_VARIANT", '\\"%s\\"' % env.BoardConfig().get("build.variant").replace('"', "")),`
`316`	`316`	`("ARDUINO_BOARD", '\\"%s\\"' % env.BoardConfig().get("name").replace('"', "")),`
`317`		`- "ARDUINO_PARTITION_%s" % env.BoardConfig().get("build.partitions", "default.csv").replace(".csv", "")`
	`317`	`+ "ARDUINO_PARTITION_%s" % basename(env.BoardConfig().get(`
	`318`	`+ "build.partitions", "default.csv")).replace(".csv", "").replace("-", "_")`
`318`	`319`	`],`
`319`	`320`
`320`	`321`	`LIBSOURCE_DIRS=[`

`‎tools/platformio-build-esp32s3.py`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`
`25`	`25`	`# Extends: https://github.com/platformio/platform-espressif32/blob/develop/builder/main.py`
`26`	`26`
`27`		`-from os.path import abspath, isdir, isfile, join`
	`27`	`+from os.path import abspath, basename, isdir, isfile, join`
`28`	`28`
`29`	`29`	`from SCons.Script import DefaultEnvironment`
`30`	`30`
`@@ -331,7 +331,8 @@`
`331`	`331`	`("ARDUINO", 10812),`
`332`	`332`	`("ARDUINO_VARIANT", '\\"%s\\"' % env.BoardConfig().get("build.variant").replace('"', "")),`
`333`	`333`	`("ARDUINO_BOARD", '\\"%s\\"' % env.BoardConfig().get("name").replace('"', "")),`
`334`		`- "ARDUINO_PARTITION_%s" % env.BoardConfig().get("build.partitions", "default.csv").replace(".csv", "")`
	`334`	`+ "ARDUINO_PARTITION_%s" % basename(env.BoardConfig().get(`
	`335`	`+ "build.partitions", "default.csv")).replace(".csv", "").replace("-", "_")`
`335`	`336`	`],`
`336`	`337`
`337`	`338`	`LIBSOURCE_DIRS=[`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 4453ca5

File tree

4 files changed

4 files changed

`‎tools/platformio-build-esp32.py`

`‎tools/platformio-build-esp32c3.py`

`‎tools/platformio-build-esp32s2.py`

`‎tools/platformio-build-esp32s3.py`

0 commit comments