# HG changeset patch
# User bgruening
# Date 1369077001 14400
# Node ID d161fa47699c960ae4899ba8c9d1fe86b2687a08
# Parent  00ab0c23750067e804c94fe2e506bbc52f2d6bac
Uploaded

diff -r 00ab0c237500 -r d161fa47699c tool_dependencies.xml
--- a/tool_dependencies.xml	Sat May 18 05:35:04 2013 -0400
+++ b/tool_dependencies.xml	Mon May 20 15:10:01 2013 -0400
@@ -2,35 +2,42 @@
 <tool_dependency>
         <package name="lapack" version="3.4.2">
             <repository changeset_revision="11df6383f50a" name="package_lapack_3_4" owner="bgruening" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu/" />
-            </package>
-    <package name="atlas" version="3.10.1">
+        </package>
+        <package name="atlas" version="3.10.1">
             <repository changeset_revision="4e971abe695a" name="package_atlas_3_10" owner="bgruening" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu/" />
-            </package>
-    <package name="numpy" version="1.7.1">
-            <actions>
-                <action type="download_by_url">https://pypi.python.org/packages/source/n/numpy/numpy-1.7.1.tar.gz</action>
-                <action type="set_environment_for_install">
-                    <repository changeset_revision="11df6383f50a" name="package_lapack_3_4" owner="bgruening" toolshed="http://testtoolshed.g2.bx.psu.edu/">
-                        <package name="lapack" version="3.4.2" />
+        </package>
+        <package name="numpy" version="1.7.1">
+            <install version="1.0">
+                <actions>
+                    <action type="download_by_url">https://pypi.python.org/packages/source/n/numpy/numpy-1.7.1.tar.gz</action>
+                    <action type="set_environment_for_install">
+                        <repository changeset_revision="4e971abe695a" name="package_atlas_3_10" owner="bgruening" toolshed="http://testtoolshed.g2.bx.psu.edu/">
+                            <package name="atlas" version="3.10.1" />
                         </repository>
-                </action>
-            <action type="set_environment_for_install">
-                    <repository changeset_revision="4e971abe695a" name="package_atlas_3_10" owner="bgruening" toolshed="http://testtoolshed.g2.bx.psu.edu/">
-                        <package name="atlas" version="3.10.1" />
+                    </action>
+                    <action type="set_environment_for_install">
+                        <repository changeset_revision="11df6383f50a" name="package_lapack_3_4" owner="bgruening" toolshed="http://testtoolshed.g2.bx.psu.edu/">
+                            <package name="lapack" version="3.4.2" />
                         </repository>
-                </action>
-            <action type="make_directory">$INSTALL_DIR/lib/python</action>
-                <action type="shell_command">export PYTHONPATH=$PYTHONPATH:$INSTALL_DIR/lib/python &amp;&amp; 
-                export BLAS=$LAPACK_LIB_DIR/libblas.a &amp;&amp; 
-                export LAPACK=$LAPACK_LIB_DIR/liblapack.a &amp;&amp; 
-                export ATLAS=$ATLAS_LIB_DIR/libatlas.a &amp;&amp; 
-                python setup.py install --home $INSTALL_DIR --install-scripts $INSTALL_DIR/bin</action>
-                <action type="set_environment">
-                    <environment_variable action="append_to" name="PYTHONPATH">$INSTALL_DIR/lib/python</environment_variable>
-                    <environment_variable action="set_to" name="PYTHONPATH_NUMPY">$INSTALL_DIR/lib/python</environment_variable>
-                    <environment_variable action="prepend_to" name="PATH">$INSTALL_DIR/bin</environment_variable>
                     </action>
-            </actions>
-        <readme>Compiling numpy requires a C and Fortran compiler (typically gcc and gfortran). The PYTHONPATH for numpy can be accessed through PYTHONPATH_NUMPY.</readme>
-            </package>
-    </tool_dependency>
+                    <action type="shell_command">echo $LAPACK_LIB_DIR/libblas.a > $INSTALL_DIR/bu.txt</action>
+                    <action type="shell_command">echo $ATLAS_LIB_DIR/libatlas.a > $INSTALL_DIR/au.txt</action>
+                    <action type="make_directory">$INSTALL_DIR/lib/python</action>
+                    <action type="shell_command">export PYTHONPATH=$PYTHONPATH:$INSTALL_DIR/lib/python &amp;&amp; 
+                    export BLAS=$LAPACK_LIB_DIR/libblas.a &amp;&amp; 
+                    export LAPACK=$LAPACK_LIB_DIR/liblapack.a &amp;&amp; 
+                    export ATLAS=$ATLAS_LIB_DIR/libatlas.a &amp;&amp; 
+                    python setup.py install --home $INSTALL_DIR --install-scripts $INSTALL_DIR/bin</action>
+                    <action type="set_environment">
+                        <environment_variable action="append_to" name="PYTHONPATH">$INSTALL_DIR/lib/python</environment_variable>
+                        <environment_variable action="set_to" name="PYTHONPATH_NUMPY">$INSTALL_DIR/lib/python</environment_variable>
+                        <environment_variable action="prepend_to" name="PATH">$INSTALL_DIR/bin</environment_variable>
+                        <environment_variable action="set_to" name="BLAS">$LAPACK_LIB_DIR/libblas.a</environment_variable>
+                        <environment_variable action="set_to" name="LAPACK">$LAPACK_LIB_DIR/liblapack.a</environment_variable>
+                        <environment_variable action="set_to" name="ATLAS">$ATLAS_LIB_DIR/libatlas.a</environment_variable>
+                        </action>
+                </actions>
+            </install>
+            <readme>Compiling numpy requires a C and Fortran compiler (typically gcc and gfortran). The PYTHONPATH for numpy can be accessed through PYTHONPATH_NUMPY.</readme>
+        </package>
+</tool_dependency>