Skip to content

Commit e7e2de2

Browse files
oriregevoriregev
committed
Resolved conflicts by temporarily removing modified files: libraries/WiFi/WiFiClient.cpp libraries/SD/utility/Sd2Card.cpp libraries/GSM/GSM3SoftSerial.cpp libraries/Ethernet/EthernetClient.cpp libraries/Ethernet/Dhcp.cpp hardware/arduino/cores/arduino/wiring.c hardware/arduino/cores/arduino/Arduino.h
2 parents 9f857ba + a00ae29 commit e7e2de2

File tree

5,208 files changed

+4264732
-238766
lines changed

Some content is hidden

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

5,208 files changed

+4264732
-238766
lines changed

‎.classpath

+15-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,25 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
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"/>
4+
<classpathentry kind="src" path="app/test"/>
45
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
5-
<classpathentry combineaccessrules="false" kind="src" path="/processing-core"/>
66
<classpathentry kind="lib" path="app/lib/antlr.jar"/>
77
<classpathentry kind="lib" path="app/lib/apple.jar"/>
88
<classpathentry kind="lib" path="app/lib/ecj.jar"/>
99
<classpathentry kind="lib" path="app/lib/jna.jar"/>
10-
<classpathentry kind="lib" path="app/lib/RXTXcomm.jar"/>
10+
<classpathentry kind="lib" path="app/test-lib/junit-4.11.jar"/>
11+
<classpathentry kind="lib" path="app/test-lib/fest-assert-1.2.jar"/>
12+
<classpathentry kind="lib" path="app/test-lib/fest-reflect-1.2.jar"/>
13+
<classpathentry kind="lib" path="app/test-lib/fest-swing-1.2.jar" sourcepath="/home/megabug/git/fest-swing-1.2-sources.jar"/>
14+
<classpathentry kind="lib" path="app/test-lib/fest-util-1.1.2.jar"/>
15+
<classpathentry kind="lib" path="app/test-lib/jcip-annotations-1.0.jar"/>
16+
<classpathentry kind="lib" path="app/lib/commons-codec-1.7.jar"/>
17+
<classpathentry kind="lib" path="app/lib/commons-exec-1.1.jar"/>
18+
<classpathentry kind="lib" path="app/lib/commons-httpclient-3.1.jar"/>
19+
<classpathentry kind="lib" path="app/lib/commons-logging-1.0.4.jar"/>
20+
<classpathentry kind="lib" path="app/lib/jmdns-3.4.1.jar"/>
21+
<classpathentry kind="lib" path="app/lib/jsch-0.1.50.jar"/>
22+
<classpathentry kind="lib" path="app/lib/jssc-2.8.0.jar"/>
23+
<classpathentry combineaccessrules="false" kind="src" path="/arduino-core"/>
1124
<classpathentry kind="output" path="app/bin"/>
1225
</classpath>

‎.gitignore

