Clean up the source tree a little more:

  * Delete setup.py.in (as we're not modifying it)
  * Make math_client.py be modified with SYSCONFDIR location per other scripts
    (although slightly longer term we'll need to stop modifying all of these
    in place, because that doesn't work after the first ./configure run)
  * Add a few files to automake's tracking so that make dist is a little happier

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

diff --git a/Makefile.am b/Makefile.am
index bf334d2..a776faa 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -37,13 +37,18 @@ DOC_FILES = @srcdir@/doc/Application-HOWTO.txt \
            @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 @@ libosrf_FILES = @srcdir@/src/libopensrf/basic_client.c \
                @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
 

diff --git a/examples/math_client.py b/examples/math_client.py
index 7dcbdbf..8e3587a 100644 (file)
--- a/examples/math_client.py
+++ b/examples/math_client.py
@@ -3,7 +3,7 @@ import osrf.system
 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

diff --git a/src/Makefile.am b/src/Makefile.am
index c7f0cfd..4dd2d9e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -56,6 +56,7 @@ install-exec-hook:
        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)/

diff --git a/src/python/setup.py.in b/src/python/setup.py.in
deleted file mode 100644 (file)
index 1b841ae..0000000
--- a/src/python/setup.py.in
+++ /dev/null
@@ -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@esilibrary.com',
-    license="GPL",
-    url='http://www.open-ils.org/',
-    packages=['osrf'],
-    scripts=['srfsh.py']
-)