Merge branch 'release/v1.0.1'

appveyor.yml

@@ -22,9 +22,9 @@ environment:
 
 install:
 - if %PLATFORM% == x64 SET PATH=C:\Python27-x64;C:\Python27-x64\Scripts;%PATH%
-- if %PLATFORM% == x86 SET PATH=%PATH%;C:\Python27\Scripts
+- if %PLATFORM% == x86 SET PATH=%PATH%;C:\Python36\Scripts
 - cmd: git submodule update --init --recursive
-- cmd: pip install -U https://github.com/platformio/platformio/archive/develop.zip
+- cmd: pip3 install -U https://github.com/platformio/platformio/archive/develop.zip
 - cmd: platformio platform install file://.
 
 test_script:

builder/main.py

@@ -60,7 +60,7 @@
                 "$PYTHONEXE",
                 join(PULP_TOOLS_DIR, "bin", "flashImageBuilder"),
                 "--flash-boot-binary", "$SOURCES",
-                "--comp-dir-rec=%s" % util.get_projectdata_dir(),
+                "--comp-dir-rec", "$PROJECTDATA_DIR",
                 "--raw", "$TARGET"
             ]), "Building data image $TARGET"),
             suffix=".bin"
@@ -78,17 +78,14 @@
 # Target: Build executable, linkable firmware and data image
 #
 
-data_available = isdir(util.get_projectdata_dir()) and listdir(
-    util.get_projectdata_dir())
-
 target_elf = None
 if "nobuild" in COMMAND_LINE_TARGETS:
     target_elf = join("$BUILD_DIR", "${PROGNAME}.elf")
 else:
     target_elf = env.BuildProgram()
 
 if "uploadfs" in COMMAND_LINE_TARGETS:
-    data_dir = util.get_projectdata_dir()
+    data_dir = env.subst("$PROJECTDATA_DIR")
     if not (isdir(data_dir) and listdir(data_dir)):
         sys.stderr.write(
             "Please create `data` directory in a project and put some files\n")

platform.json

@@ -12,7 +12,7 @@
     "type": "git",
     "url": "https://github.com/pioplus/platform-riscv_gap.git"
   },
-  "version": "1.0.0",
+  "version": "1.0.1",
   "packageRepositories": [
     "https://dl.bintray.com/platformio/dl-packages/manifest.json",
     "http://dl.platformio.org/packages/manifest.json"