rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2024-12-03 14:24:15 +01:00
Code Issues Releases Activity

Merge remote-tracking branch 'arduino/ide-1.5.x' into ide-1.5.x

Browse Source
This commit is contained in:
Cristian Maglie 2013-07-30 11:15:48 +02:00
commit 1b0e47ef78
5 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/processing/app/Base.java
View File

@ -132,7 +132,7 @@ public class Base {
File versionFile = getContentFile("lib/version.txt"); File versionFile = getContentFile("lib/version.txt");
if (versionFile.exists()) { if (versionFile.exists()) {
String version = PApplet.loadStrings(versionFile)[0]; String version = PApplet.loadStrings(versionFile)[0];
if (!version.equals(VERSION_NAME)) { if (!version.equals(VERSION_NAME) && !version.equals("${version}")) {
VERSION_NAME = version; VERSION_NAME = version;
RELEASE = true; RELEASE = true;
} }
@ -141,6 +141,10 @@ public class Base {
e.printStackTrace(); e.printStackTrace();
} }
// help 3rd party installers find the correct hardware path
Preferences.set("last.ide." + VERSION_NAME + ".hardwarepath", getHardwarePath());
Preferences.set("last.ide." + VERSION_NAME + ".daterun", "" + (new Date()).getTime() / 1000);
// if (System.getProperty("mrj.version") != null) { // if (System.getProperty("mrj.version") != null) {
// //String jv = System.getProperty("java.version"); // //String jv = System.getProperty("java.version");
// String ov = System.getProperty("os.version"); // String ov = System.getProperty("os.version");

17
build/build.xml
View File

@ -20,6 +20,13 @@
<condition property="platform" <condition property="platform"
value="linux64"><os family="unix" arch="amd64" /></condition> value="linux64"><os family="unix" arch="amd64" /></condition>
<condition property="arch-bits" value="32">
<equals arg1="${platform}" arg2="linux32"/>
</condition>
<condition property="arch-bits" value="64">
<equals arg1="${platform}" arg2="linux64"/>
</condition>
<!-- Libraries required for running arduino --> <!-- Libraries required for running arduino -->
<fileset dir=".." id="runtime.jars"> <fileset dir=".." id="runtime.jars">
<include name="core/core.jar" /> <include name="core/core.jar" />
@ -463,13 +470,15 @@
<copy todir="linux/work" file="linux/dist/arduino" /> <copy todir="linux/work" file="linux/dist/arduino" />
<chmod perm="755" file="linux/work/arduino" /> <chmod perm="755" file="linux/work/arduino" />
<copy todir="linux/work/hardware"> <mkdir dir="linux/work/hardware/tools" />
<fileset dir="linux/dist" includes="tools/**" /> <copy file="linux/dist/tools/adk2install" todir="linux/work/hardware/tools" />
</copy> <copy file="linux/dist/tools/adk2tool" todir="linux/work/hardware/tools" />
<copy file="linux/dist/tools/avrdude${arch-bits}" tofile="linux/work/hardware/tools/avrdude" />
<copy file="linux/dist/tools/avrdude.conf" todir="linux/work/hardware/tools" />
<copy file="linux/dist/tools/bossac${arch-bits}" tofile="linux/work/hardware/tools/bossac" />
<chmod perm="755" file="linux/work/hardware/tools/avrdude" /> <chmod perm="755" file="linux/work/hardware/tools/avrdude" />
<chmod perm="755" file="linux/work/hardware/tools/bossac" /> <chmod perm="755" file="linux/work/hardware/tools/bossac" />
<chmod perm="755" file="linux/work/hardware/tools/bossac64" />
<chmod perm="755" file="linux/work/hardware/tools/adk2tool" /> <chmod perm="755" file="linux/work/hardware/tools/adk2tool" />
<chmod perm="755" file="linux/work/hardware/tools/adk2install" /> <chmod perm="755" file="linux/work/hardware/tools/adk2install" />

0
build/linux/dist/tools/avrdude → build/linux/dist/tools/avrdude32 vendored
View File

0
build/linux/dist/tools/bossac → build/linux/dist/tools/bossac32 vendored
View File

BIN
build/linux/dist/tools/bossac64 vendored
View File

Binary file not shown.