Merge branch 'release/v1.0.0'

platformio · Aug 30, 2016 · 3cbbebe · 3cbbebe
2 parents 9727e64 + cda5b6e
commit 3cbbebe
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 27 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,13 +1,22 @@
 language: python
 python:
-    - "2.7"
+  - "2.7"
 
 env:
-    - PLATFORMIO_PROJECT_DIR=examples/hello-world
+  - PLATFORMIO_PROJECT_DIR=examples/hello-world
 
 install:
-    - pip install -U https://github.com/platformio/platformio/archive/feature/platformio-30.zip
-    - platformio platform install file://.
+  - pip install -U https://github.com/platformio/platformio/archive/develop.zip
+  - platformio platform install file://.
 
 script:
-    - platformio run -d $PLATFORMIO_PROJECT_DIR
+  - platformio run -d $PLATFORMIO_PROJECT_DIR
+
+notifications:
+  email: false
+
+  slack:
+    rooms:
+      secure: lDUpAT7KPfMSNcsgO4kxFL/SKqaFnk72RoO2ReQPns/5vUR+dLB3gz6/JJ3yy7vnmMzcwDrD2UfPA8pDm7Fw3NyYsaJKeTsQBYjaPk7HIBC6CAixKZG8lEzYobIDDzT74H8SUTXE6hlHDcCjUX4gGIjU+2pOT1Zk60Aftlg5NpiVjDJHcPL0h6Pc2weMPEw9vNIbp5v9t0F/qWmoTTUztDa3Qkjn9GzcW+BLwg2l6MME80N+xpAYw/9SzpQtX6YWLiXftGxXWqNvYvpkX+9T12jM8iXQ50zW6uueeUAiOjSU7vM2tmv8vcC9SIOyq7NvWSfXs1+ATNhBsnXsbWOG7EQ0spR26iDFctpQ0p+AoNzYRmuM80WawxLbd/RFBQMrVd7Zs81s+i+dsAnAy9jodDCU6j0Qmvq7OjRBd2FE//ULZA2dBK/tmLENX5cAumPevxWmn5+hy2E8NjG+GpoO7UVoxpGd3U7Up32cc2z+JB0hHcpJQ39tyW0gt25c3gdf3rQ0zCkEc4tRsroiCDZOJ6jXjbKrHBy5FhSvyzKgpdEVZ5xIOcBVEZu+9rwmbreJInb9xdIimVs+FkSFcloAQ67H6OISyy5NKHiGJSfxqXr+nUlrTQJQcnpJD294JNOBMhjJOP2+ggxrQdVb0YTQ+fB+rkIEDjHVmL+ZXoIF0r8=
+    on_failure: always
+    on_success: change
diff --git a/README.md b/README.md
@@ -14,5 +14,5 @@ Windows x86 (32-bit) is a metafamily of graphical operating systems developed an
 > platformio platform install windows_x86
 
 # install development version
-> platformio platform install https://github.com/platformio/platform-windows_x86/archive/develop.zip
+> platformio platform install https://github.com/platformio/platform-windows_x86.git
 ```
diff --git a/appveyor.yml b/appveyor.yml
@@ -7,8 +7,16 @@ environment:
 install:
   - cmd: git submodule update --init --recursive
   - cmd: SET PATH=%PATH%;C:\Python27\Scripts;C:\MinGW\bin
-  - cmd: pip install -U https://github.com/platformio/platformio/archive/feature/platformio-30.zip
+  - cmd: pip install -U https://github.com/platformio/platformio/archive/develop.zip
   - cmd: platformio platform install file://.
 
 test_script:
   - cmd: platformio run -d %PLATFORMIO_PROJECT_DIR%
+
+notifications:
+  - provider: Slack
+    incoming_webhook:
+      secure: E9H0SU0Ju7WLDvgxsV8cs3J62T3nTTX7QkEjsczN0Sto/c9hWkVfhc5gGWUkxhlD975cokHByKGJIdwYwCewqOI+7BrcT8U+nlga4Uau7J8=
+    on_build_success: false
+    on_build_failure: true
+    on_build_status_changed: true
diff --git a/builder/main.py b/builder/main.py
@@ -55,17 +55,12 @@
 # Target: Print binary size
 #
 
-target_size = env.Alias("size", target_bin, "$SIZEPRINTCMD")
+target_size = env.Alias("size", target_bin, env.VerboseAction(
+    "$SIZEPRINTCMD", "Calculating size $SOURCE"))
 AlwaysBuild(target_size)
 
 #
-# Target: Unit Testing
-#
-
-AlwaysBuild(env.Alias("test", [target_bin, target_size]))
-
-#
-# Target: Define targets
+# Default targets
 #
 
 Default([target_bin])
diff --git a/examples/hello-world/platformio.ini b/examples/hello-world/platformio.ini
@@ -1,9 +1,11 @@
-#
-# PlatformIO Project Configuration File
-#
-# Please make sure to read documentation with examples first
-# http://docs.platformio.org/en/stable/projectconf.html
-#
+; PlatformIO Project Configuration File
+;
+;   Build options: build flags, source filter, extra scripting
+;   Upload options: custom port, speed and extra flags
+;   Library options: dependencies, extra library storages
+;
+; Please visit documentation for the other options and examples
+; http://docs.platformio.org/en/stable/projectconf.html
 
 [env:windows_x86]
 platform = windows_x86
diff --git a/platform.json b/platform.json
@@ -4,19 +4,16 @@
   "description": "Windows x86 (32-bit) is a metafamily of graphical operating systems developed and marketed by Microsoft. Using host OS (Windows, Linux 32/64 or Mac OS X) you can build native application for Windows x86 platform.",
   "url": "http://platformio.org/platforms/windows_x86",
   "homepage": "http://platformio.org/platforms/windows_x86",
-  "license": {
-    "type": "Apache-2.0",
-    "url": "http://opensource.org/licenses/apache2.0.php"
-  },
+  "license": "Apache-2.0",
   "engines": {
-    "platformio": "~3.0.0",
+    "platformio": "^3.0.0",
     "scons": ">=2.3.0,<2.6.0"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/platformio/platform-windows_x86.git"
   },
-  "version": "0.1.0",
+  "version": "1.0.0",
   "packageRepositories": [
     "https://dl.bintray.com/platformio/dl-packages/manifest.json",
     "https://sourceforge.net/projects/platformio-storage/files/packages/manifest.json/download",