Skip to content

Commit 7887b54

Browse files
author
Federico Fissore
committed
updated build.xml to include new jars
1 parent 6754035 commit 7887b54

File tree

1 file changed

+18
-19
lines changed

1 file changed

+18
-19
lines changed

app/build.xml

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,20 @@
11
<?xml version="1.0"?>
22
<project name="Arduino PDE" default="build">
33

4+
<path id="class.path">
5+
<fileset dir="lib">
6+
<include name="*.jar"/>
7+
</fileset>
8+
<pathelement path="${env.JAVA_HOME}/lib/tools.jar"/>
9+
<pathelement path="../core/core.jar"/>
10+
</path>
11+
12+
<path id="class.path.test">
13+
<path refid="class.path"/>
14+
<pathelement location="bin/"/>
15+
<pathelement path="test-lib/junit-4.11.jar"/>
16+
</path>
17+
418
<target name="clean" description="Clean the build directories">
519
<delete dir="bin" />
620
<delete dir="test-bin" />
@@ -44,7 +58,7 @@
4458
encoding="UTF-8"
4559
includeAntRuntime="false"
4660
debug="true"
47-
classpath="../core/core.jar; ${env.JAVA_HOME}/lib/tools.jar; lib/apple.jar; lib/ecj.jar; lib/jna.jar; lib/RXTXcomm.jar" />
61+
classpathref="class.path" />
4862
<copy todir="bin" overwrite="true" verbose="true">
4963
<fileset dir="src" includes="**/*.properties" />
5064
</copy>
@@ -58,17 +72,8 @@
5872
destdir="test-bin"
5973
encoding="UTF-8"
6074
includeAntRuntime="false"
61-
debug="true">
62-
<classpath>
63-
<pathelement location="bin"/>
64-
<pathelement location="../core/core.jar"/>
65-
<pathelement location="${env.JAVA_HOME}/lib/tools.jar"/>
66-
<pathelement location="lib/apple.jar"/>
67-
<pathelement location="lib/ecj.jar"/>
68-
<pathelement location="lib/jna.jar"/>
69-
<pathelement location="lib/RXTXcomm.jar"/>
70-
<pathelement location="test-lib/junit-4.11.jar"/>
71-
</classpath>
75+
debug="true"
76+
classpathref="class.path.test">
7277
</javac>
7378

7479
<copy todir="test-bin" overwrite="true" verbose="true">
@@ -80,13 +85,7 @@
8085
<classpath>
8186
<pathelement location="bin"/>
8287
<pathelement location="test-bin"/>
83-
<pathelement location="../core/core.jar"/>
84-
<pathelement location="${env.JAVA_HOME}/lib/tools.jar"/>
85-
<pathelement location="lib/apple.jar"/>
86-
<pathelement location="lib/ecj.jar"/>
87-
<pathelement location="lib/jna.jar"/>
88-
<pathelement location="lib/RXTXcomm.jar"/>
89-
<pathelement location="test-lib/junit-4.11.jar"/>
88+
<path refid="class.path.test"/>
9089
</classpath>
9190

9291
<formatter type="xml"/>

0 commit comments

Comments
 (0)