Merge pull request #2 from esp8266/esp8266

pull master

Author: me-no-dev

.gitignore

@@ -75,3 +75,5 @@ nbproject
 build/macosx/esptool-*-osx.zip
 
 build/macosx/dist/osx-xtensa-lx106-elf.tgz
+/docs/lib_dump/full
+/docs/lib_dump

.travis.yml

@@ -1,35 +1,38 @@
-sudo: true
+sudo: false
+
 language: java
 
 os:
   - linux
-  - osx
+
+addons:
+  apt:
+    packages:
+    - ant
 
 jdk:
   - oraclejdk8
 
 script:
-  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get update -qq; fi
-  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get install -qq ant; fi
   - pushd build
-  - echo "" | ant dist
+  - echo "" | ant build
   - popd
-#- bash -x ./generate-appimage
-
-deploy:
-  provider: releases
-  api_key:
-    secure: eKHcAMuC58JZKRsn1QwbiYE4aL/9dZsybDqqHTo1dUo8x9+3fGed/Dci76ItFFS7SmFfIdl6ej8/Uj0nPK/sIE21blKBe3+L0KAJm0TTq3m0ig1suCmMipCsSW+srWYM0hl58+OKagM4FoHKDjsEnzRDv9Z4xtxyvG+7/XLD1dE=
-  skip_cleanup: true
-  file_glob: true
-  file:
-    - '$TRAVIS_BUILD_DIR/build/linux/arduino-*.tar.xz'
-#    - '$TRAVIS_BUILD_DIR/Arduino.AppImage'
-  on:
-    tags: true
-    all_branches: true
+  - /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_1.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :1 -ac -screen 0 1280x1024x16
+  - sleep 3
+  - export DISPLAY=:1.0
+  - export PATH="$PWD/build/linux/work:$PATH"
+  - which arduino
+  - source hardware/esp8266com/esp8266/tests/common.sh
+  - arduino --board esp8266com:esp8266:generic --save-prefs
+  - build_sketches arduino $PWD/hardware/esp8266com/esp8266
 
 notifications:
   email:
     on_success: change
     on_failure: change
+  webhooks:
+    urls:
+      - secure: "dnSY+KA7NK+KD+Z71copmANDUsyVePrZ0iXvXxmqMEQv+lp3j2Z87G5pHn7j0WNcNZrejJqOdbElJ9Q4QESRaAYxTR7cA6ameJeEKHiFJrQtN/4abvoXb9E1CxpL8aNON/xgnqCk+fycOK3nbWWXlJBodzBm7KN64vrcHO7et+M="
+    on_success: change  # options: [always|never|change] default: always
+    on_failure: always  # options: [always|never|change] default: always
+    on_start: false     # default: false

README.md

@@ -27,17 +27,29 @@ size=`/bin/ls -l $outdir.zip | awk '{print $5}'`
 echo Size: $size
 echo SHA-256: $sha
 
-if [ "$upload" == "prod" ]; then
-    remote="http://arduino.esp8266.com"
+if [ "$upload" == "stable" ]; then
+    badge_title="stable"
+    badge_color="blue"
     path=""
-elif [ "$upload" == "stag" ]; then
-    remote="http://arduino.esp8266.com"
+elif [ "$upload" == "staging" ]; then
+    badge_title="staging"
+    badge_color="yellow"
     path="staging/"
+elif [ "$upload" == "test" ]; then
+    badge_title="test"
+    badge_color="red"
+    path="test/"
 else
     upload=""
     remote="http://localhost:8000"
 fi
 
+if [ ! -z "$upload" ]; then
+  remote="http://arduino.esp8266.com"
+  release_date=$(date "+%b_%d,_%Y")
+  wget -O badge.svg https://img.shields.io/badge/$badge_title-$release_date-$badge_color.svg
+fi
+
 cat << EOF > package_esp8266com_index.json
 {
   "packages": [ {
@@ -76,6 +88,9 @@ cat << EOF > package_esp8266com_index.json
         },
         {
           "name":"Adafruit HUZZAH ESP8266 (ESP-12)"
+        },
+        {
+          "name":"SweetPea ESP-210"
         }
       ],
       "toolsDependencies":[ {
@@ -120,7 +135,7 @@ cat << EOF > package_esp8266com_index.json
             "url":"https://github.com/igrr/esptool-ck/releases/download/0.4.5/esptool-0.4.5-linux32.tar.gz",
             "archiveFileName":"esptool-0.4.5-linux32.tar.gz",
             "checksum":"SHA-256:4aa81b97a470641771cf371e5d470ac92d3b177adbe8263c4aae66e607b67755",
-            "size":"12044"  
+            "size":"12044"
         }
       ]
     },
@@ -168,9 +183,7 @@ if [ ! -z "$upload" ]; then
     scp $outdir.zip $remote_path
     scp package_esp8266com_index.json $remote_path
     scp -r $srcdir/doc $remote_path
+    scp badge.svg $remote_path
 else
-    python -m SimpleHTTPServer 
+    python -m SimpleHTTPServer
 fi
-
-
-