|
|
@@ -48,10 +48,10 @@
|
|
|
<pathelement location="${build.classes}"/>
|
|
|
<fileset refid="lib.jars"/>
|
|
|
<pathelement location="${zk.root}/build/classes"/>
|
|
|
- <fileset dir="${zk.root}/build/lib" erroronmissingdir="false">
|
|
|
+ <fileset dir="${zk.root}/build/lib">
|
|
|
<include name="**/*.jar" />
|
|
|
</fileset>
|
|
|
- <fileset dir="${zk.root}/build/test/lib" erroronmissingdir="false">
|
|
|
+ <fileset dir="${zk.root}/build/test/lib">
|
|
|
<include name="**/*.jar" />
|
|
|
</fileset>
|
|
|
<fileset dir="${zk.root}/src/java/lib">
|
|
|
@@ -128,8 +128,13 @@
|
|
|
|
|
|
<target name="checkMainIsAvailable">
|
|
|
<available classname="org.apache.zookeeper.ZooKeeperMain"
|
|
|
- classpathref="classpath"
|
|
|
- property="mainIsCompiled"/>
|
|
|
+ property="mainIsCompiled">
|
|
|
+ <!-- we can't use id=classpath, because available fails if fileset directory
|
|
|
+ doesn't exist -->
|
|
|
+ <classpath>
|
|
|
+ <pathelement location="${zk.root}/build/classes"/>
|
|
|
+ </classpath>
|
|
|
+ </available>
|
|
|
</target>
|
|
|
|
|
|
<target name="checkMainCompiled" unless="mainIsCompiled" depends="checkMainIsAvailable">
|
Mahadev Konar