changeset 30:83b2e852544b

ChemicalToolBoX update.
author Bjoern Gruening <bjoern.gruening@gmail.com>
date Mon, 22 Jul 2013 18:39:37 +0200
parents 293ce490fc22
children dd81b71dff1b
files tool_dependencies.xml
diffstat 1 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/tool_dependencies.xml	Mon Jul 22 17:05:24 2013 +0200
+++ b/tool_dependencies.xml	Mon Jul 22 18:39:37 2013 +0200
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
 <tool_dependency>
     <package name="numpy" version="1.7.1">
-       <repository changeset_revision="62fda117ad4a" name="package_numpy_1_7" owner="bgruening" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu/" />
+       <repository changeset_revision="a0f0a86440ca" name="package_numpy_1_7" owner="bgruening" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu/" />
     </package>
     <package name="freetype" version="2.4.11">
         <repository changeset_revision="4e54e357ac25" name="package_freetype_2_4" owner="bgruening" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu/" />
@@ -14,7 +14,7 @@
 
                 <!-- populate the environment variables from the dependend repos -->
                 <action type="set_environment_for_install">
-                    <repository changeset_revision="62fda117ad4a" name="package_numpy_1_7" owner="bgruening" toolshed="http://testtoolshed.g2.bx.psu.edu/">
+                    <repository changeset_revision="a0f0a86440ca" name="package_numpy_1_7" owner="bgruening" toolshed="http://testtoolshed.g2.bx.psu.edu/">
                         <package name="numpy" version="1.7.1" />
                     </repository>
                     <repository changeset_revision="4e54e357ac25" name="package_freetype_2_4" owner="bgruening" toolshed="http://testtoolshed.g2.bx.psu.edu/">
@@ -24,10 +24,12 @@
 
                 <!-- install matplotlib -->
                 <action type="make_directory">$INSTALL_DIR/lib/python</action>
-                <action type="shell_command">export PYTHONPATH=$PYTHONPATH:$INSTALL_DIR/lib/python:$PYTHONPATH_NUMPY &amp;&amp; 
+                <action type="shell_command">
+                    export PYTHONPATH=$PYTHONPATH:$INSTALL_DIR/lib/python:$PYTHONPATH_NUMPY &amp;&amp; 
                     export CPLUS_INCLUDE_PATH=$FREETYPE_INCLUDE_DIR:$FREETYPE_INCLUDE_DIR/freetype2/ &amp;&amp; 
                     export LIBRARY_PATH=$FREETYPE_LIB_DIR &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="append_to" name="PYTHONPATH">$ENV[PYTHONPATH_NUMPY]</environment_variable>