[Opensrf-commits] r1478 - in branches/rel_1_0: . bin src/python

[svn at svn.open-ils.org]

Author: dbs
Date: 2008-10-25 13:27:12 -0400 (Sat, 25 Oct 2008)
New Revision: 1478

Added:
   branches/rel_1_0/src/python/setup.py
Modified:
   branches/rel_1_0/bin/osrf_config.in
   branches/rel_1_0/configure.ac
Log:
Merge r1477 from trunk to fix Python build

Modified: branches/rel_1_0/bin/osrf_config.in
===================================================================
--- branches/rel_1_0/bin/osrf_config.in	2008-10-25 17:25:47 UTC (rev 1477)
+++ branches/rel_1_0/bin/osrf_config.in	2008-10-25 17:27:12 UTC (rev 1478)
@@ -46,12 +46,6 @@
 	 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 "------------------------------------------------------------"

Modified: branches/rel_1_0/configure.ac
===================================================================
--- branches/rel_1_0/configure.ac	2008-10-25 17:25:47 UTC (rev 1477)
+++ branches/rel_1_0/configure.ac	2008-10-25 17:27:12 UTC (rev 1478)
@@ -262,8 +262,6 @@
 
 AC_OUTPUT
 
-bin/osrf_config --cconfig
-
 AC_MSG_RESULT([])
 AC_MSG_RESULT([--------------------- Configuration options:  -----------------------])
 

Copied: branches/rel_1_0/src/python/setup.py (from rev 1477, trunk/src/python/setup.py)
===================================================================
--- branches/rel_1_0/src/python/setup.py	                        (rev 0)
+++ branches/rel_1_0/src/python/setup.py	2008-10-25 17:27:12 UTC (rev 1478)
@@ -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 at esilibrary.com',
+    license="GPL",
+    url='http://www.open-ils.org/',
+    packages=['osrf'],
+    scripts=['srfsh.py']
+)