From 1e00e50675693ec2c4825abe2c2f39eccdd45c69 Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.anjos@idiap.ch>
Date: Tue, 25 Sep 2012 16:25:08 +0200
Subject: [PATCH] Package all build instructions into buildout.cfg
---
README.rst | 13 ++++---------
buildout.cfg | 11 +++++++----
2 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/README.rst b/README.rst
index cc26650..739f6a5 100644
--- a/README.rst
+++ b/README.rst
@@ -45,15 +45,10 @@ Just type::
$ python bootstrap.py
$ ./bin/buildout
-If Bob is installed in a non-standard location, remember to use the **same
-python interpreter** that was used to compile Bob (replace ``<bob-root>`` with
-the root of your local installation of Bob)::
-
- $ <bob-root>/bin/python bootstrap.py
- $ PKG_CONFIG_PATH=<bob-root>/lib/pkgconfig ./bin/buildout
-
-The `PKG_CONFIG_PATH` variable will help ``buildout`` find the correct include
-and link paths to your non-stock Bob installation.
+If Bob is installed in a non-standard location, edit the file ``buildout.cfg``
+to set the root to Bob's local installation path. Remember to use the **same
+python interpreter** that was used to compile Bob, then execute the same steps
+as above.
Usage
-----
diff --git a/buildout.cfg b/buildout.cfg
index 989ccae..da72e0c 100644
--- a/buildout.cfg
+++ b/buildout.cfg
@@ -3,19 +3,22 @@
; Mon 16 Apr 08:29:18 2012 CEST
[buildout]
-parts = environment external tests python
-develop = .
+parts = env flandmark external tests python
eggs = bob
flandmark
newest = false
; Path to Bob's root - No need setting this if Bob is installed centrally
-bob = /idiap/group/torch5spro/nightlies/last/install/install/linux-x86_64-release
+bob = /idiap/group/torch5spro/nightlies/last/install/linux-x86_64-release
-[environment]
+[env]
recipe = collective.recipe.environment
PKG_CONFIG_PATH = ${buildout:bob}/lib/pkgconfig
+[flandmark]
+recipe = zc.recipe.egg:develop
+setup = .
+
[external]
recipe = xbob.buildout:external
egg-directories = ${buildout:bob}/lib
--
GitLab