arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-17 22:23:10 +03:00
Code Activity

testing via ant failed (see #1288)

Browse Source
This commit is contained in:
Federico Fissore
2013-02-20 10:56:48 +01:00
parent 19d8e24eeb
commit 024dcf05f9
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/build.xml
View File

@ -51,7 +51,7 @@
<condition property="work.dir" value="../build/macosx/work/Arduino.app/Contents/Resources/Java/"> <condition property="work.dir" value="../build/macosx/work/Arduino.app/Contents/Resources/Java/">
<os family="mac"/> <os family="mac"/>
</condition> </condition>
<condition property="java.library.path" value="."> <condition property="java.additional.library.path" value=".">
<os family="mac"/> <os family="mac"/>
</condition> </condition>
<condition property="java.additional.jvmargs" value="-d32"> <condition property="java.additional.jvmargs" value="-d32">
@ -60,7 +60,7 @@
<condition property="work.dir" value="../build/windows/work/"> <condition property="work.dir" value="../build/windows/work/">
<os family="windows"/> <os family="windows"/>
</condition> </condition>
<condition property="java.library.path" value="."> <condition property="java.additional.library.path" value=".">
<os family="windows"/> <os family="windows"/>
</condition> </condition>
<condition property="java.additional.jvmargs" value="-d32"> <condition property="java.additional.jvmargs" value="-d32">
@ -69,7 +69,10 @@
<condition property="work.dir" value="../build/linux/work/"> <condition property="work.dir" value="../build/linux/work/">
<os family="unix"/> <os family="unix"/>
</condition> </condition>
<condition property="java.library.path" value="lib"> <condition property="java.additional.library.path" value="lib">
<os family="unix"/>
</condition>
<condition property="java.additional.jvmargs" value="-Ddummy=0">
<os family="unix"/> <os family="unix"/>
</condition> </condition>
@ -110,7 +113,7 @@
</copy> </copy>
<junit printsummary="yes" dir="${work.dir}" fork="true"> <junit printsummary="yes" dir="${work.dir}" fork="true">
<jvmarg value="-Djava.library.path=${java.library.path}"/> <jvmarg value="-Djava.library.path=${java.additional.library.path}"/>
<jvmarg value="${java.additional.jvmargs}"/> <jvmarg value="${java.additional.jvmargs}"/>
<classpath> <classpath>
<pathelement location="bin"/> <pathelement location="bin"/>