From e605d8d2e5d9fbb7e350f3768e75f8f43739ff62 Mon Sep 17 00:00:00 2001
From: Valerio Mariani <valerio.mariani@unibas.ch>
Date: Tue, 12 Mar 2013 12:48:14 +0100
Subject: [PATCH] Updated bundling scripts
Thanks Tobias for diagnosing the problem
---
deployment/linux/create_bundle_precise.py | 2 +-
scripts/ost_config.in | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/deployment/linux/create_bundle_precise.py b/deployment/linux/create_bundle_precise.py
index 1bde046d6..ab0afd7b0 100644
--- a/deployment/linux/create_bundle_precise.py
+++ b/deployment/linux/create_bundle_precise.py
@@ -11,7 +11,7 @@ import PyQt4
# parameters that can be modified
qt4_plugins_location='/usr/lib/i386-linux-gnu/qt4/plugins'
ssl_crypto_location='/lib/i386-linux-gnu/'
-chemlib_dictionary_location='/home/bundler/compounds.chemlib'
+chemlib_dictionary_location='/data/Work/Software/compounds.chemlib'
list_of_excluded_libraries=[
'ld-linux',
'libexpat',
diff --git a/scripts/ost_config.in b/scripts/ost_config.in
index 51786394b..7e242c696 100644
--- a/scripts/ost_config.in
+++ b/scripts/ost_config.in
@@ -31,13 +31,13 @@ export DYLD_FRAMEWORK_PATH="$DNG_LIBDIR:${DYLD_FRAMEWORK_PATH}"
export DYLD_LIBRARY_PATH="$DNG_LIBDIR:${DYLD_LIBRARY_PATH}"
export LD_LIBRARY_PATH="$DNG_LIBDIR:${LD_LIBRARY_PATH}"
# set QT_PLUGIN_PATH for bundle (commented except in linux bundles)
-# export QT_PLUGIN_PATH="$BIN_DIR/plugins"
+#export QT_PLUGIN_PATH="$BIN_DIR/plugins"
# unset PYTHONPATH for bundle (commented except in linux bundles)
-# unset PYTHONPATH
+#unset PYTHONPATH
# retrieve absolute path to python executable
-pyexec="@PYTHON_BINARY@"
+pyexec="$DNG_ROOT/bin/python"
if [ ! -x "$pyexec" ]; then
echo "Error: Python executable '$pyexec' not found!"
--
GitLab