Skip to content

Commit

Permalink
Merge branch 'master' of github.com:ooici/coi-services
Browse files Browse the repository at this point in the history
  • Loading branch information
thomaslennan committed Mar 14, 2012
2 parents 22a544d + c402abe commit 0ffd704
Show file tree
Hide file tree
Showing 76 changed files with 5,954 additions and 3,106 deletions.
23 changes: 21 additions & 2 deletions README
Expand Up @@ -42,7 +42,7 @@ For Mac, use homebrew
Be sure to read the pyon README for platform specific guidance to installing
dependent libraries and packages.
Linux: Note that many installs have much older versions installed by default.
(If you have trouble with brew 'MD5 mismatch' errors, try running 'brew update'
(If you have trouble with brew 'MD5 mismatch' errors, try running 'brew update'
and try the install again)


Expand Down Expand Up @@ -140,6 +140,25 @@ Use integration tests:

> bin/nosetests -a INT

TROUBLESHOOTING
===============

bin/generate_interfaces can leave outdated stuff behind that causes your
tests to fail unexpectedly. Do an ant clean and try again.
> ant clean

bin/generate_interfaces still has import errors after ant clean. Then, you
might have an outdated pyon repo
> cd ../pyon
> git pull
> cd -

If your tests fail unexpectedly when you have tried everything else, your build
might be corrupted. Do an ant clean buildout and try again with a new
virtualenv and build from scratch.

> ant clean-buildout

DEBUG
=====

Expand Down Expand Up @@ -226,4 +245,4 @@ if it notices a change to the commit that your supermodule points to.
The pre-commit script is so you don't forget to push changes to the submodule *BEFORE* you push changes
to the supermodule.


4 changes: 3 additions & 1 deletion autolaunch.cfg
Expand Up @@ -2,8 +2,10 @@
extends = buildout.cfg
eggs-directory = /opt/cache
parts =
dashi
python
eggs =
${dashi:eggs}
coi-services

[dashi]
recipe = zc.recipe.egg
Expand Down
10 changes: 10 additions & 0 deletions build.xml
Expand Up @@ -51,4 +51,14 @@
<target name="interfaces" depends="clean" description="Generate the interfces">
</target>

<target name="clean-buildout"
description="clean up buildout dirs" depends="clean" >
<echo message="Clean up buildout directories. Please run `python bootstrap.py` to start buildout."/>
<delete dir="parts"/>
<delete dir="develop-eggs"/>
<delete dir="bin"/>
<delete dir="downloads"/>
<delete dir="eggs"/>
<delete file=".installed.cfg"/>
</target>
</project>

0 comments on commit 0ffd704

Please sign in to comment.