diff --git a/deployment/linux/create_bundle_centos5.py b/deployment/linux/create_bundle_centos5.py index 1a3580f2db98f096d367a8c4a942008c81be0c04..36aa8a6877c2a702fcc6919ff4eab102c88465f8 100644 --- a/deployment/linux/create_bundle_centos5.py +++ b/deployment/linux/create_bundle_centos5.py @@ -91,7 +91,7 @@ subprocess.call('mkdir '+directory_name+'/bin',shell=True,cwd='../../') print 'Copy python executable into stage for dependency detection' subprocess.call('cp '+system_python_bin+ ' stage/bin/python',shell=True,cwd='../../') print 'Copy python libraries into the stage for dependency detection' -subprocess.call('cp -pRL '+system_python_libs+'/* stage/'+libdir+'/',shell=True,cwd='../../') +subprocess.call('cp -pRL '+system_python_libs+' stage/'+libdir+'/',shell=True,cwd='../../') subprocess.call('rm -fr stage/'+libdir+'/'+system_python_executable+'/dist-packages',shell=True,cwd='../../') subprocess.call('cp -pRL '+sip_module_location+'/sip* stage/'+libdir+'/'+system_python_executable+'/',shell=True,cwd='../../') subprocess.call('cp -pRL '+qt4_module_location+' stage/'+libdir+'/'+system_python_executable+'/',shell=True,cwd='../../') @@ -129,7 +129,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/deployment/linux/create_bundle_centos6.py b/deployment/linux/create_bundle_centos6.py index f179d539e5a0dc3178d72e375f6e07e1924dd128..cfb2669676fbcad27513e86a35dff63d7b7ef34e 100644 --- a/deployment/linux/create_bundle_centos6.py +++ b/deployment/linux/create_bundle_centos6.py @@ -91,7 +91,7 @@ subprocess.call('mkdir '+directory_name+'/bin',shell=True,cwd='../../') print 'Copy python executable into stage for dependency detection' subprocess.call('cp '+system_python_bin+ ' stage/bin/python',shell=True,cwd='../../') print 'Copy python libraries into the stage for dependency detection' -subprocess.call('cp -pRL '+system_python_libs+'/* stage/'+libdir+'/',shell=True,cwd='../../') +subprocess.call('cp -pRL '+system_python_libs+' stage/'+libdir+'/',shell=True,cwd='../../') subprocess.call('rm -fr stage/'+libdir+'/'+system_python_executable+'/dist-packages',shell=True,cwd='../../') subprocess.call('cp -pRL '+sip_module_location+'/sip* stage/'+libdir+'/'+system_python_executable+'/',shell=True,cwd='../../') subprocess.call('cp -pRL '+qt4_module_location+' stage/'+libdir+'/'+system_python_executable+'/',shell=True,cwd='../../') @@ -129,7 +129,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/deployment/linux/create_bundle_lucid.py b/deployment/linux/create_bundle_lucid.py index 113b05f5b8f0dae463ce4fb959161b70870562f0..17e6b1a443b829b9ff967224402dbaf794c59692 100644 --- a/deployment/linux/create_bundle_lucid.py +++ b/deployment/linux/create_bundle_lucid.py @@ -67,6 +67,7 @@ else: 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.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='../../') diff --git a/scripts/ost_config.in b/scripts/ost_config.in index 4736555cdb3e78e7ae87c24d0a0a678b62974a2c..531d5a8ad5eb3a579a4ba608d2bc27159ff95d52 100644 --- a/scripts/ost_config.in +++ b/scripts/ost_config.in @@ -31,9 +31,9 @@ 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