1
0
mirror of https://github.com/arduino/Arduino.git synced 2024-12-04 15:24:12 +01:00
Commit Graph

415 Commits

Author SHA1 Message Date
Federico Fissore
70e4c35690 Upgrading to astyle 2.04: see changes at http://astyle.sourceforge.net/notes.html 2014-10-07 11:46:52 +02:00
Cristian Maglie
f346092818 Revert appbundler until we figure out how to support OSX 10.6 2014-07-04 14:06:57 +02:00
Cristian Maglie
d52e75ff38 Merge branch 'osx-app-bundler' into ide-1.5.x
Conflicts:
	build/build.xml
2014-06-27 16:08:20 +02:00
Cristian Maglie
c2e5f67ea6 Updated arm gcc to version 4.8.3-2014q1 2014-06-25 11:59:47 +02:00
Cristian Maglie
4df2c8982a Updated arm gcc to 4.8.3 2014-06-25 11:57:49 +02:00
Cristian Maglie
3a4381955e Updated arm gcc to 4.7.4 2014-06-25 11:56:50 +02:00
Cristian Maglie
578cac41dc Added 'unzip-tool' target in build.xml 2014-06-25 10:14:34 +02:00
Federico Fissore
febf6735ab New toolchain: macosx fix 2014-06-25 10:14:34 +02:00
Federico Fissore
98c3080d2a New toolchain: gcc 4.8.1, avr-libc 1.8.0, binutils 2.23.2 2014-06-25 10:14:34 +02:00
Federico Fissore
5a015b3eec New common AVR toolchain 2014-06-25 10:12:39 +02:00
Cristian Maglie
39a6693f2a Fixed arm toolchain unzip and factored paths in build.xml 2014-05-30 13:07:33 +02:00
Cristian Maglie
ab1ee51d68 MacOSX: switched to appbundler for building distribution files (Haavar Valeur)
See #1665
2014-05-29 12:28:42 +02:00
Cristian Maglie
777692a0f3 Fix regexp pattern for revision detection in build.xml 2014-05-29 11:58:20 +02:00
Cristian Maglie
70df7ffc0c Fixed build.xml leftovers after last merge 2014-03-17 10:31:20 +01:00
Cristian Maglie
738b9d8e29 Merge remote-tracking branch 'arduino/master' into ide-1.5.x
Conflicts:
	.gitignore
	app/lib/commons-logging-1.0.4.jar
	build/build.xml
	build/windows/launcher/config_debug.xml
	libraries/Esplora/examples/Beginners/EsploraJoystickMouse/EsploraJoystickMouse.ino
2014-03-16 12:11:19 +01:00
Federico Fissore
5a60f6b008 Windows: launch4j gets downloaded at build time 2014-03-04 13:13:48 +01:00
Federico Fissore
994f0d7bfd Windows: arduino_debug.exe. Backport of ad2ff737bb 2014-02-27 13:24:49 +01:00
Federico Fissore
a3632d53a2 Windows: launch4j gets downloaded at build time 2014-02-20 12:42:05 +01:00
Federico Fissore
ad2ff737bb Windows: arduino_debug.exe: no splash screen, outputs messages to stdout 2014-02-20 11:06:30 +01:00
Jesse Vincent
dfa490f2c3 Be more consistent about not trying to redownload the JRE and astyle every time we build the IDE.
This is particularly nice when working offline
2014-02-18 14:37:05 -03:00
Cristian Maglie
48c1223762 Update to jssc 2.8.0
Fixes #1811
2014-01-27 16:06:55 +01:00
Federico Fissore
4b3717bc53 jssc: updated config files (eclipse, ant build.xml, windows launcher, mac template.app), removed rxtx binaries 2013-11-28 17:27:13 +01:00
Cristian Maglie
fabbe45c81 Updated msys-1.0.dll to the latest version for Windows 8.1 compatibility.
Removed windows/avr_tools.zip, the binary distribution is now downloaded
from the Arduino repository.

