Permalink
Browse files

Change the build order and classpaths to include Xalan libraries.

Also build 'junit' after 'contrib' so now tests in junit may test contrib code.
  • Loading branch information...
1 parent 7288c9b commit 5074cc7d9ffb27200974d459dad997dcebdd356d @rolfl rolfl committed Feb 11, 2012
Showing with 12 additions and 3 deletions.
  1. +12 −3 build.xml
View
@@ -103,6 +103,8 @@ For instructions on how to build JDOM, please view the README.txt file.
<property name="jaxen.jar" value="${lib.dir}/jaxen-1.1.3.jar" />
<property name="junit.jar" value="${lib.dir}/junit-4.8.2.jar" />
<property name="isorelax.jar" value="${contrib}/lib/isorelax.jar" />
+ <property name="xalan.jar" value="${lib.dir}/xalan/xalan-2.7.1.jar" />
+ <property name="xalanser.jar" value="${lib.dir}/xalan/serializer-2.7.1.jar" />
<!-- Compilation class path -->
<path id="base.class.path">
@@ -111,17 +113,24 @@ For instructions on how to build JDOM, please view the README.txt file.
<pathelement location="${xmlapi.jar}" />
<pathelement location="${junit.jar}" />
<pathelement location="${isorelax.jar}" />
+ <pathelement location="${xalan.jar}" />
+ <pathelement location="${xalanser.jar}" />
</path>
<path id="core.class.path">
<path refid="base.class.path"/>
<pathelement location="${core.build}"/>
</path>
+ <path id="contrib.class.path">
+ <path refid="core.class.path"/>
+ <pathelement location="${contrib.build}"/>
+ </path>
+
<path id="junit.class.path">
<pathelement location="${junit.instrumented}" />
<pathelement location="${junit.build}"/>
- <path refid="core.class.path"/>
+ <path refid="contrib.class.path"/>
<fileset dir="${lib.dir}/cobertura" includes="*.jar" />
</path>
@@ -227,7 +236,7 @@ For instructions on how to build JDOM, please view the README.txt file.
</javac>
</target>
- <target name="compile.junit" depends="compile.core"
+ <target name="compile.junit" depends="compile.core, compile.contrib"
description="Compiles the junit source code">
<!-- Copy resources and stuff - everything except Java code -->
@@ -243,7 +252,7 @@ For instructions on how to build JDOM, please view the README.txt file.
source="${compile.source}"
deprecation="${compile.deprecation}"
includeantruntime="false">
- <classpath refid="core.class.path" />
+ <classpath refid="contrib.class.path" />
</javac>
</target>

0 comments on commit 5074cc7

Please sign in to comment.