From 907ce7ce654ffd401790bf6e9c84687e7a2d42e7 Mon Sep 17 00:00:00 2001 From: dbs Date: Sat, 25 Oct 2008 17:25:47 +0000 Subject: [PATCH] Fix build of OpenSRF Python support: we cannot use a fully-qualified pathname for packages and scripts vars git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1477 9efc2488-bf62-4759-914b-345cdb29e865 --- bin/osrf_config.in | 6 ------ configure.ac | 2 -- src/python/setup.py | 24 ++++++++++++++++++++++++ 3 files changed, 24 insertions(+), 8 deletions(-) create mode 100644 src/python/setup.py diff --git a/bin/osrf_config.in b/bin/osrf_config.in index 70b5c38..7cc0d8e 100644 --- a/bin/osrf_config.in +++ b/bin/osrf_config.in @@ -46,12 +46,6 @@ function showAll { showInstalled; } -function cconfig { - -sed -e 's|osrf|@abs_top_srcdir@/src/python/osrf|g' \ - -e 's|srfsh\.py|@abs_top_srcdir@/src/python/srfsh.py|g' @srcdir@/src/python/setup.py.in > @srcdir@/src/python/setup.py -} - function showHelp { echo echo "------------------------------------------------------------" diff --git a/configure.ac b/configure.ac index 4b9e62c..a7a1180 100644 --- a/configure.ac +++ b/configure.ac @@ -262,8 +262,6 @@ AC_CONFIG_FILES([Makefile AC_OUTPUT -bin/osrf_config --cconfig - AC_MSG_RESULT([]) AC_MSG_RESULT([--------------------- Configuration options: -----------------------]) diff --git a/src/python/setup.py b/src/python/setup.py new file mode 100644 index 0000000..1b841ae --- /dev/null +++ b/src/python/setup.py @@ -0,0 +1,24 @@ +#!/usr/bin/env python + +from setuptools import setup + +setup(name='OpenSRF', + version='1.0.0', + install_requires=[ + 'dnspython', # required by pyxmpp + 'python-memcached', + 'pyxmpp>=1.0.0', + 'simplejson>=1.7.1' + ], + dependency_links = [ + "http://pyxmpp.jajcus.net/downloads/", + "ftp://ftp.tummy.com/pub/python-memcached/python-memcached-latest.tar.gz" + ], + description='OpenSRF Python Modules', + author='Bill Erickson', + author_email='erickson@esilibrary.com', + license="GPL", + url='http://www.open-ils.org/', + packages=['osrf'], + scripts=['srfsh.py'] +) -- 2.11.0