Fixes #1658
2013-11-20 18:07:28 +01:00
Federico Fissore
a81f04056d fixing crlf for windows 2013-10-14 18:26:59 +02:00
Federico Fissore
56bdebb8d7 Introducing Artistic Style: new IDE autoformatter 2013-10-14 18:11:30 +02:00
Federico Fissore
d4fd836853 Removed jre.zip from windows: is now downloaded at "dist" time
Upgraded bundled java to version 7u40 (latest stable): closes #1405
2013-10-02 18:12:19 +02:00
Federico Fissore
effb59da4b Merge remote-tracking branch 'arduino/ide-1.5.x' into dev-ide-1.5.x-discovery 2013-09-06 12:59:24 +02:00
Federico Fissore
51602496eb removed output from exec tar: windows does not know /dev/null 2013-08-30 17:19:06 +02:00
Cristian Maglie
690eac4047 Moved arm-gcc upgrade to specific development branch 2013-08-30 10:58:16 +02:00
Cristian Maglie
3cf06be044 Fixed arm toolchain unpack for macosx. 2013-08-29 18:26:53 +02:00
Cristian Maglie
fa3fc39c3f Fixed output filename in build.xml 2013-08-29 16:17:14 +02:00
Cristian Maglie
6c1696f4c6 Fixed application signing check for codesign.
Sometimes "codesign" returns error code 1 when replacing an already existing
signature.
2013-08-29 16:07:09 +02:00
Federico Fissore
c206ba6b84 Merge branch 'ide-1.5.x' into dev-ide-1.5.x-discovery 2013-08-29 09:44:18 +02:00
Cristian Maglie
aff29deb1e Force codesign to overwrite old signature if present 2013-08-28 15:15:39 +02:00
Cristian Maglie
ea8c14421a Merge branch 'ide-1.5.x' into dev-ide-1.5.x-discovery
Conflicts:
	app/src/processing/app/Preferences.java
	app/src/processing/app/debug/Uploader.java
