From d8c0ff972a822a4e6ed1ca621a5838902cab55ba Mon Sep 17 00:00:00 2001 From: Chuck Thier Date: Wed, 14 Jul 2010 16:56:03 -0500 Subject: [PATCH 1/2] Updated saio to reflect setup.py changes --- doc/source/development_saio.rst | 3 +-- setup.py | 5 ----- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/doc/source/development_saio.rst b/doc/source/development_saio.rst index 3099b5b9ac..cead9607d4 100644 --- a/doc/source/development_saio.rst +++ b/doc/source/development_saio.rst @@ -153,10 +153,9 @@ good idea what to do on other environments. `bzr launchpad-login ` #. Check out your bzr repo of swift, for example: `bzr branch lp:~swift-core/swift/trunk swift` - #. ``for f in `ls ~/swift/bin/`; do sudo ln -s /home//swift/bin/$f /usr/bin/$f`; done`` + #. `cd ~/swift; python setup.py develop` #. Edit `~/.bashrc` and add to the end:: - export PYTHONPATH=~/swift export PATH_TO_TEST_XFS=/mnt/sdb1/test export SWIFT_TEST_CONFIG_FILE=/etc/swift/func_test.conf export PATH=${PATH}:~/bin diff --git a/setup.py b/setup.py index 22952e02e0..1fa1a75538 100644 --- a/setup.py +++ b/setup.py @@ -28,11 +28,6 @@ setup( url='https://launchpad.net/swift', packages=find_packages(exclude=['tests','bin']), test_suite = 'nose.collector', - command_options = { - 'build_sphinx': { - 'version': ('setup.py', version), - } - }, classifiers=[ 'Development Status :: 4 - Beta', 'License :: OSI Approved :: Apache Software License', From 42a9910fc239b6ee6240dbec8e6324e4f6dab826 Mon Sep 17 00:00:00 2001 From: Chuck Thier Date: Wed, 14 Jul 2010 17:05:50 -0500 Subject: [PATCH 2/2] User login doesn't really need to be the same as the lp id in the SAIO --- doc/source/development_saio.rst | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/doc/source/development_saio.rst b/doc/source/development_saio.rst index cead9607d4..ef5ee9cbfc 100644 --- a/doc/source/development_saio.rst +++ b/doc/source/development_saio.rst @@ -19,8 +19,7 @@ good idea what to do on other environments. #. `Use operating system installation disc image file`, pick the .iso from above. #. Select `Linux` and `Ubuntu 64-bit`. - #. Fill in the *Linux Easy Install* details (you should make the user - name match your launchpad user id). + #. Fill in the *Linux Easy Install* details. #. `Customize Settings`, name the image whatever you want (`SAIO` for instance.) #. When the `Settings` window comes up, select `Hard Disk`, create an