File tree Expand file tree Collapse file tree 1 file changed +22
-5
lines changed
Expand file tree Collapse file tree 1 file changed +22
-5
lines changed Original file line number Diff line number Diff line change 4848 <fail if =" windows" unless =" java_home"
4949 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." />
5050
51- <condition property =" work.dir" value =" ../build/linux/work/" >
52- <os family =" unix" />
51+ <condition property =" work.dir" value =" ../build/macosx/work/Arduino.app/Contents/Resources/Java/" >
52+ <os family =" mac" />
53+ </condition >
54+ <condition property =" java.library.path" value =" ." >
55+ <os family =" mac" />
56+ </condition >
57+ <condition property =" java.additional.jvmargs" value =" -d32" >
58+ <os family =" mac" />
5359 </condition >
5460 <condition property =" work.dir" value =" ../build/windows/work/" >
5561 <os family =" windows" />
5662 </condition >
57- <condition property =" work.dir" value =" ../build/macosx/work/" >
58- <os family =" mac" />
63+ <condition property =" java.library.path" value =" ." >
64+ <os family =" windows" />
65+ </condition >
66+ <condition property =" java.additional.jvmargs" value =" -d32" >
67+ <os family =" windows" />
68+ </condition >
69+ <condition property =" work.dir" value =" ../build/linux/work/" >
70+ <os family =" unix" />
71+ </condition >
72+ <condition property =" java.library.path" value =" lib" >
73+ <os family =" unix" />
5974 </condition >
6075
6176 <!--
95110 </copy >
96111
97112 <junit printsummary =" yes" dir =" ${ work.dir } " fork =" true" >
98- <jvmarg value =" -Djava.library.path=lib/" />
113+ <jvmarg value =" -Djava.library.path=${ java.library.path } " />
114+ <jvmarg value =" ${ java.additional.jvmargs } " />
99115 <classpath >
100116 <pathelement location =" bin" />
101117 <pathelement location =" test-bin" />
118+ <pathelement path =" ../build/macosx/work/Arduino.app/Contents/Resources/Java/quaqua.jar" />
102119 <path refid =" class.path.test" />
103120 </classpath >
104121
You can’t perform that action at this time.
0 commit comments