changeset 1:966f29c955b9 draft

Uploaded
author bgruening
date Thu, 12 Sep 2013 07:02:18 -0400
parents a476c1177222
children 85b7ddf90888
files tool_dependencies.xml
diffstat 1 files changed, 8 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/tool_dependencies.xml	Mon Jul 08 10:17:54 2013 -0400
+++ b/tool_dependencies.xml	Thu Sep 12 07:02:18 2013 -0400
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <tool_dependency>
     <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" />
+       <repository changeset_revision="b7ff4a8c58df" name="package_numpy_1_7" owner="iuc" 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" />
+        <repository changeset_revision="fe5cfaf931ff" name="package_freetype_2_4" owner="iuc" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu" />
     </package>
     <package name="matplotlib" version="1.2.1">
         <install version="1.0">
@@ -14,20 +14,22 @@
 
                 <!-- populate the environment variables from the dependend repos -->
                 <action type="set_environment_for_install">
-                    <repository changeset_revision="ad6ebe2c75ef" name="package_numpy_1_7" owner="bgruening" toolshed="http://testtoolshed.g2.bx.psu.edu">
+                    <repository changeset_revision="b7ff4a8c58df" name="package_numpy_1_7" owner="iuc" 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">
+                    <repository changeset_revision="fe5cfaf931ff" name="package_freetype_2_4" owner="iuc" toolshed="http://testtoolshed.g2.bx.psu.edu">
                         <package name="freetype" version="2.4.11" />
                     </repository>
                 </action>
 
                 <!-- 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 --install-lib $INSTALL_DIR/lib/python --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>