[Yt-svn] commit/yt: MatthewTurk: Updating mercurial to 2.0, fixing the PhiloGL linking. (Long term, we should

Bitbucket commits-noreply at bitbucket.org
Wed Nov 2 08:51:27 PDT 2011


1 new commit in yt:


https://bitbucket.org/yt_analysis/yt/changeset/16e8d749a806/
changeset:   16e8d749a806
branch:      yt
user:        MatthewTurk
date:        2011-11-02 13:04:39
summary:     Updating mercurial to 2.0, fixing the PhiloGL linking.  (Long term, we should
stop extracting files and just use zipfile to read files!)
affected #:  1 file

diff -r 4dad11dc2d2d22545958f9007c18a11650278622 -r 16e8d749a806df28e253f4ca4d6c8275cb99a8e8 doc/install_script.sh
--- a/doc/install_script.sh
+++ b/doc/install_script.sh
@@ -304,7 +304,7 @@
 get_enzotools Python-2.7.2.tgz
 get_enzotools numpy-1.6.1.tar.gz
 get_enzotools matplotlib-1.1.0.tar.gz
-get_enzotools mercurial-1.8.1.tar.gz
+get_enzotools mercurial-2.0.tar.gz
 get_enzotools ipython-0.10.tar.gz
 get_enzotools h5py-2.0.1.tar.gz
 get_enzotools Cython-0.15.1.tar.gz
@@ -442,7 +442,7 @@
 if [ $INST_HG -eq 1 ]
 then
     echo "Installing Mercurial."
-    do_setup_py mercurial-1.8.1
+    do_setup_py mercurial-2.0
     export HG_EXEC=${DEST_DIR}/bin/hg
 else
     # We assume that hg can be found in the path.
@@ -553,6 +553,7 @@
 then
     ( unzip -o ext-3.3.2.zip 2>&1 ) 1>> ${LOG_FILE} || do_exit
     ( echo "Symlinking ext-3.3.2 as ext-resources" 2>&1 ) 1>> ${LOG_FILE}
+    rm -rf ext-resources
     ln -sf ext-3.3.2 ext-resources
     touch ext-3.3.2/done
 fi
@@ -562,6 +563,7 @@
 then
     ( unzip -o ext-slate-110328.zip 2>&1 ) 1>> ${LOG_FILE} || do_exit
     ( echo "Symlinking ext-slate-110328 as ext-theme" 2>&1 ) 1>> ${LOG_FILE}
+    rm -rf ext-theme
     ln -sf ext-slate-110328 ext-theme
     touch ext-slate-110328/done
 fi
@@ -571,6 +573,7 @@
 then
     ( unzip -o PhiloGL-1.4.2.zip 2>&1 ) 1>> ${LOG_FILE} || do_exit
     ( echo "Symlinking PhiloGL-1.4.2 as PhiloGL" 2>&1 ) 1>> ${LOG_FILE}
+    rm -rf PhiloGL
     ln -sf PhiloGL-1.4.2 PhiloGL
     touch PhiloGL-1.4.2/done
 fi

Repository URL: https://bitbucket.org/yt_analysis/yt/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.



More information about the yt-svn mailing list