changeset 11:54b116d8fd11

Uploaded
author bgruening
date Tue, 21 May 2013 20:10:44 -0400 (2013-05-22)
parents 6fc7731ca1c5
children b5ac9e7b9e61
files tool_dependencies.xml
diffstat 1 files changed, 4 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/tool_dependencies.xml	Tue May 21 16:16:29 2013 -0400
+++ b/tool_dependencies.xml	Tue May 21 20:10:44 2013 -0400
@@ -1,27 +1,25 @@
 <?xml version="1.0"?>
 <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/" />
+            <repository changeset_revision="11df6383f50a" name="package_lapack_3_4" owner="bgruening" prior_installation_required="True" />
         </package>
         <package name="atlas" version="3.10.1">
-            <repository changeset_revision="11bb8ca8c41c" name="package_atlas_3_10" owner="bgruening" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu/" />
+            <repository changeset_revision="3bf7e2082c5c" name="package_atlas_3_10" owner="bgruening" prior_installation_required="True" />
         </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="11bb8ca8c41c" name="package_atlas_3_10" owner="bgruening" toolshed="http://testtoolshed.g2.bx.psu.edu/">
+                        <repository changeset_revision="3bf7e2082c5c" name="package_atlas_3_10" owner="bgruening">
                             <package name="atlas" version="3.10.1" />
                         </repository>
                     </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/">
+                        <repository changeset_revision="11df6383f50a" name="package_lapack_3_4" owner="bgruening">
                             <package name="lapack" version="3.4.2" />
                         </repository>
                     </action>
-                    <action type="shell_command">echo $LAPACK_LIB_DIR/libblas.a &gt; $INSTALL_DIR/bu.txt</action>
-                    <action type="shell_command">echo $ATLAS_LIB_DIR/libatlas.a &gt; $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; 
@@ -32,9 +30,6 @@
                         <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>