Return-Path: 
 <zookeeper-commits-return-343-apmail-hadoop-zookeeper-commits-archive=hadoop.apache.org@hadoop.apache.org>
Delivered-To: apmail-hadoop-zookeeper-commits-archive@minotaur.apache.org
Received: (qmail 47032 invoked from network); 19 May 2009 21:54:05 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 19 May 2009 21:54:05 -0000
Received: (qmail 45862 invoked by uid 500); 19 May 2009 21:27:38 -0000
Delivered-To: apmail-hadoop-zookeeper-commits-archive@hadoop.apache.org
Received: (qmail 45823 invoked by uid 500); 19 May 2009 21:27:37 -0000
Mailing-List: contact zookeeper-commits-help@hadoop.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:zookeeper-commits-help@hadoop.apache.org>
List-Unsubscribe: <mailto:zookeeper-commits-unsubscribe@hadoop.apache.org>
List-Post: <mailto:zookeeper-commits@hadoop.apache.org>
List-Id: <zookeeper-commits.hadoop.apache.org>
Reply-To: zookeeper-dev@<hadoop.apache.org>
Delivered-To: mailing list zookeeper-commits@hadoop.apache.org
Received: (qmail 45813 invoked by uid 99); 19 May 2009 21:27:37 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 May 2009 21:27:37 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 May 2009 21:27:28 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id A695D23888BB; Tue, 19 May 2009 21:27:07 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r776471 - in /hadoop/zookeeper/trunk: CHANGES.txt
 src/contrib/zkpython/build.xml
Date: Tue, 19 May 2009 21:27:07 -0000
To: zookeeper-commits@hadoop.apache.org
From: mahadev@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20090519212707.A695D23888BB@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

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>