arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-07-30 16:24:09 +03:00
Code Activity

Merge remote-tracking branch 'arduino/ide-1.5.x' into dev-ide-1.5.x-discovery

Browse Source
This commit is contained in:
Federico Fissore
2013-09-06 12:59:24 +02:00
parent c206ba6b84 b5ba1617f7
commit effb59da4b
24 changed files with 381 additions and 334 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
build/build.xml
View File

@ -248,9 +248,9 @@
</antcall>
<antcall target="unzip-arm-toolchain">
<param name="dist_file" value="gcc-arm-none-eabi-4.7.4-2013q2-mac.tar.gz" />
<param name="dist_url" value="http://arduino.googlecode.com/files/gcc-arm-none-eabi-4.7.4-2013q2-mac.tar.gz" />
<param name="dist_check_file" value="gcc-arm-none-eabi-4.7.4-2013q2" />
<param name="dist_file" value="gcc-arm-none-eabi-4.4.1-2010q1-188-macos.tar.gz" />
<param name="dist_url" value="http://arduino.googlecode.com/files/gcc-arm-none-eabi-4.4.1-2010q1-188-macos.tar.gz" />
<param name="dist_check_file" value="g++_arm_none_eabi" />
</antcall>
<delete includeEmptyDirs="true" quiet="true">
@ -290,15 +290,20 @@
</exec>
<!-- Sign app -->
<exec executable="codesign" dir="macosx/work" failonerror="true">
<exec executable="codesign" dir="macosx/work">
<arg line="--keychain &quot;${macosx-sign-keychain}&quot; --force -s &quot;${macosx-sign-id}&quot; -v Arduino.app/" />
</exec>
<!-- Check for successful signing -->
<exec executable="codesign" dir="macosx/work" failonerror="true">
<arg line="-vvvv Arduino.app/" />
</exec>
<delete file="macosx/arduino-${version}-${platform}.zip" />
<!-- Create signed zip file -->
<exec executable="zip" dir="macosx/work">
<arg line="-q -r ../arduino-${version}-${platform}.zip ." />
<arg line="-q -r ../arduino-${version}-${platform}-signed.zip ." />
</exec>
<echo>
@ -470,9 +475,9 @@
<target name="linux32-build" depends="linux-build" description="Build linux (32-bit) version">
<!-- Unzip ARM tools -->
<antcall target="unzip-arm-toolchain">
<param name="dist_file" value="gcc-arm-none-eabi-4.7.4-2013q2-linux32.tar.gz" />
<param name="dist_url" value="http://arduino.googlecode.com/files/gcc-arm-none-eabi-4.7.4-2013q2-linux32.tar.gz" />
<param name="dist_check_file" value="gcc-arm-none-eabi-4.7.4-2013q2" />
<param name="dist_file" value="gcc-arm-none-eabi-4.4.1-2010q1-188-linux32.tar.gz" />
<param name="dist_url" value="http://arduino.googlecode.com/files/gcc-arm-none-eabi-4.4.1-2010q1-188-linux32.tar.gz" />
<param name="dist_check_file" value="g++_arm_none_eabi" />
</antcall>
<!-- Unzip AVR tools -->
@ -490,9 +495,9 @@
<!-- Unzip ARM tools -->
<antcall target="unzip-arm-toolchain">
<param name="dist_file" value="gcc-arm-none-eabi-4.7.4-2013q2-linux64.tar.gz" />
<param name="dist_url" value="http://arduino.googlecode.com/files/gcc-arm-none-eabi-4.7.4-2013q2-linux64.tar.gz" />
<param name="dist_check_file" value="gcc-arm-none-eabi-4.7.4-2013q2" />
<param name="dist_file" value="gcc-arm-none-eabi-4.4.1-2010q1-188-linux32.tar.gz" />
<param name="dist_url" value="http://arduino.googlecode.com/files/gcc-arm-none-eabi-4.4.1-2010q1-188-linux32.tar.gz" />
<param name="dist_check_file" value="g++_arm_none_eabi" />
</antcall>
<!-- Unzip AVR tools -->
@ -536,7 +541,7 @@
</fail>
<!-- Unzip toolchain to the destination folder -->
<exec executable="tar" output="/dev/null" os="Linux">
<exec executable="tar">
<arg value="xfz"/>
<arg value="${staging_folder}/dist/${dist_file}"/>
<arg value="--directory=${staging_folder}/work/${staging_hardware_folder}/tools/"/>
@ -688,9 +693,9 @@
<!-- Unzip ARM toolchain -->
<antcall target="unzip-arm-toolchain">
<param name="dist_file" value="gcc-arm-none-eabi-4.7.4-2013q2-windows.tar.gz" />
<param name="dist_url" value="http://arduino.googlecode.com/files/gcc-arm-none-eabi-4.7.4-2013q2-windows.tar.gz" />
<param name="dist_check_file" value="gcc-arm-none-eabi-4.7.4-2013q2" />
<param name="dist_file" value="gcc-arm-none-eabi-4.4.1-2010q1-188-win32.tar.gz" />
<param name="dist_url" value="http://arduino.googlecode.com/files/gcc-arm-none-eabi-4.4.1-2010q1-188-win32.tar.gz" />
<param name="dist_check_file" value="g++_arm_none_eabi" />
</antcall>
<delete includeEmptyDirs="true" quiet="true">

