Skip to content

ZOOKEEPER-3433 zkpython build broken after maven migration #991

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
phunt wants to merge 1 commit into from
Closed

ZOOKEEPER-3433 zkpython build broken after maven migration #991

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions zookeeper-contrib/zookeeper-contrib-zkpython/src/python/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
Expand Down
4 changes: 2 additions & 2 deletions zookeeper-contrib/zookeeper-contrib-zkpython/src/test/run_tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`

@eolivelli eolivelli Jun 19, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't any 'target' directory name?
Did you build with raw 'make' the c client?

There are multiple ways to build the C client

@phunt phunt Jun 19, 2019

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I used ant to build the c client as maven doesn't seem to be working (the c client is not being built even with "full-build" profile). That's the way it was always done on the past - just continuing until we have a maven based approach. So with this we get back to status quo - after the directory structure changes for maven I mean.

I did a "ant clean compile compile-native" at the toplevel, then "ant compile" and "ant test" within the zookeeper-contrib-zkpython directory.

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"
Expand Down
2 changes: 1 addition & 1 deletion zookeeper-contrib/zookeeper-contrib-zkpython/src/test/zkServer.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ fi

if [ "x${base_dir}" == "x" ]
then
zk_base="../../../"
zk_base="../../"
else
zk_base="${base_dir}"
fi
Expand Down