From 756b0bc2bc38ea91615f3a34608328c1e8b15ae3 Mon Sep 17 00:00:00 2001 From: su_v Date: Mon, 25 Aug 2014 01:22:19 +0200 Subject: osx-app.sh: check for python_dir if 'add_python' is true (needs fixing) (bzr r13506.1.45) --- packaging/macosx/osx-app.sh | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh index 3fb1585e1..5bb2a5340 100755 --- a/packaging/macosx/osx-app.sh +++ b/packaging/macosx/osx-app.sh @@ -135,12 +135,19 @@ if [ ! -f "$plist" ]; then exit 1 fi -# if [ ${add_python} = "true" ]; then -# if [ "x$python_dir" == "x" ]; then -# echo "Python modules directory not specified." >&2 -# exit 1 -# fi -# fi +if [ ${add_python} = "true" ]; then + if [ "x$python_dir" == "x" ]; then + echo "Python modules will be copied from MacPorts tree." + else + if [ ! -e "$python_dir" ]; then + echo "Python modules directory \""$python_dir"\" not found." >&2 + exit 1 + else + # TODO: check directoy structure and reject old one based on ppc/i386 + echo "Python modules will be copied from $python_dir." + fi + fi +fi if [ ! -e "$LIBPREFIX" ]; then echo "Cannot find the directory containing the libraires: $LIBPREFIX" >&2 -- cgit v1.2.3