diff --git a/deployment/linux/create_bundle.py b/deployment/linux/create_bundle.py index 43e980f9dbfed5f355ead57d1501823d5b15e5cd..a186f1e257ff9c2541da4dfb0adcc3a465c19a12 100644 --- a/deployment/linux/create_bundle.py +++ b/deployment/linux/create_bundle.py @@ -12,7 +12,7 @@ if len(sys.argv) < 2: print 'usage: create_bundle.py additional_label' sys.exit() -boost_string='\".so.1.40.0\"' +#boost_string='\".so.1.42.0\"' system_python_version='python2.6' system_python_bin='/usr/bin/'+system_python_version system_python_libs='/usr/lib/'+system_python_version @@ -41,9 +41,8 @@ else: libdir='lib' archstring='32bit' date_pattern='%Y-%b-%d' -build=str(datetime.datetime.now()) -stamp=datetime.datetime.strptime(build, date_pattern) -directory_name='openstructure-linux-'+archstring+'-'+additional_label+stamp +build=datetime.date.today() +directory_name='openstructure-linux-'+archstring+'-'+additional_label+'-'+str(build) print 'Hardcoding package python binary path in openstructure executables' subprocess.call('mv scripts/ost.in scripts/ost.in.backup',shell=True,cwd='../../') subprocess.call('sed "s/@PYTHON_BINARY@/\$DNG_ROOT\/bin\/'+python_bin_in_bundle+'/g" scripts/ost.in.backup > scripts/ost.in.prepreprepre',shell=True,cwd='../../') @@ -60,12 +59,14 @@ subprocess.call('sed "s/\#export QT_PLUGIN_PATH/ export QT_PLUGIN_PATH/g" script #subprocess.call('wget ftp://ftp.wwpdb.org/pub/pdb/data/monomers/components.cif', shell=True, cwd='../../') #print 'Compiling Openstructure' #subprocess.call('cmake ./ -DCMAKE_BUILD_TYPE=Release -DPREFIX='+directory_name+' -DBoost_COMPILER='+boost_string+'-DENABLE_IMG=OFF -DENABLE_UI=OFF -DENABLE_GFX=OFF', shell=True,cwd='../../') +#subprocess.call('cmake ./ -DCMAKE_BUILD_TYPE=Release -DPREFIX='+directory_name+' s-DENABLE_IMG=OFF -DENABLE_UI=OFF -DENABLE_GFX=OFF', shell=True,cwd='../../') #subprocess.call('make -j5',shell=True,cwd='../../') #print 'Converting Chemlib dictionary' #subprocess.call('stage/bin/chemdict_tool create components.cif compounds.chemlib', shell=True, cwd='../../') #print '\nStaging Chemlib dictionary' print 'Compiling Openstructure' -subprocess.call('cmake ./ -DCMAKE_BUILD_TYPE=Release -DPREFIX='+directory_name+' -DBoost_COMPILER='+boost_string+' -DCOMPOUND_LIB=ChemLib/compounds.chemlib -DENABLE_IMG=ON -DENABLE_UI=ON -DENABLE_GFX=ON -DOPTIMIZE=ON',shell=True,cwd='../../') +#subprocess.call('cmake ./ -DCMAKE_BUILD_TYPE=Release -DPREFIX='+directory_name+' -DBoost_COMPILER='+boost_string+' -DCOMPOUND_LIB=ChemLib/compounds.chemlib -DENABLE_IMG=ON -DENABLE_UI=ON -DENABLE_GFX=ON -DOPTIMIZE=ON',shell=True,cwd='../../') +subprocess.call('cmake ./ -DCMAKE_BUILD_TYPE=Release -DPREFIX='+directory_name+' -DCOMPOUND_LIB=ChemLib/compounds.chemlib -DENABLE_IMG=ON -DENABLE_UI=ON -DENABLE_GFX=ON -DOPTIMIZE=ON',shell=True,cwd='../../') subprocess.call('make -j2',shell=True,cwd='../../') print 'Removing obsolete packages and package directory' subprocess.call('rm -fr openstructure-linux*',shell=True,cwd='../../')