Author: mahadev
Date: Wed Sep 23 21:53:55 2009
New Revision: 818276
URL: http://svn.apache.org/viewvc?rev=818276&view=rev
Log:
ZOOKEEPER-533. fix for ant version 1.7.0
Modified:
hadoop/zookeeper/trunk/src/contrib/build-contrib.xml
hadoop/zookeeper/trunk/src/recipes/build-recipes.xml
Modified: hadoop/zookeeper/trunk/src/contrib/build-contrib.xml
URL:
http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/contrib/build-contrib.xml?rev=818276&r1=818275&r2=818276&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/src/contrib/build-contrib.xml (original)
+++ hadoop/zookeeper/trunk/src/contrib/build-contrib.xml Wed Sep 23 21:53:55
2009
@@ -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">
Modified: hadoop/zookeeper/trunk/src/recipes/build-recipes.xml
URL:
http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/recipes/build-recipes.xml?rev=818276&r1=818275&r2=818276&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/src/recipes/build-recipes.xml (original)
+++ hadoop/zookeeper/trunk/src/recipes/build-recipes.xml Wed Sep 23 21:53:55
2009
@@ -48,7 +48,7 @@
<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}/src/java/lib">
@@ -125,8 +125,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">
