Skip to content

Commit 903622e

Browse files
ricardojlrufinoFederico Fissore
authored and
Federico Fissore
committed
build and run scripts - add new dependency and linux desktop icon
1 parent 6b4e7d7 commit 903622e

File tree

6 files changed

+8
-4
lines changed

6 files changed

+8
-4
lines changed

build/build.xml

+2
Original file line numberDiff line numberDiff line change
@@ -596,6 +596,8 @@
596596
</antcall>
597597

598598
<copy todir="linux/work" file="linux/dist/arduino" />
599+
<copy todir="linux/work" file="linux/dist/arduino.desktop" />
600+
<copy todir="linux/work" file="linux/dist/install.sh" />
599601
<chmod perm="755" file="linux/work/arduino" />
600602

601603
<copy todir="linux/work" file="linux/dist/arduino" />

build/linux/dist/arduino

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,5 @@ else
2626
SPLASH="-splash:./lib/splash.png"
2727
fi
2828

29-
java -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel $SPLASH processing.app.Base --curdir $CURDIR "$@"
29+
java -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel $SPLASH ArduinoIDE --curdir $CURDIR "$@"
3030

build/linux/dist/arduino.desktop

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ Type=Application
33
Name=Arduino IDE
44
GenericName=Integrated Development Environment
55
Comment=An IDE for Arduino-compatible electronics prototyping platforms
6-
Exec=arduino
7-
Icon=arduino
6+
Exec=FULL_PATH/arduino
7+
Icon=FULL_PATH/lib/arduino.png
88
Terminal=false
99
Categories=Development;IDE;Electronics;
1010
MimeType=text/x-arduino

build/macosx/template.app/Contents/Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
<!-- In 0149, removed /System/Library/Java from the CLASSPATH because
9898
it can cause problems if users have installed weird files there.
9999
http://dev.processing.org/bugs/show_bug.cgi?id=1045 -->
100-
<string>$JAVAROOT/antlr.jar:$JAVAROOT/apple.jar:$JAVAROOT/arduino-core.jar:$JAVAROOT/bcpg-jdk15on-152.jar:$JAVAROOT/bcprov-jdk15on-152.jar:$JAVAROOT/commons-codec-1.7.jar:$JAVAROOT/commons-compress-1.8.jar:$JAVAROOT/commons-exec-1.1.jar:$JAVAROOT/commons-httpclient-3.1.jar:$JAVAROOT/commons-lang3-3.3.2.jar:$JAVAROOT/commons-logging-1.0.4.jar:$JAVAROOT/ecj.jar:$JAVAROOT/guava-18.0.jar:$JAVAROOT/jackson-annotations-2.2.3.jar:$JAVAROOT/jackson-core-2.2.3.jar:$JAVAROOT/jackson-databind-2.2.3.jar:$JAVAROOT/jackson-module-mrbean-2.2.3.jar:$JAVAROOT/java-semver-0.8.0.jar:$JAVAROOT/jmdns-3.4.1.jar:$JAVAROOT/jna.jar:$JAVAROOT/jsch-0.1.50.jar:$JAVAROOT/jssc-2.8.0.jar:$JAVAROOT/pde.jar:$JAVAROOT/quaqua.jar</string>
100+
<string>$JAVAROOT/antlr.jar:$JAVAROOT/apple.jar:$JAVAROOT/arduino-core.jar:$JAVAROOT/bcpg-jdk15on-152.jar:$JAVAROOT/bcprov-jdk15on-152.jar:$JAVAROOT/commons-codec-1.7.jar:$JAVAROOT/commons-compress-1.8.jar:$JAVAROOT/commons-exec-1.1.jar:$JAVAROOT/commons-httpclient-3.1.jar:$JAVAROOT/commons-lang3-3.3.2.jar:$JAVAROOT/commons-logging-1.0.4.jar:$JAVAROOT/ecj.jar:$JAVAROOT/guava-18.0.jar:$JAVAROOT/jackson-annotations-2.2.3.jar:$JAVAROOT/jackson-core-2.2.3.jar:$JAVAROOT/jackson-databind-2.2.3.jar:$JAVAROOT/jackson-module-mrbean-2.2.3.jar:$JAVAROOT/java-semver-0.8.0.jar:$JAVAROOT/jmdns-3.4.1.jar:$JAVAROOT/jna.jar:$JAVAROOT/jsch-0.1.50.jar:$JAVAROOT/jssc-2.8.0.jar:$JAVAROOT/pde.jar:$JAVAROOT/quaqua.jar:$JAVAROOT/rsyntaxtextarea-2.6.0-SNAPSHOT.jar</string>
101101

102102
<key>JVMArchs</key>
103103
<array>

build/windows/launcher/config.xml

+1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
<cp>lib/jsch-0.1.50.jar</cp>
3939
<cp>lib/jssc-2.8.0.jar</cp>
4040
<cp>lib/pde.jar</cp>
41+
<cp>lib/rsyntaxtextarea-2.6.0-SNAPSHOT.jar</cp>
4142
</classPath>
4243
<jre>
4344
<path>java</path>

build/windows/launcher/config_debug.xml

+1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
<cp>lib/jsch-0.1.50.jar</cp>
3939
<cp>lib/jssc-2.8.0.jar</cp>
4040
<cp>lib/pde.jar</cp>
41+
<cp>lib/rsyntaxtextarea-2.6.0-SNAPSHOT.jar</cp>
4142
</classPath>
4243
<jre>
4344
<path>java</path>

0 commit comments

Comments
 (0)