[zookeeper] branch master updated: ZOOKEEPER-3433: zkpython build broken after maven migration

[nk...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

nkalmar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zookeeper.git


The following commit(s) were added to refs/heads/master by this push:
     new 2711d69  ZOOKEEPER-3433: zkpython build broken after maven migration
2711d69 is described below

commit 2711d69297ce45cb6fc5beab482e4ec36d07249f
Author: Patrick Hunt <ph...@apache.org>
AuthorDate: Tue Jun 25 15:47:58 2019 +0200

    ZOOKEEPER-3433: zkpython build broken after maven migration
    
    Fixed the build and test infrastructure for zkpython.
    
    Verified the build and tests all passing under both ubuntu and macos.
    
    Change-Id: I3c80774a2712f280d1f14739d1eb78baa066fdc6
    
    Author: Patrick Hunt <ph...@apache.org>
    
    Reviewers: Norbert Kalmar <nk...@apache.org>
    
    Closes #991 from phunt/zk3433
---
 zookeeper-contrib/zookeeper-contrib-zkpython/src/python/setup.py   | 4 ++--
 zookeeper-contrib/zookeeper-contrib-zkpython/src/test/run_tests.sh | 4 ++--
 zookeeper-contrib/zookeeper-contrib-zkpython/src/test/zkServer.sh  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/zookeeper-contrib/zookeeper-contrib-zkpython/src/python/setup.py b/zookeeper-contrib/zookeeper-contrib-zkpython/src/python/setup.py
index d9fa36b..c64889e 100755
--- a/zookeeper-contrib/zookeeper-contrib-zkpython/src/python/setup.py
+++ b/zookeeper-contrib/zookeeper-contrib-zkpython/src/python/setup.py
@@ -16,10 +16,10 @@
 
 from distutils.core import setup, Extension
 
-zookeeper_basedir = "../../../"
+zookeeper_basedir = "../../"
 
 zookeepermodule = Extension("zookeeper",
-                            sources=["zookeeper-client/zookeeper-client-c/zookeeper.c"],
+                            sources=["src/c/zookeeper.c"],
                             include_dirs=[zookeeper_basedir + "/zookeeper-client/zookeeper-client-c/include",
                                           zookeeper_basedir + "/build/c",
                                           zookeeper_basedir + "/zookeeper-client/zookeeper-client-c/generated"],
diff --git a/zookeeper-contrib/zookeeper-contrib-zkpython/src/test/run_tests.sh b/zookeeper-contrib/zookeeper-contrib-zkpython/src/test/run_tests.sh
index 18d9240..91e5b57 100755
--- a/zookeeper-contrib/zookeeper-contrib-zkpython/src/test/run_tests.sh
+++ b/zookeeper-contrib/zookeeper-contrib-zkpython/src/test/run_tests.sh
@@ -30,9 +30,9 @@ else
 fi
 
 # Find the build directory containing zookeeper.so
-SO_PATH=`find ../../../build/ -name "zookeeper.so" | head -1`
+SO_PATH=`find ../../build/ -name "zookeeper.so" | head -1`
 PYTHONPATH=`dirname $SO_PATH`
-LIB_PATH=../../c/.libs/:../../../build/test/test-cppunit/.libs
+LIB_PATH=../../build/c/.libs/:../../build/test/test-cppunit/.libs
 for test in `ls $1/*_test.py`; 
 do
     echo "Running $test"
diff --git a/zookeeper-contrib/zookeeper-contrib-zkpython/src/test/zkServer.sh b/zookeeper-contrib/zookeeper-contrib-zkpython/src/test/zkServer.sh
index 74ead8c..a4638de 100755
--- a/zookeeper-contrib/zookeeper-contrib-zkpython/src/test/zkServer.sh
+++ b/zookeeper-contrib/zookeeper-contrib-zkpython/src/test/zkServer.sh
@@ -34,7 +34,7 @@ fi
 
 if [ "x${base_dir}" == "x" ]	
 then
-zk_base="../../../"
+zk_base="../../"
 else
 zk_base="${base_dir}"
 fi