+31-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
app/bin/
22
app/pde.jar
33
build/macosx/work/
4-
core/bin/
5-
core/core.jar
4+
arduino-core/bin/
5+
arduino-core/arduino-core.jar
66
hardware/arduino/bootloaders/caterina_LUFA/Descriptors.o
77
hardware/arduino/bootloaders/caterina_LUFA/Descriptors.lst
88
hardware/arduino/bootloaders/caterina_LUFA/Caterina.sym
@@ -13,9 +13,38 @@ 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
1617
build/windows/work/
18+
build/windows/*.zip
19+
build/windows/*.tgz
20+
build/windows/libastylej*
21+
build/windows/arduino-*.zip
22+
build/windows/dist/*.tar.gz
23+
build/windows/dist/*.tar.bz2
24+
build/windows/launch4j-*
25+
build/windows/launcher/launch4j
26+
build/windows/WinAVR-*.zip
27+
build/macosx/arduino-*.zip
28+
build/macosx/dist/*.tar.gz
29+
build/macosx/dist/*.tar.bz2
30+
build/macosx/libastylej*
31+
build/macosx/appbundler*.jar
32+
build/macosx/appbundler*.zip
33+
build/macosx/appbundler
1734
build/linux/work/
1835
build/linux/dist/*.tar.gz
36+
build/linux/dist/*.tar.bz2
1937
build/linux/*.tgz
38+
build/linux/*.zip
39+
build/linux/libastylej*
40+
build/shared/reference*.zip
2041
test-bin
2142
*.iml
43+
.idea
44+
.DS_Store
45+
.directory
46+
build/windows/launch4j-*
47+
build/windows/launcher/launch4j
48+
build/windows/WinAVR-*.zip
49+
hardware/arduino/avr/libraries/Bridge/examples/XivelyClient/passwords.h
50+
avr-toolchain-*.zip

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

+260
Large diffs are not rendered by default.

‎.settings/org.eclipse.jdt.ui.prefs

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#Fri Dec 30 12:12:25 CET 2011
2+
eclipse.preferences.version=1
3+
formatter_profile=_Arduino
4+
formatter_settings_version=11

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,5 @@ Gianluca Martino, Daniela Antonietti, and David A. Mellis.
4040
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
4141
[Processing](http://www.processing.org) and [Wiring](http://wiring.org.co).
4242

43-
Icon and about image designed by ToDo: http://www.todo.to.it/
43+
Icon and about image designed by [ToDo](http://www.todo.to.it/)
4444

‎app/.classpath

+16-11
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,25 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
33
<classpathentry excluding="processing/app/tools/format/" kind="src" path="src"/>
4+
<classpathentry kind="src" path="test"/>
45
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
5-
<classpathentry combineaccessrules="false" kind="src" path="/core"/>
6-
<classpathentry combineaccessrules="false" kind="src" path="/dxf"/>
7-
<classpathentry combineaccessrules="false" kind="src" path="/net"/>
8-
<classpathentry combineaccessrules="false" kind="src" path="/opengl">
9-
<attributes>
10-
<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="opengl/library"/>
11-
</attributes>
12-
</classpathentry>
13-
<classpathentry combineaccessrules="false" kind="src" path="/pdf"/>
14-
<classpathentry combineaccessrules="false" kind="src" path="/serial"/>
15-
<classpathentry combineaccessrules="false" kind="src" path="/video"/>
166
<classpathentry kind="lib" path="lib/antlr.jar"/>
177
<classpathentry kind="lib" path="lib/jna.jar"/>
188
<classpathentry kind="lib" path="lib/ecj.jar"/>
9+
<classpathentry kind="lib" path="lib/apple.jar"/>
10+
<classpathentry kind="lib" path="lib/commons-codec-1.7.jar"/>
11+
<classpathentry kind="lib" path="lib/commons-exec-1.1.jar"/>
12+
<classpathentry kind="lib" path="lib/commons-httpclient-3.1.jar"/>
13+
<classpathentry kind="lib" path="lib/commons-logging-1.0.4.jar"/>
14+
<classpathentry kind="lib" path="lib/jmdns-3.4.1.jar"/>
15+
<classpathentry kind="lib" path="lib/jsch-0.1.50.jar"/>
16+
<classpathentry kind="lib" path="lib/jssc-2.8.0.jar"/>
17+
<classpathentry kind="lib" path="test-lib/junit-4.11.jar"/>
18+
<classpathentry kind="lib" path="test-lib/fest-assert-1.2.jar"/>
19+
<classpathentry kind="lib" path="test-lib/fest-reflect-1.2.jar"/>
20+
<classpathentry kind="lib" path="test-lib/fest-swing-1.2.jar"/>
21+
<classpathentry kind="lib" path="test-lib/fest-util-1.1.2.jar"/>
22+
<classpathentry combineaccessrules="false" kind="src" path="/arduino-core"/>
23+
<classpathentry kind="lib" path="test-lib/jcip-annotations-1.0.jar"/>
1924
<classpathentry kind="output" path="bin"/>
2025
</classpath>

‎app/.classpath_vista

100755100644
File mode changed.

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
#Wed Jun 04 15:47:46 EDT 2008
1+
#Wed Jan 11 13:49:57 CET 2012
22
eclipse.preferences.version=1
33
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
4-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
4+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
55
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
6-
org.eclipse.jdt.core.compiler.compliance=1.5
6+
org.eclipse.jdt.core.compiler.compliance=1.6
77
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
88
org.eclipse.jdt.core.compiler.debug.localVariable=generate
99
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -63,7 +63,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=di
6363
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
6464
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
6565
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
66-
org.eclipse.jdt.core.compiler.source=1.5
66+
org.eclipse.jdt.core.compiler.source=1.6
6767
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
6868
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
6969
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

‎app/build.xml

+86-13
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,33 @@
11
<?xml version="1.0"?>
22
<project name="Arduino PDE" default="build">
3-
3+
4+
<path id="class.path">
5+
<fileset dir="lib">
6+
<include name="*.jar"/>
7+
</fileset>
8+
<pathelement path="${env.JAVA_HOME}/lib/tools.jar"/>
9+
<pathelement path="../arduino-core/arduino-core.jar"/>
10+
</path>
11+
12+
<path id="class.path.test">
13+
<path refid="class.path"/>
14+
<pathelement location="bin/"/>
15+
<fileset dir="test-lib">
16+
<include name="*.jar"/>
17+
</fileset>
18+
</path>
19+
420
<target name="clean" description="Clean the build directories">
521
<delete dir="bin" />
22+
<delete dir="test-bin" />
623
<delete file="pde.jar" />
724
</target>
825

926
<target name="compile" description="Compile sources">
1027
<condition property="core-built">
11-
<available file="../core/core.jar" />
28+
<available file="../arduino-core/arduino-core.jar" />
1229
</condition>
13-
<fail unless="core-built" message="Please build the core library first and make sure it sits in ../core/core.jar" />
30+
<fail unless="core-built" message="Please build the Arduino-core library first and make sure it sits in ../arduino-core/arduino-core.jar" />
1431

1532
<mkdir dir="bin" />
1633

@@ -24,32 +41,88 @@
2441
<property name="java_home" value="${env.JAVA_HOME}" />
2542

2643
<condition property="linux"><os family="unix" /></condition>
27-
<fail if="linux" unless="java_home"
44+
<fail if="linux" unless="java_home"
2845
message="The JAVA_HOME variable must be set to the location of a full JDK. For instance, on Ubuntu Linux, this might be /usr/lib/jvm/java-6-sun." />
2946

3047
<condition property="windows"><os family="windows" /></condition>
31-
<fail if="windows" unless="java_home"
48+
<fail if="windows" unless="java_home"
3249
message="The JAVA_HOME variable must be set to the location of a full JDK. For instance, on Windows, this might be c:\jdk1.6.0_18." />
3350

51+
<condition property="work.dir" value="../build/macosx/work/Arduino.app/Contents/Resources/Java/">
52+
<os family="mac"/>
53+
</condition>
54+
<condition property="java.additional.library.path" value=".">
55+
<os family="mac"/>
56+
</condition>
57+
<condition property="work.dir" value="../build/windows/work/">
58+
<os family="windows"/>
59+
</condition>
60+
<condition property="java.additional.library.path" value=".">
61+
<os family="windows"/>
62+
</condition>
63+
<condition property="work.dir" value="../build/linux/work/">
64+
<os family="unix"/>
65+
</condition>
66+
<condition property="java.additional.library.path" value="lib">
67+
<os family="unix"/>
68+
</condition>
69+
3470
<!--
3571
<dirname property="blah" file="${java.home}" />
3672
<echo message="here! ${java.home}/lib/tools.jar or there: ${blah}" />
3773
<echo message="override ${env.JAVA_HOME}/lib/tools.jar" />
3874
<fail />
3975
-->
40-
<javac target="1.5"
41-
srcdir="src"
42-
destdir="bin"
43-
excludes="**/tools/format/**"
76+
<javac source="1.6" target="1.6"
77+
srcdir="src"
78+
destdir="bin"
4479
encoding="UTF-8"
4580
includeAntRuntime="false"
4681
debug="true"
47-
classpath="../core/core.jar; ${env.JAVA_HOME}/lib/tools.jar; lib/ant.jar; lib/ant-launcher.jar; lib/apple.jar; lib/ecj.jar; lib/jna.jar; lib/RXTXcomm.jar" />
48-
<copy todir="bin" overwrite="true" verbose="true">
49-
<fileset dir="src" includes="**/*.properties" />
82+
classpathref="class.path" />
83+
</target>
84+
85+
<target name="test" depends="compile" description="Runs the test">
86+
<mkdir dir="test-bin"/>
87+
88+
<javac source="1.6" target="1.6"
89+
srcdir="test"
90+
destdir="test-bin"
91+
encoding="UTF-8"
92+
includeAntRuntime="false"
93+
debug="true"
94+
classpathref="class.path.test">
95+
</javac>
96+
97+
<copy todir="test-bin" overwrite="true" verbose="true">
98+
<fileset dir="test" includes="**/*.zip" />
99+
<fileset dir="test" includes="**/*.txt" />
100+
<fileset dir="test" includes="**/*.properties" />
101+
<fileset dir="test" includes="**/*.ino" />
50102
</copy>
103+
104+
<junit printsummary="yes" dir="${work.dir}" fork="true">
105+
<jvmarg value="-Djava.library.path=${java.additional.library.path}"/>
106+
<jvmarg value="-DWORK_DIR=."/>
107+
<classpath>
108+
<pathelement location="bin"/>
109+
<pathelement location="test-bin"/>
110+
<pathelement path="../build/macosx/work/Arduino.app/Contents/Resources/Java/quaqua.jar"/>
111+
<path refid="class.path.test"/>
112+
</classpath>
113+
114+
<formatter type="xml"/>
115+
116+
<batchtest fork="yes" todir="test-bin">
117+
<fileset dir="test">
118+
<include name="**/*Test.java"/>
119+
<exclude name="**/Abstract*.java"/>
120+
</fileset>
121+
</batchtest>
122+
</junit>
123+
51124
</target>
52-
125+
53126
<target name="build" depends="compile" description="Build PDE">
54127
<jar basedir="bin" destfile="pde.jar" />
55128
</target>

