[Opensrf-commits] r1486 - in branches/rel_1_0: . examples src src/python

[svn at svn.open-ils.org]

Author: dbs
Date: 2008-10-27 01:10:21 -0400 (Mon, 27 Oct 2008)
New Revision: 1486

Removed:
   branches/rel_1_0/src/python/setup.py.in
Modified:
   branches/rel_1_0/Makefile.am
   branches/rel_1_0/examples/math_client.py
   branches/rel_1_0/src/Makefile.am
Log:
Merge r1484 from trunk (clean up build)


Modified: branches/rel_1_0/Makefile.am
===================================================================
--- branches/rel_1_0/Makefile.am	2008-10-27 05:09:41 UTC (rev 1485)
+++ branches/rel_1_0/Makefile.am	2008-10-27 05:10:21 UTC (rev 1486)
@@ -37,13 +37,18 @@
 	    @srcdir@/doc/dokuwiki-doc-stubber.pl \
 	    @srcdir@/doc/OpenSRF-Messaging-Protocol.html \
 	    @srcdir@/doc/Persist-API.html \
-	    @srcdir@/doc/Roadmap.txt
+	    @srcdir@/doc/Roadmap.txt \
+		@srcdir@/AUTHORS \
+		@srcdir@/ChangeLog \
+		@srcdir@/INSTALL \
+		@srcdir@/README
 
 EXAMPLES_FILES = @srcdir@/examples/fieldmapper2cdbi.xsl \
 		 @srcdir@/examples/fieldmapper2javascript.xsl \
 		 @srcdir@/examples/fieldmapper2perl.xsl \
 		 @srcdir@/examples/gen-fieldmapper.xml \
 		 @srcdir@/examples/math_bench.pl \
+		 @srcdir@/examples/math_client.py \
 		 @srcdir@/examples/multisession-test.pl \
 		 @srcdir@/examples/register.pl \
 		 @srcdir@/examples/srfsh_config.xsd \
@@ -70,7 +75,7 @@
 		@srcdir@/src/libopensrf/osrfConfig.c
 
 
-EXTRA_DIST = $(DOC_FILES) $(EXAMPLES_FILES) $(libosrf_FILES) $(strn_compat_FILES) $(python_FILES) $(java_FILES) @srcdir@/autogen.sh @srcdir@/src/extras @srcdir@/DCO-1.1.txt @srcdir@/LICENSE.txt @srcdir@/src/perl @srcdir@/src/javascript
+EXTRA_DIST = $(DOC_FILES) $(EXAMPLES_FILES) $(libosrf_FILES) $(strn_compat_FILES) $(python_FILES) $(java_FILES) @srcdir@/autogen.sh @srcdir@/src/extras @srcdir@/COPYING @srcdir@/DCO-1.1.txt @srcdir@/LICENSE.txt @srcdir@/src/perl @srcdir@/src/javascript
 
 opensrfincludedir = @includedir@/opensrf
 

Modified: branches/rel_1_0/examples/math_client.py
===================================================================
--- branches/rel_1_0/examples/math_client.py	2008-10-27 05:09:41 UTC (rev 1485)
+++ branches/rel_1_0/examples/math_client.py	2008-10-27 05:10:21 UTC (rev 1486)
@@ -3,7 +3,7 @@
 import osrf.ses
 
 # XXX: Replace with command line arguments
-file = '/opensrf/conf/opensrf_core.xml'
+file = '/openils/conf/opensrf_core.xml'
 operator = 'add'
 operand1 = 5
 operand2 = 7

Modified: branches/rel_1_0/src/Makefile.am
===================================================================
--- branches/rel_1_0/src/Makefile.am	2008-10-27 05:09:41 UTC (rev 1485)
+++ branches/rel_1_0/src/Makefile.am	2008-10-27 05:10:21 UTC (rev 1486)
@@ -56,6 +56,7 @@
 	sed -i 's|LOCALSTATEDIR|$(VAR)|g' '$(DESTDIR)@sysconfdir@/srfsh.xml.example'
 	sed -i 's|SYSCONFDIR|$(ETCDIR)|g' '$(DESTDIR)@sysconfdir@/srfsh.xml.example'
 	sed -i 's|SYSCONFDIR|$(ETCDIR)|g' '@abs_top_srcdir@/examples/math_bench.pl'
+	sed -i 's|SYSCONFDIR|$(ETCDIR)|g' '@abs_top_srcdir@/examples/math_client.py'
 	sed -i 's|LIBDIR|$(LIBDIR)|g' '@abs_top_srcdir@/examples/multisession-test.pl'
 	sed -i 's|SYSCONFDIR|$(ETCDIR)|g' '@abs_top_srcdir@/doc/dokuwiki-doc-stubber.pl'
 	cp -r @srcdir@/javascript/* $(jsdir)/

Deleted: branches/rel_1_0/src/python/setup.py.in
===================================================================
--- branches/rel_1_0/src/python/setup.py.in	2008-10-27 05:09:41 UTC (rev 1485)
+++ branches/rel_1_0/src/python/setup.py.in	2008-10-27 05:10:21 UTC (rev 1486)
@@ -1,24 +0,0 @@
-#!/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']
-)