From: dbs <dbs@9efc2488-bf62-4759-914b-345cdb29e865>
Date: Sat, 25 Oct 2008 17:27:12 +0000 (+0000)
Subject: Merge r1477 from trunk to fix Python build
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=7a3f154ac981c3be47335daf748d12d522e840b2;p=OpenSRF.git

Merge r1477 from trunk to fix Python build

git-svn-id: svn://svn.open-ils.org/OpenSRF/branches/rel_1_0@1478 9efc2488-bf62-4759-914b-345cdb29e865
---

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']
+)