[SCM] Packaging for cctbx branch, master, updated. upstream/2012.05.08.2305-37-g91f9d56
Radostan Riedel
raybuntu at googlemail.com
Mon Jul 23 20:56:59 UTC 2012
The following commit has been merged in the master branch:
commit 91f9d56a1f6f3a4aaf8ecccb7989dda03876f7e0
Author: Radostan Riedel <raybuntu at googlemail.com>
Date: Mon Jul 23 22:39:18 2012 +0200
Fix install targets don't copy symlinks
diff --git a/debian/patches/0007-adding-shlib-versioning.patch b/debian/patches/0007-adding-shlib-versioning.patch
index 827c284..ec6cf1d 100644
--- a/debian/patches/0007-adding-shlib-versioning.patch
+++ b/debian/patches/0007-adding-shlib-versioning.patch
@@ -3,10 +3,10 @@ Date: Mon, 23 Jul 2012 18:33:07 +0200
Subject: adding-shlib-versioning
---
- cctbx_sources/boost_adaptbx/SConscript | 3 ++
- cctbx_sources/libtbx/SConscript | 74 ++++++++++++++++++++++++++++++++
- cctbx_sources/libtbx/env_config.py | 7 +++
- 3 files changed, 84 insertions(+)
+ cctbx_sources/boost_adaptbx/SConscript | 3 +
+ cctbx_sources/libtbx/SConscript | 113 +++++++++++++++++++++++++++++---
+ cctbx_sources/libtbx/env_config.py | 7 ++
+ 3 files changed, 115 insertions(+), 8 deletions(-)
diff --git a/cctbx_sources/boost_adaptbx/SConscript b/cctbx_sources/boost_adaptbx/SConscript
index ed21fb4..17f0e89 100644
@@ -23,10 +23,10 @@ index ed21fb4..17f0e89 100644
LIBPATH=env_etc.libpath_python)
env_no_includes_boost_python_ext.Append(
diff --git a/cctbx_sources/libtbx/SConscript b/cctbx_sources/libtbx/SConscript
-index a1580f7..0ee8b6f 100644
+index a1580f7..6228bae 100644
--- a/cctbx_sources/libtbx/SConscript
+++ b/cctbx_sources/libtbx/SConscript
-@@ -1056,6 +1056,80 @@ env_etc.libpath = os.path.join(env_etc.install_path, 'lib')
+@@ -1056,14 +1056,97 @@ env_etc.libpath = os.path.join(env_etc.install_path, 'lib')
env_etc.inclpath = os.path.join(env_etc.install_path, 'include')
env_etc.rpath = os.path.join(env_etc.prefix, 'lib')
@@ -80,6 +80,17 @@ index a1580f7..0ee8b6f 100644
+ src_suffix = '$SHOBJSUFFIX',
+ src_builder = shared_obj)
+
++ from SCons.Tool.install import add_targets_to_INSTALLED_FILES
++ LibtoolInstall = SCons.Builder.Builder(
++ action = 'libtool --mode=install install -D ${SOURCE.abspath} ${TARGET.abspath}',
++ target_factory = env.fs.Entry,
++ source_factory = env.fs.Entry,
++ multi = 1,
++ emitter = [ add_targets_to_INSTALLED_FILES, ],
++ name = 'LibtoolInstall')
++
++ env['BUILDERS']['LibtoolInstall'] = LibtoolInstall
++
+ lib_dir = '%s%s'%(abs(libtbx.env.lib_path), env_etc.rpath)
+ if not os.path.exists(lib_dir):
+ os.makedirs(lib_dir)
@@ -107,6 +118,52 @@ index a1580f7..0ee8b6f 100644
def create_install_targets():
cwd = os.getcwd()
rp = libtbx.env.repository_paths
+- lib_dir = '%s%s'%(abs(libtbx.env.lib_path), env_etc.rpath)
++ lib_dir = abs(libtbx.env.lib_path)
+ exe_dev = libtbx.env.under_build("exe_dev")
+ include_path = libtbx.env.include_path
+- if not os.path.exists(lib_dir):
+- os.makedirs(lib_dir)
+ rp = list(rp)
+ rp.append(lib_dir)
+ rp.append(include_path)
+@@ -1075,17 +1158,31 @@ def create_install_targets():
+ os.chdir(src_dir)
+ dest = None
+ for root, dirnames, filenames in os.walk('.'):
++ # exclude .libs dir
++ if '.libs' in dirnames:
++ dirnames.remove('.libs')
+ for filename in filenames:
+- if re.match('^lib.*\.(so.*|dylib.*|la|a)$', filename, flags=re.IGNORECASE):
+- dest = os.path.join(env_etc.libpath, root)
+- src = os.path.join(src_dir, root, filename)
+- env_base.Install(dest, src)
+- env_base.Alias("install-shlib", dest)
++ if not (libtbx.env.build_options.libtoolize):
++ if re.match('^lib.*\.(so|dylib|a)$', filename, flags=re.IGNORECASE):
++ dest = os.path.join(env_etc.libpath, root)
++ src = os.path.join(src_dir, root, filename)
++ env_base.Install(dest, src)
++ env_base.Alias("install-shlib", dest)
++ else:
++ if re.match('^lib.*\.la$', filename, flags=re.IGNORECASE):
++ dest = os.path.join(env_etc.libpath, root, filename)
++ src = os.path.join(src_dir, root, filename)
++ env_base.LibtoolInstall(dest, src)
++ env_base.Alias("install-shlib", dest)
+ if re.match('^.*\.(h|hpp)$', filename, flags=re.IGNORECASE):
+ dest = os.path.join(env_etc.inclpath, root)
+ src = os.path.join(src_dir, root, filename)
+ env_base.Install(dest, src)
+ env_base.Alias("install-header", dest)
++ if src_dir == lib_dir:
++ break
++
++ env_base.Alias("install-shlib", dest)
+ dest = env_etc.binpath
+ env_base.Install(dest, Glob('%s/*'%(exe_dev)))
+ env_base.Alias("install-bin", dest)
diff --git a/cctbx_sources/libtbx/env_config.py b/cctbx_sources/libtbx/env_config.py
index 5efad84..e1cc775 100644
--- a/cctbx_sources/libtbx/env_config.py
diff --git a/debian/patches/0008-add-with_pycbf-option.patch b/debian/patches/0008-add-with_pycbf-option.patch
index daf976b..08adff7 100644
--- a/debian/patches/0008-add-with_pycbf-option.patch
+++ b/debian/patches/0008-add-with_pycbf-option.patch
@@ -29,7 +29,7 @@ index 4ac6717..14deee3 100644
Export("env_cbflib_boost_python_ext")
diff --git a/cctbx_sources/libtbx/SConscript b/cctbx_sources/libtbx/SConscript
-index 0ee8b6f..5419e3c 100644
+index 6228bae..f757775 100644
--- a/cctbx_sources/libtbx/SConscript
+++ b/cctbx_sources/libtbx/SConscript
@@ -1048,6 +1048,7 @@ else:
diff --git a/debian/patches/0011-fix-missing-python-lib-during-linking.patch b/debian/patches/0011-fix-missing-python-lib-during-linking.patch
index 1c1a9ed..1f00252 100644
--- a/debian/patches/0011-fix-missing-python-lib-during-linking.patch
+++ b/debian/patches/0011-fix-missing-python-lib-during-linking.patch
@@ -8,7 +8,7 @@ Subject: fix missing python lib during linking
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/cctbx_sources/libtbx/SConscript b/cctbx_sources/libtbx/SConscript
-index 5419e3c..ad08c18 100644
+index f757775..9c28be9 100644
--- a/cctbx_sources/libtbx/SConscript
+++ b/cctbx_sources/libtbx/SConscript
@@ -54,9 +54,11 @@ def set_python_include_and_libs(env_etc):
--
Packaging for cctbx
More information about the debian-science-commits
mailing list