‎app/src/processing/app/tools/format/src/AutoFormat.java renamed to ‎app/format/src/AutoFormat.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
* <A HREF="http://jalopy.sourceforge.net/">Jalopy</A>. This is to replace
3535
* the buggy code formatter found in previous releases.
3636
*/
37-
public class AutoFormat {
37+
public class AutoFormat {
3838
Editor editor;
3939

4040

‎app/src/processing/app/tools/format/tool/jalopy.jar renamed to ‎app/format/tool/jalopy.jar

File renamed without changes.

‎app/src/processing/app/tools/format/tool/log4j.jar renamed to ‎app/format/tool/log4j.jar

File renamed without changes.

‎app/lib/RXTXcomm.jar

-58.1 KB
Binary file not shown.

‎build/linux/dist/.cvsignore renamed to ‎app/lib/antlr-2.7.7.LICENSE.PUBLIC-DOMAIN.txt

File renamed without changes.

‎app/lib/apple.LICENSE.BSD-like.txt

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
http://developer.apple.com/library/mac/#/legacy/library/samplecode/AppleJavaExtensions/Listings/README_txt.html#//apple_ref/doc/uid/DTS10000677-README_txt-DontLinkElementID_3

‎app/lib/apple.jar

100755100644
File mode changed.

‎app/lib/commons-codec-1.7.jar

254 KB
Binary file not shown.

0 commit comments

Comments
 (0)