Author: tlinnet Date: Mon Oct 3 13:46:29 2016 New Revision: 28248 URL: http://svn.gna.org/viewcvs/relax?rev=28248&view=rev Log: Again small changes to deployment scripts.
Modified: trunk/devel_scripts/deploy_scripts/deploy_google_computing_redhat_6_86_x64.sh trunk/devel_scripts/deploy_scripts/deploy_google_computing_redhat_6_86_x64_upgrade_python.sh trunk/devel_scripts/deploy_scripts/deploy_google_computing_redhat_7_86_x64.sh Modified: trunk/devel_scripts/deploy_scripts/deploy_google_computing_redhat_6_86_x64.sh URL: http://svn.gna.org/viewcvs/relax/trunk/devel_scripts/deploy_scripts/deploy_google_computing_redhat_6_86_x64.sh?rev=28248&r1=28247&r2=28248&view=diff ============================================================================== --- trunk/devel_scripts/deploy_scripts/deploy_google_computing_redhat_6_86_x64.sh (original) +++ trunk/devel_scripts/deploy_scripts/deploy_google_computing_redhat_6_86_x64.sh Mon Oct 3 13:46:29 2016 @@ -11,22 +11,21 @@ sudo yum -y install openmpi-devel echo "module load openmpi-1.10-x86_64" >> $HOME/.bash_profile + # For trunk checkout and graphs + sudo yum -y install subversion scons + + # Install xmgrace. Add the EPEL repository. + sudo yum -y install wget curl bzip2 + wget http://download.fedoraproject.org/pub/epel/6/x86_64/epel-release-6-8.noarch.rpm + sudo rpm -ivh epel-release-6-8.noarch.rpm + sudo yum -y install grace + # Install dependencies sudo yum -y install numpy sudo yum -y install scipy python-matplotlib - # For trunk checkout and graphs - sudo yum -y install subversion scons - - # Install xmgrace. Add the EPEL repository. - sudo yum -y install wget curl - wget http://download.fedoraproject.org/pub/epel/6/x86_64/epel-release-6-8.noarch.rpm - sudo rpm -ivh epel-release-6-8.noarch.rpm - sudo yum -y install grace - # mpi4py sudo yum -y install mpi4py-openmpi - sudo yum info mpi4py-openmpi # wxPython for GUI sudo yum -y install wxPython @@ -80,7 +79,6 @@ # Get latest compiled version of relax function getlatest { - sudo yum -y install bzip2 cd $HOME if [ ! -d "$HOME/relax-$VREL" ]; then curl http://download.gna.org/relax/relax-$VREL.GNU-Linux.x86_64.tar.bz2 -o relax-$VREL.GNU-Linux.x86_64.tar.bz2 Modified: trunk/devel_scripts/deploy_scripts/deploy_google_computing_redhat_6_86_x64_upgrade_python.sh URL: http://svn.gna.org/viewcvs/relax/trunk/devel_scripts/deploy_scripts/deploy_google_computing_redhat_6_86_x64_upgrade_python.sh?rev=28248&r1=28247&r2=28248&view=diff ============================================================================== --- trunk/devel_scripts/deploy_scripts/deploy_google_computing_redhat_6_86_x64_upgrade_python.sh (original) +++ trunk/devel_scripts/deploy_scripts/deploy_google_computing_redhat_6_86_x64_upgrade_python.sh Mon Oct 3 13:46:29 2016 @@ -11,16 +11,17 @@ sudo yum -y install openmpi-devel echo "module load openmpi-1.10-x86_64" >> $HOME/.bash_profile - # Install dependencies - sudo yum -y install scipy python-matplotlib - # For trunk checkout and graphs sudo yum -y install subversion scons # Install xmgrace. Add the EPEL repository. + sudo yum -y install wget curl bzip2 wget http://download.fedoraproject.org/pub/epel/6/x86_64/epel-release-6-8.noarch.rpm sudo rpm -ivh epel-release-6-8.noarch.rpm sudo yum -y install grace + + # wxPython for GUI + sudo yum -y install wxPython } # Install python @@ -77,6 +78,8 @@ cd $VERS/wxPython #python build-wxpython.py --build_dir=../bld sudo -- sh -c 'source scl_source enable python27; python build-wxpython.py --install' + echo 'export PYTHONPATH=${PYTHONPATH}:/opt/rh/python27/root/usr/lib64/python2.7/site-packages/wx-3.0-gtk2' >> $HOME/.bash_profile + echo 'export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/local/lib' >> $HOME/.bash_profile # Installing wxGTK from source #VERS=wxWidgets-3.1.0 @@ -131,7 +134,6 @@ # Get latest compiled version of relax function getlatest { - sudo yum -y install bzip2 cd $HOME if [ ! -d "$HOME/relax-$VREL" ]; then curl http://download.gna.org/relax/relax-$VREL.GNU-Linux.x86_64.tar.bz2 -o relax-$VREL.GNU-Linux.x86_64.tar.bz2 Modified: trunk/devel_scripts/deploy_scripts/deploy_google_computing_redhat_7_86_x64.sh URL: http://svn.gna.org/viewcvs/relax/trunk/devel_scripts/deploy_scripts/deploy_google_computing_redhat_7_86_x64.sh?rev=28248&r1=28247&r2=28248&view=diff ============================================================================== --- trunk/devel_scripts/deploy_scripts/deploy_google_computing_redhat_7_86_x64.sh (original) +++ trunk/devel_scripts/deploy_scripts/deploy_google_computing_redhat_7_86_x64.sh Mon Oct 3 13:46:29 2016 @@ -11,22 +11,21 @@ sudo yum -y install openmpi-devel echo "module load mpi/openmpi-x86_64" >> $HOME/.bash_profile + # For trunk checkout and graphs + sudo yum -y install subversion scons + + # Install xmgrace. Add the EPEL repository. + sudo yum -y install wget curl bzip2 + wget https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm + sudo yum -y install epel-release-latest-7.noarch.rpm + sudo yum -y install grace + # Install dependencies sudo yum -y install numpy sudo yum -y install scipy python-matplotlib - # For trunk checkout and graphs - sudo yum -y install subversion scons - - # Install xmgrace. Add the EPEL repository. - sudo yum -y install wget curl - wget https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm - sudo yum -y install epel-release-latest-7.noarch.rpm - sudo yum -y install grace - # mpi4py sudo yum -y install mpi4py-openmpi - sudo yum info mpi4py-openmpi # wxPython for GUI sudo yum -y install wxPython @@ -80,7 +79,7 @@ # Get latest compiled version of relax function getlatest { - sudo yum -y install bzip2 + sudo yum -y install cd $HOME if [ ! -d "$HOME/relax-$VREL" ]; then curl http://download.gna.org/relax/relax-$VREL.GNU-Linux.x86_64.tar.bz2 -o relax-$VREL.GNU-Linux.x86_64.tar.bz2 _______________________________________________ relax (http://www.nmr-relax.com) This is the relax-commits mailing list relax-commits@gna.org To unsubscribe from this list, get a password reminder, or change your subscription options, visit the list information page at https://mail.gna.org/listinfo/relax-commits