Fix mkspiffs binary name when both arduino and esp-idf frameworks selected // Resolve #244

valeros · valeros · commit 1fadd964e9e3 · 2019-11-01T18:40:03.000+02:00
diff --git a/builder/main.py b/builder/main.py
@@ -158,7 +158,8 @@ def __fetch_spiffs_size(target, source, env):
     ],
     ERASECMD='"$PYTHONEXE" "$OBJCOPY" $ERASEFLAGS erase_flash',
 
-    MKSPIFFSTOOL="mkspiffs_${PIOPLATFORM}_${PIOFRAMEWORK}",
+    MKSPIFFSTOOL="mkspiffs_${PIOPLATFORM}_" + ("espidf" if "espidf" in env.subst(
+        "$PIOFRAMEWORK") else "${PIOFRAMEWORK}"),
     PROGSUFFIX=".elf"
 )
 

Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,8 @@ def __fetch_spiffs_size(target, source, env):`
`158`	`158`	`],`
`159`	`159`	`ERASECMD='"$PYTHONEXE" "$OBJCOPY" $ERASEFLAGS erase_flash',`
`160`	`160`
`161`		`- MKSPIFFSTOOL="mkspiffs_${PIOPLATFORM}_${PIOFRAMEWORK}",`
	`161`	`+ MKSPIFFSTOOL="mkspiffs_${PIOPLATFORM}_" + ("espidf" if "espidf" in env.subst(`
	`162`	`+ "$PIOFRAMEWORK") else "${PIOFRAMEWORK}"),`
`162`	`163`	`PROGSUFFIX=".elf"`
`163`	`164`	`)`
`164`	`165`