Author: mahadev
Date: Tue May 19 21:27:07 2009
New Revision: 776471
URL: http://svn.apache.org/viewvc?rev=776471&view=rev
Log:
ZOOKEEPER-404. nightly build failed on hudson. (henry robinson and pat via
mahadev)
Modified:
hadoop/zookeeper/trunk/CHANGES.txt
hadoop/zookeeper/trunk/src/contrib/zkpython/build.xml
Modified: hadoop/zookeeper/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/CHANGES.txt?rev=776471&r1=776470&r2=776471&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/CHANGES.txt (original)
+++ hadoop/zookeeper/trunk/CHANGES.txt Tue May 19 21:27:07 2009
@@ -133,6 +133,9 @@
ZOOKEEPER-94. JMX tests are needed to verify that the JMX MBeans work
properly (phunt via mahadev)
+
+ ZOOKEEPER-404. nightly build failed on hudson. (henry robinson and pat via
+mahadev)
NEW FEATURES:
Modified: hadoop/zookeeper/trunk/src/contrib/zkpython/build.xml
URL:
http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/contrib/zkpython/build.xml?rev=776471&r1=776470&r2=776471&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/src/contrib/zkpython/build.xml (original)
+++ hadoop/zookeeper/trunk/src/contrib/zkpython/build.xml Tue May 19 21:27:07
2009
@@ -61,22 +61,46 @@
<target name="python-test">
<exec executable="${test.src.dir}/run_tests.sh" failonerror="true">
- <arg value="${test.src.dir}"/>
+ <arg value="${test.src.dir}"/>
</exec>
</target>
- <target name="build">
+ <target name="compile">
<exec executable="python" failonerror="true">
- <arg value="${python.src.dir}/setup.py"/>
- <arg value="build"/>
+ <arg value="${python.src.dir}/setup.py"/>
+ <arg value="build"/>
+ <arg value="--build-base=${build.dir}"/>
</exec>
</target>
- <target name="install" depends="build">
+ <target name="install" depends="compile">
<exec executable="python" failonerror="true">
- <arg value="${python.src.dir}/setup.py"/>
- <arg value="install"/>
+ <arg value="${python.src.dir}/setup.py"/>
+ <arg value="build"/>
+ <arg value="--build-base=${build.dir}"/>
+ <arg value="install"/>
</exec>
</target>
+
+ <target name="package" unless="skip.contrib">
+ <echo message="contrib: ${name}"/>
+
+ <mkdir dir="${build.dir}"/>
+ <copy todir="${build.dir}">
+ <fileset dir="${basedir}">
+ <exclude name="**/VERSION"/>
+ </fileset>
+ </copy>
+ <exec executable="echo" output="${build.dir}/VERSION">
+ <arg line="${version}" />
+ </exec>
+
+ <mkdir dir="${dist.dir}/contrib/${name}"/>
+ <copy todir="${dist.dir}/contrib/${name}">
+ <fileset dir="${build.dir}">
+ <exclude name="**/temp*"/>
+ </fileset>
+ </copy>
+ </target>
</project>
