diff tool_dependencies.xml @ 5:0a80636e2735

ChemicalToolBoX update.

--- a/tool_dependencies.xml	Mon Jul 22 16:00:26 2013 +0200
+++ b/tool_dependencies.xml	Mon Jul 22 16:26:21 2013 +0200
@@ -4,7 +4,7 @@
             <repository changeset_revision="a6b8f46acca7" 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">
-            <repository changeset_revision="25dc49b0d6d5" name="package_atlas_3_10" owner="bgruening" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu/" />
+            <repository changeset_revision="68df9078bf69" 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">
             <repository changeset_revision="ad6ebe2c75ef" name="package_numpy_1_7" owner="bgruening" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu/" />
@@ -14,7 +14,7 @@
                 <actions>
                     <action type="download_by_url">http://downloads.sourceforge.net/project/scipy/scipy/0.12.0/scipy-0.12.0.tar.gz</action>
                     <action type="set_environment_for_install">
-                        <repository changeset_revision="25dc49b0d6d5" name="package_atlas_3_10" owner="bgruening" toolshed="http://testtoolshed.g2.bx.psu.edu/">
+                        <repository changeset_revision="68df9078bf69" name="package_atlas_3_10" owner="bgruening" toolshed="http://testtoolshed.g2.bx.psu.edu/">
                             <package name="atlas" version="3.10.1" />
                         </repository>
                         <repository changeset_revision="a6b8f46acca7" name="package_lapack_3_4" owner="bgruening" toolshed="http://testtoolshed.g2.bx.psu.edu/">
@@ -25,13 +25,22 @@
                         </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; 
+                    <action language="cheetah" type="template_command">
+                    export PYTHONPATH=$PYTHONPATH:$INSTALL_DIR/lib/python &amp;&amp; 
+
+
+                    #if env.get('ATLAS_LIB_DIR', False):
+                        export ATLAS=$ATLAS_LIB_DIR/libatlas.a &amp;&amp; 
+                    #end if
+                    #if env.get('LAPACK_LIB_DIR', False):
+                        export BLAS=$LAPACK_LIB_DIR/libblas.a &amp;&amp; 
+                        export LAPACK=$LAPACK_LIB_DIR/liblapack.a &amp;&amp; 
+                    #end if
+
                     export PATH=$PATH:$PATH_NUMPY &amp;&amp; 
                     export PYTHONPATH=$PYTHONPATH:$PYTHONPATH_NUMPY &amp;&amp; 
-                    python setup.py install --home $INSTALL_DIR --install-scripts $INSTALL_DIR/bin</action>
+                    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="prepend_to" name="PATH">$INSTALL_DIR/bin</environment_variable>
@@ -44,4 +53,4 @@
             </install>
             <readme>Compiling scipy requires a C and Fortran compiler (typically gcc and gfortran). The PYTHONPATH for scipy can be accessed through PYTHONPATH_SCIPY and the binaries with PATH_SCIPY.</readme>
         </package>
-</tool_dependency>
+</tool_dependency>
\ No newline at end of file