1
build/linux/dist/gcc-arm-none-eabi-4.4.1-2010q1-188-linux32.tar.gz.sha vendored Normal file
View File

@ -0,0 +1 @@
46a93ceec28772ac19c76ffc9b285a1eac4288a3

1
build/linux/dist/gcc-arm-none-eabi-4.7.4-2013q2-linux32.tar.gz.sha vendored
View File

@ -1 +0,0 @@
b35a6b9b1066977509ad5dcf51936b7a6bb18c18

1
build/linux/dist/gcc-arm-none-eabi-4.7.4-2013q2-linux64.tar.gz.sha vendored
View File

@ -1 +0,0 @@
14afebbb1a26b799237080ec32b300a409ff99cb

1
build/macosx/dist/gcc-arm-none-eabi-4.4.1-2010q1-188-macos.tar.gz.sha vendored Normal file
View File

@ -0,0 +1 @@
14c554bb9aa9f0d0262a593e7452d33f4babc60d

1
build/macosx/dist/gcc-arm-none-eabi-4.7.4-2013q2-mac.tar.gz.sha vendored
View File

@ -1 +0,0 @@
a1326c6258f91d9b318570bc619ca8a3b799d8bc

12
build/shared/revisions.txt
View File

@ -1,5 +1,10 @@
ARDUINO 1.5.3 BETA
ARDUINO 1.5.4 BETA
[libraries]
* sam: fixed wrong SPI initialization (noblepepper)
ARDUINO 1.5.3 BETA 2013.08.30
[ide]
* Removed useless baud rates from serial monitor
@ -7,8 +12,6 @@ ARDUINO 1.5.3 BETA
* Added support for new 1.5 Library format (https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5:-Library-specification)
* Pass board type from boards.txt (https://github.com/arduino/Arduino/issues/308)
* Display estimated RAM usage after compile (Loren M. Lang)
* Updated arm gcc to 4.7.4 and simplified build.xml
* ARM gcc doesn't require ia32-libs anymore on 64 bits linux systems
* Import library menu is now scrollable
* Scrollable menus can now be scrolled with the mouse wheel
@ -27,7 +30,8 @@ ARDUINO 1.5.3 BETA
* removed unused flags from String (free 1 byte of SRAM)
[libraries]
* sam: Added CAN library (still in early stage of development) (Palliser)
* sam: Removed CAN library, you can find an updated version here:
https://github.com/collin80/due_can
* sam: Bugfix SPI library: begin() after end() now works (stimmer)
* sam: Bugfix SPI library: incorrent pin configuration in non-extended mode.
* Ported all libraries to new 1.5 format

1
build/windows/dist/gcc-arm-none-eabi-4.4.1-2010q1-188-win32.tar.gz.sha vendored Normal file
View File

@ -0,0 +1 @@
f288affa058bfdd44f8b93800fc4cb01b2ebf1e5

1
build/windows/dist/gcc-arm-none-eabi-4.7.4-2013q2-windows.tar.gz.sha vendored
View File

@ -1 +0,0 @@
c41fa509205b9ced43fc221b6a0cae4223a0842d