File tree 1 file changed +22
-5
lines changed
1 file changed +22
-5
lines changed Original file line number Diff line number Diff line change 48
48
<fail if =" windows" unless =" java_home"
49
49
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." />
50
50
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" />
53
59
</condition >
54
60
<condition property =" work.dir" value =" ../build/windows/work/" >
55
61
<os family =" windows" />
56
62
</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" />
59
74
</condition >
60
75
61
76
<!--
95
110
</copy >
96
111
97
112
<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 } " />
99
115
<classpath >
100
116
<pathelement location =" bin" />
101
117
<pathelement location =" test-bin" />
118
+ <pathelement path =" ../build/macosx/work/Arduino.app/Contents/Resources/Java/quaqua.jar" />
102
119
<path refid =" class.path.test" />
103
120
</classpath >
104
121
You can’t perform that action at this time.
0 commit comments