8000 Merge branch 'master' into linuxinstall · arduino/Arduino@e7ea19e · GitHub
[go: up one dir, main page]
Skip to content

Commit e7ea19e

Browse files
fiechrfiechr
committed
Merge branch 'master' into linuxinstall
2 parents 8f37455 + e5252e3 commit e7ea19e

File tree

1,293 files changed

+100191
-330786
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,293 files changed

+100191
-330786
lines changed

‎.classpath

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<classpathentry excluding="processing/app/tools/format/|processing/app/tools/format/src/|processing/app/Trace.java|processing/app/RunnerClassLoader.java" kind="src" path="app/src"/>
44
<classpathentry kind="src" path="app/test"/>
55
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
6-
<classpathentry kind="lib" path="app/lib/antlr.jar"/>
76
<classpathentry kind="lib" path="app/lib/apple.jar"/>
87
<classpathentry kind="lib" path="app/lib/ecj.jar"/>
98
<classpathentry kind="lib" path="app/test-lib/junit-4.11.jar"/>
@@ -16,6 +15,7 @@
1615
<classpathentry kind="lib" path="app/lib/commons-exec-1.1.jar"/>
1716
<classpathentry kind="lib" path="app/lib/commons-httpclient-3.1.jar"/>
1817
<classpathentry kind="lib" path="app/lib/commons-logging-1.0.4.jar"/>
18+
<classpathentry kind="lib" path="app/lib/commons-net-3.3.jar"/>
1919
<classpathentry kind="lib" path="app/lib/jmdns-3.4.1.jar"/>
2020
<classpathentry kind="lib" path="app/lib/jsch-0.1.50.jar"/>
2121
<classpathentry kind="lib" path="app/lib/jssc-2.8.0.jar"/>

‎.gitignore

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ hardware/arduino/bootloaders/caterina_LUFA/Caterina.lss
1313
hardware/arduino/bootloaders/caterina_LUFA/Caterina.elf
1414
hardware/arduino/bootloaders/caterina_LUFA/Caterina.eep
1515
hardware/arduino/bootloaders/caterina_LUFA/.dep/
16-
build/libastylej-*.zip
16+
build/*.zip
17+
build/*.tar.bz2
1718
build/windows/work/
1819
build/windows/*.zip
1920
build/windows/*.tgz
@@ -33,8 +34,9 @@ build/macosx/libastylej*
3334
build/macosx/appbundler*.jar
3435
build/macosx/appbundler*.zip
3536
build/macosx/appbundler
36-
build/macosx/appbundler-1.0ea-arduino2
37-
build/macosx/appbundler-1.0ea-upstream1
37+
build/macosx/appbundler-1.0ea-arduino?
38+
build/macosx/appbundler-1.0ea-arduino*.zip
39+
build/macosx/appbundler-1.0ea-upstream*.zip
3840
build/linux/work/
3941
build/linux/dist/*.tar.gz
4042
build/linux/dist/*.tar.bz2

‎README.md

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ IDE can be downloaded for free at http://www.arduino.cc/en/Main/Software
1010

1111
* For more information, see the website at: http://www.arduino.cc/
1212
or the forums at: http://www.arduino.cc/forum/
13-
You can also follow Arduino on twitter at: https://twitter.com/arduino or like Arduino on Facebook at: https://www.facebook.com/official.arduino
13+
You can also follow Arduino on twitter at: https://twitter.com/arduino or
14+
like Arduino on Facebook at: https://www.facebook.com/official.arduino
1415

1516
* To report a *bug* in the software or to request *a simple enhancement* go to:
1617
http://github.com/arduino/Arduino/issues
@@ -35,11 +36,18 @@ Credits
3536
--------
3637
Arduino is an open source project, supported by many.
3738

38-
The Arduino team is composed of Massimo Banzi, David Cuartielles, Tom Igoe,
39-
Gianluca Martino, Daniela Antonietti, and David A. Mellis.
40-
41-
Arduino uses the [GNU avr-gcc toolchain](http://gcc.gnu.org/wiki/avr-gcc), [avrdude](http://www.nongnu.org/avrdude/), [avr-libc](http://www.nongnu.org/avr-libc/), and code from
42-
[Processing](http://www.processing.org) and [Wiring](http://wiring.org.co).
39+
The Arduino team is composed of Massimo Banzi, David Cuartielles, Tom Igoe
40+
and David A. Mellis.
41+
42+
Arduino uses
43+
[GNU avr-gcc toolchain](http://gcc.gnu.org/wiki/avr-gcc),
44+
[GCC ARM Embedded toolchain](https://launchpad.net/gcc-arm-embedded),
45+
[avr-libc](http://www.nongnu.org/avr-libc/),
46+
[avrdude](http://www.nongnu.org/avrdude/),
47+
[bossac](http://www.shumatech.com/web/products/bossa),
48+
[openOCD](http://openocd.org/)
49+
and code from [Processing](http://www.processing.org)
50+
and [Wiring](http://wiring.org.co).
4351

4452
Icon and about image designed by [ToDo](http://www.todo.to.it/)
4553

‎app/.classpath

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22
<classpath>
33
<classpathentry excluding="processing/app/tools/format/" kind="src" path="src"/>
44
<classpathentry kind="src" path="test"/>
5-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
6-
<classpathentry kind="lib" path="lib/antlr.jar"/>
7-
<classpathentry kind="lib" path="lib/ecj.jar"/>
5+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
86
<classpathentry kind="lib" path="lib/apple.jar"/>
97
<classpathentry kind="lib" path="lib/bcpg-jdk15on-152.jar"/>
108
<classpathentry kind="lib" path="lib/bcprov-jdk15on-152.jar"/>
@@ -13,6 +11,7 @@
1311
<classpathentry kind="lib" path="lib/commons-exec-1.1.jar"/>
1412
<classpathentry kind="lib" path="lib/commons-httpclient-3.1.jar"/>
1513
<classpathentry kind="lib" path="lib/commons-logging-1.0.4.jar"/>
14+
<classpathentry kind="lib" path="lib/commons-net-3.3.jar"/>
1615
<classpathentry kind="lib" path="lib/jackson-annotations-2.2.3.jar"/>
1716
<classpathentry kind="lib" path="lib/jackson-core-2.2.3.jar"/>
1817
<classpathentry kind="lib" path="lib/jackson-databind-2.2.3.jar"/>
@@ -28,8 +27,7 @@
2827
<classpathentry combineaccessrules="false" kind="src" path="/arduino-core"/>
2928
<classpathentry kind="lib" path="test-lib/jcip-annotations-1.0.jar"/>
3029
<classpathentry kind="lib" path="lib/commons-lang3-3.3.2.jar"/>
31-
<classpathentry kind="lib" path="lib/guava-18.0.jar"/>
3230
<classpathentry kind="lib" path="lib/java-semver-0.8.0.jar"/>
33-
<classpathentry kind="lib" path="lib/rsyntaxtextarea-2.5.6.1+arduino.jar"/>
31+
<classpathentry kind="lib" path="lib/rsyntaxtextarea-2.5.8.1+arduino.jar"/>
3432
<classpathentry kind="output" path="bin"/>
3533
</classpath>

‎app/.classpath_macosx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
<classpathentry combineaccessrules="false" kind="src" path="/pdf"/>
1414
<classpathentry combineaccessrules="false" kind="src" path="/serial"/>
1515
<classpathentry combineaccessrules="false" kind="src" path="/video"/>
16-
<classpathentry kind="lib" path="lib/antlr.jar"/>
1716
<classpathentry kind="lib" path="lib/ecj.jar"/>
1817
<classpathentry kind="output" path="bin"/>
1918
</classpath>

‎app/.settings/org.eclipse.jdt.core.prefs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
eclipse.preferences.version=1
22
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
3-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
3+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
44
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
5-
org.eclipse.jdt.core.compiler.compliance=1.6
5+
org.eclipse.jdt.core.compiler.compliance=1.8
66
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
77
org.eclipse.jdt.core.compiler.debug.localVariable=generate
88
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -62,7 +62,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=di
6262
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
6363
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
6464
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
65-
org.eclipse.jdt.core.compiler.source=1.6
65+
org.eclipse.jdt.core.compiler.source=1.8
6666
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
6767
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
6868
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
@@ -145,7 +145,6 @@ org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
145145
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
146146
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
147147
org.eclipse.jdt.core.formatter.indentation.size=2
148-
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
149148
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
150149
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
151150
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert

‎app/build.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
<echo message="override ${env.JAVA_HOME}/lib/tools.jar" />
7474
<fail />
7575
-->
76-
<javac source="1.6" target="1.6"
76+
<javac source="1.8" target="1.8"
7777
srcdir="src"
7878
destdir="bin"
7979
encoding="UTF-8"
@@ -85,7 +85,7 @@
8585
<target name="test" depends="compile" description="Runs the test">
8686
<mkdir dir="test-bin"/>
8787

88-
<javac source="1.6" target="1.6"
88+
<javac source="1.8" target="1.8"
8989
srcdir="test"
9090
destdir="test-bin"
9191
encoding="UTF-8"
@@ -101,6 +101,8 @@
101101
<fileset dir="test" includes="**/*.ino" />
102102
<fileset dir="test" includes="**/*.json*" />
103103
<fileset dir="test" includes="**/*.key" />
104+
<fileset dir="test" includes="**/*.hex" />
105+
<fileset dir="test" includes="**/*.pac" />
104106
</copy>
105107

