[Yt-svn] yt-commit r695 - branches/yt-1.0/doc trunk/doc

[mturk at wrangler.dreamhost.com]

Author: mturk
Date: Fri Jul 25 08:57:51 2008
New Revision: 695
URL: http://yt.spacepope.org/changeset/695

Log:
Changed the order of compilation & installation to do MPL after wxPython.



Modified:
   branches/yt-1.0/doc/install_script.sh
   trunk/doc/install_script.sh

Modified: branches/yt-1.0/doc/install_script.sh
==============================================================================
--- branches/yt-1.0/doc/install_script.sh	(original)
+++ branches/yt-1.0/doc/install_script.sh	Fri Jul 25 08:57:51 2008
@@ -64,16 +64,6 @@
     cd ..
 fi
 
-if [ ! -e matplotlib-0.91.4/done ]
-then
-    echo "Doing Matplotlib"
-    [ ! -e matplotlib-0.91.4 ] && tar xvfz matplotlib-0.91.4.tar.gz
-    cd matplotlib-0.91.4
-    $MY_DIR/bin/python2.5 setup.py install || exit 1
-    touch done
-    cd ..
-fi
-
 if [ ! -e wxPython-src-2.8.7.1/done ]
 then
     echo "Doing wxPython"
@@ -89,6 +79,16 @@
     cd ../..
 fi
 
+if [ ! -e matplotlib-0.91.4/done ]
+then
+    echo "Doing Matplotlib"
+    [ ! -e matplotlib-0.91.4 ] && tar xvfz matplotlib-0.91.4.tar.gz
+    cd matplotlib-0.91.4
+    $MY_DIR/bin/python2.5 setup.py install || exit 1
+    touch done
+    cd ..
+fi
+
 if [ ! -e yt-0.3/done ]
 then
     echo "Doing yt installation"

Modified: trunk/doc/install_script.sh
==============================================================================
--- trunk/doc/install_script.sh	(original)
+++ trunk/doc/install_script.sh	Fri Jul 25 08:57:51 2008
@@ -64,16 +64,6 @@
     cd ..
 fi
 
-if [ ! -e matplotlib-0.91.4/done ]
-then
-    echo "Doing Matplotlib"
-    [ ! -e matplotlib-0.91.4 ] && tar xvfz matplotlib-0.91.4.tar.gz
-    cd matplotlib-0.91.4
-    $MY_DIR/bin/python2.5 setup.py install || exit 1
-    touch done
-    cd ..
-fi
-
 if [ ! -e wxPython-src-2.8.7.1/done ]
 then
     echo "Doing wxPython"
@@ -89,6 +79,16 @@
     cd ../..
 fi
 
+if [ ! -e matplotlib-0.91.4/done ]
+then
+    echo "Doing Matplotlib"
+    [ ! -e matplotlib-0.91.4 ] && tar xvfz matplotlib-0.91.4.tar.gz
+    cd matplotlib-0.91.4
+    $MY_DIR/bin/python2.5 setup.py install || exit 1
+    touch done
+    cd ..
+fi
+
 if [ ! -e yt-0.3/done ]
 then
     echo "Doing yt installation"