Allow to initialise PlatformIO project for the specified IDE // Resolve #151

platformio/builder/scripts/frameworks/arduino.py

@@ -106,20 +106,20 @@ env.Append(
 #
 
 if env.subst("${PLATFORMFW_DIR}")[-3:] == "sam":
-    env.VariantDir(
+    env.VariantDirWrap(
         join("$BUILD_DIR", "FrameworkCMSISInc"),
         join("$PLATFORMFW_DIR", "system", "CMSIS", "CMSIS", "Include")
     )
-    env.VariantDir(
+    env.VariantDirWrap(
         join("$BUILD_DIR", "FrameworkDeviceInc"),
         join("$PLATFORMFW_DIR", "system", "CMSIS", "Device", "ATMEL")
     )
-    env.VariantDir(
+    env.VariantDirWrap(
         join("$BUILD_DIR", "FrameworkLibSam"),
         join("$PLATFORMFW_DIR", "system", "libsam")
     )
 
-    env.VariantDir(
+    env.VariantDirWrap(
         join("$BUILD_DIR", "FrameworkArduinoInc"),
         join("$PLATFORMFW_DIR", "cores", "${BOARD_OPTIONS['build']['core']}")
     )

platformio/builder/scripts/frameworks/cmsis.py

@@ -25,7 +25,7 @@ env.Replace(
     PLATFORMFW_DIR=join("$PIOPACKAGES_DIR", "framework-cmsis")
 )
 
-env.VariantDir(
+env.VariantDirWrap(
     join("$BUILD_DIR", "FrameworkCMSIS"),
     join("$PLATFORMFW_DIR", "cores", "${BOARD_OPTIONS['build']['core']}")
 )

platformio/builder/scripts/frameworks/energia.py

@@ -28,7 +28,7 @@ ENERGIA_VERSION = int(
               "version.txt")).read().replace(".", "").strip())
 
 # include board variant
-env.VariantDir(
+env.VariantDirWrap(
     join("$BUILD_DIR", "FrameworkEnergiaVariant"),
     join("$PLATFORMFW_DIR", "variants", "${BOARD_OPTIONS['build']['variant']}")
 )

platformio/builder/scripts/frameworks/libopencm3.py

@@ -138,7 +138,7 @@ if BOARD_BUILDOPTS.get("core") == "lm4f":
         CPPDEFINES=["LM4F"]
     )
 
-env.VariantDir(
+env.VariantDirWrap(
     join("$BUILD_DIR", "FrameworkLibOpenCM3Variant"),
     join("$PLATFORMFW_DIR", "include")
 )
@@ -166,7 +166,7 @@ env.Replace(
 )
 
 libs = []
-env.VariantDir(
+env.VariantDirWrap(
     join("$BUILD_DIR", "FrameworkLibOpenCM3"),
     "$PLATFORMFW_DIR"
 )

platformio/builder/scripts/frameworks/mbed.py

@@ -134,7 +134,7 @@ def add_mbedlib(libname, libar):
                        (libname.upper(), crc32(root)))
         if var_dir in env.get("CPPPATH"):
             continue
-        env.VariantDir(var_dir, root)
+        env.VariantDirWrap(var_dir, root)
         env.Append(CPPPATH=[var_dir])
 
 
@@ -221,7 +221,7 @@ if board_type in ("frdm_k22f", "frdm_k64f"):
 
 for lib_path in eixdata.get("CPPPATH"):
     _vdir = join("$BUILD_DIR", "FrameworkMbedInc%d" % crc32(lib_path))
-    env.VariantDir(_vdir, join(variant_dir, lib_path))
+    env.VariantDirWrap(_vdir, join(variant_dir, lib_path))
     env.Append(CPPPATH=[_vdir])
 
 env.Append(

platformio/builder/scripts/frameworks/spl.py

@@ -22,7 +22,7 @@ env.Replace(
     PLATFORMFW_DIR=join("$PIOPACKAGES_DIR", "framework-spl")
 )
 
-env.VariantDir(
+env.VariantDirWrap(
     join("$BUILD_DIR", "FrameworkSPLInc"),
     join("$PLATFORMFW_DIR", "${BOARD_OPTIONS['build']['core']}",
          "variants", "${BOARD_OPTIONS['build']['variant']}", "inc")