Skip to content

Commit 0e85891

Browse files
fix launcher depencencies for windows
2 parents 22b6e4d + 4a9c3b1 commit 0e85891

File tree

8 files changed

+19
-7
lines changed

8 files changed

+19
-7
lines changed

arduino-core/src/processing/app/BaseNoGui.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@
3737
public class BaseNoGui {
3838

3939
/** Version string to be used for build */
40-
public static final int REVISION = 10601;
40+
public static final int REVISION = 10602;
4141
/** Extended version string displayed on GUI */
42-
static String VERSION_NAME = "1.6.1";
42+
static String VERSION_NAME = "1.6.2";
4343

4444
static File buildFolder;
4545

build/build.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -745,7 +745,7 @@
745745
=======================================================
746746
Arduino for Linux was built. Grab the archive from
747747

748-
linux/arduino-${version}-${platform}.tar.xz
748+
build/linux/arduino-${version}-${platform}.tar.xz
749749
=======================================================
750750
</echo>
751751
</target>

build/shared/revisions.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11

2+
ARDUINO 1.6.2
3+
24
ARDUINO 1.6.1 - 2015.03.10
35

46
[ide]
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
-Xms128M
2-
-Xmx1024M
1+
-Xms128M
2+
-Xmx512M

build/windows/launcher/config.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@
2626
<cp>lib/commons-logging-1.0.4.jar</cp>
2727
<cp>lib/jmdns-3.4.1.jar</cp>
2828
<cp>lib/jsch-0.1.50.jar</cp>
29+
<cp>lib/rsyntax-autocomplete-2.6.0-SNAPSHOT.jar</cp>
30+
<cp>lib/rsyntaxtextarea-2.6.0-SNAPSHOT.jar</cp>
31+
<cp>lib/jsoup-htmlparser-1.8.1.jar</cp>
32+
<cp>lib/cplus-libparser-0.0.1.jar</cp>
33+
<cp>lib/arduino-autocomplete.jar</cp>
2934
</classPath>
3035
<jre>
3136
<path>java</path>

build/windows/launcher/config_debug.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@
2626
<cp>lib/commons-logging-1.0.4.jar</cp>
2727
<cp>lib/jmdns-3.4.1.jar</cp>
2828
<cp>lib/jsch-0.1.50.jar</cp>
29+
<cp>lib/rsyntax-autocomplete-2.6.0-SNAPSHOT.jar</cp>
30+
<cp>lib/rsyntaxtextarea-2.6.0-SNAPSHOT.jar</cp>
31+
<cp>lib/jsoup-htmlparser-1.8.1.jar</cp>
32+
<cp>lib/cplus-libparser-0.0.1.jar</cp>
33+
<cp>lib/arduino-autocomplete.jar</cp>
2934
</classPath>
3035
<jre>
3136
<path>java</path>

hardware/arduino/avr/platform.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5---3rd-party-Hardware-specification
77

88
name=Arduino AVR Boards
9-
version=1.6.1
9+
version=1.6.2
1010

1111
# AVR compile variables
1212
# ---------------------

hardware/arduino/sam/platform.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5---3rd-party-Hardware-specification
66

77
name=Arduino ARM (32-bits) Boards
8-
version=1.6.1
8+
version=1.6.2
99

1010
# SAM3 compile variables
1111
# ----------------------

0 commit comments

Comments
 (0)