2013-08-23 15:59:24 +02:00
Cristian Maglie
32a5a300b9 Merge branch 'update-arm-gcc' into ide-1.5.x 2013-08-08 15:00:14 +02:00
Cristian Maglie
b5bea8f508 build.xml some properties are now deduced from 'platform' property 2013-08-08 14:52:49 +02:00
Cristian Maglie
960c517b51 Updated ARM gcc for win32 and macos to version 4.7.4 2013-08-05 17:23:45 +02:00
Federico Fissore
f2c0198b10 Revert "Revert "avrdude -> avrdude32""
This reverts commit b0332f0c36.
2013-07-29 10:59:42 +02:00
Cristian Maglie
ea804023ef Updated ARM gcc to 4.7.4. Added native 64 bit version for linux (no more ia32-libs needed).
Fixes #1474
2013-07-28 14:14:04 +02:00
Federico Fissore
b0332f0c36 Revert "avrdude -> avrdude32"
This reverts commit a1f04cc3c0.
2013-07-26 18:42:23 +02:00
Federico Fissore
a1f04cc3c0 avrdude -> avrdude32
bossac -> bossac32
adapted build.xml to copy the right avrdude and bossac according to target arch
2013-07-26 17:55:35 +02:00
Federico Fissore
21203cbe1b introducing jsch. now network monitor uses SSH to trigger a telnet session at yun side 2013-06-11 15:02:10 +02:00
Federico Fissore
79952e9691 linux, macosx, windows build scripts and confs
temporary lock image
2013-05-06 12:31:03 +02:00
Federico Fissore
1445529d1c working on #223: Auto-detection of serial ports. Windows version ready 2013-05-06 12:31:01 +02:00
Federico Fissore
776952762f working on #223: Auto-detection of serial ports. Linux version ready 2013-05-06 12:31:01 +02:00
Cristian Maglie
4d3a9a4bf0 Revert "removing old rxtx references"
This reverts commit 719f79c037.
2013-02-27 17:54:48 +01:00
Federico Fissore
719f79c037 removing old rxtx references 2013-02-27 13:42:45 +01:00
Federico Fissore
271a2c53d4 moved tests in a separater ant target so that they can run AFTER assets like nodejs and the compiler are unpacked and ready to be used 2013-02-19 15:26:49 +01:00
Federico Fissore
bfbd9252e7 fixing macosx signed build 2013-02-05 16:30:00 +01:00
Federico Fissore
f3c9cf037f closes #928. Windows release notes need carriage returns 2013-02-04 16:56:26 +01:00
Cristian Maglie
3c4132b0df Merge remote-tracking branch 'arduino/macosx-sign-build' into ide-1.5.x 2013-02-04 15:20:00 +01:00
Cristian Maglie
9b16f7baa5 MacOSX code sign procedure (part 2) 2013-02-04 14:46:27 +01:00
Federico Fissore
d70d063cc8 see #1227
using ant zip target on macosx build
setting zip compression level to 9
2013-02-04 11:09:18 +01:00
Federico Fissore
d6aa373674 see #1227
windows zip reduced from 95M(403M uncompressed) to 83M(363M uncompressed)
2013-02-04 11:09:18 +01:00
Federico Fissore
d1bf880786 see #1227
macosx zip reduced from 126M(390M uncompressed) to 120M(370M uncompressed)
2013-02-04 11:09:18 +01:00
Federico Fissore
067b14a16c see #1227
tgz reduced from 79M(395M uncompressed) to 56M(193M uncompressed)
2013-02-04 11:09:18 +01:00
Cristian Maglie
3492911527 MacOSX code sign procedure 2013-02-01 23:51:50 +01:00
Federico Fissore
3f105bcd00 ant clean now removes tgz/zip
linux tgz renamed to linux32 and linux64
2013-01-31 12:32:29 +01:00
Federico Fissore
bef59a4de1 removed TemplateSketch.ino. Now using BareMinimum.ino 2013-01-30 15:33:14 +01:00
Federico Fissore
8e00662cb7 introducing template sketch with empty setup and loop functions. see #1138 2013-01-30 15:33:14 +01:00
Cristian Maglie
24bd97413e Updates to build.xml. (version auto defetect for "dist" target) 2013-01-24 14:46:57 +01:00
Cristian Maglie
aba27c43aa Merged upstream arduino branch 2012-10-18 15:50:09 +02:00
David A. Mellis
b7fc69aa9f Only exclude build/windows and build/macosx, not the app/ ones.
http://code.google.com/p/arduino/issues/detail?id=1011
2012-08-23 11:16:26 -04:00
Cristian Maglie
06c0928192 Merged master 2012-06-27 13:51:16 +02:00
Travis Geiselbrecht
b99d525a91 [sam] have the adk2 use the adk2install tool to flash and reboot a board 2012-05-29 14:33:32 -07:00
Cristian Maglie
e9f69129b4 Little change in build.xml to help cross-compiling 2012-05-26 19:07:31 +02:00
Cristian Maglie
b276a75d13 Pre-merge upstream Arduino 2012-05-22 11:23:47 +02:00
Cristian Maglie
6a8d8b050d [sam] build.xml - fixed some typos 2012-05-17 22:56:28 +02:00
Cristian Maglie
0e0c18ed73 [sam] toolchain download is done during default ant build 2012-05-17 22:46:56 +02:00
Cristian Maglie
6537c1c059 [sam] added toolchain download for windows 2012-05-17 05:43:25 +02:00
Cristian Maglie
844f559439 [sam] refactored build.xml to ensure compatibility with ant 1.7.1 2012-05-16 17:35:54 +02:00
Cristian Maglie
d9d08402d5 [sam] added toolchain download for linux64 2012-05-16 16:21:27 +02:00
Cristian Maglie
d02af8b680 [sam] added toolchain download for Mac 2012-05-16 13:44:51 +02:00
Cristian Maglie
d5a1938530 [sam] Moved arm toolchain distribution to google code 2012-05-16 11:43:56 +02:00
Cristian Maglie
b8f5ba7497 [sam] Added automatic toolchain download on build.xml (linux only) 2012-05-15 19:58:03 +02:00
David A. Mellis
22424b5e85 Extracting Mac OS X ARM tools in build.xml. 2012-05-11 16:29:42 -04:00
Cristian Maglie
49d7bdad47 Update to ANT build.xml for linux 2012-05-11 11:23:39 +02:00
David A. Mellis
c540ac19b3 Excluding .bz2 files from source-dist. 2012-04-08 19:17:03 -04:00
Cristian Maglie
b7c8b3ea74 Fixed compiling on windows 2012-04-02 18:30:53 +02:00
David A. Mellis
34d7925f27 Eliminating temporary file when unzipping 64-bit Linux AVR toolchain.
http://code.google.com/p/arduino/issues/detail?id=841
2012-02-29 16:43:01 -05:00
David A. Mellis
8cd670bee3 Avoid intermediate file when unzipping 32-bit Linux AVR toolchain.
http://code.google.com/p/arduino/issues/detail?id=841
2012-03-11 15:33:16 -04:00
David A. Mellis
c5c41bc531 Fixing build on 64-bit linux. 2012-02-29 16:16:37 -05:00
David A. Mellis
de8c051f38 Merge branch 'master' of github.com:arduino/Arduino
Conflicts:
	build/build.xml
2012-02-29 15:56:23 -05:00
David A. Mellis
c128aac761 Cleaning up Linux build (32 vs. 64-bit, dist). 2012-02-29 15:30:03 -05:00
David A. Mellis
ee537dd53e Adding 64-bit version of AVR tools on Linux (Paul Stoffregen)
http://code.google.com/p/arduino/issues/detail?id=300
2012-02-28 15:24:03 -05:00
David A. Mellis
784232c6a5 Adding 32-bit version of AVR toolchain on Linux (Paul Stoffregen)
http://code.google.com/p/arduino/issues/detail?id=300
2012-02-28 14:50:28 -05:00
Cristian Maglie
b7c54b79d7 Fine tuned libraries search. Reintroduced ./libraries folder for shipped
platform independent libraries.
2012-01-09 18:20:55 +01:00
Cristian Maglie
57b8713cab Moved libraries folder inside platform folder. Now libraries and examples are searched per board/platform 2012-01-04 15:14:51 +01:00
Cristian Maglie
65c15d93eb Merge commit 'fcbbf8f4b4960bae1091c0cd9dc58b4a1885baf6' into platforms-b
Conflicts:
	app/src/processing/app/Base.java
	app/src/processing/app/debug/Compiler.java
	build/build.xml
	hardware/arduino/boards.txt
