[SCM] Packaging for cctbx branch, master, updated. upstream/2012.05.08.2305-65-ga56fa3f

[Radostan Riedel]

The following commit has been merged in the master branch:
commit 05c31bfbcc9236e19c816cd83a13f004563c7b49
Author: Radostan Riedel <raybuntu at googlemail.com>
Date:   Sat Aug 4 17:15:22 2012 +0200

    Fix to set correct dispatcher paths in pickle object

diff --git a/debian/patches/0010-adding-setup_py.patch b/debian/patches/0010-adding-setup_py.patch
index 525e554..1b66bae 100644
--- a/debian/patches/0010-adding-setup_py.patch
+++ b/debian/patches/0010-adding-setup_py.patch
@@ -4,9 +4,9 @@ Subject: adding-setup_py
 
 ---
  cctbx_sources/stdlib.py |    4 +
- sconsutils.py           |  399 +++++++++++++++++++++++++++++++++++++++++++++++
- setup.py                |  128 +++++++++++++++
- 3 files changed, 531 insertions(+)
+ sconsutils.py           |  408 +++++++++++++++++++++++++++++++++++++++++++++++
+ setup.py                |  130 +++++++++++++++
+ 3 files changed, 542 insertions(+)
  create mode 100755 cctbx_sources/stdlib.py
  create mode 100644 sconsutils.py
  create mode 100755 setup.py
@@ -23,10 +23,10 @@ index 0000000..759f689
 +random = stdlib_import("random")
 diff --git a/sconsutils.py b/sconsutils.py
 new file mode 100644
-index 0000000..550a691
+index 0000000..0b82bdd
 --- /dev/null
 +++ b/sconsutils.py
-@@ -0,0 +1,399 @@
+@@ -0,0 +1,408 @@
 +from distutils.sysconfig import get_python_lib, get_config_var
 +from distutils.command.build_ext import build_ext as _build_ext
 +from distutils.command.build_py import build_py as _build_py
@@ -49,6 +49,7 @@ index 0000000..550a691
 +configure_list = []
 +scons_buildargv = []
 +scons_installargv = []
++SRCDIR=''
 +
 +class Command(_Command):
 +    def run_scons(self, argv):
@@ -334,7 +335,15 @@ index 0000000..550a691
 +                else:
 +                    paths.append(None)
 +            module.dist_paths = paths
-+        env.reset_dispatcher_bookkeeping()
++        _dispatcher_registry={}
++        for key, value in libtbx.env._dispatcher_registry.items():
++            new_key = relocatable_path(anchor=build_path, 
++                                       relocatable=key.relocatable)
++            rel = os.path.relpath(abs(value), SRCDIR)
++            new_val = relocatable_path(anchor=absolute_path(rel_path), 
++                                       relocatable=rel)
++            _dispatcher_registry[new_key] = new_val
++        libtbx.env._dispatcher_registry = _dispatcher_registry
 +        # install the environment file in the data dir
 +        file_obj = open(libtbx_env_path, 'wb')
 +        pickle.dump(env, file_obj, 0)
@@ -428,10 +437,10 @@ index 0000000..550a691
 +    return out, list(outext)
 diff --git a/setup.py b/setup.py
 new file mode 100755
-index 0000000..09b5759
+index 0000000..455e43e
 --- /dev/null
 +++ b/setup.py
-@@ -0,0 +1,128 @@
+@@ -0,0 +1,130 @@
 +from distutils.core import setup, Extension
 +from distutils.util import convert_path
 +import sys, os, shutil
@@ -463,6 +472,8 @@ index 0000000..09b5759
 +import sconsutils
 +from sconsutils import find_packages_and_extensions, build_ext, build_py, test, install_lib, install_data, clean
 +
++sconsutils.SRCDIR = SRCDIR
++
 +# Configure settings
 +# We need this directory to get env_config.cold_start to run!
 +# trailing slash is important

-- 
Packaging for cctbx