Changeset 1443

Timestamp:

22/08/06 14:34:28 (13 years ago)

Author:

spascoe

Message:

Bug fix for installing with setuptools + updated README.

Location:

TI05-delivery/trunk

Files:

• README (modified) (2 diffs)
• setup.py (modified) (4 diffs)

TI05-delivery/trunk/README

@@ -1 +1 @@
 You can build bbftp in 2 ways from this directory.  Either stand-alone client and server, with
-NDG authorisation extensions and a dummy auth/authz module or in embedded python mode.
+NDG authorisation extensions and a dummy auth/authz module, or in embedded python mode.
 
 stand-alone client & server
@@ -18 +18 @@
 ====================
 
-$ make -C src
+ 1. Select a suitable python to install into.
 
-   Needed to properly configure the bbftp source and compile the bbftp client for testing.
+    If you don't want to install into your default python
+    (recommended!) you can create a local copy of your global python
+    setup using the virtual-python.py script:
 
-Make sure your default python is fairly modern (v2.3+) which includes:
- - distutils (part of the python-devel package in some linux distributions)
+    $ python ./virtual-python.py --prefix=./vpython
+    $ export PATH=./vython/bin:$PATH
 
-$ python setup.py build
+    installed packages will now be put in the ./vpython tree.  This is a good way of
+    testing the installation locally.
+    
+ 2. Run the install script
 
-   Don't do "setup.py install" as the distribution hasn't been configured
-   for installation.
+    $ python setup.py install
 
+    If you don't have setuptools installed this will download and install it automatically.
 
-$ test/test_bbftpd.py
+ 3. Run the test cases.
 
-   Run the python-embedded tests.
+    $ test/test_embedded.py
 
+    These test cases run the client and server locally.
+
+    $ test/test_remote.py
+
+    These test cases ask for a remote host which has the delivery service installed.

TI05-delivery/trunk/setup.py

@@ -106 +106 @@
         self.execute(os.system, ('doxygen',))
 
-from distutils.command.build import build
+from setuptools.command.bdist_egg import bdist_egg
 
-class MyBuild(build):
+class MyBuild(bdist_egg):
     def run(self):
         # We make the stand-alone client/server here for 2 reasons: The source must be
@@ -114 +114 @@
         # the stand-alone client.
         self.spawn(['make', '-C', 'src'])
-        build.run(self)
+        bdist_egg.run(self)
 
 #-------------------------------------------------------------------------------------------
@@ -156 +156 @@
       scripts=['examples/deliveryd.py'],
       ext_modules = [bbftpd],
-      cmdclass = {'doc': Doc, 'build': MyBuild}
+      cmdclass = {'doc': Doc, 'bdist_egg': MyBuild}
       )
       
@@ -173 +173 @@
       scripts=['examples/deliveryclient.py'],
       ext_modules = [bbftpc],
-      cmdclass = {'doc': Doc, 'build': MyBuild}
+      cmdclass = {'doc': Doc, 'bdist_egg': MyBuild}
       )