2011-12-22 00:35:33 +01:00
David A. Mellis
33544fc3e6 Changing Mac OS X build to a .zip file (and adding OS name to archive).
http://code.google.com/p/arduino/issues/detail?id=645
2011-11-28 17:36:03 -05:00
David A. Mellis
b35e76ab42 Cleaning up Mac OS X ant build script (template.app copying). 2011-10-10 11:49:08 -04:00
David A. Mellis
be786b70de Revert "Don't include ArduinoTestSuite in Mac OS X distribution."
This reverts commit a18eb93d81.
2011-09-02 10:02:55 -04:00
ricklon
8e8102da78 Added debug mode for macox. Sets the spawn value to false. 2011-06-06 21:48:12 -04:00
David A. Mellis
24e62aa4e7 Switching to RXTX-2.1-7r2 on 64-bit Linux (working version).
This also means we don't need a separate RXTXcomm.jar file for 64-bit Linux.
2011-02-16 23:26:40 -05:00
David A. Mellis
6e227dda6e Updating 64-bit linux version of avrdude (to one with usbtiny support).
This also means we don't need a separate avrdude.conf for the 64-bit Linux version of avrdude.
2011-02-16 20:56:33 -05:00
David A. Mellis
253ab0cace Support for building on 64-bit Linux.
Includes changes to the build.xml, 64-bit versions of avrdude and RXTX native libraries, and alternative versions of the RXTX jar and avrdude.conf for those 64-bit versions (because they also have other differences).
2011-02-16 20:23:24 -05:00
David A. Mellis
a18eb93d81 Don't include ArduinoTestSuite in Mac OS X distribution. 2010-12-24 11:41:48 -06:00
David Mellis
544cfafb36 Updating eeprom.h on Windows, too. 2010-12-23 19:14:59 -05:00
David A. Mellis
867dee8245 Custom eeprom.h file to fix Mega 2560. 2010-12-23 18:00:01 -06:00
David A. Mellis
c6d1baa275 Fixing up some Linux stuff. 2010-11-27 19:50:33 +01:00
David A. Mellis
224a7bf768 Adding source-dist target to build.xml.
http://code.google.com/p/arduino/issues/detail?id=193
2010-10-03 21:21:27 -04:00
David A. Mellis
3650b471b9 Merge branch 'master' of github.com:arduino/Arduino 2010-10-03 20:04:29 -04:00
David A. Mellis
fa4d058297 Reapplying Christian's regex patch.
Revert "Revert "Removed dependencies from regex library oro.jar""

This reverts commit ed7795ef8d.
2010-10-03 19:44:28 -04:00
David A. Mellis
b656d42e92 Modifying the ant run target in Linux.
According to a comment at http://code.google.com/p/arduino/issues/detail?id=352 this helps ant find the executable.  It still doesn't work for me, but maybe it will for you.
2010-10-02 22:16:22 +02:00
David A. Mellis
ed7795ef8d Revert "Removed dependencies from regex library oro.jar"
This reverts commit 2b4391052c.
2010-10-02 17:19:53 +02:00
Cristian Maglie
2b4391052c Removed dependencies from regex library oro.jar 2010-10-01 19:41:36 +02:00
David A. Mellis
ca89be0a15 Fixes to Linux dist permissions (executables). 2010-08-30 22:54:08 +00:00
David A. Mellis
605bb90609 Commenting out the JDK download from the Processing site. 2010-08-30 00:23:47 +00:00
David A. Mellis
645d9cac85 Chmod'ing executables in the Mac dist .dmg (thanks to j.e.t.) 2010-08-12 22:29:15 +00:00
David A. Mellis
235321e486 Adding -n (never overwrite option) on unzip. 2010-05-10 01:18:33 +00:00
David A. Mellis
f6b887cd6e Trying to get linux ant build working. 2010-05-08 23:43:20 +00:00
David A. Mellis
ce78f8e0da Fixing (partially, at least) build.xml on Windows. Now requires you to have a local JDK and to install ant. 2010-05-08 23:20:52 +00:00
David A. Mellis
9529b70fbf Noise. 2010-05-08 22:07:30 +00:00
David A. Mellis
c4760d8ae7 Moving to ant-based build system from Processing. Mac OS X seems to work (for the moment). 2010-05-08 21:47:19 +00:00