From a43d6ff9cb78dfcbc2d550424de5f77890043ea3 Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Mon, 9 Feb 2015 17:37:44 +0300 Subject: [PATCH] Merge arduino/master into esp8266 * commit '71c39489180723b13cabe3c07e3994a239f8a03e': Updated translations Updated offline docs Corrected some email contacts. MacOS tests fix: new way of discovering work dir conflicts with tests execution. Fixed. Updated build_pull_request.bash Renamed mac build from "macosxnew" to "macosx-java-latest" Updated revision log. Version set to 1.6.0rc3 build.xml and mac. Change in platform names: macosx now macosxnew, oldmacosx now macosx Fixed bug with paths with spaces build_pull_requests now builds oldmacosx as well Macosx: new appbundler, new macosx builds. Use platform=macosx and platform=oldmacosx build_pull_requests now moves the artifacts to the parent folder: this allows calling "clean" target before each build build.xml linux-clean target was not deleting old linux builds Fix typos in BlinkWithoutDelay.ino Conflicts: build/build.xml --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 9a2f56075..54d94ffce 100644 --- a/.gitignore +++ b/.gitignore @@ -29,12 +29,15 @@ build/macosx/dist/*.tar.gz build/macosx/dist/*.tar.bz2 build/macosx/libastylej* build/macosx/appbundler*.jar +build/macosx/appbundler*.zip +build/macosx/appbundler build/linux/work/ build/linux/dist/*.tar.gz build/linux/dist/*.tar.bz2 build/linux/*.tgz build/linux/*.zip build/linux/libastylej* +build/shared/reference*.zip test-bin *.iml .idea