Merge upstream changes from Marlin 2.1.1

buildroot/share/PlatformIO/scripts/STM32F1_create_variant.py

@@ -1,30 +1,31 @@
 #
 # STM32F1_create_variant.py
 #
-import os,shutil,marlin
-from SCons.Script import DefaultEnvironment
-from platformio import util
+import pioutil
+if pioutil.is_pio_build():
+	import shutil,marlin
+	from pathlib import Path
 
-env = DefaultEnvironment()
-platform = env.PioPlatform()
-board = env.BoardConfig()
+	Import("env")
+	platform = env.PioPlatform()
+	board = env.BoardConfig()
 
-FRAMEWORK_DIR = platform.get_package_dir("framework-arduinoststm32-maple")
-assert os.path.isdir(FRAMEWORK_DIR)
+	FRAMEWORK_DIR = Path(platform.get_package_dir("framework-arduinoststm32-maple"))
+	assert FRAMEWORK_DIR.is_dir()
 
-source_root = os.path.join("buildroot", "share", "PlatformIO", "variants")
-assert os.path.isdir(source_root)
+	source_root = Path("buildroot/share/PlatformIO/variants")
+	assert source_root.is_dir()
 
-variant = board.get("build.variant")
-variant_dir = os.path.join(FRAMEWORK_DIR, "STM32F1", "variants", variant)
+	variant = board.get("build.variant")
+	variant_dir = FRAMEWORK_DIR / "STM32F1/variants" / variant
 
-source_dir = os.path.join(source_root, variant)
-assert os.path.isdir(source_dir)
+	source_dir = source_root / variant
+	assert source_dir.is_dir()
 
-if os.path.isdir(variant_dir):
-    shutil.rmtree(variant_dir)
+	if variant_dir.is_dir():
+		shutil.rmtree(variant_dir)
 
-if not os.path.isdir(variant_dir):
-    os.mkdir(variant_dir)
+	if not variant_dir.is_dir():
+		variant_dir.mkdir()
 
-marlin.copytree(source_dir, variant_dir)
+	marlin.copytree(source_dir, variant_dir)