Skip to content

Commit 370648a

Browse files
cmagliecmaglie
committed
Merge branch 'ide-1.5.7' into ide-1.5.x
2 parents a1229e8 + c2e5f67 commit 370648a

35 files changed

+153
-18392
lines changed

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,5 @@ test-bin
3636
build/windows/launch4j-*
3737
build/windows/launcher/launch4j
3838
build/windows/WinAVR-*.zip
39+
hardware/arduino/avr/libraries/Bridge/examples/XivelyClient/passwords.h
40+
avr-toolchain-*.zip

‎app/src/processing/app/Base.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@
6161
* files and images, etc) that comes from that.
6262
*/
6363
public class Base {
64-
public static final int REVISION = 156;
64+
public static final int REVISION = 157;
6565
/** This might be replaced by main() if there's a lib/version.txt file. */
66-
static String VERSION_NAME = "0156";
66+
static String VERSION_NAME = "0157";
6767
/** Set true if this a proper release rather than a numbered revision. */
6868
static public boolean RELEASE = false;
6969

‎app/src/processing/app/helpers/ProcessUtils.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package processing.app.helpers;
22

3-
import java.io.IOException;
4-
53
import processing.app.Base;
64

5+
import java.io.IOException;
6+
import java.util.Map;
7+
78
public class ProcessUtils {
89

910
public static Process exec(String[] command) throws IOException {
@@ -20,6 +21,10 @@ public static Process exec(String[] command) throws IOException {
2021
String[] cmdLine = new String[command.length];
2122
for (int i = 0; i < command.length; i++)
2223
cmdLine[i] = command[i].replace("\"", "\\\"");
23-
return Runtime.getRuntime().exec(cmdLine);
24+
25+
ProcessBuilder pb = new ProcessBuilder(cmdLine);
26+
Map<String, String> env = pb.environment();
27+
env.put("CYGWIN", "nodosfilewarning");
28+
return pb.start();
2429
}
2530
}

‎build/build.xml

Lines changed: 95 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -229,8 +229,11 @@
229229
</copy>
230230

231231
<!-- Unzip AVR tools -->
232-
<!-- <unzip dest="macosx/work/Arduino.app/Contents/Resources/Java/hardware" src="macosx/dist/tools-universal.zip" overwrite="false"/> -->
232+
<antcall target="unzip-avr-toolchain">
233+
<param name="file_arch" value="mac32" />
234+
</antcall>
233235

236+
<!--
234237
<exec executable="unzip">
235238
<arg value="-q" />
236239
<arg value="-n" />
@@ -239,24 +242,25 @@
239242
<arg value="macosx/dist/tools-universal.zip" />
240243
</exec>
241244
245+
<copy todir="macosx/work/Arduino.app/Contents/Resources/Java/hardware/tools/avr/avr/include/avr">
246+
<fileset file="macosx/dist/eeprom.h" />
247+
</copy>
248+
-->
249+
242250
<copy todir="macosx/work/Arduino.app/Contents/Resources/Java/hardware/tools/">
243251
<fileset file="macosx/dist/bossac" />
244252
</copy>
245253

246254
<chmod file="macosx/work/Arduino.app/Contents/Resources/Java/hardware/tools/bossac" perm="+x" />
247255

248-
<copy todir="macosx/work/Arduino.app/Contents/Resources/Java/hardware/tools/avr/avr/include/avr">
249-
<fileset file="macosx/dist/eeprom.h" />
250-
</copy>
251-
252256
<antcall target="assemble">
253257
<param name="target.path" value="macosx/work/Arduino.app/Contents/Resources/Java" />
254258
</antcall>
255259

256260
<antcall target="unzip-arm-toolchain">
257-
<param name="dist_file" value="gcc-arm-none-eabi-4.4.1-2010q1-188-macos.tar.gz" />
258-
<param name="dist_url" value="http://arduino.googlecode.com/files/gcc-arm-none-eabi-4.4.1-2010q1-188-macos.tar.gz" />
259-
<param name="dist_check_file" value="g++_arm_none_eabi" />
261+
<param name="dist_file" value="gcc-arm-none-eabi-4.8.3-2014q1-mac.tar.gz" />
262+
<param name="dist_url" value="http://downloads.arduino.cc/gcc-arm-none-eabi-4.8.3-2014q1-mac.tar.gz" />
263+
<param name="dist_check_file" value="gcc-arm-none-eabi-4.8.3-2014q1" />
260264
</antcall>
261265

262266
<delete includeEmptyDirs="true" quiet="true">
@@ -341,9 +345,7 @@
341345
<chmod perm="+x">
342346
<fileset dir="macosx/work/Arduino.app/Contents/Resources/Java/hardware/tools/avr/bin" includes="**/*" />
343347
<fileset dir="macosx/work/Arduino.app/Contents/Resources/Java/hardware/tools/avr/avr/bin" includes="**/*" />
344-
<fileset dir="macosx/work/Arduino.app/Contents/Resources/Java/hardware/tools/avr/avr-3/bin" includes="**/*" />
345-
<fileset dir="macosx/work/Arduino.app/Contents/Resources/Java/hardware/tools/avr/avr-4/bin" includes="**/*" />
346-
<fileset dir="macosx/work/Arduino.app/Contents/Resources/Java/hardware/tools/avr/libexec/gcc/avr/4.3.2/" includes="**/cc1*" />
348+
<fileset dir="macosx/work/Arduino.app/Contents/Resources/Java/hardware/tools/avr/libexec/gcc/avr/4.8.1/" includes="*" />
347349
</chmod>
348350

349351
<replace file="macosx/work/Arduino.app/Contents/Info.plist"
@@ -470,11 +472,8 @@
470472
<mkdir dir="linux/work/hardware/tools" />
471473
<copy file="linux/dist/tools/adk2install" todir="linux/work/hardware/tools" />
472474
<copy file="linux/dist/tools/adk2tool" todir="linux/work/hardware/tools" />
473-
<copy file="linux/dist/tools/avrdude${arch-bits}" tofile="linux/work/hardware/tools/avrdude" />
474-
<copy file="linux/dist/tools/avrdude.conf" todir="linux/work/hardware/tools" />
475475
<copy file="linux/dist/tools/bossac${arch-bits}" tofile="linux/work/hardware/tools/bossac" />
476476

477-
<chmod perm="755" file="linux/work/hardware/tools/avrdude" />
478477
<chmod perm="755" file="linux/work/hardware/tools/bossac" />
479478
<chmod perm="755" file="linux/work/hardware/tools/adk2tool" />
480479
<chmod perm="755" file="linux/work/hardware/tools/adk2install" />
@@ -491,36 +490,29 @@
491490
<target name="linux32-build" depends="linux-build" description="Build linux (32-bit) version">
492491
<!-- Unzip ARM tools -->
493492
<antcall target="unzip-arm-toolchain">
494-
<param name="dist_file" value="gcc-arm-none-eabi-4.4.1-2010q1-188-linux32.tar.gz" />
495-
<param name="dist_url" value="http://arduino.googlecode.com/files/gcc-arm-none-eabi-4.4.1-2010q1-188-linux32.tar.gz" />
496-
<param name="dist_check_file" value="g++_arm_none_eabi" />
493+
<param name="dist_file" value="gcc-arm-none-eabi-4.8.3-2014q1-linux32.tar.gz" />
494+
<param name="dist_url" value="http://downloads.arduino.cc/gcc-arm-none-eabi-4.8.3-2014q1-linux32.tar.gz" />
495+
<param name="dist_check_file" value="gcc-arm-none-eabi-4.8.3-2014q1" />
497496
</antcall>
498497

499498
<!-- Unzip AVR tools -->
500-
<exec executable="tar" dir="linux/work/hardware">
501-
<arg value="-xjf"/>
502-
<arg value="../../avr_tools_linux32.tar.bz2"/>
503-
</exec>
504-
499+
<antcall target="unzip-avr-toolchain">
500+
<param name="file_arch" value="linux32" />
501+
</antcall>
505502
</target>
506503

507504
<target name="linux64-build" depends="linux-build" description="Build linux (64-bit) version">
508-
<copy tofile="linux/work/hardware/tools/avrdude" file="linux/dist/tools/avrdude64" overwrite="true" />
509-
510-
<chmod perm="755" file="linux/work/hardware/tools/avrdude" />
511-
512505
<!-- Unzip ARM tools -->
513-
<antcall target="unzip-arm-toolchain">
514-
<param name="dist_file" value="gcc-arm-none-eabi-4.4.1-2010q1-188-linux32.tar.gz" />
515-
<param name="dist_url" value="http://arduino.googlecode.com/files/gcc-arm-none-eabi-4.4.1-2010q1-188-linux32.tar.gz" />
516-
<param name="dist_check_file" value="g++_arm_none_eabi" />
506+
<antcall target="unzip-tool">
507+
<param name="dist_file" value="gcc-arm-none-eabi-4.8.3-2014q1-linux64.tar.gz" />
508+
<param name="dist_url" value="http://downloads.arduino.cc/gcc-arm-none-eabi-4.8.3-2014q1-linux64.tar.gz" />
509+
<param name="dist_check_file" value="gcc-arm-none-eabi-4.8.3-2014q1" />
517510
</antcall>
518511

519512
<!-- Unzip AVR tools -->
520-
<exec executable="tar" dir="linux/work/hardware">
521-
<arg value="-xjf"/>
522-
<arg value="../../avr_tools_linux64.tar.bz2"/>
523-
</exec>
513+
<antcall target="unzip-avr-toolchain">
514+
<param name="file_arch" value="linux64" />
515+
</antcall>
524516
</target>
525517

526518
<target name="linux32-run" depends="linux32-build" description="Run Linux (32-bit) version">
@@ -531,6 +523,68 @@
531523
<exec executable="./linux/work/arduino" spawn="false"/>
532524
</target>
533525

526+
<target name="unzip-avr-toolchain">
527+
<get src="http://downloads.arduino.cc/avr-toolchain-${file_arch}-gcc-4.8.1.zip" dest="${staging_folder}" usetimestamp="true" ignoreerrors="true" verbose="true" />
528+
529+
<checksum file="${staging_folder}/avr-toolchain-${file_arch}-gcc-4.8.1.zip" algorithm="sha" fileext=".sha" verifyproperty="checksum.matches"/>
530+
<condition property="checksum.matches.fail">
531+
<equals arg1="${checksum.matches}" arg2="false"/>
532+
</condition>
533+
<fail if="checksum.matches.fail">Checksum failed.
534+
535+
File avr-toolchain-${file_arch}-gcc-4.8.1.zip failed checksum.
536+
Please remove "${staging_folder}/avr-toolchain-${file_arch}-gcc-4.8.1.zip" and download it again.
537+
</fail>
538+
539+
<mkdir dir="${staging_folder}/work/${staging_hardware_folder}/tools/avr" />
540+
<exec executable="unzip">
541+
<arg value="-q" />
542+
<arg value="-n" />
543+
<arg value="-d" />
544+
<arg value="${staging_folder}/work/${staging_hardware_folder}/tools/avr" />
545+
<arg value="${staging_folder}/avr-toolchain-${file_arch}-gcc-4.8.1.zip" />
546+
</exec>
547+
</target>
548+
549+
550+
551+
<!-- Set '${dist_file}_available' property if toolchain dist_file is downloaded -->
552+
<!-- Set '${dist_file}_installed' property if toolchain is installed in working directory -->
553+
<!-- hardware/tools/${dist_check_file} is checked for existence -->
554+
<target name="check-tool">
555+
<available file="${staging_folder}/dist/${dist_file}" property="${dist_file}_available" />
556+
<available file="${staging_folder}/work/hardware/tools/${dist_check_file}" property="${dist_file}_installed" />
557+
</target>
558+
559+
<!-- Retrieve tool -->
560+
<target name="get-tool" depends="check-tool" unless="${dist_file}_available">
561+
<get src="${dist_url}" dest="${staging_folder}/dist/${dist_file}" verbose="true" ignoreerrors="true" />
562+
</target>
563+
564+
<!-- Ensure that the tool is downloaded and test checksums, if everything's ok unzip it on the tools folder -->
565+
<target name="unzip-tool" depends="get-tool, check-tool" unless="${dist_file}_installed">
566+
<echo>Testing checksum of "${staging_folder}/dist/${dist_file}"</echo>
567+
<checksum file="${staging_folder}/dist/${dist_file}" algorithm="sha" fileext=".sha" verifyproperty="checksum.matches"/>
568+
<condition property="checksum.matches.fail">
569+
<equals arg1="${checksum.matches}" arg2="false"/>
570+
</condition>
571+
<fail if="checksum.matches.fail">Checksum failed.
572+
573+
File ${dist_file} failed checksum.
574+
Please remove "${staging_folder}/dist/${dist_file}" to download it again.
575+
</fail>
576+
577+
<!-- Unzip tool to the destination folder -->
578+
<echo>Unzipping into folder ${staging_folder}/dist/${dist_file}</echo>
579+
<exec executable="tar">
580+
<arg value="xfz"/>
581+
<arg value="${staging_folder}/dist/${dist_file}"/>
582+
<arg value="--directory=${staging_folder}/work/${staging_hardware_folder}/tools/"/>
583+
</exec>
584+
</target>
585+
586+
587+
534588
<!-- Set 'arm_disfile_available' property if ARM toolchain dist_file is downloaded -->
535589
<!-- Set 'arm_toolchain_installed' property if ARM toolchain is installed in working directory -->
536590
<target name="check-arm-toolchain">
@@ -540,7 +594,7 @@
540594

541595
<!-- Retrieve ARM toolchain -->
542596
<target name="get-arm-toolchain" depends="check-arm-toolchain" unless="arm_distfile_available">
543-
<get src="${dist_url}" dest="${staging_folder}/dist/${dist_file}" verbose="true" />
597+
<get src="${dist_url}" dest="${staging_folder}/dist/${dist_file}" verbose="true" ignoreerrors="true" />
544598
</target>
545599

546600
<target name="unzip-arm-toolchain" depends="get-arm-toolchain, check-arm-toolchain"
@@ -684,12 +738,9 @@
684738
</copy>
685739

686740
<!-- Unzip AVR tools -->
687-
<get src="http://downloads.arduino.cc/WinAVR-20081205-arduino-2.zip" dest="windows" usetimestamp="true" skipexisting="true" verbose="true" />
688-
<unzip dest="windows/work/hardware" src="windows/WinAVR-20081205-arduino-2.zip" overwrite="false"/>
689-
690-
<copy todir="windows/work/hardware/tools/avr/avr/include/avr">
691-
<fileset file="windows/eeprom.h" />
692-
</copy>
741+
<antcall target="unzip-avr-toolchain">
742+
<param name="file_arch" value="win32" />
743+
</antcall>
693744

694745
<get src="http://downloads.arduino.cc/libastylej-2.03.zip" dest="windows" usetimestamp="true" skipexisting="true" />
695746
<unzip src="windows/libastylej-2.03.zip" dest="windows" overwrite="true"/>
@@ -732,9 +783,9 @@
732783

733784
<!-- Unzip ARM toolchain -->
734785
<antcall target="unzip-arm-toolchain">
735-
<param name="dist_file" value="gcc-arm-none-eabi-4.4.1-2010q1-188-win32.tar.gz" />
736-
<param name="dist_url" value="http://arduino.googlecode.com/files/gcc-arm-none-eabi-4.4.1-2010q1-188-win32.tar.gz" />
737-
<param name="dist_check_file" value="g++_arm_none_eabi" />
786+
<param name="dist_file" value="gcc-arm-none-eabi-4.8.3-2014q1-windows.tar.gz" />
787+
<param name="dist_url" value="http://downloads.arduino.cc/gcc-arm-none-eabi-4.8.3-2014q1-windows.tar.gz" />
788+
<param name="dist_check_file" value="gcc-arm-none-eabi-4.8.3-2014q1" />
738789
</antcall>
739790

740791
<delete includeEmptyDirs="true" quiet="true">
@@ -770,18 +821,11 @@
770821
prefix="arduino-${version}" />
771822
</zip>
772823

773-
<zip destfile="windows/arduino-${version}-${platform}-expert.zip" level="9">
774-
<zipfileset dir="windows/work"
775-
prefix="arduino-${version}"
776-
excludes="java/**" />
777-
</zip>
778-
779824
<echo>
780825
=======================================================
781826
Arduino for Windows was built. Grab the archive from
782827

783828
windows/arduino-${version}-${platform}.zip
784-
windows/arduino-${version}-${platform}-expert.zip
785829
=======================================================
786830
</echo>
787831
</target>

‎build/linux/avr-toolchain-linux32-gcc-4.8.1.zip.sha

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
60f9edb4dd033109e22ee9e87cb6f45efd15882e

‎build/linux/avr-toolchain-linux64-gcc-4.8.1.zip.sha

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
5b0131ac2ccf20637d16ecc40a0ef2fae48fe73a

‎build/linux/avr_tools_linux32.tar.bz2

-8.14 MB
Binary file not shown.

‎build/linux/avr_tools_linux64.tar.bz2

-9.08 MB
Binary file not shown.

‎build/linux/dist/gcc-arm-none-eabi-4.4.1-2010q1-188-linux32.tar.gz.sha

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎build/linux/dist/gcc-arm-none-eabi-4.8.3-2014q1-linux32.tar.gz.sha

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
20500b304b2b7c08a699cdd25564003aaf78088e

0 commit comments

Comments
 (0)