106108
<junit printsummary="yes" dir="${work.dir}" fork="true">
@@ -110,7 +112,6 @@
110112
<classpath>
111113
<pathelement location="bin"/>
112114
<pathelement location="test-bin"/>
113-
<pathelement path="../build/macosx/work/Arduino.app/Contents/Resources/Java/quaqua.jar"/>
114115
<path refid="class.path.test"/>
115116
</classpath>
116117

‎app/format/src/AutoFormat.java

Lines changed: 0 additions & 160 deletions
This file was deleted.

‎app/format/tool/jalopy.jar

-1.27 MB
Binary file not shown.

‎app/format/tool/log4j.jar

-344 KB
Binary file not shown.

‎app/lib/antlr-2.7.7.LICENSE.PUBLIC-DOMAIN.txt

Whitespace-only changes.

‎app/lib/antlr.jar

-433 KB
Binary file not shown.

‎app/lib/commons-net-3.3.jar

274 KB
Binary file not shown.

‎app/lib/guava-18.0.LICENSE.ASL-2.0.txt renamed to ‎app/lib/commons-net.LICENSE.ASL-2.0.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,4 +200,3 @@
200200
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
201201
See the License for the specific language governing permissions and
202202
limitations under the License.
203-

‎app/lib/ecj.LICENSE.EPL-1.0.txt

Whitespace-only changes.

‎app/lib/ecj.jar

-1.57 MB
Binary file not shown.

‎app/lib/guava-18.0.jar

-2.15 MB
Binary file not shown.

‎app/lib/jna-4.1.0.jar

893 KB
Binary file not shown.

‎app/lib/jna-platform-4.1.0.jar

1.4 MB
Binary file not shown.

‎app/lib/rsyntaxtextarea-2.5.6.1+arduino.jar

-1010 KB
Binary file not shown.

‎app/lib/rsyntaxtextarea-2.5.8.1+arduino.jar

1.01 MB
Binary file not shown.

0 commit comments

Comments
 (0)
0