diff --git a/deployment/linux/create_bundle_precise.py b/deployment/linux/create_bundle_precise.py index 9ffeff82463112f79e857ecc8f7bf202deef91da..ab0afd7b065698526c9f5ab2d057f62357734deb 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', @@ -68,9 +68,10 @@ directory_name='openstructure-linux-'+archstring+'-'+additional_label print 'Hardcoding package python binary path in openstructure executables' subprocess.call('rm -f scripts/ost_config.in.pre* scripts/ost_config.in.backup',shell=True,cwd='../../') subprocess.call('mv scripts/ost_config.in scripts/ost_config.in.backup',shell=True,cwd='../../') -subprocess.call('sed "s/@PYTHON_BINARY@/\$DNG_ROOT\/bin\/python/g" scripts/ost_config.in.backup > scripts/ost_config.in.preprepre',shell=True,cwd='../../') -subprocess.call('sed "s/\#export PYTHONHOME/ export PYTHONHOME/g" scripts/ost_config.in.preprepre > scripts/ost_config.in.prepre',shell=True,cwd='../../') -subprocess.call('sed "s/\#export PYTHONPATH/ export PYTHONPATH/g" scripts/ost_config.in.prepre > scripts/ost_config.in.pre',shell=True,cwd='../../') +subprocess.call('sed "s/@PYTHON_BINARY@/\$DNG_ROOT\/bin\/python/g" scripts/ost_config.in.backup > scripts/ost_config.in.prepreprepre',shell=True,cwd='../../') +subprocess.call('sed "s/\#export PYTHONHOME/ export PYTHONHOME/g" scripts/ost_config.in.prepreprepre > scripts/ost_config.in.preprepre',shell=True,cwd='../../') +subprocess.call('sed "s/\#export PYTHONPATH/ export PYTHONPATH/g" scripts/ost_config.in.preprepre > scripts/ost_config.in.prepre',shell=True,cwd='../../') +subprocess.call('sed "s/\#unset PYTHONPATH/ unset PYTHONPATH/g" scripts/ost_config.in.prepre > scripts/ost_config.in.pre',shell=True,cwd='../../') subprocess.call('sed "s/\#export QT_PLUGIN_PATH/ export QT_PLUGIN_PATH/g" scripts/ost_config.in.pre > scripts/ost_config.in',shell=True,cwd='../../') print 'Compiling Openstructure' subprocess.call('cmake ./ -DCMAKE_BUILD_TYPE=Release -DPREFIX='+directory_name+' -DCOMPOUND_LIB='+chemlib_dictionary_location+' -DUSE_RPATH=ON -DENABLE_IMG=ON -DENABLE_GUI=ON -DENABLE_GFX=ON -DOPTIMIZE=ON',shell=True,cwd='../../') @@ -121,7 +122,7 @@ for entry in filtered_dep_list: print 'Copy python executable into package directory structure' subprocess.call('cp '+system_python_bin+ ' '+directory_name+'/bin/python',shell=True,cwd='../../') print 'Copy python libraries into package directory structure' -subprocess.call('cp -pRL '+system_python_libs+' '+directory_name+'/'+libdir+'/'+system_python_executable+'/',shell=True,cwd='../../') +subprocess.call('cp -pRL '+system_python_libs+'/* '+directory_name+'/'+libdir+'/'+system_python_executable+'/',shell=True,cwd='../../') subprocess.call('rm -fr '+directory_name+'/'+libdir+'/'+system_python_executable+'/dist-packages',shell=True,cwd='../../') subprocess.call('cp -pRL '+sip_module_location+'/sip* '+directory_name+'/'+libdir+'/'+system_python_executable+'/',shell=True,cwd='../../') subprocess.call('cp -pRL '+qt4_module_location+' '+directory_name+'/'+libdir+'/'+system_python_executable+'/',shell=True,cwd='../../') diff --git a/scripts/ost_config.in b/scripts/ost_config.in index 99dd87b0faa8136f49591f206673d4b49d19b592..001309fbbfaef99c8941676ba3203faccb0a0006 100644 --- a/scripts/ost_config.in +++ b/scripts/ost_config.in @@ -31,10 +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 + # 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!"